Merge remote-tracking branch 'origin/feature/dev_point_manage' into feature/dev_point_manage

src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue

@@ -67,7 +67,7 @@
             >查询</el-button
           >
           <div
-            id="map_app"
+            id="map_add"
             class="div_map"
             style="width: 500px; height: 300px; margin-top: 20px"
           ></div>
@@ -96,12 +96,12 @@
         </div>
       </el-form-item>
     </el-form>
-    <template slot="footer">
+    <div class="submit">
       <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -213,7 +213,7 @@ export default {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义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, // 设置俯仰角
@@ -401,4 +401,8 @@ export default {
 .position_label >>> .el-form-item__label::before{
   color:#fff!important;
 }
+.submit{
+  text-align: center;
+  margin: auto;
+}
 </style>

src/views/modules/plugins/point/icpointnucleicmonitoring.vue

@@ -174,6 +174,7 @@
       :destroy-on-close="true"
     >
       <add-or-update
+        v-if="addOrUpdateVisible"
         ref="addOrUpdate"
         @refreshDataList="getDataList"
       ></add-or-update>

src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue

@@ -69,6 +69,7 @@
         <el-input
           v-model="dataForm.address"
           placeholder="接种点地址"
+          disabled
         ></el-input>
       </el-form-item>
       <el-form-item label="位置坐标" class="position_label" prop="longitude" style="display: block">
@@ -118,12 +119,12 @@
         </div>
       </el-form-item>
     </el-form>
-    <template slot="footer">
+    <div class="submit">
       <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -252,7 +253,8 @@ export default {
     },
   },
   mounted() {
-    // this.getFormInfo();
+    console.log(document.getElementById("map_app"));
+    this.getFormInfo();
     this.initMap();
   },
   methods: {
@@ -432,4 +434,8 @@ export default {
 .position_label >>> .el-form-item__label::before{
   color:#fff!important;
 }
+.submit{
+  text-align: center;
+  margin: auto;
+}
 </style>

src/views/modules/plugins/point/icpointvaccinesinoculation.vue

@@ -315,9 +315,18 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 .exportBtn {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
 }
+.div_left_table {
+  margin-top: 10px;
+  margin-left: 15px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
 </style>