Merge remote-tracking branch 'origin/master'

hw-ui/src/views/ems/base/dianMeasurement/index.vue

@@ -41,6 +41,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="表具类型" prop="monitorType">
+        <el-select v-model="queryParams.monitorType" placeholder="请选择表具类型" clearable>
+          <el-option
+            v-for="dict in dict.type.energy_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="表具类型" prop="isAmmeter">-->
 <!--        <el-select-->
 <!--          v-model="queryParams.publicShareType"-->
@@ -268,8 +278,15 @@
             placeholder="请输入计量设备位置"
           />
         </el-form-item>
-        <el-form-item label="类型" prop="monitorType" v-if="false">
+        <el-form-item label="表具类型" prop="monitorType">
-          <el-input v-model="form.monitorType" />
+          <el-radio-group v-model="form.monitorType">
+            <el-radio
+              v-for="dict in dict.type.energy_type"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
 <!--        <el-form-item label="CBS房间编号" prop="roomCode">-->
 <!--          <el-input v-model="form.roomCode" placeholder="请输入CBS房间编号" />-->
@@ -597,7 +614,6 @@ export default {
     /** 查询计量设备信息列表 */
     getList() {
       this.loading = true;
-      this.queryParams.monitorType = 2;
       listShuiMeasurement(this.queryParams).then((response) => {
         this.list = response.data;
         // response.data.forEach(m=>{
@@ -616,7 +632,6 @@ export default {
           "parentId"
         );
 
-        console.log("this.expandrowid", this.expandrowid);
         this.loading = false;
       });
     },
@@ -757,7 +772,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.form.monitorType = 2;
           this.form.buildId = this.getBuildAllCheckedKeys();
           // this.form.subentryId = this.getSubentryAllCheckedKeys();
           // this.form.businessId = this.getBusinessAllCheckedKeys();
@@ -861,7 +875,6 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      this.queryParams.monitorType = 2;
       listShuiMeasurement(this.queryParams).then((response) => {
         this.ShuiMeasurementOptions = [];
         const data = { objid: 0, monitorName: "顶级节点", children: [] };