wenhongquan 9 месяцев назад
Родитель
Сommit
9b6ea9c75c
4 измененных файлов с 8 добавлено и 4 удалено
  1. 2 1
      package.json
  2. 4 1
      src/views/upbag/index.vue
  3. 1 1
      src/views/yunying/sties/index.vue
  4. 1 1
      vite.config.ts

+ 2 - 1
package.json

@@ -88,5 +88,6 @@
     "vitest": "^0.29.7",
     "vue-eslint-parser": "9.1.0",
     "vue-tsc": "0.35.0"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

+ 4 - 1
src/views/upbag/index.vue

@@ -209,7 +209,10 @@ const getSites = () => {
     res2.rows.filter(i=>i.remark.indexOf("cabinetType")!=-1).forEach((item) => {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       //@ts-ignore
-      item["deviceId"] = (JSON.parse(item.remark)??[]).filter(i=>i.type=="cabinet")[0]?.cabinetType;
+      item["deviceId"] = (JSON.parse(item.remark)??[]).filter(i=>i.type=="cabinet")[0]?.wdcode;
+      if(item["deviceId"]==undefined){
+        return;
+      }
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       //@ts-ignore
       sitelist.value[item["deviceId"]] = item;

+ 1 - 1
src/views/yunying/sties/index.vue

@@ -406,7 +406,7 @@ const savedata = () => {
   };
   updateData(data).then((res) => {
     ElMessage.success("成功!");
-    getLineSites();
+    window.location.reload();
   });
 };
 

+ 1 - 1
vite.config.ts

@@ -27,7 +27,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       proxy: {
         [env.VITE_APP_BASE_API]: {
           // target: 'http://localhost:8080',
-          target: 'http://47.104.97.60/api',
+          target: 'https://khy.xiaole.vip/api',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')