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

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

@@ -46,13 +46,19 @@
       <el-form-item label="检测点地址" prop="address">
         <el-input
           v-model="dataForm.address"
-          placeholder="检测点地址"
-          disabled
+          placeholder="例:青岛市时代国际广场"
         ></el-input>
+          <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">
         <div>
-          <el-input
+          <!-- <el-input
             class="item_width_4"
             maxlength="50"
             placeholder="例:青岛市时代国际广场"
@@ -67,13 +73,13 @@
             size="small"
             @click="handleSearchMap"
             >查询</el-button
-          >
+          > -->
           <div
             id="map_add"
             class="div_map"
             style="width: 500px; height: 300px; margin-top: 20px"
           ></div>
-          <div style="margin-top: 10px">
+          <div style="margin-top: 10px" v-show="false">
             <span>经度</span>
             <el-input
               class="item_width_3"
@@ -272,7 +278,8 @@ export default {
       // 在地图显示范围内以给定的关键字搜索地点
       search
         .searchRectangle({
-          keyword: this.keyWords,
+          // keyword: this.keyWords,
+          keyword: this.dataForm.address,
           bounds: map.getBounds(),
         })
         .then((result) => {
@@ -391,7 +398,7 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.internalMsg);
               }
               this.$message({
                 message: this.$t("prompt.success"),

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"

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

@@ -88,9 +88,15 @@
       <el-form-item label="接种点地址" prop="address">
         <el-input
           v-model="dataForm.address"
-          placeholder="接种点地址"
-          disabled
+          placeholder="例:青岛市时代国际广场"
         ></el-input>
+        <el-button
+            style="margin-left: 10px"
+            type="primary"
+            size="small"
+            @click="handleSearchMap"
+            >查询</el-button
+          >
       </el-form-item>
       <el-form-item
         label="位置坐标"
@@ -99,7 +105,7 @@
         style="display: block"
       >
         <div>
-          <el-input
+          <!-- <el-input
             class="item_width_4"
             maxlength="50"
             placeholder="例:青岛市时代国际广场"
@@ -114,13 +120,13 @@
             size="small"
             @click="handleSearchMap"
             >查询</el-button
-          >
+          > -->
           <div
             id="map_app"
             class="div_map"
             style="width: 500px; height: 300px; margin-top: 20px"
           ></div>
-          <div style="margin-top: 10px">
+          <div style="margin-top: 10px" v-show="false">
             <span>经度</span>
             <el-input
               class="item_width_3"
@@ -374,7 +380,8 @@ export default {
       // 在地图显示范围内以给定的关键字搜索地点
       search
         .searchRectangle({
-          keyword: this.keyWords,
+          // keyword: this.keyWords,
+          keyword: this.dataForm.address,
           bounds: map.getBounds(),
         })
         .then((result) => {
@@ -502,7 +509,7 @@ export default {
           )
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.internalMsg);
               }
               this.$message({
                 message: this.$t("prompt.success"),