Explorar o código

fix: 修复新环境空指针

@dayan_hjm hai 11 meses
pai
achega
02ecedacf9
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 4 4
      config/webpack.dev.js
  2. 1 1
      src/utils/util.js

+ 4 - 4
config/webpack.dev.js

@@ -133,16 +133,16 @@ module.exports = merge(common, {
133
     hot: true,
133
     hot: true,
134
     proxy: {
134
     proxy: {
135
       "/api": {
135
       "/api": {
136
-        // target: "http://47.96.100.195:9081"
136
+        target: "http://10.9.9.182:9081",
137
         // target: "http://dataportal-test.agile.com.cn:8081"
137
         // target: "http://dataportal-test.agile.com.cn:8081"
138
-        target: "http://10.9.9.173:9081",
138
+        // target: "http://10.9.9.173:9081",
139
         // target:"https://dms.dataportal.tianqilithium.com:9000",
139
         // target:"https://dms.dataportal.tianqilithium.com:9000",
140
         changeOrigin:true,
140
         changeOrigin:true,
141
 
141
 
142
       },
142
       },
143
       "/dataengine-center-oneservice": {
143
       "/dataengine-center-oneservice": {
144
-        // target: "http://10.8.8.185:31233",
145
-        target: "http://10.9.9.173:9081",
144
+        target: "http://10.9.9.182:9081",
145
+        // target: "http://10.9.9.173:9081",
146
         // target:"https://dms.dataportal.tianqilithium.com:9000",
146
         // target:"https://dms.dataportal.tianqilithium.com:9000",
147
         changeOrigin:true,
147
         changeOrigin:true,
148
       },
148
       },

+ 1 - 1
src/utils/util.js

@@ -985,7 +985,7 @@ export function getThousandNum(num, need100) {
985
   if (!num) { return 0 }
985
   if (!num) { return 0 }
986
   //统一保留2位小数
986
   //统一保留2位小数
987
   // num = Math.floor(num*100)/100;
987
   // num = Math.floor(num*100)/100;
988
-  num = Number(need100 ? (num * 100).toFixed(2) : num.toFixed(2));
988
+  num = Number(need100 ? (num * 100).toFixed(2) : Number(num).toFixed(2));
989
   var TextBox8_all = num.toLocaleString();
989
   var TextBox8_all = num.toLocaleString();
990
   // var text8_sum = TextBox8_all.replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g,'$1,');
990
   // var text8_sum = TextBox8_all.replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g,'$1,');
991
   if (TextBox8_all.split('.')[1] && TextBox8_all.split('.')[1].length == 1) {
991
   if (TextBox8_all.split('.')[1] && TextBox8_all.split('.')[1].length == 1) {