修改提交

cokingCoal/hr.html

@@ -135,7 +135,7 @@
                                 style="width: 100%; height: 100%" />
 
                         </div>
-                        <div class="echarts_icon" @click="hanleIcon()">
+                        <div :class="dataFlag?'echarts_icon':'echarts_icon_else'" @click="hanleIcon()">
                             <img src="./images/blue.png" alt="">
                         </div>
                     </div>

cokingCoal/index.html

@@ -981,7 +981,7 @@
             </div>
 
         </div>
-        <div class="icon_box" @click="handleMore()">
+        <div :class="dataFlag?'icon_box':'icon_box_else'" @click="handleMore()">
             <img src="./images/blue.png" alt="">
         </div>
         <div class="mark_box" @click="handleChangeImage()" v-if="imageIndex < imageList.length && imageFlag">

cokingCoal/js/humanResources.js

@@ -371,7 +371,7 @@ let app = new Vue({
             pageFlag: true,
             hecharts: null,
             leftErrorList: ["信息不完整", "信息有误", "任职条件不符", "出勤不足", "工作年限不符"],
-            
+
             isShowList: true,
             isListEnd: 0,
             address: "西山煤电屯兰矿。",
@@ -411,6 +411,7 @@ let app = new Vue({
     beforeCreate() {
         // 跳转地址
         let AddUrl = location.protocol + "//" + location.host + "/ierp"
+        // return
         if (!window.location.search) {
             // alert("链接已失效，请重新打开")
             window.location.href = AddUrl
@@ -438,7 +439,12 @@ let app = new Vue({
 
         let date = new Date()
         let year = date.getFullYear()
-        let month = "0" + date.getMonth()
+        let month
+        if (date.getMonth() <= 9) {
+            month = "0" + date.getMonth()
+        } else {
+            month = date.getMonth()
+        }
         this.timeList1 = [(year - 1) + "-" + month, year + "-" + month]
         this.timeList2 = [(year - 1) + "-" + month, year + "-" + month]
 
@@ -597,6 +603,17 @@ let app = new Vue({
 
             let vita = this.$refs.vita
             that.initVitaEcharts(vita)
+
+
+            setTimeout(() => {
+                let itemContent = document.getElementById("itemContent")
+                if (itemContent) {
+                    let target = itemContent.getElementsByClassName("row-item")
+                    let targetList = target.item(0)
+                    targetList.style.background = "#302e2d50"
+                    targetList.style.color = "#E1AF27"
+                }
+            }, 10)
         })
     },
     methods: {
@@ -916,6 +933,7 @@ let app = new Vue({
             });
         },
         scrollChange(index) {
+            this.itemClass = "item_content_6",
             this.rollFlag = false;
             let listIndex = index
             if (listIndex >= this.config1.data.length) {
@@ -2390,7 +2408,7 @@ let app = new Vue({
                         list.push([item[0], item[1], item[2], item[3], item[4]])
                         a[index] = []
                         let arr = item[5].split("&")
-                        if(arr[0].length == 2){
+                        if (arr[0].length == 2) {
                             arr.shift()
                         }
                         arr.forEach(i => {
@@ -2409,19 +2427,19 @@ let app = new Vue({
                     that.itemClass = "item_content_99"
                     if (that.config1.data.length <= that.config1.rowNum) {
                         that.listChange = setInterval(() => {
-
                             // that.configDataIndex
+                            console.log(that.configDataIndex >= that.config1.data.length);
                             if (that.configDataIndex >= that.config1.data.length) {
                                 that.configDataIndex = 1
                                 that.itemClass = "item_content_99"
                                 that.funChangeList(0)
+                                that.recruitInfoIndex = 0
                                 return
                             }
                             that.itemClass = "item_content_" + (that.configDataIndex + 5)
                             that.funChangeList(that.configDataIndex)
-                            // console.log(that.itemClass);
-                            that.configDataIndex += 1
                             that.recruitInfoIndex = that.configDataIndex
+                            that.configDataIndex += 1
                         }, that.config1.waitTime)
                     } else {
                         setTimeout(() => {
@@ -2443,15 +2461,23 @@ let app = new Vue({
 
                 } else {
                     that.config1.data = list
+                    that.itemClass = "item_content_6"
                     that.listChange && clearInterval(that.listChange)
+                    setTimeout(() => {
+                        let itemContent = document.getElementById("itemContent")
+                        if (itemContent) {
+                            let target = itemContent.getElementsByClassName("row-item")
+                            let targetList = target.item(0)
+                            targetList.style.background = "#302e2d50"
+                            targetList.style.color = "#E1AF27"
+                        }
+
+                    }, 0)
                 }
                 setTimeout(() => {
                     that.isShowInfoList = true
                 })
             })
-
-
-
         },
         funChangeList(idnex) {
             let listIndex = idnex
@@ -2720,11 +2746,14 @@ let app = new Vue({
                         if (Array.isArray(res[key])) {
                             res[key].forEach(item => {
                                 // item.splice(item.length - 2, 1);
-                                item[item.length - 1] = item[item.length - 1].replaceAll("年", "-")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("月", "-")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("日", " ")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("/", "-")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("|", "-")
+                                if (item[item.length - 1]) {
+                                    item[item.length - 1] = item[item.length - 1].replaceAll("年", "-")
+                                    item[item.length - 1] = item[item.length - 1].replaceAll("月", "-")
+                                    item[item.length - 1] = item[item.length - 1].replaceAll("日", " ")
+                                    item[item.length - 1] = item[item.length - 1].replaceAll("/", "-")
+                                    item[item.length - 1] = item[item.length - 1].replaceAll("|", "-")
+                                }
+
                             })
                         }
                     }

cokingCoal/js/newIndex.js

@@ -571,7 +571,12 @@ let app = new Vue({
         },
     },
     mounted() {
-        let data = "0" + new Date().getMonth()
+        let data 
+        if(new Date().getMonth() <= 9){
+            data = "0" + new Date().getMonth()
+        } else {
+            data = new Date().getMonth()
+        }
         this.selectInfo = {
             total: data,
             average: data
@@ -1034,7 +1039,7 @@ let app = new Vue({
                 this.downholeTime && clearInterval(this.downholeTime);
                 this.downholeTimes()
                 let efficiency = this.$refs.efficiency
-                this.downhole.dispose()
+                this.downhole && this.downhole.dispose()
                 if (that.downholeIndex == 1) {
 
                     this.downholeObj = {
@@ -1075,7 +1080,6 @@ let app = new Vue({
                     if (that.twoTimeIndex == that.nx2.length - 1) {
                         that.twoTimeIndex = 0
                         that.twoIndex = 1
-                        console.log(that.twoTimeIndex);
                         that.initTwoBarEcharts(echartTwo, { x: that.nx1[that.twoTimeIndex], y: that.ny1[that.twoTimeIndex] })
                         return
                     } else {
@@ -6556,9 +6560,10 @@ let app = new Vue({
                             that.selectTraining = item.value
                         }
                     })
-                    this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
-                    this.getFrontLine()
                 }
+                this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
+                this.getFrontLine()
+
 
             })
             this.downholeTimes()
@@ -6737,7 +6742,11 @@ let app = new Vue({
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary", data).then(res => {
                 if (res) {
                     // leftEndList = res.data
-                    x = res.lastyear.x
+                    if(res.lastyear.x.length != 0){
+                        x = res.lastyear.x
+                    } else {
+                        x = res.thisyear.x
+                    }
                     y1 = res.lastyear.y
                     y2 = res.thisyear.y
                     leftEndList = {

cokingCoal/js/request.js

@@ -13,7 +13,7 @@ function isLocalEnv() {
 }
 
 
-window.apiType = "prod"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
+window.apiType = "uat"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
 // if(window.location.search){
 //   apiType = window.location.search.split("=")[1]
 // }
@@ -210,7 +210,7 @@ function localEnvAppToken() {
         appId: "jsc",
         appSecuret: "Cs?9HeKqacN%gnu3",
         tenantid: "jmuatierp",
-        accountId: "1609428936914108416",
+        accountId: "1507348433172694016",
       }
     } else if(window.apiType == "prod") {
       data = {
@@ -275,7 +275,7 @@ function getLocalEnvAccessToken() {
         // user: "18335173447",
         user: window.user,
         usertype: "Mobile",
-        accountId: "1609428936914108416",
+        accountId: "1507348433172694016",
       }
     }  else if(window.apiType == "prod") {
       data = {

cokingCoal/styles/humanResources.css

@@ -386,6 +386,11 @@ img {
 .green {
     color: green;
 }
+
+/* .item_content_6 .rows .row-item:nth-child(2){
+    color: #E1AF27;
+    background-color: #302e2d50 !important;
+} */
 .item_content_99 .rows .row-item:nth-child(1) {
     color: #E1AF27;
     background-color: #302e2d50 !important;
@@ -395,10 +400,22 @@ img {
     color: #E1AF27;
     background-color: #302e2d50 !important;
 }
+
+.item_content_6_else .rows .row-item:nth-child(2) {
+    color: #E1AF27;
+    background-color: #302e2d50 !important;
+}
+
+.item_content_5 .rows .row-item:nth-child(2) {
+    color: #E1AF27;
+    background-color: #302e2d50 !important;
+}
+
 .item_content_7 .rows .row-item:nth-child(3) {
     color: #E1AF27;
     background-color: #302e2d50 !important;
 }
+
 .item_content_8 .rows .row-item:nth-child(4) {
     color: #E1AF27;
     background-color: #302e2d50 !important;
@@ -438,15 +455,19 @@ img {
     0% {
         transform: translateY(0);
     }
+
     25% {
         transform: translateY(-5%);
     }
+
     50% {
         transform: translateY(0);
     }
+
     75% {
         transform: translateY(5%);
     }
+
     100% {
         transform: translateY(0);
     }
@@ -528,6 +549,9 @@ li {
     font-weight: bold;
 }
 
+
+
+
 .name {
     font-size: 36px;
     font-family: Source Han Sans CN;
@@ -593,9 +617,11 @@ li {
     25% {
         transform: translate(200%, 50%) scale(1.4);
     }
+
     50% {
         transform: translate(80%, 80%) scale(1.7);
     }
+
     75% {
         transform: translate(-20%, -60%) scale(1.95);
     }
@@ -605,12 +631,15 @@ li {
     0% {
         background-color: #ffefad;
     }
+
     25% {
         background-color: #ffadad;
     }
+
     50% {
         background-color: #aeadff;
     }
+
     75% {
         background-color: #adffd9;
     }
@@ -660,7 +689,7 @@ li {
 }
 
 
-.item_con_main{
+.item_con_main {
     line-height: 45px;
     white-space: pre-wrap;
     font-size: 26px;
@@ -669,6 +698,7 @@ li {
     margin-top: 10px;
     color: #fff !important;
 }
+
 .main_item_2 {
     width: 20%;
     height: 100%;
@@ -778,15 +808,19 @@ li {
     0% {
         transform: translateY(0);
     }
+
     25% {
         transform: translateY(-5%);
     }
+
     50% {
         transform: translateY(0);
     }
+
     75% {
         transform: translateY(5%);
     }
+
     100% {
         transform: translateY(0);
     }
@@ -796,15 +830,19 @@ li {
     0% {
         transform: translateY(0);
     }
+
     25% {
         transform: translateY(10%);
     }
+
     50% {
         transform: translateY(0);
     }
+
     75% {
         transform: translateY(-10%);
     }
+
     100% {
         transform: translateY(0);
     }
@@ -1007,14 +1045,24 @@ li {
 }
 
 .echarts_icon {
-    width: 70px;
-    height: 70px;
+    width: 90px;
+    height: 90px;
+    position: fixed;
+    left: 32.5%;
+    top: 62%;
+    z-index: 999999;
+}
+.echarts_icon_else {
+    width: 90px;
+    height: 90px;
     position: fixed;
     left: 32.5%;
     top: 62%;
     z-index: 999999;
+    filter: hue-rotate(204deg);
 }
 
+
 .svg_box {
     width: 40%;
     height: 500px;
@@ -1063,7 +1111,7 @@ li {
     height: 100%;
 } */
 
-.w100 .header .header-item{
+.w100 .header .header-item {
     font-size: 30px;
 }
 

cokingCoal/styles/newIndex.css

@@ -1368,7 +1368,18 @@ img {
     width: calc(31px * 2);
     height: calc(31px * 2);
 }
+.icon_box_else{
+        width: 100px;
+    height: 100px;
+    position: absolute;
+    right: 50px;
+    top: 70px;
+    z-index: 9999;
+    /* filter: drop-shadow(16px 16px 20px red) invert(75%); */
+    /* filter: hue-rotate(204deg); */
+    filter: hue-rotate(204deg);
 
+}
 .icon_box {
     width: 100px;
     height: 100px;
@@ -1376,6 +1387,8 @@ img {
     right: 50px;
     top: 70px;
     z-index: 9999;
+    /* filter: drop-shadow(16px 16px 20px red) invert(75%); */
+
 }
 
 .echarts_mark_view {