From b680f1b81723c5903e5c95e60667bcc8c31fe1c5 Mon Sep 17 00:00:00 2001
From: nieli <329261568@qq.com>
Date: Sun, 15 Jan 2023 14:42:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    |  4 ++--
 src/views/bigScreen/v3/profile/EHead.vue            |  1 +
 src/views/iot/project/index.vue                     |  4 ++--
 .../profileV2/DeviceManage/EDynamicTable.vue        | 13 +++++++++++++
 src/views/iot/project/profileV2/details.vue         |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index 19b8309e..c4ab480f 100644
--- a/.env.development
+++ b/.env.development
@@ -19,6 +19,6 @@ port= 9988
 // target = http://192.168.18.136:8899
 
 // 测试端
-//  target = http://192.168.10.241:32024
+  target = http://192.168.10.241:32024
 // 开发端
- target = http://192.168.10.241:30646
+// target = http://192.168.10.241:30646
diff --git a/src/views/bigScreen/v3/profile/EHead.vue b/src/views/bigScreen/v3/profile/EHead.vue
index 6d5e0b61..960b7834 100644
--- a/src/views/bigScreen/v3/profile/EHead.vue
+++ b/src/views/bigScreen/v3/profile/EHead.vue
@@ -19,6 +19,7 @@
         filterable
         placeholder="项目名称"
         clearable
+        :popper-append-to-body="false"
       >
         <el-option
           v-for="item in projectList"
diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue
index a9bd1841..7b25e496 100644
--- a/src/views/iot/project/index.vue
+++ b/src/views/iot/project/index.vue
@@ -201,7 +201,7 @@
             </el-col>
           </el-row>
 
-          <el-form-item label="电价合同:">
+          <!-- <el-form-item label="电价合同:">
             <e-dialog-table-input
               :table="selectPriceTable"
               :refurbishFun="listContract"
@@ -212,7 +212,7 @@
               psize="small"
               @change="handleProiceDialogEvent"
             />
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="行政区划" prop="regionalismId">
             <!-- <el-input v-model="form.regionalismId" placeholder="请输入行政区划代码" /> -->
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
index d39d58c6..932b2430 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="e-dynamic-table">
     <el-table
+      ref="multipleTable"
       v-loading="loading"
       :height="tableHeight"
       :data="tableList"
@@ -13,6 +14,7 @@
         v-if="isSelect"
         width="50"
         align="center"
+        :reserve-selection="true"
       />
 
       <el-table-column
@@ -130,8 +132,19 @@ export default {
           slotName: "inst",
         },
       ],
+      selectArr: [],
     };
   },
+  watch:{
+    tableList: {
+      handler (val) {
+        this.$nextTick(() => {
+          this.$refs.multipleTable.value && this.$refs.multipleTable.value.store.cleanSelection();
+      });
+      },
+      deep: true,
+    },
+  },
   methods: {
     handleQuery2() {
       this.$emit("handleQuery", this.queryParams);
diff --git a/src/views/iot/project/profileV2/details.vue b/src/views/iot/project/profileV2/details.vue
index 15e87a8d..77defa17 100644
--- a/src/views/iot/project/profileV2/details.vue
+++ b/src/views/iot/project/profileV2/details.vue
@@ -434,7 +434,7 @@ export default {
           key: "todayAlarmTotal",
         },
         {
-          label: "近30天报警数",
+          label: "报警总数",
           key: "alarmTotal",
         },
       ],