fengxu 1 år sedan
förälder
incheckning
dfa6855926
2 ändrade filer med 9 tillägg och 11 borttagningar
  1. 8 10
      cokingCoal/js/newIndex.js
  2. 1 1
      cokingCoal/js/request.js

+ 8 - 10
cokingCoal/js/newIndex.js

@@ -513,7 +513,7 @@ let app = new Vue({
         // 跳转地址
         setTimeout(() => {
             let AddUrl = location.protocol + "//" + location.host + "/ierp"
-            // return
+            return
             if (!window.location.search) {
                 // alert("链接已失效,请重新打开")
                 window.location.href = AddUrl
@@ -6784,14 +6784,14 @@ let app = new Vue({
                     if (salaryList.x.length < 6) {
                         that.initLineElseEchartsR(echarts90, { x: salaryList.x, y: salaryList.y })
                         that.time4 && clearInterval(that.time4);
+                    } else {
+                        that.sx = spArr(salaryList.x, 6)
+                        that.sy = spArr(salaryList.y, 6)
+                        that.initLineElseEchartsR(echarts90, { x: that.sx[0], y: that.sy[0] })
+                        that.time4 && clearInterval(that.time4);
+                        that.timeSy()
                     }
-                } else {
-                    that.sx = spArr(salaryList.x, 6)
-                    that.sy = spArr(salaryList.y, 6)
-                    that.initLineElseEchartsR(echarts90, { x: that.sx[0], y: that.sy[0] })
-                    that.time4 && clearInterval(that.time4);
-                    that.timeSy()
-                }
+                } 
 
 
 
@@ -7003,8 +7003,6 @@ let app = new Vue({
                     }
                     res.data[0].flag = true
                     that.organizationList.push(...res.data)
-                    console.log(that.organizationList);
-                    console.log(res.data);
                     that.getDistributionInfo()
                 }
             })

+ 1 - 1
cokingCoal/js/request.js

@@ -13,7 +13,7 @@ function isLocalEnv() {
 }
 
 
-window.apiType = "uat"  // dev 本地测试 ,  sit  线上测试  uat  客户测试环境 prod  正式环境
+window.apiType = "prod"  // dev 本地测试 ,  sit  线上测试  uat  客户测试环境 prod  正式环境
 // if(window.location.search){
 //   apiType = window.location.search.split("=")[1]
 // }