Merge branch 'dev-九小场所1026' into dev

src/views/modules/cpts/base/cpts/edit.vue

@@ -43,6 +43,7 @@
               <div class="item-show"
                    v-else>
                 {{ fmData[item.keyName] || "--" }}
+                <span v-if="item.attach">{{item.attach}}</span>
               </div>
             </template>
 
@@ -205,7 +206,11 @@
             <template v-else-if="item.type == 'address'">
 
               <div class="address-item">
+<<<<<<< HEAD
                 <!-- <el-input class="address-item-input"
+=======
+                <el-input class="address-item-input"
+>>>>>>> dev-九小场所1026
                           :placeholder="item.placeholder || '请输入所在地址'"
                           v-model="fmData[item.keyName]"
                           :maxlength="item.maxlength || ''"
@@ -216,6 +221,7 @@
                            type="default"
                            size="small"
                            ref="mapSearch"
+<<<<<<< HEAD
                            @click="handleSearchMap(item)">查询</el-button> -->
                 <el-select v-model="searchValue"
                            filterable
@@ -233,6 +239,10 @@
                   </el-option>
                 </el-select>
                 <div id="app_base"
+=======
+                           @click="handleSearchMap(item)">查询</el-button>
+                <div id="app"
+>>>>>>> dev-九小场所1026
                      class="div_map"></div>
                 <div style="margin-top: 10px"
                      v-show="false">
@@ -639,6 +649,7 @@ export default {
       map.setMarker(latitude, longitude);
     },
 
+<<<<<<< HEAD
 
 
     async handleSearchMap (item) {
@@ -656,6 +667,56 @@ export default {
 
     async handleMoveCenter (item, e) {
       console.log("handleMoveCenter", e);
+=======
+    setMarker (lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    handleSearchMap (item) {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchNearby({
+          keyword: this.fmData[item.keyName],
+          radius: 1000,
+          autoExtend: true,
+          center: map.getCenter(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            // item.supValues[0] = lng;
+            // item.supValues[1] = lat;
+            this.fmData[item.supKeys[0]] = lng;
+            this.fmData[item.supKeys[1]] = lat;
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+
+    handleMoveCenter (item, e) {
+      console.log(e);
+>>>>>>> dev-九小场所1026
       //修改地图中心点
       const { lat, lng } = map.getCenter();
 
@@ -671,6 +732,7 @@ export default {
       }
     },
 
+<<<<<<< HEAD
     async remoteMethod (query) {
 
       if (query !== '') {
@@ -719,6 +781,8 @@ export default {
     },
 
 
+=======
+>>>>>>> dev-九小场所1026
     async getInfo () {
       let url = this.infoUrl;
       if (!url) return;

src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue

@@ -204,16 +204,30 @@ export default {
             },
           ],
         },
+        // {
+        //   field: "规模",
+        //   keyName: "scale",
+        //   type: "select",
+        //   optionUrl: "/sys/dict/data/dictlist",
+        //   optionUrlParams: {
+        //     dictType: "scale",
+        //   },
+        //   optionList: [],
+        //   editDisabled: false,
+        //   rules: [
+        //     {
+        //       required: true,
+        //       message: "规模不能为空",
+        //       trigger: "blur",
+        //     },
+        //   ],
+        // },
         {
           field: "规模",
-          keyName: "scale",
+          keyName: "scaleTotal",
-          type: "select",
+          type: "input",
-          optionUrl: "/sys/dict/data/dictlist",
+          attach: '人',
-          optionUrlParams: {
+
-            dictType: "scale",
-          },
-          optionList: [],
-          editDisabled: false,
           rules: [
             {
               required: true,