From 69062dc5e24b91f8817379966a66e90f029d5866 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 09:40:01 +0800
Subject: [PATCH 01/14] =?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

---
 src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 7d9204b7d..9638faf1e 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -11,7 +11,7 @@
             ref="org"
             v-model="orgIds"
             :options="organizationList"
-            :props="{ checkStrictly: false, multiple: false, emitPath: true }"
+            :props="{ checkStrictly: true, multiple: false, emitPath: true }"
             style="width: 200px"
             clearable
             @change="orgChangeHandle"

From 4e3f7db0887ccaabef95daaaa478dc78222ade57 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 10:13:39 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=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, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 7d9204b7d..010bd3dff 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -113,7 +113,7 @@
         :data="dataList"
         border
         @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%"
+        style="width: 100%;height:564px;"
       >
         <el-table-column
           type="selection"
@@ -499,6 +499,8 @@ export default {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
+  margin-top: 10px;
+  margin-left: 10px;
 }
 .div_left_table {
   margin-top: 10px;
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 150b4ef18..2ef3f5d15 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -103,7 +103,7 @@
         :data="dataList"
         border
         @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%"
+        style="width: 100%;height:564px;"
       >
         <el-table-column
           type="selection"
@@ -483,6 +483,8 @@ export default {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
+  margin-top: 10px;
+  margin-left: 10px;
 }
 .div_left_table {
   margin-top: 10px;

From 87244fc7bce97309e142f432bfa577134a873c63 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 13:49:50 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...icpointnucleicmonitoring-add-or-update.vue | 113 ++++++++++--------
 ...pointvaccinesinoculation-add-or-update.vue |   1 +
 2 files changed, 67 insertions(+), 47 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 fcf09c4b9..5af3d475e 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height:600px;overflow:auto;padding: 20px;" class="form-class">
+  <div style="height: 600px; overflow: auto; padding: 20px" class="form-class">
     <el-form
       :model="dataForm"
       :rules="dataRule"
@@ -8,7 +8,12 @@
       label-width="120px"
     >
       <el-form-item label="所属组织名称" prop="orgId">
-        <el-select v-model="dataForm.orgId" placeholder="所属组织名称" @change="orgChangeHandle" :disabled='dialogTitle == "查看"'>
+        <el-select
+          v-model="dataForm.orgId"
+          placeholder="所属组织名称"
+          @change="orgChangeHandle"
+          :disabled="dialogTitle == '查看'"
+        >
           <el-option
             ref="org"
             v-for="item in organizationList"
@@ -23,7 +28,7 @@
         <el-input
           v-model="dataForm.name"
           placeholder="核酸检测点名称"
-          :disabled='dialogTitle == "查看"'
+          :disabled="dialogTitle == '查看'"
         ></el-input>
       </el-form-item>
       <el-form-item label="服务时间" prop="serveTime">
@@ -32,7 +37,7 @@
           type="textarea"
           :rows="2"
           placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
-          :disabled='dialogTitle == "查看"'
+          :disabled="dialogTitle == '查看'"
         ></el-input>
       </el-form-item>
       <el-form-item label="咨询电话" prop="mobile">
@@ -40,23 +45,29 @@
           v-model="dataForm.mobile"
           placeholder="咨询电话"
           :change="check_num()"
-          :disabled='dialogTitle == "查看"'
+          :disabled="dialogTitle == '查看'"
         ></el-input>
       </el-form-item>
       <el-form-item label="检测点地址" prop="address">
         <el-input
           v-model="dataForm.address"
           placeholder="例:青岛市时代国际广场"
+          style="width:65%;"
         ></el-input>
-          <el-button
-            style="margin-left: 10px"
-            type="primary"
-            size="small"
-            @click="handleSearchMap"
-            >查询</el-button
-          >
+        <el-button
+          style="margin-left: 10px"
+          type="primary"
+          size="small"
+          @click="handleSearchMap"
+          >查询</el-button
+        >
       </el-form-item>
-      <el-form-item label="位置坐标" prop="longitude" style="display: block" class="position_label">
+      <el-form-item
+        label="位置坐标"
+        prop="longitude"
+        style="display: block"
+        class="position_label"
+      >
         <div>
           <!-- <el-input
             class="item_width_4"
@@ -87,7 +98,7 @@
               placeholder="请输入经度"
               v-model="dataForm.longitude"
               disabled
-              style="width: 200px;margin-left: 20px;"
+              style="width: 200px; margin-left: 20px"
             >
             </el-input>
             <span style="margin-left: 20px">纬度</span>
@@ -97,7 +108,7 @@
               placeholder="请输入纬度"
               v-model="dataForm.latitude"
               disabled
-              style="width: 200px;margin-left: 20px;"
+              style="width: 200px; margin-left: 20px"
             >
             </el-input>
           </div>
@@ -106,9 +117,12 @@
     </el-form>
     <div class="submit">
       <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
-      <el-button v-if='dialogTitle != "查看"' type="primary" @click="dataFormSubmitHandle()">{{
-        $t("confirm")
-      }}</el-button>
+      <el-button
+        v-if="dialogTitle != '查看'"
+        type="primary"
+        @click="dataFormSubmitHandle()"
+        >{{ $t("confirm") }}</el-button
+      >
     </div>
   </div>
 </template>
@@ -213,29 +227,32 @@ export default {
   mounted() {
     this.getFormInfo();
   },
-  props:{
-    dialogTitle:{
-      type:String,
-      default:''
-    }
+  props: {
+    dialogTitle: {
+      type: String,
+      default: "",
+    },
   },
   methods: {
-    closeSubmit(){
-      this.$emit('closeDialog')
+    closeSubmit() {
+      this.$emit("closeDialog");
     },
-    orgChangeHandle(val){
-        for(var i = 0 ; i < this.organizationList.length ; i++){
-            if( this.organizationList[i].orgId === val){
-                this.dataForm.orgName=this.organizationList[i].orgName
-                return false
-            }
+    orgChangeHandle(val) {
+      for (var i = 0; i < this.organizationList.length; i++) {
+        if (this.organizationList[i].orgId === val) {
+          this.dataForm.orgName = this.organizationList[i].orgName;
+          return false;
         }
+      }
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap() {
       // 定义地图中心点坐标
-      let _this = this
-      var center = new window.TMap.LatLng(_this.dataForm.latitude, _this.dataForm.longitude);
+      let _this = this;
+      var center = new window.TMap.LatLng(
+        _this.dataForm.latitude,
+        _this.dataForm.longitude
+      );
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("map_add"), {
         center: center, // 设置地图中心点坐标
@@ -250,12 +267,14 @@ export default {
         geometries: [],
       });
       infoWindowList = Array(10);
+
       geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
       // 监听地图平移结束
       map.on("panend", () => {
         this.handleMoveCenter();
       });
-      this.handleMoveCenter();
+      // this.handleMoveCenter()
       this.convert();
     },
     handleMoveCenter() {
@@ -356,9 +375,9 @@ export default {
         this.$refs["dataForm"].resetFields();
         if (this.dataForm.id) {
           this.getInfo();
-        }else{
-          this.dataForm.longitude = "120.38945519"
-          this.dataForm.latitude = "36.0722275"
+        } else {
+          this.dataForm.longitude = "120.38945519";
+          this.dataForm.latitude = "36.0722275";
           this.initMap();
         }
       });
@@ -377,9 +396,9 @@ export default {
             ...res.data,
           };
 
-          if(!this.dataForm.longitude && !this.dataForm.latitude){
-            this.dataForm.longitude = "120.38945519"
-            this.dataForm.latitude = "36.0722275"
+          if (!this.dataForm.longitude && !this.dataForm.latitude) {
+            this.dataForm.longitude = "120.38945519";
+            this.dataForm.latitude = "36.0722275";
           }
           this.initMap();
         })
@@ -406,7 +425,7 @@ export default {
                 duration: 500,
                 onClose: () => {
                   this.$emit("refreshDataList");
-                  this.closeSubmit()
+                  this.closeSubmit();
                 },
               });
             })
@@ -427,17 +446,17 @@ export default {
 };
 </script>
 <style scoped>
-.position_label >>> .el-form-item__label::before{
-  color:#fff!important;
+.position_label >>> .el-form-item__label::before {
+  color: #fff !important;
 }
-.submit{
+.submit {
   text-align: center;
   margin: auto;
 }
-.form-class .el-input{
+.form-class .el-input {
   width: 75%;
 }
-.form-class .el-textarea{
-  width: 75%!important;
+.form-class .el-textarea {
+  width: 75% !important;
 }
 </style>
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 ff8fa54e9..4d5dd0d45 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -89,6 +89,7 @@
         <el-input
           v-model="dataForm.address"
           placeholder="例:青岛市时代国际广场"
+          style="width:65%;"
         ></el-input>
         <el-button
             style="margin-left: 10px"

From 817cbd0200f5f0704e817608d46edab926d74b2d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 14:34:39 +0800
Subject: [PATCH 04/14] =?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

---
 .../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 fcf09c4b9..9026eaa5a 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -398,7 +398,7 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.internalMsg);
+                return this.$message.error(res.internalMsg ? res.msg : res.internalMsg);
               }
               this.$message({
                 message: this.$t("prompt.success"),
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 ff8fa54e9..686fbad84 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -509,7 +509,7 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.internalMsg);
+                return this.$message.error(res.internalMsg ? res.msg : res.internalMsg);
               }
               this.$message({
                 message: this.$t("prompt.success"),

From c7b4f96edba3924f656fda52583b01df1245078a Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 14:55:12 +0800
Subject: [PATCH 05/14] =?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

---
 .../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 cb89b8972..9551e4590 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -417,7 +417,7 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.internalMsg ? res.msg : res.internalMsg);
+                return this.$message.error(res.internalMsg ? res.internalMsg : res.msg);
               }
               this.$message({
                 message: this.$t("prompt.success"),
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 96ad285ef..4fa1afa40 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -510,7 +510,7 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.internalMsg ? res.msg : res.internalMsg);
+                return this.$message.error(res.internalMsg ? res.internalMsg : res.msg);
               }
               this.$message({
                 message: this.$t("prompt.success"),

From c3c921dbb16a9c3e02ba63e58c5c2fc9a4e93b8e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 15:10:53 +0800
Subject: [PATCH 06/14] =?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        | 4 ++--
 1 file changed, 2 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 4fa1afa40..763ad21f6 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -496,11 +496,11 @@ export default {
           if (!valid) {
             return false;
           }
-          if(this.morningTime === null){
+          if(this.morningTime === null && this.dataForm.noAvailableVaccines !== '1'){
               this.$message.error('请填写上午接种时间');
               return false
           }
-          if(this.afterTime === null ){
+          if(this.afterTime === null && this.dataForm.noAvailableVaccines !== '1'){
               this.$message.error('请填写下午接种时间');
               return false
           }

From 8a6584fe53bab0942361624cfd8a82962e827cf3 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 15:19:06 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...icpointnucleicmonitoring-add-or-update.vue | 36 +++++++------
 .../point/icpointnucleicmonitoring.vue        | 29 +++++-----
 ...pointvaccinesinoculation-add-or-update.vue | 40 +++++++-------
 .../point/icpointvaccinesinoculation.vue      | 54 ++++++++-----------
 4 files changed, 77 insertions(+), 82 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 5af3d475e..9fb1b95ae 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -148,8 +148,8 @@ export default {
         serveTime: "",
         mobile: "",
         address: "",
-        longitude: "120.38945519",
-        latitude: "36.0722275",
+        longitude: '',
+        latitude: '',
       },
       keyWords: null,
       organizationList: [],
@@ -247,12 +247,14 @@ export default {
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap() {
+      let { latitude, longitude } = this.dataForm;
       // 定义地图中心点坐标
-      let _this = this;
-      var center = new window.TMap.LatLng(
-        _this.dataForm.latitude,
-        _this.dataForm.longitude
-      );
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      console.log(latitude,longitude);
+      var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("map_add"), {
         center: center, // 设置地图中心点坐标
@@ -297,7 +299,6 @@ export default {
       // 在地图显示范围内以给定的关键字搜索地点
       search
         .searchRectangle({
-          // keyword: this.keyWords,
           keyword: this.dataForm.address,
           bounds: map.getBounds(),
         })
@@ -307,6 +308,7 @@ export default {
             const {
               location: { lat, lng },
             } = data[0];
+
             map.setCenter(new TMap.LatLng(lat, lng));
             this.setMarker(lat, lng);
             this.dataForm.latitude = lat;
@@ -340,8 +342,14 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          this.dataForm.address = result.result.address;
+          this.dataForm.address =
+            this.dataForm.address !== "" &&
+            this.dataForm.address !== null &&
+            (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+              ? this.dataForm.address
+              : result.result.address;
           // 显示搜索到的地址
+          console.log(this.dataForm.address);
         });
     },
 
@@ -363,7 +371,7 @@ export default {
       this.$http
         .post(`/gov/org/agency/communityListByCustomerId`)
         .then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (tMapres.code !== 0) {
             return this.$message.error(res.msg);
           }
           this.organizationList = res.data;
@@ -376,8 +384,7 @@ export default {
         if (this.dataForm.id) {
           this.getInfo();
         } else {
-          this.dataForm.longitude = "120.38945519";
-          this.dataForm.latitude = "36.0722275";
+          
           this.initMap();
         }
       });
@@ -395,11 +402,6 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
-
-          if (!this.dataForm.longitude && !this.dataForm.latitude) {
-            this.dataForm.longitude = "120.38945519";
-            this.dataForm.latitude = "36.0722275";
-          }
           this.initMap();
         })
         .catch(() => {});
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 8650234e4..ecf6cf110 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,13 +112,12 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%;height:564px;"
-      >
-        <el-table-column
-          type="selection"
+        style="width: 100%; height: 564px"
+        ><el-table-column
+          label="序号"
           header-align="center"
           align="center"
+          type="index"
           width="50"
         ></el-table-column>
         <el-table-column
@@ -181,16 +180,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
-      >
-      </el-pagination>
+      <el-pagination @size-change="pageSizeChangeHandle"
+                       @current-change="pageCurrentChangeHandle"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="limit"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -509,7 +506,7 @@ export default {
   border-radius: 5px;
   padding: 10px;
 }
-.dialog-h >>> .el-dialog__body{
+.dialog-h >>> .el-dialog__body {
   overflow: scroll;
 }
 </style>
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 4d5dd0d45..c0709d643 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -123,7 +123,7 @@
             >查询</el-button
           > -->
           <div
-            id="map_app"
+            id="map_add"
             class="div_map"
             style="width: 500px; height: 300px; margin-top: 20px"
           ></div>
@@ -188,8 +188,8 @@ export default {
         noAvailableVaccines: "1",
         mobile: "",
         address: "",
-        longitude: "120.38945519",
-        latitude: "36.0722275",
+        longitude: "",
+        latitude: "",
       },
       keyWords: null,
       // organizationList: [],
@@ -333,14 +333,16 @@ export default {
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap() {
+      let { latitude, longitude } = this.dataForm;
       // 定义地图中心点坐标
-      let _this = this;
-      var center = new window.TMap.LatLng(
-        _this.dataForm.latitude,
-        _this.dataForm.longitude
-      );
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      console.log(latitude,longitude);
+      var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById("map_app"), {
+      map = new window.TMap.Map(document.getElementById("map_add"), {
         center: center, // 设置地图中心点坐标
         zoom: 17.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
@@ -353,12 +355,14 @@ export default {
         geometries: [],
       });
       infoWindowList = Array(10);
+
       geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
       // 监听地图平移结束
       map.on("panend", () => {
         this.handleMoveCenter();
       });
-      this.handleMoveCenter();
+      // this.handleMoveCenter()
       this.convert();
     },
     handleMoveCenter() {
@@ -381,7 +385,6 @@ export default {
       // 在地图显示范围内以给定的关键字搜索地点
       search
         .searchRectangle({
-          // keyword: this.keyWords,
           keyword: this.dataForm.address,
           bounds: map.getBounds(),
         })
@@ -391,6 +394,7 @@ export default {
             const {
               location: { lat, lng },
             } = data[0];
+
             map.setCenter(new TMap.LatLng(lat, lng));
             this.setMarker(lat, lng);
             this.dataForm.latitude = lat;
@@ -424,8 +428,14 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          this.dataForm.address = result.result.address;
+          this.dataForm.address =
+            this.dataForm.address !== "" &&
+            this.dataForm.address !== null &&
+            (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+              ? this.dataForm.address
+              : result.result.address;
           // 显示搜索到的地址
+          console.log(this.dataForm.address);
         });
     },
 
@@ -461,8 +471,6 @@ export default {
         if (this.dataForm.id) {
           this.getInfo();
         } else {
-          this.dataForm.longitude = "120.38945519";
-          this.dataForm.latitude = "36.0722275";
           this.initMap();
         }
       });
@@ -481,10 +489,6 @@ export default {
           };
           this.morningTime = [res.data.moStartTime,res.data.moEndTime]
           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"
-          }
           this.initMap();
         })
         .catch(() => {});
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 2ef3f5d15..697c44da8 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,13 +102,13 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%;height:564px;"
+        style="width: 100%; height: 564px"
       >
         <el-table-column
-          type="selection"
+          label="序号"
           header-align="center"
           align="center"
+          type="index"
           width="50"
         ></el-table-column>
         <!--<el-table-column-->
@@ -130,29 +130,23 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="moStartTime"
-          label="接种上午开始时间"
+          label="接种上午时间"
           header-align="center"
           align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="moEndTime"
-          label="接种上午结束时间"
-          header-align="center"
-          align="center"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.moStartTime }} - {{ scope.row.moEndTime }}</div>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="afStartTime"
           label="接种下午开始时间"
           header-align="center"
           align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="afEndTime"
-          label="接种下午结束时间"
-          header-align="center"
-          align="center"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.afStartTime }} - {{ scope.row.afEndTime }}</div>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="noAvailableVaccines"
           label="暂无疫苗"
@@ -201,16 +195,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
-      >
-      </el-pagination>
+      <el-pagination @size-change="pageSizeChangeHandle"
+                       @current-change="pageCurrentChangeHandle"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="limit"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -493,7 +485,7 @@ export default {
   border-radius: 5px;
   padding: 10px;
 }
-.dialog-h{
+.dialog-h {
   overflow: scroll;
 }
 </style>

From 1369d6a202497b89ce0e3e23e8d08d2936c5feb7 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 15:28:03 +0800
Subject: [PATCH 08/14] =?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

---
 .../icpointvaccinesinoculation-add-or-update.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 763ad21f6..935730152 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -185,7 +185,7 @@ export default {
         moEndTime: "",
         afStartTime: "",
         afEndTime: "",
-        noAvailableVaccines: "1",
+        noAvailableVaccines: '1',
         mobile: "",
         address: "",
         longitude: "120.38945519",
@@ -216,7 +216,7 @@ export default {
         ],
         inoculationDate: [
           {
-            required: true,
+            required: this.dataForm.noAvailableVaccines === '2',
             message: this.$t("validate.required"),
             trigger: "blur",
           },
@@ -479,8 +479,10 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
-          this.morningTime = [res.data.moStartTime,res.data.moEndTime]
-          this.afterTime = [res.data.afStartTime,res.data.afEndTime]
+          if(res.data.moStartTime !== ''){
+              this.morningTime = [res.data.moStartTime,res.data.moEndTime]
+              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"
@@ -496,11 +498,11 @@ export default {
           if (!valid) {
             return false;
           }
-          if(this.morningTime === null && this.dataForm.noAvailableVaccines !== '1'){
+          if(this.morningTime === null && this.dataForm.noAvailableVaccines === '2'){
               this.$message.error('请填写上午接种时间');
               return false
           }
-          if(this.afterTime === null && this.dataForm.noAvailableVaccines !== '1'){
+          if(this.afterTime === null && this.dataForm.noAvailableVaccines === '2'){
               this.$message.error('请填写下午接种时间');
               return false
           }

From 18c5d1a732f62831780c9b8e9e9d3b95c8001a49 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 15:58:28 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=B7=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pointvaccinesinoculation-add-or-update.vue | 230 ++++++++++--------
 1 file changed, 131 insertions(+), 99 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 f203ef84c..15dce74f1 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height:600px;overflow:auto;padding: 20px;" class="form-class">
+  <div style="height: 600px; overflow: auto; padding: 20px" class="form-class">
     <el-form
       :model="dataForm"
       :rules="dataRule"
@@ -22,82 +22,90 @@
         <el-input
           v-model="dataForm.name"
           placeholder="疫苗接种点名称"
-          :disabled='dialogTitle == "查看"'
+          :disabled="dialogTitle == '查看'"
         ></el-input>
       </el-form-item>
-      <el-form-item label="接种日期" prop="inoculationDate">
-        <!-- <el-input
-          v-model="dataForm.inoculationDate"
-          placeholder="接种日期"
-        ></el-input> -->
-        <el-date-picker
-          v-model="dataForm.inoculationDate"
-          value-format="yyyy-MM-dd"
-          type="date"
-          placeholder="选择日期"
-          :disabled='dialogTitle == "查看"'
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="上午接种时间" prop="morningTime" class="time-class">
-        <el-time-picker
-          is-range
-          v-model="morningTime"
-          format="HH:mm"
-          value-format="HH:mm"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          placeholder="选择时间范围"
-          @change="startTimeChange"
-          :disabled='dialogTitle == "查看"'
-          :clearable="false"
-          :editable="false"
-        >
-        </el-time-picker>
-      </el-form-item>
-      <el-form-item label="下午接种时间" prop="afterTime" class="time-class">
-        <el-time-picker
-          is-range
-          v-model="afterTime"
-          format="HH:mm"
-          value-format="HH:mm"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          placeholder="选择时间范围"
-          @change="endTimeChange"
-          :disabled='dialogTitle == "查看"'
-          :clearable="false"
-          :editable="false"
-        >
-        </el-time-picker>
+      <el-form-item label="接种时间" :class="dataForm.noAvailableVaccines != '2'?'':'time-class'">
+        <div class="data-block">
+          <div style="width: 30%">
+            <el-date-picker
+              v-model="dataForm.inoculationDate"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :disabled="dialogTitle == '查看'"
+            >
+            </el-date-picker>
+          </div>
+          <div class="time-block">
+            <div>
+              <span>上午</span>
+              <el-time-picker
+                is-range
+                v-model="morningTime"
+                format="HH:mm"
+                value-format="HH:mm"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                placeholder="选择时间范围"
+                @change="startTimeChange"
+                :disabled="dialogTitle == '查看'"
+                :clearable="false"
+                :editable="false"
+              >
+              </el-time-picker>
+            </div>
+            <div>
+              <span>下午</span>
+              <el-time-picker
+                is-range
+                v-model="afterTime"
+                format="HH:mm"
+                value-format="HH:mm"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                placeholder="选择时间范围"
+                @change="endTimeChange"
+                :disabled="dialogTitle == '查看'"
+                :clearable="false"
+                :editable="false"
+              >
+              </el-time-picker>
+            </div>
+          </div>
+        </div>
       </el-form-item>
       <el-form-item label="" prop="noAvailableVaccines">
         <el-checkbox
           v-model="dataForm.noAvailableVaccines"
           true-label="1"
           false-label="2"
-          :disabled='dialogTitle == "查看"'
+          :disabled="dialogTitle == '查看'"
           >暂无疫苗</el-checkbox
         >
       </el-form-item>
       <el-form-item label="咨询电话" prop="mobile">
-        <el-input v-model="dataForm.mobile" :disabled='dialogTitle == "查看"' placeholder="咨询电话"></el-input>
+        <el-input
+          v-model="dataForm.mobile"
+          :disabled="dialogTitle == '查看'"
+          placeholder="咨询电话"
+        ></el-input>
       </el-form-item>
       <el-form-item label="接种点地址" prop="address">
         <el-input
           v-model="dataForm.address"
           placeholder="例:青岛市时代国际广场"
-          style="width:65%;"
+          style="width: 65%"
         ></el-input>
         <el-button
-            style="margin-left: 10px"
-            type="primary"
-            size="small"
-            @click="handleSearchMap"
-            >查询</el-button
-          >
+          style="margin-left: 10px"
+          type="primary"
+          size="small"
+          @click="handleSearchMap"
+          >查询</el-button
+        >
       </el-form-item>
       <el-form-item
         label="位置坐标"
@@ -154,9 +162,12 @@
     </el-form>
     <div class="submit">
       <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
-      <el-button v-if='dialogTitle != "查看"' type="primary" @click="dataFormSubmitHandle()">{{
-        $t("confirm")
-      }}</el-button>
+      <el-button
+        v-if="dialogTitle != '查看'"
+        type="primary"
+        @click="dataFormSubmitHandle()"
+        >{{ $t("confirm") }}</el-button
+      >
     </div>
   </div>
 </template>
@@ -185,7 +196,7 @@ export default {
         moEndTime: "",
         afStartTime: "",
         afEndTime: "",
-        noAvailableVaccines: '1',
+        noAvailableVaccines: "1",
         mobile: "",
         address: "",
         longitude: "",
@@ -216,7 +227,7 @@ export default {
         ],
         inoculationDate: [
           {
-            required: this.dataForm.noAvailableVaccines === '2',
+            required: this.dataForm.noAvailableVaccines === "2",
             message: this.$t("validate.required"),
             trigger: "blur",
           },
@@ -259,11 +270,11 @@ export default {
       };
     },
   },
-  props:{
-    dialogTitle:{
-      type:String,
-      default:''
-    }
+  props: {
+    dialogTitle: {
+      type: String,
+      default: "",
+    },
   },
   methods: {
     startTimeChange() {
@@ -280,14 +291,14 @@ export default {
           return false;
         }
         if (hour_0 == 12) {
-          if(minute_0 > 0 || second_0 > 0){
+          if (minute_0 > 0 || second_0 > 0) {
             this.$message.error("请选择00:00-12:00时间段的时间");
             this.morningTime = null;
             return false;
           }
         }
         if (hour_1 == 12) {
-          if(minute_1 > 0 || second_1 > 0){
+          if (minute_1 > 0 || second_1 > 0) {
             this.$message.error("请选择00:00-12:00时间段的时间");
             this.morningTime = null;
             return false;
@@ -311,14 +322,14 @@ export default {
           return false;
         }
         if (hour_0 == 12) {
-          if(minute_0 == 0 && second_0 == 0){
+          if (minute_0 == 0 && second_0 == 0) {
             this.$message.error("请选择12:01-23:59时间段的时间");
             this.afterTime = null;
             return false;
           }
         }
         if (hour_1 == 12) {
-          if(minute_1 == 0 && second_1 == 0){
+          if (minute_1 == 0 && second_1 == 0) {
             this.$message.error("请选择12:01-23:59时间段的时间");
             this.afterTime = null;
             return false;
@@ -339,7 +350,7 @@ export default {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
       }
-      console.log(latitude,longitude);
+      console.log(latitude, longitude);
       var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("map_add"), {
@@ -487,15 +498,15 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
-          this.morningTime = [res.data.moStartTime,res.data.moEndTime]
-          this.afterTime = [res.data.afStartTime,res.data.afEndTime]
-          if(res.data.moStartTime !== ''){
-              this.morningTime = [res.data.moStartTime,res.data.moEndTime]
-              this.afterTime = [res.data.afStartTime,res.data.afEndTime]
+          this.morningTime = [res.data.moStartTime, res.data.moEndTime];
+          this.afterTime = [res.data.afStartTime, res.data.afEndTime];
+          if (res.data.moStartTime !== "") {
+            this.morningTime = [res.data.moStartTime, res.data.moEndTime];
+            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 (!this.dataForm.longitude && !this.dataForm.latitude) {
+            this.dataForm.longitude = "120.38945519";
+            this.dataForm.latitude = "36.0722275";
           }
           this.initMap();
         })
@@ -508,13 +519,24 @@ export default {
           if (!valid) {
             return false;
           }
-          if(this.morningTime === null && this.dataForm.noAvailableVaccines === '2'){
-              this.$message.error('请填写上午接种时间');
-              return false
+          if(!this.dataForm.inoculationDate &&
+            this.dataForm.noAvailableVaccines === "2"){
+              this.$message.error("请选择接种日期");
+              return false;
           }
-          if(this.afterTime === null && this.dataForm.noAvailableVaccines === '2'){
-              this.$message.error('请填写下午接种时间');
-              return false
+          if (
+            this.morningTime === null &&
+            this.dataForm.noAvailableVaccines === "2"
+          ) {
+            this.$message.error("请填写上午接种时间");
+            return false;
+          }
+          if (
+            this.afterTime === null &&
+            this.dataForm.noAvailableVaccines === "2"
+          ) {
+            this.$message.error("请填写下午接种时间");
+            return false;
           }
           this.$http[!this.dataForm.id ? "post" : "put"](
             "/epmetuser/icPointVaccinesInoculation/",
@@ -522,7 +544,9 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.internalMsg ? res.internalMsg : res.msg);
+                return this.$message.error(
+                  res.internalMsg ? res.internalMsg : res.msg
+                );
               }
               this.$message({
                 message: this.$t("prompt.success"),
@@ -545,6 +569,15 @@ export default {
 };
 </script>
 <style scoped>
+.data-block {
+  display: flex;
+}
+.time-block>div{
+  margin-bottom: 10px;
+}
+.time-block span {
+  padding: 10px;
+}
 .position_label >>> .el-form-item__label::before {
   color: #fff !important;
 }
@@ -552,21 +585,20 @@ export default {
   text-align: center;
   margin: auto;
 }
-.form-class .el-input{
+.form-class .el-input {
   width: 75%;
 }
-.form-class .el-textarea{
-  width: 75%!important;
+.form-class .el-textarea {
+  width: 75% !important;
 }
-.time-class{
+.time-class {
   position: relative;
 }
-.time-class::before{
-    content: '*';
-    color: #F56C6C;
-    position: absolute;
-    left:16px;
-    top: 10px;
+.time-class::before {
+  content: "*";
+  color: #f56c6c;
+  position: absolute;
+  left: 42px;
+  top: 10px;
 }
-
 </style>

From a1411f52ed38fc7734250549b73ab99911b9558e Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 16:19:13 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=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  | 1 -
 .../point/icpointvaccinesinoculation-add-or-update.vue        | 4 +++-
 .../modules/plugins/point/icpointvaccinesinoculation.vue      | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index ecf6cf110..00202d023 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -182,7 +182,6 @@
       </el-table>
       <el-pagination @size-change="pageSizeChangeHandle"
                        @current-change="pageCurrentChangeHandle"
-                       :current-page.sync="pageNo"
                        :page-sizes="[20, 50, 100, 200]"
                        :page-size="limit"
                        layout="sizes, prev, pager, next, total"
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 15dce74f1..6090ce2b8 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -27,7 +27,7 @@
       </el-form-item>
       <el-form-item label="接种时间" :class="dataForm.noAvailableVaccines != '2'?'':'time-class'">
         <div class="data-block">
-          <div style="width: 30%">
+          <div style="width: 25%">
             <el-date-picker
               v-model="dataForm.inoculationDate"
               value-format="yyyy-MM-dd"
@@ -53,6 +53,7 @@
                 :disabled="dialogTitle == '查看'"
                 :clearable="false"
                 :editable="false"
+                style="width: 63%"
               >
               </el-time-picker>
             </div>
@@ -71,6 +72,7 @@
                 :disabled="dialogTitle == '查看'"
                 :clearable="false"
                 :editable="false"
+                style="width: 63%"
               >
               </el-time-picker>
             </div>
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 697c44da8..803d35558 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -197,7 +197,6 @@
       </el-table>
       <el-pagination @size-change="pageSizeChangeHandle"
                        @current-change="pageCurrentChangeHandle"
-                       :current-page.sync="pageNo"
                        :page-sizes="[20, 50, 100, 200]"
                        :page-size="limit"
                        layout="sizes, prev, pager, next, total"

From f3a3e83d3bc31ba42fe8795735972ec9e6d52293 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:19:55 +0800
Subject: [PATCH 11/14] =?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    | 8 +-------
 1 file changed, 1 insertion(+), 7 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 15dce74f1..4e9ed7dec 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -32,6 +32,7 @@
               v-model="dataForm.inoculationDate"
               value-format="yyyy-MM-dd"
               type="date"
+              :clearable="false"
               placeholder="选择日期"
               :disabled="dialogTitle == '查看'"
             >
@@ -225,13 +226,6 @@ export default {
             trigger: "blur",
           },
         ],
-        inoculationDate: [
-          {
-            required: this.dataForm.noAvailableVaccines === "2",
-            message: this.$t("validate.required"),
-            trigger: "blur",
-          },
-        ],
         noAvailableVaccines: [
           {
             required: true,

From 3b4bcbe2e5e60c919c856dc09f9760362d0e9ec6 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 16:28:50 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E2=80=9D?=
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, 3 insertions(+), 3 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 6090ce2b8..81112138f 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -27,7 +27,7 @@
       </el-form-item>
       <el-form-item label="接种时间" :class="dataForm.noAvailableVaccines != '2'?'':'time-class'">
         <div class="data-block">
-          <div style="width: 25%">
+          <div style="width: 30%">
             <el-date-picker
               v-model="dataForm.inoculationDate"
               value-format="yyyy-MM-dd"
@@ -53,7 +53,7 @@
                 :disabled="dialogTitle == '查看'"
                 :clearable="false"
                 :editable="false"
-                style="width: 63%"
+                style="width: 56%"
               >
               </el-time-picker>
             </div>
@@ -72,7 +72,7 @@
                 :disabled="dialogTitle == '查看'"
                 :clearable="false"
                 :editable="false"
-                style="width: 63%"
+                style="width: 56%"
               >
               </el-time-picker>
             </div>

From 057a116ddb35a9a65a3ab0fb7b6f1217fe07510e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:31:35 +0800
Subject: [PATCH 13/14] =?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

---
 .../plugins/point/icpointvaccinesinoculation-add-or-update.vue  | 2 --
 1 file changed, 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 3c8f663de..2d1c3c763 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -494,8 +494,6 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
-          this.morningTime = [res.data.moStartTime, res.data.moEndTime];
-          this.afterTime = [res.data.afStartTime, res.data.afEndTime];
           if (res.data.moStartTime !== "") {
             this.morningTime = [res.data.moStartTime, res.data.moEndTime];
             this.afterTime = [res.data.afStartTime, res.data.afEndTime];

From cfdbb1d8cc3b99e3e4302c0679c762f281738d54 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:41:05 +0800
Subject: [PATCH 14/14] =?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

---
 .../plugins/point/icpointvaccinesinoculation-add-or-update.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4f6a5c183..a60e71d64 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -494,7 +494,7 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
-          if (res.data.moStartTime !== "") {
+          if (res.data.moStartTime !== "" && res.data.afStartTime !== "") {
             this.morningTime = [res.data.moStartTime, res.data.moEndTime];
             this.afterTime = [res.data.afStartTime, res.data.afEndTime];
           }