|
@@ -115,14 +115,17 @@ let app = new Vue({
|
|
|
waitTime: 2000,
|
|
waitTime: 2000,
|
|
|
rowNum: 2,
|
|
rowNum: 2,
|
|
|
data: [
|
|
data: [
|
|
|
- // ["金融资本公司", '山焦担保', '组织合并', '2023-06-01'],
|
|
|
|
|
- ["集团本部", '洗选管理中心', '组织更名', '2023-07-29'],
|
|
|
|
|
- ["集团本部", '财税共享服务中心', '组织更名', '2023-07-13'],
|
|
|
|
|
["西山煤电", '西山建筑', '组织更名', '2023-07-13'],
|
|
["西山煤电", '西山建筑', '组织更名', '2023-07-13'],
|
|
|
- ["山西焦煤", '焦炭交易中心', '组织新设', '2022-12-29'],
|
|
|
|
|
- ["集团本部", '综治信访中心', '组织新设', '2022-12-1'],
|
|
|
|
|
- ["山西焦煤", '实验室', '组织新设', '2022-07-20'],
|
|
|
|
|
- ["山西焦煤", '招标公司', '组织新设', '2022-05-19'],
|
|
|
|
|
|
|
+ ["集团本部", '财税共享服务中心', '组织更名', '2023-07-13'],
|
|
|
|
|
+ ["焦煤置业", '海南科思实业有限公司', '组织停用', '2023-04-04'],
|
|
|
|
|
+ ["焦煤置业", '呼和浩特市城发供热有限责任公司', '组织更名', '2023-04-04'],
|
|
|
|
|
+ ["西山煤电", '房城建安有限公司', '组织停用', '2023-04-01'],
|
|
|
|
|
+ ["霍州煤电", '建筑建材公司', '组织停用', '2023-03-25'],
|
|
|
|
|
+ // ["金融资本公司", '山焦担保', '组织合并', '2023-06-01'],
|
|
|
|
|
+ // ["山西焦煤", '焦炭交易中心', '组织新设', '2022-12-29'],
|
|
|
|
|
+ // ["集团本部", '综治信访中心', '组织新设', '2022-12-1'],
|
|
|
|
|
+ // ["山西焦煤", '实验室', '组织新设', '2022-07-20'],
|
|
|
|
|
+ // ["山西焦煤", '招标公司', '组织新设', '2022-05-19'],
|
|
|
|
|
|
|
|
|
|
|
|
|
],
|
|
],
|
|
@@ -152,7 +155,7 @@ let app = new Vue({
|
|
|
},
|
|
},
|
|
|
configMark: {
|
|
configMark: {
|
|
|
waitTime: 2000,
|
|
waitTime: 2000,
|
|
|
- header: ["单位名称", "人员数量","月份", "预警项"],
|
|
|
|
|
|
|
+ header: ["单位名称", "人员数量", "月份", "预警项"],
|
|
|
rowNum: 6,
|
|
rowNum: 6,
|
|
|
data: [
|
|
data: [
|
|
|
["<span class='red'>西山煤电</span>", "<span class='red'>71</span>", "<span class='red'>7月</span>", "<span class='red'>薪资低于4000元</span>"],
|
|
["<span class='red'>西山煤电</span>", "<span class='red'>71</span>", "<span class='red'>7月</span>", "<span class='red'>薪资低于4000元</span>"],
|
|
@@ -371,7 +374,7 @@ let app = new Vue({
|
|
|
image: "./images/top-1.png",
|
|
image: "./images/top-1.png",
|
|
|
}, {
|
|
}, {
|
|
|
key: "缓冲池",
|
|
key: "缓冲池",
|
|
|
- value: 1830,
|
|
|
|
|
|
|
+ value: 3733,
|
|
|
image: "./images/top-3.png",
|
|
image: "./images/top-3.png",
|
|
|
}, {
|
|
}, {
|
|
|
key: "待岗池",
|
|
key: "待岗池",
|
|
@@ -419,7 +422,7 @@ let app = new Vue({
|
|
|
},],
|
|
},],
|
|
|
orgChange: true,
|
|
orgChange: true,
|
|
|
SalaryCalProgDetail: true,
|
|
SalaryCalProgDetail: true,
|
|
|
- imageList: ["./images/newImage/ppt1.png","./images/newImage/ppt2.png","./images/newImage/ppt3.png"],
|
|
|
|
|
|
|
+ imageList: ["./images/newImage/ppt1.png", "./images/newImage/ppt2.png", "./images/newImage/ppt3.png"],
|
|
|
imageIndex: 0,
|
|
imageIndex: 0,
|
|
|
imageFlag: false,
|
|
imageFlag: false,
|
|
|
pageFlag: true,
|
|
pageFlag: true,
|
|
@@ -449,8 +452,8 @@ let app = new Vue({
|
|
|
src: "./images/newImage/woman.png"
|
|
src: "./images/newImage/woman.png"
|
|
|
}],
|
|
}],
|
|
|
downholeObj: {
|
|
downholeObj: {
|
|
|
- key: "集团公司",
|
|
|
|
|
- value: 15396
|
|
|
|
|
|
|
+ key: "选拔培养",
|
|
|
|
|
+ value: 2807
|
|
|
},
|
|
},
|
|
|
staffList: {
|
|
staffList: {
|
|
|
coal: 97395,
|
|
coal: 97395,
|
|
@@ -686,7 +689,7 @@ let app = new Vue({
|
|
|
this.initChartR1(initChartR1)
|
|
this.initChartR1(initChartR1)
|
|
|
|
|
|
|
|
let efficiency = this.$refs.efficiency
|
|
let efficiency = this.$refs.efficiency
|
|
|
- this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1]] }, 1)
|
|
|
|
|
|
|
+ this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
|
|
|
this.downholeTimes()
|
|
this.downholeTimes()
|
|
|
|
|
|
|
|
let sequence = this.$refs.sequence
|
|
let sequence = this.$refs.sequence
|
|
@@ -807,7 +810,7 @@ let app = new Vue({
|
|
|
this.initChartR1(initChartR1)
|
|
this.initChartR1(initChartR1)
|
|
|
|
|
|
|
|
let efficiency = this.$refs.efficiency
|
|
let efficiency = this.$refs.efficiency
|
|
|
- this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1]] }, 1)
|
|
|
|
|
|
|
+ this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
|
|
|
this.downholeTimes()
|
|
this.downholeTimes()
|
|
|
|
|
|
|
|
let sequence = this.$refs.sequence
|
|
let sequence = this.$refs.sequence
|
|
@@ -925,10 +928,19 @@ let app = new Vue({
|
|
|
let efficiency = this.$refs.efficiency
|
|
let efficiency = this.$refs.efficiency
|
|
|
this.downhole.dispose()
|
|
this.downhole.dispose()
|
|
|
if (that.downholeIndex == 1) {
|
|
if (that.downholeIndex == 1) {
|
|
|
- this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[2], downhole.y[3]] }, 2)
|
|
|
|
|
|
|
+
|
|
|
|
|
+ this.downholeObj = {
|
|
|
|
|
+ key: "集团公司",
|
|
|
|
|
+ value: 15396
|
|
|
|
|
+ }
|
|
|
|
|
+ this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[4], downhole.y[5]] }, 2)
|
|
|
that.downholeIndex = 2
|
|
that.downholeIndex = 2
|
|
|
} else if (that.downholeIndex == 2) {
|
|
} else if (that.downholeIndex == 2) {
|
|
|
- this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1]] }, 1)
|
|
|
|
|
|
|
+ this.downholeObj = {
|
|
|
|
|
+ key: "选拔培养",
|
|
|
|
|
+ value: 2807
|
|
|
|
|
+ }
|
|
|
|
|
+ this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
|
|
|
that.downholeIndex = 1
|
|
that.downholeIndex = 1
|
|
|
}
|
|
}
|
|
|
}, 10000)
|
|
}, 10000)
|
|
@@ -2089,6 +2101,15 @@ let app = new Vue({
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
|
|
+ select: {
|
|
|
|
|
+ itemStyle: {
|
|
|
|
|
+ areaColor: '#1C4FBB',
|
|
|
|
|
+ borderColor: 'rgba(5,216,252,0.7)',
|
|
|
|
|
+ borderWidth: 6, //隐藏省界线
|
|
|
|
|
+ shadowColor: 'rgba(5,216,252,0.7)',
|
|
|
|
|
+ shadowBlur: 90,
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
itemStyle: {
|
|
itemStyle: {
|
|
|
areaColor: '#1C4FBB',
|
|
areaColor: '#1C4FBB',
|
|
|
borderColor: 'rgba(5,216,252,0.7)',
|
|
borderColor: 'rgba(5,216,252,0.7)',
|
|
@@ -2447,6 +2468,9 @@ let app = new Vue({
|
|
|
show: false
|
|
show: false
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ selectedMode: 'single',
|
|
|
|
|
+ selectedOffset: 90,
|
|
|
|
|
+ clockwise: true,
|
|
|
label: {
|
|
label: {
|
|
|
show: false,
|
|
show: false,
|
|
|
formatter: "{b}",
|
|
formatter: "{b}",
|
|
@@ -2459,16 +2483,26 @@ let app = new Vue({
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
data: echarts2,
|
|
data: echarts2,
|
|
|
|
|
+ emphasis: {
|
|
|
|
|
+ scaleSize: 15, // 设置放大倍数
|
|
|
|
|
+ },
|
|
|
itemStyle: {
|
|
itemStyle: {
|
|
|
color: function (colors) {
|
|
color: function (colors) {
|
|
|
var colorList = [
|
|
var colorList = [
|
|
|
"#DDEBF7", "#BDD7EE", "#9BC2E6", "#2F75B5", "#1F4E78"
|
|
"#DDEBF7", "#BDD7EE", "#9BC2E6", "#2F75B5", "#1F4E78"
|
|
|
];
|
|
];
|
|
|
return colorList[colors.dataIndex];
|
|
return colorList[colors.dataIndex];
|
|
|
- }
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ // emphasis: {
|
|
|
|
|
+ // // shadowBlur: 50,
|
|
|
|
|
+ // shadowOffsetX: 15,
|
|
|
|
|
+ // shadowOffsetY: 15,
|
|
|
|
|
+ // shadowColor: 'red'
|
|
|
|
|
+ // },
|
|
|
}
|
|
}
|
|
|
},],
|
|
},],
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
myChart.setOption(option)
|
|
myChart.setOption(option)
|
|
|
tools.loopShowTooltip(myChart, option, {
|
|
tools.loopShowTooltip(myChart, option, {
|
|
|
nterval: 2000,
|
|
nterval: 2000,
|
|
@@ -3481,6 +3515,7 @@ let app = new Vue({
|
|
|
axisLabel: {
|
|
axisLabel: {
|
|
|
// inside: true,
|
|
// inside: true,
|
|
|
// rotate: 30,
|
|
// rotate: 30,
|
|
|
|
|
+ interval: 0,
|
|
|
padding: [15, 0, 0, 0],
|
|
padding: [15, 0, 0, 0],
|
|
|
textStyle: {
|
|
textStyle: {
|
|
|
color: "#fff",
|
|
color: "#fff",
|
|
@@ -4964,10 +4999,11 @@ let app = new Vue({
|
|
|
this.downhole = echarts.init(el);
|
|
this.downhole = echarts.init(el);
|
|
|
let series = []
|
|
let series = []
|
|
|
let grid = {}
|
|
let grid = {}
|
|
|
|
|
+ console.log(data);
|
|
|
if (type == 1) {
|
|
if (type == 1) {
|
|
|
series.push({
|
|
series.push({
|
|
|
type: 'bar',
|
|
type: 'bar',
|
|
|
- name: "基层正职",
|
|
|
|
|
|
|
+ name: "一级专员",
|
|
|
barWidth: 26,
|
|
barWidth: 26,
|
|
|
itemStyle: {
|
|
itemStyle: {
|
|
|
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
|
|
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
|
|
@@ -4985,7 +5021,7 @@ let app = new Vue({
|
|
|
|
|
|
|
|
series.push({
|
|
series.push({
|
|
|
type: 'bar',
|
|
type: 'bar',
|
|
|
- name: "基层副职",
|
|
|
|
|
|
|
+ name: "二级专员",
|
|
|
barWidth: 26,
|
|
barWidth: 26,
|
|
|
itemStyle: {
|
|
itemStyle: {
|
|
|
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
|
|
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
|
|
@@ -5000,6 +5036,40 @@ let app = new Vue({
|
|
|
},
|
|
},
|
|
|
data: data.y[1],
|
|
data: data.y[1],
|
|
|
})
|
|
})
|
|
|
|
|
+ series.push({
|
|
|
|
|
+ type: 'bar',
|
|
|
|
|
+ name: "一级技工",
|
|
|
|
|
+ barWidth: 26,
|
|
|
|
|
+ itemStyle: {
|
|
|
|
|
+ color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
|
|
|
|
|
+ offset: 0,
|
|
|
|
|
+ color: '#80D0C7 ',
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ offset: 1,
|
|
|
|
|
+ color: '#0093E9',
|
|
|
|
|
+ },
|
|
|
|
|
+ ]),
|
|
|
|
|
+ },
|
|
|
|
|
+ data: data.y[2],
|
|
|
|
|
+ })
|
|
|
|
|
+ series.push({
|
|
|
|
|
+ type: 'bar',
|
|
|
|
|
+ name: "二级技工",
|
|
|
|
|
+ barWidth: 26,
|
|
|
|
|
+ itemStyle: {
|
|
|
|
|
+ color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
|
|
|
|
|
+ offset: 0,
|
|
|
|
|
+ color: '#52ACFF',
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ offset: 1,
|
|
|
|
|
+ color: '#FFE32C',
|
|
|
|
|
+ },
|
|
|
|
|
+ ]),
|
|
|
|
|
+ },
|
|
|
|
|
+ data: data.y[3],
|
|
|
|
|
+ })
|
|
|
|
|
|
|
|
// series.push({
|
|
// series.push({
|
|
|
// type: 'bar',
|
|
// type: 'bar',
|
|
@@ -5069,7 +5139,7 @@ let app = new Vue({
|
|
|
right: "1%"
|
|
right: "1%"
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ console.log(series);
|
|
|
option = {
|
|
option = {
|
|
|
tooltip: {
|
|
tooltip: {
|
|
|
show: true,
|
|
show: true,
|
|
@@ -5086,7 +5156,7 @@ let app = new Vue({
|
|
|
},
|
|
},
|
|
|
grid,
|
|
grid,
|
|
|
legend: {
|
|
legend: {
|
|
|
- data: ["基层正职", "基层副职", "井下一线", "井下辅助",],
|
|
|
|
|
|
|
+ data: ["一级专员", "二级专员", "一级技工", "二级技工", "井下一线", "井下辅助",],
|
|
|
align: 'left',
|
|
align: 'left',
|
|
|
itemGap: 50,
|
|
itemGap: 50,
|
|
|
right: '1%',
|
|
right: '1%',
|
fengxu