[Mod 0000] 地图执法处坐标固定及登录接口重调

src/api/sys/map.ts

@@ -63,6 +63,44 @@ export function getGeoJSON(params: any) {
     return get(colorMap, lv, StatusColorEnum.blue);
   };
 
+  const positionPresets = new Map([
+    [
+      '执法一处',
+      {
+        x: '38.640448',
+        y: '110.025366',
+      },
+    ],
+    [
+      '执法二处',
+      {
+        x: '39.195141',
+        y: '110.844117',
+      },
+    ],
+    [
+      '执法三处',
+      {
+        x: '35.83317',
+        y: '109.425873',
+      },
+    ],
+    [
+      '执法四处',
+      {
+        x: '35.184',
+        y: '109.937609',
+      },
+    ],
+    [
+      '执法五处',
+      {
+        x: '33.812234',
+        y: '108.337231',
+      },
+    ],
+  ]);
+
   // const pointInPolygon = (point, polygon) => {
   //   const x = point[0],
   //     y = point[1];
@@ -142,8 +180,8 @@ export function getGeoJSON(params: any) {
         isLeaf: false,
         dynamic: true,
         alarmLevel: element.alarmLevel,
-        longitude: element.longitude,
-        latitude: element.latitude,
+        longitude: positionPresets.get(ref.departName)?.y || element.longitude,
+        latitude: positionPresets.get(ref.departName)?.x || element.latitude,
         fillColor: getAlarmColor(element.alarmLevel),
         zoom: 5 + parseInt(ref.orgType),
       };
@@ -185,6 +223,8 @@ export function getGeoJSON(params: any) {
       })),
     };
 
+    console.log('debug rrr', markers);
+
     return [geojson, records, markers];
   });
 }

src/views/system/loginmini/MiniLogin.vue

@@ -350,7 +350,7 @@
           password: formData.password,
           username: formData.username,
           loginOrgCode: formData.loginOrgCode,
-          captcha: formData.inputCode,
+          // captcha: formData.inputCode,
           checkKey: randCodeData.checkKey,
           mode: 'none', //不要默认的错误提示
         })
@@ -396,7 +396,7 @@
       loginLoading.value = true;
       const { userInfo }: any = await userStore.phoneLogin({
         mobile: phoneFormData.mobile,
-        captcha: phoneFormData.smscode,
+        // captcha: phoneFormData.smscode,
         loginOrgCode: phoneFormData.loginOrgCode,
         mode: 'none', //不要默认的错误提示
       });