|
@@ -4751,9 +4751,14 @@ let app = new Vue({
|
|
|
},
|
|
},
|
|
|
initEchartsBar(el, data, color) {
|
|
initEchartsBar(el, data, color) {
|
|
|
this.studentEcharts = echarts.init(el);
|
|
this.studentEcharts = echarts.init(el);
|
|
|
- data.x.forEach(item => {
|
|
|
|
|
- item = item.slice(0, -2)
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ if(Array.isArray(data.x)){
|
|
|
|
|
+ data.x.forEach(item => {
|
|
|
|
|
+ item = item.slice(0, -2)
|
|
|
|
|
+ })
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
let xLabel = data.x
|
|
let xLabel = data.x
|
|
|
option = {
|
|
option = {
|
|
|
grid: {
|
|
grid: {
|
|
@@ -5538,8 +5543,6 @@ let app = new Vue({
|
|
|
index = index + 1
|
|
index = index + 1
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
- console.log(that.organizationList.length);
|
|
|
|
|
- console.log(that.organizationList);
|
|
|
|
|
if (that.organizationList.length == 3) {
|
|
if (that.organizationList.length == 3) {
|
|
|
that.organizationList.push(...res.data)
|
|
that.organizationList.push(...res.data)
|
|
|
}
|
|
}
|
|
@@ -6710,6 +6713,19 @@ let app = new Vue({
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
if (that.fetchIndex == 3) {
|
|
if (that.fetchIndex == 3) {
|
|
|
|
|
+ this.organizationList = [{
|
|
|
|
|
+ name: "职能部门",
|
|
|
|
|
+ flag: true,
|
|
|
|
|
+ value: 18
|
|
|
|
|
+ }, {
|
|
|
|
|
+ name: "共享中心",
|
|
|
|
|
+ flag: false,
|
|
|
|
|
+ value: 12
|
|
|
|
|
+ }, {
|
|
|
|
|
+ name: "事业部",
|
|
|
|
|
+ flag: false,
|
|
|
|
|
+ value: 5
|
|
|
|
|
+ }]
|
|
|
that.getDistributionInfo()
|
|
that.getDistributionInfo()
|
|
|
that.fetchIndex = 0
|
|
that.fetchIndex = 0
|
|
|
|
|
|
|
@@ -6720,7 +6736,6 @@ let app = new Vue({
|
|
|
that.getDept(false)
|
|
that.getDept(false)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
- console.log(12312132132);
|
|
|
|
|
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(that.organizationList);
|