|
@@ -1406,18 +1406,18 @@ let app = new Vue({
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
}],
|
|
}],
|
|
|
- legend: {
|
|
|
|
|
- data: ["入池人数", "出池人数"],
|
|
|
|
|
- textStyle: {
|
|
|
|
|
- // 图列内容样式
|
|
|
|
|
- color: "#fff", // 字体颜色
|
|
|
|
|
- // fontSize: "10",
|
|
|
|
|
- },
|
|
|
|
|
- right: 30,
|
|
|
|
|
- icon: "roundRect",
|
|
|
|
|
- // 小图标的宽高
|
|
|
|
|
- itemHeight: 5,
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // legend: {
|
|
|
|
|
+ // data: ["入池人数", "出池人数"],
|
|
|
|
|
+ // textStyle: {
|
|
|
|
|
+ // // 图列内容样式
|
|
|
|
|
+ // color: "#fff", // 字体颜色
|
|
|
|
|
+ // // fontSize: "10",
|
|
|
|
|
+ // },
|
|
|
|
|
+ // right: 30,
|
|
|
|
|
+ // icon: "roundRect",
|
|
|
|
|
+ // // 小图标的宽高
|
|
|
|
|
+ // itemHeight: 5,
|
|
|
|
|
+ // },
|
|
|
};
|
|
};
|
|
|
let that = this;
|
|
let that = this;
|
|
|
this.industryEcharts.setOption(option);
|
|
this.industryEcharts.setOption(option);
|
|
@@ -5522,13 +5522,24 @@ let app = new Vue({
|
|
|
let data = {
|
|
let data = {
|
|
|
flag: that.dataFlag
|
|
flag: that.dataFlag
|
|
|
}
|
|
}
|
|
|
|
|
+ let index = 0
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Distribution", data).then(res => {
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Distribution", data).then(res => {
|
|
|
if (res) {
|
|
if (res) {
|
|
|
res.data.forEach(item => {
|
|
res.data.forEach(item => {
|
|
|
item.flag = false
|
|
item.flag = false
|
|
|
item.name = item.key
|
|
item.name = item.key
|
|
|
|
|
+ if (item.value == 0) {
|
|
|
|
|
+ index = index + 1
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
- this.organizationList.push(...res.data)
|
|
|
|
|
|
|
+ if(that.organizationList.length == 3){
|
|
|
|
|
+ that.organizationList.push(...res.data)
|
|
|
|
|
+ }
|
|
|
|
|
+ if (index < 3) {
|
|
|
|
|
+ let arr = this.organizationList.splice(0, this.organizationList.length - 3)
|
|
|
|
|
+ this.organizationList = []
|
|
|
|
|
+ this.organizationList.push(...arr, ...res.data)
|
|
|
|
|
+ }
|
|
|
setInterval(_ => {
|
|
setInterval(_ => {
|
|
|
if (this.fIndex == this.fList.length - 1) {
|
|
if (this.fIndex == this.fList.length - 1) {
|
|
|
this.fIndex = 0
|
|
this.fIndex = 0
|
|
@@ -5941,6 +5952,7 @@ let app = new Vue({
|
|
|
let data = {
|
|
let data = {
|
|
|
flag: that.dataFlag
|
|
flag: that.dataFlag
|
|
|
}
|
|
}
|
|
|
|
|
+ let buffer = that.$refs.buffer
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HumanOrgAllResources", data).then(res => {
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HumanOrgAllResources", data).then(res => {
|
|
|
if (res) {
|
|
if (res) {
|
|
|
res.data.forEach(item => {
|
|
res.data.forEach(item => {
|
|
@@ -5957,11 +5969,13 @@ let app = new Vue({
|
|
|
userList.y3 = item.value
|
|
userList.y3 = item.value
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ if (!userList.x) {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
that.userListX = spArr(userList.x, 9)
|
|
that.userListX = spArr(userList.x, 9)
|
|
|
that.userListy1 = spArr(userList.y1, 9)
|
|
that.userListy1 = spArr(userList.y1, 9)
|
|
|
that.userListy2 = spArr(userList.y2, 9)
|
|
that.userListy2 = spArr(userList.y2, 9)
|
|
|
that.userListy3 = spArr(userList.y3, 9)
|
|
that.userListy3 = spArr(userList.y3, 9)
|
|
|
- let buffer = that.$refs.buffer
|
|
|
|
|
that.initStereoscopic(buffer, { x: that.userListX[0], y1: that.userListy1[0], y2: that.userListy2[0], y3: that.userListy3[0], })
|
|
that.initStereoscopic(buffer, { x: that.userListX[0], y1: that.userListy1[0], y2: that.userListy2[0], y3: that.userListy3[0], })
|
|
|
that.timeuserList()
|
|
that.timeuserList()
|
|
|
}
|
|
}
|
|
@@ -6633,7 +6647,7 @@ let app = new Vue({
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
if (that.fetchIndex == 3) {
|
|
if (that.fetchIndex == 3) {
|
|
|
- // that.getDistributionInfo()
|
|
|
|
|
|
|
+ that.getDistributionInfo()
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
if (index == 3) {
|
|
if (index == 3) {
|