字段变更

ems-ui-cloud/src/views/basecfg/meterdevc/index.vue

@@ -20,11 +20,6 @@
 
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="计量类别" prop="meterCls">
-            <el-select v-model="queryParams.meterCls">
-              <el-option v-for="item in emsClsOptions" :label="item.name" :value="item.code" :key="item.code" />
-            </el-select>
-          </el-form-item>
           <el-form-item label="设备代码" prop="deviceCode">
             <el-input v-model="queryParams.deviceCode" placeholder="请输入设备代码" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
@@ -52,23 +47,14 @@
 
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="计量对象" align="left" prop="objName" width="300px">
-            <template slot-scope="scope">
-              <span>{{ "（" + getObjTypeName(scope.row.objType) + "）"+ scope.row.objName }}</span>
-            </template>
-          </el-table-column>
+          <el-table-column label="设备编号" align="left" prop="deviceCode" />
+          <el-table-column label="设备名称" align="left" prop="deviceName" width="200px"/>
+          <el-table-column label="安装位置" align="left" prop="deviceLocation" width="200px"/>
           <el-table-column label="计量标签" align="center" prop="objTag">
             <template slot-scope="scope">
               {{formatDict(scope.row.objTag,'objTagOptions')}}
             </template>
           </el-table-column>
-
-          <el-table-column label="设备代码" align="center" prop="deviceCode" />
-          <el-table-column label="计量类别" align="center" prop="meterCls">
-            <template slot-scope="scope">
-              <span>{{ getMeterClsName(scope.row.meterCls) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="采集方式" align="center" prop="colMode">
             <template slot-scope="scope">
               <span>{{ getColModeName(scope.row.colMode) }}</span>
@@ -106,16 +92,14 @@
                 <el-option v-for="item in emsClsOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
-            <el-form-item label="设备代码" prop="deviceCode">
-              <el-input v-model="form.deviceCode" placeholder="请输入设备代码" />
+            <el-form-item label="设备编号" prop="deviceCode">
+              <el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
             </el-form-item>
-            <el-form-item label="计量分类" prop="objType">
-              <el-select v-model="form.objType" @change="changeObjOptions">
-                <el-option v-for="item in objTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
-              </el-select>
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="form.deviceName" placeholder="请输入设备代码" />
             </el-form-item>
-            <el-form-item label="计量对象" prop="objCode">
-              <treeselect v-model="objCode" :options="objCodeOptions" :show-count="true" placeholder="请选择计量对象"  />
+            <el-form-item label="安装位置" prop="deviceLocation">
+              <el-input v-model="form.deviceLocation" placeholder="请输入设备安装位置" />
             </el-form-item>
             <el-form-item label="计量标签" prop="objTag">
               <el-radio-group v-model="form.objTag" size="medium">
@@ -187,7 +171,6 @@ export default {
       objCodeOptions: [],
       areaOptions: [],
       selectObjCode: null,
-      objCode: null,
       defaultProps: {
         children: 'children',
         label: 'label'
@@ -197,11 +180,6 @@ export default {
         { code: 45, name: '电表' },
         { code: 70, name: '水表' }
       ],
-      objTypeOptions: [
-        { code: 1, name: '区域' },
-        { code: 2, name: '设施' },
-        { code: 3, name: '设备' }
-      ],
       objTagOptions: [
         { code: 0, name: '公摊表' },
         { code: 1, name: '个户表' }
@@ -225,9 +203,6 @@ export default {
         bldgCode: null,
         deviceCode: null,
         meterCls: null,
-        objType: null,
-        objCode: null,
-        objName: null,
         objTag: null,
         colCycle: null,
         colMode: null,
@@ -243,8 +218,7 @@ export default {
         areaCode: [{ required: true, message: '选择服务区', trigger: 'blur' }],
         deviceCode: [{ required: true, message: '设备代码不能为空', trigger: 'blur' }],
         meterCls: [{ required: true, message: '计量类别不能为空', trigger: 'blur' }],
-        objType: [{ required: true, message: '计量对象类型 1-区块 2-设备不能为空', trigger: 'change' }],
-        objCode: [{ required: true, message: '计量对象编码不能为空', trigger: 'blur' }]
+        meterCls: [{ required: true, message: '计量类别不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -295,9 +269,9 @@ export default {
       this.form = {
         id: null,
         deviceCode: null,
+        deviceName: null,
+        deviceLocation:null,
         meterCls: null,
-        meterObjType: null,
-        objCode: null,
         colCycle: null,
         colMode: null,
         specDesc: null
@@ -338,31 +312,6 @@ export default {
         this.open = true
         this.title = '修改计量设备'
       })
-
-      this.objCode = row.objCode
-
-      // 区域
-      if (row.objType === 1) {
-        areaTreeSelect(row.areaCode, true).then(response => {
-          this.objCodeOptions = [{
-            id: row.areaCode,
-            label: this.getAreaLabelById(row.areaCode),
-            children: response.data
-          }]
-        })
-      }
-      // 设施
-      else if (row.objType === 2) {
-        devTreeByFacs(row.areaCode).then(response => {
-          this.objCodeOptions = response.data
-        })
-      }
-      // 设备
-      else if (row.objType === 2) {
-        devTreeByFacs(row.areaCode).then(response => {
-          this.objCodeOptions = response.data
-        })
-      }
     },
     isAreaCodeMod() {
       return !this.areaMod;
@@ -414,21 +363,7 @@ export default {
       })
       return name
     },
-    getMeterClsName(meterCls) {
-      const clsMap = {
-        45: '电表',
-        70: '水表'
-      }
-      return clsMap[meterCls] || '未知'
-    },
-    getObjTypeName(objType) {
-      const typeMap = {
-        1: '区域',
-        2: '设施',
-        3: '设备',
-      }
-      return typeMap[objType] || '未知'
-    },
+
     getColCycleName(colCycle) {
       const cycleMap = {
         0: '实时',
@@ -461,33 +396,6 @@ export default {
     handleNodeClick(data) {
       this.queryParams.areaCode = data.id
       this.handleQuery()
-    },
-    changeObjOptions(objType) {
-      this.objCode = null
-      // 区域
-      if (objType === 1) {
-        areaTreeSelect(this.form.areaCode, true).then(response => {
-          this.objCodeOptions = [{
-            id: this.form.areaCode,
-            label: this.getAreaLabelById(this.form.areaCode),
-            children: response.data
-          }]
-        })
-      }
-      // 设施
-      else if (objType === 2) {
-        const devcCategory = 'Z';
-        devTreeByFacs(this.form.areaCode, devcCategory).then(response => {
-          this.objCodeOptions = response.data
-        })
-      }
-      // 设备
-      else if (objType === 3) {
-        const devcCategory = 'Z';
-        devTreeByFacs(this.form.areaCode, devcCategory).then(response => {
-          this.objCodeOptions = response.data
-        })
-      }
     }
   }
 }