|
@@ -292,24 +292,24 @@ export default {
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
partFilter: function (value, arr) {
|
|
partFilter: function (value, arr) {
|
|
|
- // console.log(value, arr,"12")
|
|
|
|
|
- // return value
|
|
|
|
|
|
|
+ return value
|
|
|
|
|
+ // debugger
|
|
|
if(value.includes(",")){
|
|
if(value.includes(",")){
|
|
|
let part = "";
|
|
let part = "";
|
|
|
let parts = []
|
|
let parts = []
|
|
|
parts = value.split(',');
|
|
parts = value.split(',');
|
|
|
for(let item of arr){
|
|
for(let item of arr){
|
|
|
for(let j = 0; j < parts.length; j++) {
|
|
for(let j = 0; j < parts.length; j++) {
|
|
|
- if(item.bu_men_id_ == parts[j]){
|
|
|
|
|
- part = part +","+ item.mian_bu_men;
|
|
|
|
|
|
|
+ if(item.ID_ == parts[j]){
|
|
|
|
|
+ part = part +","+ item.NAME_;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return part.slice(1,part.length)
|
|
return part.slice(1,part.length)
|
|
|
}else{
|
|
}else{
|
|
|
- for (let i = 0; i < arr.length; i++) {
|
|
|
|
|
- if (arr[i].bu_men_id_ == value) {
|
|
|
|
|
- return arr[i].mian_bu_men;
|
|
|
|
|
|
|
+ for (let i = 0; i < arr.length; i++) {
|
|
|
|
|
+ if (arr[i].ID_ == value) {
|
|
|
|
|
+ return arr[i].NAME_;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -415,12 +415,12 @@ export default {
|
|
|
//cnas指定数据到坐标轴的映射
|
|
//cnas指定数据到坐标轴的映射
|
|
|
getLoadEchartsTwo() {
|
|
getLoadEchartsTwo() {
|
|
|
var chartDom = document.getElementById("in-echarts");
|
|
var chartDom = document.getElementById("in-echarts");
|
|
|
|
|
+ console.log(this.source.length- 1,"legth")
|
|
|
const setEchartWH = {
|
|
const setEchartWH = {
|
|
|
//设置控制图表大小变量
|
|
//设置控制图表大小变量
|
|
|
- width: 400,
|
|
|
|
|
- height: 300,
|
|
|
|
|
|
|
+ width: 500,
|
|
|
|
|
+ height: (this.source.length- 1)*30 + 100,
|
|
|
};
|
|
};
|
|
|
-
|
|
|
|
|
var myChart = echarts.init(chartDom, null, setEchartWH);
|
|
var myChart = echarts.init(chartDom, null, setEchartWH);
|
|
|
var option;
|
|
var option;
|
|
|
|
|
|
|
@@ -462,7 +462,7 @@ export default {
|
|
|
// Map the "product" column to Y axis
|
|
// Map the "product" column to Y axis
|
|
|
y: "product",
|
|
y: "product",
|
|
|
},
|
|
},
|
|
|
- barWidth: 30,
|
|
|
|
|
|
|
+ barWidth: 15,
|
|
|
},
|
|
},
|
|
|
],
|
|
],
|
|
|
};
|
|
};
|
|
@@ -530,8 +530,8 @@ export default {
|
|
|
var chartDom = document.getElementById("department");
|
|
var chartDom = document.getElementById("department");
|
|
|
const setEchartWH = {
|
|
const setEchartWH = {
|
|
|
//设置控制图表大小变量
|
|
//设置控制图表大小变量
|
|
|
- width: 400,
|
|
|
|
|
- height: 300,
|
|
|
|
|
|
|
+ width: 500,
|
|
|
|
|
+ height: 400,
|
|
|
};
|
|
};
|
|
|
var myChart = echarts.init(chartDom, null, setEchartWH);
|
|
var myChart = echarts.init(chartDom, null, setEchartWH);
|
|
|
var option;
|
|
var option;
|
|
@@ -539,6 +539,10 @@ export default {
|
|
|
tooltip: {
|
|
tooltip: {
|
|
|
trigger: "item",
|
|
trigger: "item",
|
|
|
},
|
|
},
|
|
|
|
|
+ label: {
|
|
|
|
|
+ formatter: '{b}\n({c}项)',
|
|
|
|
|
+ edgeDistance: "20%"
|
|
|
|
|
+ },
|
|
|
legend: {
|
|
legend: {
|
|
|
orient: "vertical",
|
|
orient: "vertical",
|
|
|
left: "left",
|
|
left: "left",
|
|
@@ -607,12 +611,11 @@ export default {
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
async getPart() {
|
|
async getPart() {
|
|
|
-
|
|
|
|
|
- let this_ = this;
|
|
|
|
|
- let sql = "select * FROM ibps_main_position";
|
|
|
|
|
- await curdPost("sql", sql).then((res) => {
|
|
|
|
|
- this_.partList = res.variables.data;
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ let this_ = this;
|
|
|
|
|
+ let sql = "select * FROM ibps_party_position";
|
|
|
|
|
+ await curdPost("sql", sql).then((res) => {
|
|
|
|
|
+ this_.partList = res.variables.data;
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
jieduan(value) {
|
|
jieduan(value) {
|
|
|
if (value.includes("1")) {
|
|
if (value.includes("1")) {
|
|
@@ -680,17 +683,17 @@ export default {
|
|
|
let newarr = [];
|
|
let newarr = [];
|
|
|
let obj = {};
|
|
let obj = {};
|
|
|
let str =""
|
|
let str =""
|
|
|
- let sql = "select * FROM ibps_main_position";
|
|
|
|
|
|
|
+ let sql = "select * FROM ibps_party_position";
|
|
|
await curdPost("sql", sql).then((res) => {
|
|
await curdPost("sql", sql).then((res) => {
|
|
|
let arr1 = res.variables.data;
|
|
let arr1 = res.variables.data;
|
|
|
arr.forEach((item, index) => {
|
|
arr.forEach((item, index) => {
|
|
|
str =""
|
|
str =""
|
|
|
arr1.forEach((it) => {
|
|
arr1.forEach((it) => {
|
|
|
- if (item.ze_ren_shi_ == it.bu_men_id_ && !item.ze_ren_shi_.includes(",")) {
|
|
|
|
|
- arr[index].ze_ren_shi_ = it.mian_bu_men;
|
|
|
|
|
|
|
+ if (item.ze_ren_shi_ == it.ID_ && !item.ze_ren_shi_.includes(",")) {
|
|
|
|
|
+ arr[index].ze_ren_shi_ = it.NAME_;
|
|
|
}
|
|
}
|
|
|
- if(item.ze_ren_shi_.includes(",")&& item.ze_ren_shi_.includes(it.bu_men_id_)){
|
|
|
|
|
- str += "," + it.mian_bu_men
|
|
|
|
|
|
|
+ if(item.ze_ren_shi_.includes(",") && item.ze_ren_shi_.includes(it.ID_)){
|
|
|
|
|
+ str += "," + it.NAME_
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
if(str){
|
|
if(str){
|
|
@@ -723,7 +726,6 @@ export default {
|
|
|
},
|
|
},
|
|
|
getInit() {
|
|
getInit() {
|
|
|
let data = this.obj[0];
|
|
let data = this.obj[0];
|
|
|
- console.log(data)
|
|
|
|
|
let jieduanvalue;
|
|
let jieduanvalue;
|
|
|
if (data.shi_fou_guo_shen_ == "已编制" && data.jie_dian_ren_wu_ == "") {
|
|
if (data.shi_fou_guo_shen_ == "已编制" && data.jie_dian_ren_wu_ == "") {
|
|
|
jieduanvalue = "2";
|
|
jieduanvalue = "2";
|
|
@@ -945,14 +947,14 @@ export default {
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
}
|
|
}
|
|
|
- .department {
|
|
|
|
|
- width: 400px;
|
|
|
|
|
- height: 300px;
|
|
|
|
|
- }
|
|
|
|
|
- #department {
|
|
|
|
|
- width: 400px;
|
|
|
|
|
- height: 300px;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // .department {
|
|
|
|
|
+ // width: 400px;
|
|
|
|
|
+ // height: 300px;
|
|
|
|
|
+ // }
|
|
|
|
|
+ // #department {
|
|
|
|
|
+ // width: 400px;
|
|
|
|
|
+ // height: 300px;
|
|
|
|
|
+ // }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
</style>
|
|
</style>
|