修改问题

cokingCoal/index.html

@@ -518,7 +518,7 @@
                                     <div class="w_100" style="position: relative; pointer-events: none;">
                                         <div class="right_item_item_else_title">
                                             <img style="height: 100%;" src="./images/title.png" alt="">
-                                            <div class="title_right">集团公司<span class="big_color">90</span><span>%</span>
+                                            <div class="title_right">集团公司<span class="big_color">{{ gtTotle }}</span><span>%</span>
                                             </div>
                                         </div>
                                         <div class="echarts_90" ref="echarts90"></div>

cokingCoal/js/dataA.js

@@ -303,7 +303,7 @@ function listToChange(list1, list2) {
     let list = []
     list1.forEach(i => {
         list2.forEach(k => {
-            list.push(i + " - " + k)
+            list.push(i + "-" + k)
         })
     });
     return list

cokingCoal/js/humanResources.js

@@ -371,6 +371,7 @@ let app = new Vue({
             pageFlag: true,
             hecharts: null,
             leftErrorList: ["信息不完整", "信息有误", "任职条件不符", "出勤不足", "工作年限不符"],
+            
             isShowList: true,
             isListEnd: 0,
             address: "西山煤电屯兰矿。",
@@ -405,13 +406,12 @@ let app = new Vue({
 
             listChange: null,
 
-
-
         }
     },
     beforeCreate() {
         // 跳转地址
         let AddUrl = location.protocol + "//" + location.host + "/ierp"
+        return
         if (!window.location.search) {
             // alert("链接已失效，请重新打开")
             window.location.href = AddUrl
@@ -672,7 +672,6 @@ let app = new Vue({
                 }, 15)
 
             } else {
-                // that.showBigList =  true
                 that.dataFlag = !that.dataFlag
                 that.leftTime && clearInterval(that.leftTime)
                 that.leftTime = setInterval(() => {
@@ -2193,6 +2192,7 @@ let app = new Vue({
             console.log(this.from);
         },
         handleMonthOption(item) {
+            console.log(item);
             this.monthItem = item
             this.handleMark()
         },
@@ -2390,8 +2390,12 @@ let app = new Vue({
                     res.data.forEach((item, index) => {
                         list.push([item[0], item[1], item[2], item[3], item[4]])
                         a[index] = []
-                        item[5].split("&").forEach(i => {
-                            let infos = i.split("\r\n")
+                        let arr = item[5].split("&")
+                        if(arr[0].length == 2){
+                            arr.shift()
+                        }
+                        arr.forEach(i => {
+                            let infos = i.split("\n")
                             let obj = {
                                 title: infos[0],
                                 content: infos[1]

cokingCoal/js/newIndex.js

@@ -155,7 +155,8 @@ let app = new Vue({
             },
             configMark: {
                 waitTime: 2000,
-                header: ["单位名称", "人员数量", "月份", "预警项"],
+                // header: ["单位名称", "人员数量", "月份", "预警项"],
+                header: ["单位名称", "月份",  "人员数量", "预警项"],
                 rowNum: 6,
                 data: [
                     ["<span class='red'>西山煤电</span>", "<span class='red'>71</span>", "<span class='red'>7月</span>", "<span class='red'>薪资低于4000元</span>"],
@@ -504,32 +505,35 @@ let app = new Vue({
 
             setTypeFlag: null,
 
+            gtTotle: 90
+
         }
     },
     beforeCreate() {
         // 跳转地址
-        let AddUrl  = location.protocol + "//" + location.host + "/ierp"
-        if(!window.location.search){
+        let AddUrl = location.protocol + "//" + location.host + "/ierp"
+        return
+        if (!window.location.search) {
             // alert("链接已失效，请重新打开")
             window.location.href = AddUrl
         }
         let arr = window.location.search.split("&")
         let dataList = []
-        arr.forEach(item=>{
+        arr.forEach(item => {
             dataList.push(item.split("=")[1])
         })
         window.user = dataList[0]
         let newDate = new Date().getTime()
         let authorityType = window.sessionStorage.getItem("authorityType") || false
-        if(!authorityType){
-            if(newDate - dataList[1] > 30000){
+        if (!authorityType) {
+            if (newDate - dataList[1] > 30000) {
                 // alert("链接已失效，请重新打开")
                 window.location.href = AddUrl
             }
             window.sessionStorage.setItem("authorityType", true)
         }
     },
-    beforeDestroy(){
+    beforeDestroy() {
         window.sessionStorage.removeItem("authorityType")
     },
     watch: {
@@ -4774,14 +4778,14 @@ let app = new Vue({
         },
         initEchartsBar(el, data, color) {
             this.studentEcharts = echarts.init(el);
-            if(Array.isArray(data.x)){
+            if (Array.isArray(data.x)) {
                 data.x.forEach(item => {
                     item = item.slice(0, -2)
                 })
             } else {
                 return
             }
-            
+
             let xLabel = data.x
             option = {
                 grid: {
@@ -6030,7 +6034,7 @@ let app = new Vue({
                             that.optimize[1].value = item.value
                         }
                         if (item.key == "优化率") {
-                            that.optimizeValue = item.value
+                            that.optimizeValue = item.value * 100
                         }
                     })
                 }
@@ -6547,11 +6551,20 @@ let app = new Vue({
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary1", data).then(res => {
                 if (res) {
                     salaryList = res
+                    that.gtTotle = res.total
+                    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()
                 }
-                that.sx = spArr(salaryList.x, 6)
-                that.sy = spArr(salaryList.y, 6)
 
-                that.initLineElseEchartsR(echarts90, { x: that.sx[0], y: that.sy[0] })
+
 
             })
         },

cokingCoal/js/request.js

@@ -13,7 +13,7 @@ function isLocalEnv() {
 }
 
 
-window.apiType = "prod"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
+window.apiType = "sit"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
 // if(window.location.search){
 //   apiType = window.location.search.split("=")[1]
 // }
@@ -22,7 +22,7 @@ window.fetchUrl = ""
 window.user = "18035133443"
 
 if (window.apiType == "dev") {
-  window.fetchUrl = "http://192.168.1.4:8080"
+  window.fetchUrl = "http://192.168.1.11:8080"
 } else if (window.apiType == "sit") {
   window.fetchUrl = "http://172.21.9.236:8081"
 } else if (window.apiType == "uat") {
@@ -272,7 +272,7 @@ function getLocalEnvAccessToken() {
         apptoken: localStorage.getItem("app_token"),
         // appSecuret: "Cs?9HeKqacN%gnu3",
         tenantid: "jmuatierp",
-        user: "17649834944",
+        user: "18335173447",
         usertype: "Mobile",
         accountId: "1609428936914108416",
       }