Browse Source

Revert "fix:修改报警联系人"

This reverts commit a37715c2104b4ed91668582589ad53b67b5b4c58.
sunk 1 year ago
parent
commit
d6b2cc55a3

+ 1 - 1
src/views/currentSystem/work/order/register/register_merge.vue

@@ -1839,7 +1839,7 @@ export default {
           this.registerForm.sjdh = this.phoneNumber;
           this.UserTable = true;
           getUserPhone({ likeStr: this.phoneNumber }).then((res) => {
-            console.log(res,"客户查询结果3");
+            console.log("客户查询结果3");
             if (res.code == 1 && this.phoneNumber !== 0) {
               this.userList(res.result.records);
             }

+ 4 - 4
src/views/zhpt/scada/scadaDayilyReport/widget.vue

@@ -20,12 +20,12 @@
       </el-select>
       &nbsp;&nbsp;
       <span class="title2">设备名称:</span>
-      <el-select ref="site" v-model="deviceType" style="display: inline-block; margin-right: 5px" size="small" placeholder="请选择" @change="bindTsNameChange" clearable>
+      <el-select ref="site" v-model="deviceType" style="display: inline-block; margin-right: 5px" size="small" placeholder="请选择" @change="bindTsNameChange">
         <el-option v-for="item in isSeletcSite" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       &nbsp;&nbsp;
       <span class="title2">指标类型:</span>
-      <el-select v-model="type" style="display: inline-block; margin-right: 5px" size="small" placeholder="请选择" @change="bindTstTypeChange" clearable>
+      <el-select v-model="type" style="display: inline-block; margin-right: 5px" size="small" placeholder="请选择" @change="bindTstTypeChange">
         <el-option v-for="item in types" :key="item.type" :label="item.typeName" :value="item.type" />
       </el-select>
       &nbsp;&nbsp;
@@ -171,7 +171,7 @@ export default {
       // const endDate = nextDate.getFullYear() + '-' + (nextDate.getMonth() + 1) + '-' + (nextDate.getDate() > 9 ? nextDate.getDate() : '0' + nextDate.getDate()) + ' 00:00:00'
       const data = {
         type: this.categoryName,
-        deviceId: this.deviceType,
+        deviceType: this.deviceType,
         censusDate: this.monthTime,
         censusDateType: '3', // 按天查询
         indexId: this.indexName + ''
@@ -248,7 +248,7 @@ export default {
       })
     },
     queryIndexType() {
-      queryIndexConfiguration({ deviceId: this.deviceType,size: 10000 }).then(res => {
+      queryIndexConfiguration({ deviceId: this.deviceType, size: 10000 }).then(res => {
         const arr = this.process(res.result.records)
         this.types = arr
         console.log(this.types)

+ 1 - 1
src/views/zhpt/scada/waringTypeManage/WaterDetail.vue

@@ -61,7 +61,7 @@
         <span class="flexTitle">报警联系人:</span>
         <div class="flexInfo">
           <el-select
-            v-model="reportForm.liaisonName"
+            v-model="reportForm.liaisonPeople"
             size="small"
             filterable
             clearable