删除表计的计量标签属性

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

@@ -928,7 +928,7 @@ export default {
     this.getFacsOptions()
     this.getSubsystem()
     this.getSubCategorygetByCode()
-    this.getFacsModel()
+    this.getDevModel()
     this.getAllDevProcess(this.subcategoryCode)
     const now = new Date()
     const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)
@@ -1581,7 +1581,7 @@ export default {
     getPsName(psName) {
       return psName === null ? '' : ' - '+psName;
     },
-    getFacsModel() {
+    getDevModel() {
       listAllModel(2).then(response => {
         this.modelList = response.data
       })

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

@@ -36,12 +36,6 @@
                       @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="表计标签" prop="objTag">
-            <el-select v-model="queryParams.objTag" placeholder="请选择表计标签" clearable>
-              <el-option v-for="item in objTagOptions" :key="item.code" :label="item.name" :value="item.code">
-              </el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="采集方式" prop="colMode">
             <el-select v-model="queryParams.colMode" placeholder="请选择采集方式" clearable>
               <el-option v-for="item in colModeOptions" :key="item.code" :label="item.name" :value="item.code">
@@ -91,11 +85,6 @@
               </el-tag>
             </template>
           </el-table-column>
-          <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="colMode">
             <template slot-scope="scope">
               <span>{{ getColModeName(scope.row.colMode) }}</span>
@@ -143,8 +132,15 @@
             <el-form-item label="设备名称" prop="deviceName">
               <el-input v-model="form.deviceName" placeholder="请输入设备代码"/>
             </el-form-item>
-            <el-form-item label="设备分组" prop="group">
-              <el-input v-model="form.group" placeholder="请输入设备分组"/>
+            <el-form-item label="设备模型" prop="deviceModel">
+              <el-select v-model="form.deviceModel" style="width:100%"  clearable>
+                <el-option
+                  v-for="item in modelList"
+                  :label="item.modelName"
+                  :value="item.modelCode"
+                  :key="item.modelCode"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="安装位置" prop="location">
               <el-input v-model="form.location" placeholder="请输入设备安装位置"/>
@@ -161,14 +157,6 @@
               >
               </el-switch>
             </el-form-item>
-            <el-form-item label="表计标签" prop="objTag">
-              <el-radio-group v-model="form.objTag" size="medium">
-                <el-radio v-for="(item, index) in objTagOptions" :key="index" :label="item.code"
-                          :disabled="item.disabled"
-                >{{ item.name }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
             <el-form-item label="采集方式" prop="colMode">
               <el-radio-group v-model="form.colMode" size="medium" @change="colModeChange">
                 <el-radio v-for="(item, index) in colModeOptions" :key="index" :label="item.code"
@@ -204,6 +192,7 @@ import { listDevice, getDevice, delDevice, addDevice, updateDevice, listAreaDevi
 import { areaTreeSelect } from '@/api/basecfg/area'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { listAllModel } from '@/api/basecfg/objModel'
 
 export default {
   name: 'Device',
@@ -235,6 +224,7 @@ export default {
       objCodeOptions: [],
       areaOptions: [],
       subAreaOptions: [],
+      modelList: [],
       selectObjCode: null,
       defaultProps: {
         children: 'children',
@@ -245,11 +235,6 @@ export default {
         { code: 45, name: '电表' },
         { code: 70, name: '水表' }
       ],
-      objTagOptions: [
-        { code: 0, name: '无标签' },
-        { code: 1, name: '个户表' },
-        { code: 2, name: '公摊表' }
-      ],
       colCycleOptions: [
         { code: 0, name: '实时' },
         { code: 1, name: '分钟' },
@@ -298,9 +283,9 @@ export default {
   },
 
   created() {
+    this.getDevModel()
     this.getAreaTree('0', 2)
     this.getList()
-
   },
 
   methods: {
@@ -376,6 +361,11 @@ export default {
       this.areaMod = false
       this.resetForm('form')
     },
+    getDevModel() {
+      listAllModel(2).then(response => {
+        this.modelList = response.data
+      })
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1