接口对接

ebike-operate/src/views/Urban/OperateRegion/index.vue

@@ -279,11 +279,11 @@ const columns = ref([
     dataIndex: 'zoneName'
   },
   {
-    key: 'regionName',
+    key: 'operationRegionName',
     title: '区域名称',
     width: 150,
     align: 'center',
-    dataIndex: 'regionName'
+    dataIndex: 'operationRegionName'
   },
   {
     key: 'simpleName',
@@ -414,11 +414,11 @@ const search = () => {
  */
 const feeConfigInfo = (record) => {
   modalFreeKey.value = getGUID();
-  openTitle.value = "费用信息 - " + record['regionName']
+  openTitle.value = "费用信息 - " + record['operationRegionName']
   open.value = true
   nextTick(() => {
     if (formModel.value) {
-      formModel.value.openForm({ regionId: record['regionId'] });
+      formModel.value.openForm({ regionId: record['operationRegionId'] });
     } else {
       console.log('formModel is not ready yet');
     }
@@ -445,11 +445,11 @@ const handleOkFeeModal = () => {
  */
 const regionConfigInfo = (record) => {
   modalOperateKey.value = getGUID();
-  openTitleConfig.value = "运营配置 - " + record['regionName']
+  openTitleConfig.value = "运营配置 - " + record['operationRegionName']
   openConfig.value = true
   nextTick(() => {
     if (formModelConfig) {
-      formModelConfig.value.openForm({ regionId: record['regionId'] });
+      formModelConfig.value.openForm({ regionId: record['operationRegionId'] });
     } else {
       console.log('formModel is not ready yet');
     }
@@ -471,9 +471,9 @@ const handleOkConfgModal = () => {
 }
 
 const handleEditORMap = (record) => {
-  openORMapTitle.value = '绘制地图（' + record['regionName'] + '）';
+  openORMapTitle.value = '绘制地图（' + record['operationRegionName'] + '）';
   const data = {
-    regionId: record['regionId']
+    regionId: record['operationRegionId']
   }
   editORMapModel.value.showModal(data);
 }

ebike-operate/src/views/Urban/OperateRegionMap/index.vue

@@ -11,10 +11,19 @@
       :afterClose="handleClose"
     >
       <div class="button-panel">
-              <a-button type="primary" @click="onEditorClear">{{ buttonName }}</a-button>
+        <a-button
-              <a-button type="primary" @click="onEditorComplete">完成</a-button>
+          type="primary"
+          @click="onEditorClear"
+        >{{ buttonName }}</a-button>
+        <a-button
+          type="primary"
+          @click="onEditorComplete"
+        >完成</a-button>
       </div>
-          <div class="map-container" style="width: auto; height: auto;">
+      <div
+        class="map-container"
+        style="width: auto; height: auto;"
+      >
         <tlbs-map
           ref="mapRef"
           :api-key="config.map.apiKey"
@@ -88,7 +97,7 @@ import { ref, reactive, defineProps } from 'vue'
     clearTimeout(timer);
     if (dataRegion) {
       const { regionId } = dataRegion;
-              callOperate("/ebikeRegion/getRegionInfo/" + regionId, {}, "get").then((res) => {
+      callOperate("/ebikeRegion/getOperationById?regionId=" + regionId, {}, "get").then((res) => {
         if (res.code != 200) {
           message.error(res.message)
           return
@@ -107,8 +116,7 @@ import { ref, reactive, defineProps } from 'vue'
       });
     }
   }
-      else
+  else {
-      {
     timer = setTimeout(() => {
       loadMap(dataRegion);
     }, 1000)
@@ -223,8 +231,7 @@ import { ref, reactive, defineProps } from 'vue'
   if (!isNullOrEmpty(shapeId)) {
     loadGeometry();
   }
-      else
+  else {
-      {
     ClearEditor();
   }
 }
@@ -266,6 +273,7 @@ import { ref, reactive, defineProps } from 'vue'
         });
         formData.value.shapeType = 2;
       }
+      debugger
       if (!isNullOrEmpty(formData.value.regionId)) {
         callOperate("/ebikeRegion/updateOperation", formData.value, "post").then((res) => {
           if (res.code == 200) {
@@ -275,14 +283,12 @@ import { ref, reactive, defineProps } from 'vue'
           }
         });
       }
-              else
+      else {
-              {
         handleClose();
       }
     }
   }
-      else
+  else {
-      {
     message.error("请先绘制区域！")
   }
 }
@@ -298,8 +304,7 @@ import { ref, reactive, defineProps } from 'vue'
     editorRef.value.editor.setActionMode(TMap.tools.constants.EDITOR_ACTION.INTERACT);
     editorRef.value.editor.select([shapeId]);
   }
-    else
+  else {
-    {
     editorRef.value.editor.setActionMode(TMap.tools.constants.EDITOR_ACTION.DRAW);
     // editorRef.value.circle.setGeometries([]);
     // editorRef.value.polygon.setGeometries([]);