Merge branch 'MicroFunction' of http://47.103.92.60:3003/skyversation/qp_onemap_ui into onemap_zmg

src/components/wgn/controlPanel.vue

@@ -448,7 +448,7 @@ export default {
           { value: "村居", label: "村居" },
           { value: "街镇", label: "街镇" },
           { value: "区县", label: "区县" },
-          { value: "要素ID", label: "要素ID" },
+          // { value: "要素ID", label: "要素ID" },
         ],
         geocodeColumnKeyword: [],
       },

src/views/Wgn.vue

@@ -475,7 +475,7 @@ export default {
             { value: "村居", label: "村居" },
             { value: "街镇", label: "街镇" },
             { value: "区县", label: "区县" },
-            { value: "要素ID", label: "要素ID" },
+            // { value: "要素ID", label: "要素ID" },
           ],
           geocodeColumnKeyword: [],
           // 单位

src/views/WgnLast.vue

@@ -460,7 +460,7 @@ export default {
             { value: "村居", label: "村居" },
             { value: "街镇", label: "街镇" },
             { value: "区县", label: "区县" },
-            { value: "要素ID", label: "要素ID" },
+            // { value: "要素ID", label: "要素ID" },
           ],
           geocodeColumnKeyword: [],
           // 单位
@@ -652,11 +652,7 @@ export default {
               // 接口路径
               this.taskColumn.apiFrom.apiUrl = apiInfo.c_url;
               const pr = this.taskColumn.apiFrom.apiParameterRules;
-              if (
-                pr &&
-                pr.includes("geocodeColumnKeyword") &&
-                this.taskUploadRawFile
-              ) {
+              if (pr && pr.includes("geocodeColumnKeyword") && this.taskUploadRawFile) {
                 this.refreshTaskGeocodeColumns(this.taskUploadRawFile);
               }
               this.syncKeyTypeForGeocodingTask();