fengxu преди 1 година
родител
ревизия
58c799ab54
променени са 3 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 2 2
      cokingCoal/index.html
  2. 0 1
      cokingCoal/js/humanResources.js
  3. 6 5
      cokingCoal/js/newIndex.js

+ 2 - 2
cokingCoal/index.html

@@ -402,7 +402,7 @@
                             <div class="main_info_item_img">
                             </div>
                             <div class="main_info_item_title" >
-                                <div>{{ loginInfo.num }} <span>{{ loginInfo.unit }}</span></div>
+                                <div>{{ loginInfo.num }} <span>{{ loginInfo.unit + " / 次" }}</span></div>
                                 <div>累计登陆</div>
                             </div>
                         </div>
@@ -410,7 +410,7 @@
                             <div class="main_info_item_img">
                             </div>
                             <div class="main_info_item_title">
-                                <div>{{ mauInfo.mau }} <span>{{ mauInfo.unit }}</span></div>
+                                <div>{{ mauInfo.mau }} <span>{{ mauInfo.unit + " / 次" }}</span></div>
                                 <div>月度活跃</div>
                             </div>
                         </div>

+ 0 - 1
cokingCoal/js/humanResources.js

@@ -411,7 +411,6 @@ let app = new Vue({
     beforeCreate() {
         // 跳转地址
         let AddUrl = location.protocol + "//" + location.host + "/ierp"
-        // return
         if (!window.location.search) {
             // alert("链接已失效,请重新打开")
             window.location.href = AddUrl

+ 6 - 5
cokingCoal/js/newIndex.js

@@ -353,11 +353,11 @@ let app = new Vue({
             downholeTime: null,
             echartsMark: false,
             loginInfo: {
-                unit: "人",
+                unit: "人",
                 num: 273030
             },
             mauInfo: {
-                unit: "人",
+                unit: "人",
                 mau: 33755
             },
             skillIndex: 0,
@@ -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
@@ -708,6 +708,7 @@ let app = new Vue({
             // this.timeTitle && clearInterval(this.timeTitle);
             this.time2 && clearInterval(this.time2);
             this.time3 && clearInterval(this.time3);
+            this.time4 && clearInterval(this.time4);
             this.requestFunction()
             setTimeout(() => {
                 this.isShowPage = true;
@@ -6755,7 +6756,7 @@ let app = new Vue({
                         y2,
                     }
 
-                    if (res.mdnb_encryption) {
+                    if (!res.mdnb_encryption) {
                         that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
 
                     } else {
@@ -6765,7 +6766,7 @@ let app = new Vue({
 
                 }
 
-
+                that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
             })
         },
         getCalSalary1() {