From e63d0f50440034141c2267e498dbadb357dd10fb Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:47:08 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/icpointvaccinesinoculation-add-or-update.vue      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index a60e71d64..050adabb8 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -494,10 +494,12 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
-          if (res.data.moStartTime !== "" && res.data.afStartTime !== "") {
+          if (res.data.moStartTime !== "") {
             this.morningTime = [res.data.moStartTime, res.data.moEndTime];
-            this.afterTime = [res.data.afStartTime, res.data.afEndTime];
           }
+            if (res.data.afStartTime !== "") {
+                this.afterTime = [res.data.afStartTime, res.data.afEndTime];
+            }
           if (!this.dataForm.longitude && !this.dataForm.latitude) {
             this.dataForm.longitude = "120.38945519";
             this.dataForm.latitude = "36.0722275";

From 39d5fe2a318295fafe20264648b937f5a23555cb Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 17:03:22 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E7=82=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/point/icpointnucleicmonitoring-add-or-update.vue    | 2 +-
 .../plugins/point/icpointvaccinesinoculation-add-or-update.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index 5529f3bde..c75823246 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -247,7 +247,7 @@ export default {
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap() {
-      let { latitude, longitude } = this.dataForm;
+      let { latitude, longitude } = this.$store.state.user;
       // 定义地图中心点坐标
       if (!latitude || latitude == "" || latitude == "0") {
         latitude = 39.9088810666821;
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index 75d212754..771ce1cc2 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -340,7 +340,7 @@ export default {
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap() {
-      let { latitude, longitude } = this.dataForm;
+      let { latitude, longitude } = this.$store.state.user;
       // 定义地图中心点坐标
       if (!latitude || latitude == "" || latitude == "0") {
         latitude = 39.9088810666821;

From 752c605bc68c483e483eab79e2fad1c991fffc13 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 17:07:11 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E7=82=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pointvaccinesinoculation-add-or-update.vue | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index de94f7872..a8a513143 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -25,7 +25,10 @@
           :disabled="dialogTitle == '查看'"
         ></el-input>
       </el-form-item>
-      <el-form-item label="接种时间" :class="dataForm.noAvailableVaccines != '2'?'':'time-class'">
+      <el-form-item
+        label="接种时间"
+        :class="dataForm.noAvailableVaccines != '2' ? '' : 'time-class'"
+      >
         <div class="data-block">
           <div style="width: 30%">
             <el-date-picker
@@ -497,12 +500,8 @@ export default {
           if (res.data.moStartTime !== "") {
             this.morningTime = [res.data.moStartTime, res.data.moEndTime];
           }
-            if (res.data.afStartTime !== "") {
-                this.afterTime = [res.data.afStartTime, res.data.afEndTime];
-            }
-          if (!this.dataForm.longitude && !this.dataForm.latitude) {
-            this.dataForm.longitude = "120.38945519";
-            this.dataForm.latitude = "36.0722275";
+          if (res.data.afStartTime !== "") {
+            this.afterTime = [res.data.afStartTime, res.data.afEndTime];
           }
           this.initMap();
         })
@@ -515,10 +514,12 @@ export default {
           if (!valid) {
             return false;
           }
-          if(!this.dataForm.inoculationDate &&
-            this.dataForm.noAvailableVaccines === "2"){
-              this.$message.error("请选择接种日期");
-              return false;
+          if (
+            !this.dataForm.inoculationDate &&
+            this.dataForm.noAvailableVaccines === "2"
+          ) {
+            this.$message.error("请选择接种日期");
+            return false;
           }
           if (
             this.morningTime === null &&
@@ -568,7 +569,7 @@ export default {
 .data-block {
   display: flex;
 }
-.time-block>div{
+.time-block > div {
   margin-bottom: 10px;
 }
 .time-block span {

From 33374f849ddac432bcbaf0833c945d8716f009d2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 17:09:37 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/point/icpointvaccinesinoculation.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 803d35558..a6f06965a 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -130,7 +130,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          label="接种上午时间"
+          label="上午接种时间"
           header-align="center"
           align="center"
         >
@@ -139,7 +139,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="接种下午开始时间"
+          label="下午接种时间"
           header-align="center"
           align="center"
         >
@@ -151,6 +151,7 @@
           prop="noAvailableVaccines"
           label="暂无疫苗"
           header-align="center"
+          width="80"
           align="center"
         ></el-table-column>
         <el-table-column

From 55c6f1611ac17d8259ad9c87ee3abb9f8c654717 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 17:15:28 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/point/icpointnucleicmonitoring.vue  | 4 ++++
 .../modules/plugins/point/icpointvaccinesinoculation.vue      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 00202d023..dc9a9d1a0 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,6 +112,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
         style="width: 100%; height: 564px"
         ><el-table-column
           label="序号"
@@ -162,18 +163,21 @@
             <el-button
               type="text"
               size="small"
+              class="div-table-button--detail"
               @click="addOrUpdateHandle(scope.row.id, '查看')"
               >{{ "查看" }}</el-button
             >
             <el-button
               type="text"
               size="small"
+              class="div-table-button--edit"
               @click="addOrUpdateHandle(scope.row.id, '修改')"
               >{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button
             >
             <el-button
               type="text"
               size="small"
+              class="div-table-button--delete--noline"
               @click="handleDelete(scope.row.id)"
               >{{ $t("delete") }}</el-button
             >
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 803d35558..939f06e73 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,6 +102,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
         style="width: 100%; height: 564px"
       >
         <el-table-column
@@ -177,18 +178,21 @@
             <el-button
               type="text"
               size="small"
+              class="div-table-button--detail"
               @click="addOrUpdateHandle(scope.row.id, '查看')"
               >{{ "查看" }}</el-button
             >
             <el-button
               type="text"
               size="small"
+              class="div-table-button--edit"
               @click="addOrUpdateHandle(scope.row.id, '修改')"
               >{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button
             >
             <el-button
               type="text"
               size="small"
+              class="div-table-button--delete--noline"
               @click="handleDelete(scope.row.id)"
               >{{ $t("delete") }}</el-button
             >

From ca07490eda657d9280d9a4afdac01edaff3bf89c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 17:22:32 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/point/icpointvaccinesinoculation.vue      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 1e543d118..639d2bd32 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -152,13 +152,14 @@
           prop="noAvailableVaccines"
           label="暂无疫苗"
           header-align="center"
-          width="80"
+          width="100"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="mobile"
           label="咨询电话"
           header-align="center"
+          width="150"
           align="center"
         ></el-table-column>
         <el-table-column
@@ -166,6 +167,7 @@
           label="接种点地址"
           header-align="center"
           align="center"
+          width="230"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column

From c2d961fe65bbb3e3e56af2e8f0c6e17e4a3cd8a5 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 18:52:58 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/icpointnucleicmonitoring-add-or-update.vue        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index c75823246..d9cd4d37b 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -224,7 +224,7 @@ export default {
       };
     },
   },
-  mounted() {
+  created() {
     this.getFormInfo();
   },
   props: {
@@ -371,7 +371,7 @@ export default {
       this.$http
         .post(`/gov/org/agency/communityListByCustomerId`)
         .then(({ data: res }) => {
-          if (tMapres.code !== 0) {
+          if (res.code !== 0) {
             return this.$message.error(res.msg);
           }
           this.organizationList = res.data;
@@ -384,7 +384,7 @@ export default {
         if (this.dataForm.id) {
           this.getInfo();
         } else {
-          
+
           this.initMap();
         }
       });

From e36ededcba423897fa404794624a0edf541c8085 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 19:37:33 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E2=80=9Cfix:=E7=A7=80=E9=98=BF=E8=B4=B5?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/icpointnucleicmonitoring.vue        | 56 ++++++++++++-----
 .../point/icpointvaccinesinoculation.vue      | 60 ++++++++++++++-----
 2 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index dc9a9d1a0..e9bf84f90 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,7 +112,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
-        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
         style="width: 100%; height: 564px"
         ><el-table-column
           label="序号"
@@ -184,13 +184,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="pageSizeChangeHandle"
-                       @current-change="pageCurrentChangeHandle"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="limit"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="pageNo"
+        :page-sizes="[20, 50, 100, 200]"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, total"
+        :total="total"
+      >
+      </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -240,13 +243,6 @@ export default {
   mixins: [mixinViewModule],
   data() {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: "/epmetuser/icPointNucleicMonitoring/page",
-        getDataListIsPage: true,
-        deleteURL: "/epmetuser/icPointNucleicMonitoring",
-        deleteIsBatch: true,
-        // exportURL: '/epmetuser/icPointNucleicMonitoring/export'
-      },
       dataForm: {
         name: "",
         mobile: "",
@@ -258,6 +254,9 @@ export default {
       sendNoticeFormShow: false,
       noticeVisible: false,
       noticeOrigin: "3",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
     };
   },
   components: {
@@ -269,6 +268,33 @@ export default {
     this.getFormInfo();
   },
   methods: {
+    async loadTable() {
+      this.dataListLoading = true;
+      const url = "/epmetuser/icPointNucleicMonitoring/page";
+      let params = {
+        limit: this.pageSize,
+        page: this.pageNo,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        console.log(data.list);
+        this.dataList = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+      this.dataListLoading = false;
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
     async handleDelete(id) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 1e543d118..d8c3c7db9 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,8 +102,8 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
-        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-        style="width: 100%; height: 564px"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+        style="width: 100%; height: 564px;overflow: auto;"
       >
         <el-table-column
           label="序号"
@@ -200,13 +200,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="pageSizeChangeHandle"
-                       @current-change="pageCurrentChangeHandle"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="limit"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="pageNo"
+        :page-sizes="[20, 50, 100, 200]"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, total"
+        :total="total"
+      >
+      </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -251,17 +254,11 @@
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointvaccinesinoculation-add-or-update";
 import icpointNoice from "./icpointNoice";
-import { requestPost } from "@/js/dai/request";
+import { requestPost , requestGet} from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
   data() {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: "/epmetuser/icPointVaccinesInoculation/page",
-        getDataListIsPage: true,
-        deleteURL: "/epmetuser/icPointVaccinesInoculation",
-        deleteIsBatch: true,
-      },
       dataForm: {
         name: "",
         mobile: "",
@@ -271,6 +268,9 @@ export default {
       noticeVisible: false,
       noticeOrigin: "4",
       dialogTitle: "",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
     };
   },
   components: {
@@ -278,9 +278,37 @@ export default {
     icpointNoice,
   },
   mounted() {
+    this.loadTable();
     this.noticeFun();
   },
   methods: {
+    async loadTable() {
+      this.dataListLoading = true;
+      const url = "/epmetuser/icPointVaccinesInoculation/page";
+      let params = {
+        limit: this.pageSize,
+        page: this.pageNo,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+      
+      if (code === 0) {
+        console.log(data.list);
+        this.dataList = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+      this.dataListLoading = false;
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
     async handleDelete(id) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",

From 86a6ace91ad72ac0bc3d37c49f7bb062e225e518 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Fri, 1 Jul 2022 09:12:17 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/point/icpointnucleicmonitoring.vue    | 1 +
 .../modules/plugins/point/icpointvaccinesinoculation.vue  | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index e9bf84f90..2be802a0e 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -257,6 +257,7 @@ export default {
       pageSize: 20,
       pageNo: 0,
       total: 0,
+      dataListLoading:false
     };
   },
   components: {
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index f63a83e96..d80eff424 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,6 +102,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        :row-key="row => { return row.id.toString() }"
         :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
         style="width: 100%; height: 564px;overflow: auto;"
       >
@@ -112,12 +113,6 @@
           type="index"
           width="50"
         ></el-table-column>
-        <!--<el-table-column-->
-        <!--prop="orgName"-->
-        <!--label="所属组织名称"-->
-        <!--header-align="center"-->
-        <!--align="center"-->
-        <!--&gt;</el-table-column>-->
         <el-table-column
           prop="name"
           label="疫苗接种点名称"
@@ -273,6 +268,7 @@ export default {
       pageSize: 20,
       pageNo: 0,
       total: 0,
+      dataListLoading:false,
     };
   },
   components: {

From 87b668da0aca5c9fdeb6a54d7b6c220e42acf410 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Fri, 1 Jul 2022 09:21:44 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/point/icpointnucleicmonitoring.vue  | 4 ++--
 .../modules/plugins/point/icpointvaccinesinoculation.vue      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 2be802a0e..e84251927 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,6 +112,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
+        :row-key="row => { return row.id.toString() }"
         :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
         style="width: 100%; height: 564px"
         ><el-table-column
@@ -153,8 +154,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          :label="$t('handle')"
-          fixed="right"
+          label="操作"
           header-align="center"
           align="center"
           width="150"
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index d80eff424..1bb5ea05b 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -166,8 +166,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          :label="$t('handle')"
-          fixed="right"
+          label="操作"
           header-align="center"
           align="center"
           width="150"