|
@@ -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
|
|
@@ -6784,14 +6784,14 @@ let app = new Vue({
|
|
if (salaryList.x.length < 6) {
|
|
if (salaryList.x.length < 6) {
|
|
that.initLineElseEchartsR(echarts90, { x: salaryList.x, y: salaryList.y })
|
|
that.initLineElseEchartsR(echarts90, { x: salaryList.x, y: salaryList.y })
|
|
that.time4 && clearInterval(that.time4);
|
|
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
|
|
res.data[0].flag = true
|
|
that.organizationList.push(...res.data)
|
|
that.organizationList.push(...res.data)
|
|
- console.log(that.organizationList);
|
|
|
|
- console.log(res.data);
|
|
|
|
that.getDistributionInfo()
|
|
that.getDistributionInfo()
|
|
}
|
|
}
|
|
})
|
|
})
|