Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front into master

# Conflicts:
#	vue.config.js

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

@@ -315,22 +315,26 @@ 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("#", "") },
-            };
+        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,11 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
+<<<<<<< HEAD
                 target: "http://127.0.0.1:9113",
+=======
+                target: "http://192.168.3.25:9114",
+>>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -101,7 +105,11 @@ module.exports = {
                 },
             },
             "/market/mk": {
+<<<<<<< HEAD
                 target: "http://127.0.0.1:9113",
+=======
+                target: "http://192.168.3.25:9114",
+>>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -109,7 +117,11 @@ module.exports = {
                 },
             },
             "/market/techcentergj": {
+<<<<<<< HEAD
                 target: "http://127.0.0.1:9113",
+=======
+                target: "http://192.168.3.25:9114",
+>>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,7 +129,11 @@ module.exports = {
                 },
             },
             "/mkWangge": {
+<<<<<<< HEAD
                 target: "http://127.0.0.1:9113",
+=======
+                target: "http://192.168.3.25:9114",
+>>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -135,7 +151,11 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
+<<<<<<< HEAD
                 target: "http://127.0.0.1:9600",
+=======
+                target: "http://192.168.3.228:9600/spfm",
+>>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
                 changeOrigin: true,
             },
         },