Merge branch 'dev_info' into test-new

src/pages/main/performance/common/export.js

@@ -315,22 +315,27 @@ function addborderToCell(borders) {
             13: "thick",
         },
     };
-    // console.log('borders', borders)
     for (const bor in borders) {
-        // console.log(bor)
-        if (borders[bor].color.indexOf("rgb") === -1) {
-            border[luckyExcel.type[bor]] = {
-                style: luckyExcel.style[borders[bor].style],
-                color: { argb: borders[bor].color.replace("#", "") },
-            };
+        console.log(borders[bor]);
+        if (borders[bor]) {
+            if (borders[bor].color.indexOf("rgb") === -1) {
+                border[luckyExcel.type[bor]] = {
+                    style: luckyExcel.style[borders[bor].style],
+                    color: { argb: borders[bor].color.replace("#", "") },
+                };
+            } else {
+                border[luckyExcel.type[bor]] = {
+                    style: luckyExcel.style[borders[bor].style],
+                    color: { argb: borders[bor].color },
+                };
+            }
         } else {
             border[luckyExcel.type[bor]] = {
-                style: luckyExcel.style[borders[bor].style],
-                color: { argb: borders[bor].color },
+                color: "#000000",
+                style: 1,
             };
         }
     }
-
     return border;
 }
 

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-                target: "http://192.168.3.129:9113",
+                target: "http://192.168.3.25:9114",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {