heyang 2 years ago
parent
commit
b043d870e1
3 changed files with 28 additions and 4 deletions
  1. 2 2
      .env.development
  2. 2 2
      src/utils/request.js
  3. 24 0
      src/views/dangerDetail.vue

+ 2 - 2
.env.development

@@ -13,7 +13,7 @@ VUE_APP_ENV = 'development'
 # 88服务器
 # VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
 # 43服务器
-# VUE_APP_BASE_API = 'http://192.168.1.43/labSystem'
+ VUE_APP_BASE_API = 'http://192.168.1.43/labSystem'
 # 柴
 # VUE_APP_BASE_API = 'http://192.168.1.9:8080'
 # 暨大
@@ -21,7 +21,7 @@ VUE_APP_ENV = 'development'
 # 矿大-文昌
 #VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 # 化工学院
-VUE_APP_BASE_API = 'http://lab.sxitdlc.com/labSaasSystem/'
+#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/labSaasSystem/'
 
 
 

+ 2 - 2
src/utils/request.js

@@ -21,8 +21,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 25d1c577-816a-478c-95db-7f613920ef37';//`Bearer ${localStorage.getItem('access_token')`;
-axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+axios.defaults.headers.common["Authorization"] = 'Bearer 17308f50-9aac-415f-a484-3344787d41d8';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

+ 24 - 0
src/views/dangerDetail.vue

@@ -247,6 +247,29 @@ export default {
                 color: '#fff',
 
               },
+              //设置一行显示几个字,自己设置
+              formatter: function (params) {
+                var newParamsName = "";
+                var paramsNameNumber = params.length;
+                var provideNumber = 3;
+                var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
+                if (paramsNameNumber > provideNumber) {
+                  for (var p = 0; p < rowNumber; p++) {
+                    var tempStr = "";
+                    var start = p * provideNumber;
+                    var end = start + provideNumber;
+                    if (p == rowNumber - 1) {
+                      tempStr = params.substring(start, paramsNameNumber);
+                    } else {
+                      tempStr = params.substring(start, end) + "\n";
+                    }
+                    newParamsName += tempStr;
+                  }
+                } else {
+                  newParamsName = params;
+                }
+                return newParamsName;
+              }
             },
             lineStyle: {
               "color": "#486CC2",
@@ -263,6 +286,7 @@ export default {
 
               }
             },
+
           }
         ],
         yAxis : [