Merge remote-tracking branch 'origin/master'

src/views/system/dept/mapSetting.vue

@@ -213,13 +213,10 @@ function saveDrawingPolygon() {
   editor.stop()
 
   console.log(polygonArr.value, '.>>>>>pointList');
-  const arr = polygonArr.value.map(i => {
-    return [i[0], i[1]];
-  })
   
   const payload = {
     ...JSON.parse(mapDeptRow),
-    pointList: arr
+    pointList: JSON.stringify(polygonArr.value)
   }
   updateDept(payload).then((response) => {
     if (response.code === 200) {

vite.config.js

@@ -38,9 +38,9 @@ export default defineConfig(({ mode, command }) => {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
           // target: 'http://localhost:9527',
-          // target: 'http://192.168.100.95:9527',
+          target: 'http://192.168.100.95:9527',
           // target: 'https://zybooks.tech/prod-api', 
-          target: 'http://192.168.100.112:9527',
+          // target: 'http://192.168.100.112:9527',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },