|
|
@@ -69,9 +69,9 @@
|
|
|
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="设备代码" align="center" prop="deviceCode" />
|
|
|
- <el-table-column label="计量对象" align="center" prop="objType" >
|
|
|
+ <el-table-column label="计量对象" align="center" prop="objName" >
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ "（" + getObjTypeName(scope.row.objCode) + "）"+ + scope.row.objName }}</span>
|
|
|
+ <span>{{ "（" + getObjTypeName(scope.row.objType) + "）"+ scope.row.objName }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="计量类别" align="center" prop="meterCls">
|
|
|
@@ -134,7 +134,7 @@
|
|
|
<el-option v-for="item in objTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="对象编码" prop="objCode">
|
|
|
+ <el-form-item label="计量对象" prop="objCode">
|
|
|
<treeselect v-model="form.objCode" :options="objCodeOptions" :show-count="true" placeholder="请选择计量对象" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="采集周期" prop="colCycle">
|
|
|
@@ -161,6 +161,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/device/meterDevice";
|
|
|
+import { devTreeByFacs } from "@/api/device/device";
|
|
|
import Treeselect from '@riophae/vue-treeselect';
|
|
|
import request from '@/utils/request'
|
|
|
import { areaTreeSelect } from '@/api/basecfg/area'
|
|
|
@@ -311,6 +312,16 @@ export default {
|
|
|
this.open = true;
|
|
|
this.title = "修改计量设备";
|
|
|
});
|
|
|
+
|
|
|
+ if (row.objType === 1) {
|
|
|
+ areaTreeSelect('Zoning').then(response => {
|
|
|
+ this.objCodeOptions = response.data;
|
|
|
+ });
|
|
|
+ } else if (row.objType === 2) {
|
|
|
+ devTreeByFacs().then(response =>{
|
|
|
+ this.objCodeOptions = response.data;
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
@@ -380,11 +391,15 @@ export default {
|
|
|
};
|
|
|
return modeMap[colMode] || '未知';
|
|
|
},
|
|
|
- changeObjOptions(code) {
|
|
|
- if (code === 1) {
|
|
|
+ changeObjOptions(objType) {
|
|
|
+ if (objType === 1) {
|
|
|
areaTreeSelect('Zoning').then(response => {
|
|
|
this.objCodeOptions = response.data;
|
|
|
});
|
|
|
+ } else if (objType === 2) {
|
|
|
+ devTreeByFacs().then(response =>{
|
|
|
+ this.objCodeOptions = response.data;
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
}
|
