|
@@ -353,11 +353,11 @@ let app = new Vue({
|
|
downholeTime: null,
|
|
downholeTime: null,
|
|
echartsMark: false,
|
|
echartsMark: false,
|
|
loginInfo: {
|
|
loginInfo: {
|
|
- unit: "人次",
|
|
|
|
|
|
+ unit: "人",
|
|
num: 273030
|
|
num: 273030
|
|
},
|
|
},
|
|
mauInfo: {
|
|
mauInfo: {
|
|
- unit: "人次",
|
|
|
|
|
|
+ unit: "人",
|
|
mau: 33755
|
|
mau: 33755
|
|
},
|
|
},
|
|
skillIndex: 0,
|
|
skillIndex: 0,
|
|
@@ -513,7 +513,7 @@ let app = new Vue({
|
|
// 跳转地址
|
|
// 跳转地址
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
let AddUrl = location.protocol + "//" + location.host + "/ierp"
|
|
let AddUrl = location.protocol + "//" + location.host + "/ierp"
|
|
- // return
|
|
|
|
|
|
+ return
|
|
if (!window.location.search) {
|
|
if (!window.location.search) {
|
|
// alert("链接已失效,请重新打开")
|
|
// alert("链接已失效,请重新打开")
|
|
window.location.href = AddUrl
|
|
window.location.href = AddUrl
|
|
@@ -708,6 +708,7 @@ let app = new Vue({
|
|
// this.timeTitle && clearInterval(this.timeTitle);
|
|
// this.timeTitle && clearInterval(this.timeTitle);
|
|
this.time2 && clearInterval(this.time2);
|
|
this.time2 && clearInterval(this.time2);
|
|
this.time3 && clearInterval(this.time3);
|
|
this.time3 && clearInterval(this.time3);
|
|
|
|
+ this.time4 && clearInterval(this.time4);
|
|
this.requestFunction()
|
|
this.requestFunction()
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.isShowPage = true;
|
|
this.isShowPage = true;
|
|
@@ -6755,7 +6756,7 @@ let app = new Vue({
|
|
y2,
|
|
y2,
|
|
}
|
|
}
|
|
|
|
|
|
- if (res.mdnb_encryption) {
|
|
|
|
|
|
+ if (!res.mdnb_encryption) {
|
|
that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
|
|
that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
|
|
|
|
|
|
} else {
|
|
} else {
|
|
@@ -6765,7 +6766,7 @@ let app = new Vue({
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+ that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
|
|
})
|
|
})
|
|
},
|
|
},
|
|
getCalSalary1() {
|
|
getCalSalary1() {
|