Merge branch 'dev-fangyi0919' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fangyi0919

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("请求基础数据失败！");
       }

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("请求基础数据失败！");
       }
@@ -570,7 +580,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,