Browse Source

1、优化空调机房分页界面;

2、优化备件库寸管理,设备类型id没有替换从字典获取;
3、优化用户管理,左边树形结构点击;
dev_fgd_scr
3067418132@qq.com 1 week ago
parent
commit
ae74554deb
  1. 2
      src/views/centerairC/enSourceAnalysis/components/equipment.vue
  2. 2
      src/views/centerairC/overview/index.vue
  3. 39
      src/views/device/spare/index.vue
  4. 11
      src/views/system/user/index.vue

2
src/views/centerairC/enSourceAnalysis/components/equipment.vue

@ -512,7 +512,7 @@ export default {
}; };
}), }),
]; ];
this.pageParm.total = res.data.totalSize; this.pageParm.total = res.data[3].total;
console.log("header", this.headers); console.log("header", this.headers);
} else { } else {
this.tableData = []; this.tableData = [];

2
src/views/centerairC/overview/index.vue

@ -427,7 +427,7 @@ export default {
electData: res.data[1].meter[index].toString(), // electData: res.data[1].meter[index].toString(), //
copData: res.data[2].cop[index].toString(), // copData: res.data[2].cop[index].toString(), //
})); }));
this.pageParm.total = res.data.totalSize; this.pageParm.total = res.data[5].total;
} else { } else {
this.tableData = []; this.tableData = [];
} }

39
src/views/device/spare/index.vue

@ -123,7 +123,14 @@
<el-table-column label="备件序列号" align="center" prop="serialNum" /> <el-table-column label="备件序列号" align="center" prop="serialNum" />
<el-table-column label="备件名称" align="center" prop="spareName" /> <el-table-column label="备件名称" align="center" prop="spareName" />
<el-table-column label="规格与型号" align="center" prop="modelSpecs" /> <el-table-column label="规格与型号" align="center" prop="modelSpecs" />
<el-table-column label="设备类型Id" align="center" prop="deviceTypeId" /> <el-table-column label="设备类型" align="center" prop="deviceTypeId">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_mt_type"
:value="scope.row.deviceTypeId"
/>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="inventoryLevels" /> <el-table-column label="库存数量" align="center" prop="inventoryLevels" />
<el-table-column <el-table-column
label="最低库存" label="最低库存"
@ -208,13 +215,29 @@
/> </el-form-item /> </el-form-item
></el-col> ></el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备类型Id" prop="deviceTypeId"> <!-- <el-form-item label="设备类型Id" prop="deviceTypeId">
<el-input <el-input
v-model="form.deviceTypeId" v-model="form.deviceTypeId"
placeholder="请输入设备类型Id" placeholder="请输入设备类型Id"
clearable clearable
/> </el-form-item /> </el-form-item
></el-col> > -->
<el-form-item label="设备类型" prop="deviceTypeId">
<el-select
v-model="form.deviceTypeId"
placeholder="请选择设备类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_mt_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row type="flex" justify="center"> <el-row type="flex" justify="center">
<el-col :span="12"> <el-col :span="12">
@ -274,6 +297,16 @@ import {
export default { export default {
name: "spare", name: "spare",
dicts: [
"sys_mt_type",
"sys_type",
"sys_param_type",
"sys_data_type",
"sys_protocol_type",
"sys_communication_type",
"sys_device_type",
"alarm_collection_type",
],
data() { data() {
return { return {
timeArr: [], timeArr: [],

11
src/views/system/user/index.vue

@ -585,3 +585,14 @@ export default {
} }
} }
</style> </style>
<style scoped>
/* 自定义高亮颜色 */
.head-container
>>> .el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content {
background-color: #285b9e !important;
/* color: #f56c6c; */
color: #25f1f8;
}
</style>
Loading…
Cancel
Save