Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/mobile/src/views/Equipment/EquipmentManagement.vue

@@ -516,6 +516,7 @@ const getEquipmentList = async (sbmc) => {
       sbmc: sbmc,
       pageNum: 1,
       pageSize: 9999,
+      requestSource: 'app', // web: Web端请求，app：移动端请求
     };
     const res = await request({
       url: "/snow-ops-platform/yjsb/list",

packages/mobile/src/views/Material/MaterialManagement.vue

@@ -298,6 +298,7 @@ const getMaterialList = async (wzmc) => {
       wzmc,
       paageNum: 1,
       paageSize: 9999,
+      requestSource: 'app', // web: Web端请求，app：移动端请求
     };
     const res = await request({
       url: "/snow-ops-platform/yjwz/list",
@@ -461,37 +462,47 @@ const afterRead = async (file) => {
 
 // 获取经纬度
 const handleGetLocation = async () => {
-  // 确保AMap完成加载
+  const location = await request({
-  if (!window.AMap) {
+    url: "/v3/ip",
-    await loadAMap();
+    method: "get",
-  }
+    params:{
-  const loadingToast = showLoadingToast({
+      key: 'c30e9ebd414fd6a4dfcc1ba8c2060dbb'
-    message: "正在获取位置",
+    },
-    forbidClick: true,
+    isThirdPartyAPI: true // 添加标识
-    duration: 0, // 设置为0表示不会自动关闭
-    zIndex: 9999,
   });
+  console.log("location", toRaw(location));
 
-  AMap.plugin("AMap.Geolocation", () => {
+  // // 确保AMap完成加载
-    const geolocation = new AMap.Geolocation({
+  // if (!window.AMap) {
-      enableHighAccuracy: true,
+  //   await loadAMap();
-      timeout: 5000,
+  // }
-      showMarker: false,
+  // const loadingToast = showLoadingToast({
-      zoomToAccuracy: true,
+  //   message: "正在获取位置",
-    });
+  //   forbidClick: true,
+  //   duration: 0, // 设置为0表示不会自动关闭
+  //   zIndex: 9999,
+  // });
 
-    geolocation.getCurrentPosition((status, result) => {
+  // AMap.plugin("AMap.Geolocation", () => {
-      if (status === "complete") {
+  //   const geolocation = new AMap.Geolocation({
-        form.material.jd = result.position.lng.toFixed(6);
+  //     enableHighAccuracy: true,
-        form.material.wd = result.position.lat.toFixed(6);
+  //     timeout: 5000,
-        loadingToast.close();
+  //     showMarker: false,
-      } else {
+  //     zoomToAccuracy: true,
-        loadingToast.close();
+  //   });
-        showToast("定位失败 请检查网络情况后重试");
+
-        console.log("result", result);
+  //   geolocation.getCurrentPosition((status, result) => {
-      }
+  //     if (status === "complete") {
-    });
+  //       form.material.jd = result.position.lng.toFixed(6);
-  });
+  //       form.material.wd = result.position.lat.toFixed(6);
+  //       loadingToast.close();
+  //     } else {
+  //       loadingToast.close();
+  //       showToast("定位失败 请检查网络情况后重试");
+  //       console.log("result", result);
+  //     }
+  //   });
+  // });
 };
 
 watch(

packages/mobile/vite.config.js

@@ -75,7 +75,12 @@ export default defineConfig(({ command, mode }) => {
           target: 'http://8.137.54.85:8661/',
           changeOrigin: true,
         },
-      }
+        '/v3':{
+          target: 'https://restapi.amap.com/',
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/v3/, '/v3') // 显式声明路径
+        }
+      },
     },
     build: {
       outDir: 'dist',

packages/screen/src/views/EquipmentManagement/index.js

@@ -185,6 +185,7 @@ const getyhzsbList = async (qxmc, yhzid, filterData) => {
             sbzt: filterData?.sbzt || '',
             pageNum: pagination.current,
             pageSize: pagination.pageSize,
+            requestSource: 'web', // web: Web端请求，app：移动端请求
         }
         const res = await request({
             url: '/snow-ops-platform/yjsb/list',
@@ -247,6 +248,10 @@ const columns = [
         prop: 'qxmc',
         label: '所属区县',
     },
+    {
+        prop: 'yhzmc',
+        label: '所属服务站',
+    },
     {
         label: '上传时间',
         width: 160,

packages/screen/src/views/MaterialManagement/index.js

@@ -200,6 +200,7 @@ const getyhzwzList = async (qxmc, yhzid, filterData) => {
             wzmc: filterData?.wzmc || '',
             pageNum: pagination.current,
             pageSize: pagination.pageSize,
+            requestSource: 'web', // web: Web端请求，app：移动端请求
         }
         const res = await request({
             url: '/snow-ops-platform/yjwz/list',

packages/screen/src/views/SnowEventManagement/index.js

@@ -174,7 +174,7 @@ const formatDate = (date) => {
 const getyhzeventList = async (qxmc, yhzid, filterData) => {
     try {
         const data = {
-            qxmc: qxmc,
+            district: qxmc,
             serviceStationId: yhzid,
             routeNo: filterData?.routeNo || '',
             stakeNo: filterData?.stakeNo || '',

packages/shared/utils/request.js

@@ -17,16 +17,16 @@ service.interceptors.request.use(config => {
 });
 
 export async function request(config) {
-    try {
+  try {
-        const res = await service(config)
+    const res = await service(config)
-        if (res === null || res === undefined) {
+    if (config.isThirdPartyAPI) { // 添加第三方API标识
-            return res
+      return res // 直接返回完整响应
-        }
-        if (Object.prototype.hasOwnProperty.call(res, 'data')) {
-            return res.data
-        }
-    } catch (error) {
-        console.log(error)
-        return null
     }
+    if (Object.prototype.hasOwnProperty.call(res, 'data')) {
+      return res.data
+    }
+  } catch (error) {
+    console.log(error)
+    return null
+  }
 }