From cfb6c82a5db41983224b8ec821be77169803e3a2 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 19 Sep 2022 15:50:08 +0800
Subject: [PATCH 1/2] 0000

---
 .../modules/base/epidemic/natFocus/natFocusListHistory.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index 8698af92f..d934c6948 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -570,7 +570,7 @@ export default {
     async loadTable() {
       this.tableLoading = true;
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/list";
+      const url = "/epmetuser/icEpidemicSpecialAttention/historyList";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,

From c210e69f4a12cacf6ec24a196ebb7dd0f56eac02 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 19 Sep 2022 17:31:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=AE=E4=B8=8D=E5=A4=9A=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/natFocus/natFocusList.vue    | 17 ++++++++++++++---
 .../epidemic/natFocus/natFocusListHistory.vue  | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 7605aab0b..de99dfcbb 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -262,6 +262,7 @@
         >
           <template slot-scope="scope">
             <a
+              style="cursor: pointer"
               v-if="scope.row.userId"
               @click="handleWatchPeopleInfo(scope.$index)"
               >{{ scope.row.name }}</a
@@ -310,6 +311,9 @@
           label="隔离状态"
           width="180"
         >
+          <template slot-scope="scope">
+            {{ optionsDict.isolatedState[scope.row.isolatedState] || "--" }}
+          </template>
         </el-table-column>
 
         <el-table-column
@@ -546,6 +550,9 @@ export default {
       options: {
         isolatedState: [],
       },
+      optionsDict: {
+        isolatedState: {},
+      },
 
       optionsV: [],
       optionsB: [],
@@ -594,11 +601,11 @@ export default {
       this.natNumList.push(obj);
     }
 
-    await this.loadTable();
-
-    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+    await this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
       dictType: "isolatedState",
     });
+
+    await this.loadTable();
   },
 
   methods: {
@@ -618,6 +625,10 @@ export default {
       if (code === 0) {
         this.options[field] =
           typeof cookFn == "function" ? cookFn(data) : data || [];
+        this.options[field].forEach((item) => {
+          this.optionsDict[field][item.value] = item.label;
+        });
+        console.log("红红火火恍恍惚惚或或或或或或或或", this.optionsDict);
       } else {
         this.$message.error("请求基础数据失败！");
       }
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index d934c6948..9b0423167 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -190,7 +190,6 @@
         @select-all="handleSelAll"
         style="width: 100%"
       >
-        <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column
           label="序号"
           header-align="center"
@@ -208,6 +207,7 @@
         >
           <template slot-scope="scope">
             <a
+              style="cursor: pointer"
               v-if="scope.row.userId"
               @click="handleWatchPeopleInfo(scope.$index)"
               >{{ scope.row.name }}</a
@@ -256,6 +256,9 @@
           label="隔离状态"
           width="180"
         >
+          <template slot-scope="scope">
+            {{ optionsDict.isolatedState[scope.row.isolatedState] || "--" }}
+          </template>
         </el-table-column>
 
         <el-table-column
@@ -485,6 +488,9 @@ export default {
       options: {
         isolatedState: [],
       },
+      optionsDict: {
+        isolatedState: {},
+      },
 
       optionsV: [],
       optionsB: [],
@@ -533,11 +539,11 @@ export default {
       this.natNumList.push(obj);
     }
 
-    await this.loadTable();
-
-    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+    await this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
       dictType: "isolatedState",
     });
+
+    await this.loadTable();
   },
 
   methods: {
@@ -557,6 +563,10 @@ export default {
       if (code === 0) {
         this.options[field] =
           typeof cookFn == "function" ? cookFn(data) : data || [];
+        this.options[field].forEach((item) => {
+          this.optionsDict[field][item.value] = item.label;
+        });
+        console.log("红红火火恍恍惚惚或或或或或或或或", this.optionsDict);
       } else {
         this.$message.error("请求基础数据失败！");
       }