计量格式

Signed-off-by: hsshuxian <3049816743@qq.com>

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

@@ -23,6 +23,21 @@
           <el-form-item label="设备代码" prop="deviceCode">
             <el-input v-model="queryParams.deviceCode" placeholder="请输入设备代码" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @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">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -87,11 +102,6 @@
                 <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="计量类别" prop="meterCls">
-              <el-select v-model="form.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="form.deviceCode" placeholder="请输入设备编号" />
             </el-form-item>
@@ -108,9 +118,10 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="采集方式" prop="colMode">
-              <el-select v-model="form.colMode" @change="colModeChange">
-                <el-option v-for="item in colModeOptions" :label="item.name" :value="item.code" :key="item.code" />
-              </el-select>
+              <el-radio-group v-model="form.colMode" size="medium" @change="colModeChange">
+                <el-radio v-for="(item, index) in colModeOptions" :key="index" :label="item.code" :disabled="item.disabled">{{item.name}}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
             <el-form-item label="采集周期" prop="colCycle">
               <el-select v-model="form.colCycle" :disabled="form.colMode === 1">
@@ -118,7 +129,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="倍率" prop="magnification">
-              <el-input-number v-model="form.magnification" :min="1" :max="99" @change="handleChange"></el-input-number>
+              <el-input-number v-model="form.magnification" :min="0" :max="99" @change="handleChange"></el-input-number>
             </el-form-item>
             <el-form-item label="规格描述" prop="specDesc">
               <el-input v-model="form.specDesc" placeholder="请输入规格描述" />
@@ -206,7 +217,7 @@ export default {
         objTag: null,
         colCycle: null,
         colMode: null,
-        magnification: null,
+        magnification: 1,
         specDesc: null
       },
       // 表单参数
@@ -273,7 +284,8 @@ export default {
         meterCls: null,
         colCycle: null,
         colMode: null,
-        specDesc: null
+        specDesc: null,
+        magnification :1
       }
       this.objCode = null
       this.areaMod = false
@@ -299,11 +311,13 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = '添加计量设备';
       this.areaMod = true;
+      this.form.magnification = 1;
       if (this.activeTab === '电表') {
+        this.title = '添加电表';
         this.form.meterCls = 45;
       } else if (this.activeTab === '水表') {
+        this.title = '添加电表';
         this.form.meterCls = 70;
       }
     },
@@ -312,9 +326,13 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getDevice(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改计量设备'
+        this.form = response.data;
+        this.open = true;
+        if (this.activeTab === '电表') {
+          this.title = '修改电表';
+        } else if (this.activeTab === '水表') {
+          this.title = '修改水表';
+        }
       })
     },
     isAreaCodeMod() {