|
|
@@ -497,6 +497,11 @@ let app = new Vue({
|
|
|
employsNums: 15308,
|
|
|
selectTraining: 2807,
|
|
|
technical: null,
|
|
|
+
|
|
|
+ IndustrydistributionIndex: 0,
|
|
|
+
|
|
|
+ isShowFlag: false,
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
beforeCreate() {
|
|
|
@@ -585,33 +590,33 @@ let app = new Vue({
|
|
|
// this.initBarCharts(works, worksList)
|
|
|
// },16000)
|
|
|
// this.timeLevel()
|
|
|
- setInterval(_ => {
|
|
|
- if (this.fIndex == this.fList.length - 1) {
|
|
|
- this.fIndex = 0
|
|
|
- } else {
|
|
|
- this.fIndex = this.fIndex + 1
|
|
|
- }
|
|
|
- this.organizationList.forEach(item => {
|
|
|
- item.flag = false
|
|
|
- })
|
|
|
- if (this.orgIndex == this.organizationList.length - 1) {
|
|
|
- this.orgIndex = 0
|
|
|
- } else {
|
|
|
- this.orgIndex = this.orgIndex + 1
|
|
|
- }
|
|
|
- this.organizationList[this.orgIndex].flag = true
|
|
|
-
|
|
|
-
|
|
|
- skillList.forEach(item => {
|
|
|
- item.flag = false
|
|
|
- })
|
|
|
- if (this.skillIndex == skillList.length - 1) {
|
|
|
- this.skillIndex = 0
|
|
|
- } else {
|
|
|
- this.skillIndex = this.skillIndex + 1
|
|
|
- }
|
|
|
- skillList[this.skillIndex].flag = true
|
|
|
- }, 2000)
|
|
|
+ // setInterval(_ => {
|
|
|
+ // if (this.fIndex == this.fList.length - 1) {
|
|
|
+ // this.fIndex = 0
|
|
|
+ // } else {
|
|
|
+ // this.fIndex = this.fIndex + 1
|
|
|
+ // }
|
|
|
+ // this.organizationList.forEach(item => {
|
|
|
+ // item.flag = false
|
|
|
+ // })
|
|
|
+ // if (this.orgIndex == this.organizationList.length - 1) {
|
|
|
+ // this.orgIndex = 0
|
|
|
+ // } else {
|
|
|
+ // this.orgIndex = this.orgIndex + 1
|
|
|
+ // }
|
|
|
+ // this.organizationList[this.orgIndex].flag = true
|
|
|
+
|
|
|
+
|
|
|
+ // skillList.forEach(item => {
|
|
|
+ // item.flag = false
|
|
|
+ // })
|
|
|
+ // if (this.skillIndex == skillList.length - 1) {
|
|
|
+ // this.skillIndex = 0
|
|
|
+ // } else {
|
|
|
+ // this.skillIndex = this.skillIndex + 1
|
|
|
+ // }
|
|
|
+ // skillList[this.skillIndex].flag = true
|
|
|
+ // }, 2000)
|
|
|
setTimeout(() => {
|
|
|
|
|
|
}, 9000)
|
|
|
@@ -787,7 +792,7 @@ let app = new Vue({
|
|
|
this.getIndustrydistribution(true)
|
|
|
this.getHumanResources()
|
|
|
this.getSalaryCalProg()
|
|
|
- this.getCollegeinternAndEnterpriseship()
|
|
|
+ // this.getCollegeinternAndEnterpriseship()
|
|
|
this.getTurnOver()
|
|
|
this.getOptimizeResources()
|
|
|
this.getHumanOrgAllResources()
|
|
|
@@ -806,6 +811,9 @@ let app = new Vue({
|
|
|
this.getTurnOverDetail()
|
|
|
this.getDistributionAttachment()
|
|
|
|
|
|
+ // 算薪预警
|
|
|
+ this.getSalaryCalProgDetail()
|
|
|
+
|
|
|
|
|
|
this.getDept(true)
|
|
|
|
|
|
@@ -5367,7 +5375,6 @@ let app = new Vue({
|
|
|
this.warningFlag = true
|
|
|
this.mobilizeFlag = false
|
|
|
this.echartsMark = false
|
|
|
- this.getSalaryCalProgDetail()
|
|
|
},
|
|
|
handleORG() {
|
|
|
this.isShowMark = true
|
|
|
@@ -5521,7 +5528,34 @@ let app = new Vue({
|
|
|
item.flag = false
|
|
|
item.name = item.key
|
|
|
})
|
|
|
- that.organizationList.push(...res.data)
|
|
|
+ this.organizationList.push(...res.data)
|
|
|
+ setInterval(_ => {
|
|
|
+ if (this.fIndex == this.fList.length - 1) {
|
|
|
+ this.fIndex = 0
|
|
|
+ } else {
|
|
|
+ this.fIndex = this.fIndex + 1
|
|
|
+ }
|
|
|
+ this.organizationList.forEach(item => {
|
|
|
+ item.flag = false
|
|
|
+ })
|
|
|
+ if (this.orgIndex == this.organizationList.length - 1) {
|
|
|
+ this.orgIndex = 0
|
|
|
+ } else {
|
|
|
+ this.orgIndex = this.orgIndex + 1
|
|
|
+ }
|
|
|
+ this.organizationList[this.orgIndex].flag = true
|
|
|
+
|
|
|
+
|
|
|
+ skillList.forEach(item => {
|
|
|
+ item.flag = false
|
|
|
+ })
|
|
|
+ if (this.skillIndex == skillList.length - 1) {
|
|
|
+ this.skillIndex = 0
|
|
|
+ } else {
|
|
|
+ this.skillIndex = this.skillIndex + 1
|
|
|
+ }
|
|
|
+ skillList[this.skillIndex].flag = true
|
|
|
+ }, 2000)
|
|
|
}
|
|
|
|
|
|
})
|
|
|
@@ -5547,6 +5581,7 @@ let app = new Vue({
|
|
|
if (!flag) {
|
|
|
data.flag = false
|
|
|
}
|
|
|
+ let industry = that.$refs.industry
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Industrydistribution", data).then(res => {
|
|
|
if (res) {
|
|
|
let x = []
|
|
|
@@ -5563,13 +5598,22 @@ let app = new Vue({
|
|
|
}
|
|
|
})
|
|
|
if (index == x.length) {
|
|
|
+ if (that.IndustrydistributionIndex >= 3) {
|
|
|
+ that.industry = {
|
|
|
+ x: ["矿井", "选煤厂", "火电厂", "清洁电厂", "焦化厂"],
|
|
|
+ y: [151, 50, 6, 32, 4]
|
|
|
+ }
|
|
|
+ that.initOrganizationElse(industry, "", that.industry, "")
|
|
|
+ return
|
|
|
+ }
|
|
|
that.getIndustrydistribution(false)
|
|
|
+ that.IndustrydistributionIndex += 1
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
that.industry.x = x
|
|
|
that.industry.y = y
|
|
|
}
|
|
|
- let industry = that.$refs.industry
|
|
|
that.initOrganizationElse(industry, "", that.industry, "")
|
|
|
//
|
|
|
})
|
|
|
@@ -5709,18 +5753,18 @@ let app = new Vue({
|
|
|
let data = {
|
|
|
flag: that.dataFlag
|
|
|
}
|
|
|
- this.isShowMark = false
|
|
|
- this.salaryFlag = false
|
|
|
+ // this.isShowMark = false
|
|
|
+ // this.salaryFlag = false
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SalaryCalProgDetail", data).then(res => {
|
|
|
if (res) {
|
|
|
that.configWarning.data = res.data
|
|
|
}
|
|
|
})
|
|
|
- this.isShowMark = true
|
|
|
- this.salaryFlag = true
|
|
|
- this.pdfFlag = false
|
|
|
- this.mobilizeFlag = false
|
|
|
- this.echartsMark = false
|
|
|
+ // this.isShowMark = true
|
|
|
+ // this.salaryFlag = true
|
|
|
+ // this.pdfFlag = false
|
|
|
+ // this.mobilizeFlag = false
|
|
|
+ // this.echartsMark = false
|
|
|
},
|
|
|
getCollegeinternAndEnterpriseship() {
|
|
|
let that = this;
|
|
|
@@ -5771,48 +5815,41 @@ let app = new Vue({
|
|
|
let userList = [];
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Collegestudy", data).then(res => {
|
|
|
if (res) {
|
|
|
- res.data.forEach(item => {
|
|
|
- if (item.key == "产学研合作高校数量") {
|
|
|
- that.schoolList2[0].value = item.value
|
|
|
- }
|
|
|
-
|
|
|
- if (item.key == "产学研成果数量") {
|
|
|
- that.schoolList2[1].value = item.value
|
|
|
- }
|
|
|
+ // res.data.forEach(item => {
|
|
|
+ // if (item.key == "产学研合作高校数量") {
|
|
|
+ // that.schoolList2[0].value = item.value
|
|
|
+ // }
|
|
|
|
|
|
- if (item.key == "项目名称") {
|
|
|
- proList = item.value
|
|
|
- }
|
|
|
+ // if (item.key == "产学研成果数量") {
|
|
|
+ // that.schoolList2[1].value = item.value
|
|
|
+ // }
|
|
|
|
|
|
- if (item.key == "合作高校") {
|
|
|
- schList = item.value
|
|
|
- }
|
|
|
+ // if (item.key == "项目名称") {
|
|
|
+ // proList = item.value
|
|
|
+ // }
|
|
|
|
|
|
- if (item.key == "合作类型") {
|
|
|
- typeList = item.value
|
|
|
- }
|
|
|
+ // if (item.key == "合作高校") {
|
|
|
+ // schList = item.value
|
|
|
+ // }
|
|
|
|
|
|
- if (item.key == "主要成效") {
|
|
|
- userList = item.value
|
|
|
- }
|
|
|
+ // if (item.key == "合作类型") {
|
|
|
+ // typeList = item.value
|
|
|
+ // }
|
|
|
|
|
|
- // {
|
|
|
- // project: "高瓦斯矿井110工法回采工作面瓦斯与自然发火共治关键技术示范研究",
|
|
|
- // school: "太原理工大学",
|
|
|
- // type: "山西省重点研发项目",
|
|
|
- // merits: "解决了瓦斯超限问题"
|
|
|
- // },
|
|
|
- that.fList = []
|
|
|
- proList.forEach((i, k) => {
|
|
|
- let obj = {
|
|
|
- project: i,
|
|
|
- school: schList[k],
|
|
|
- type: typeList[k],
|
|
|
- merits: userList[k],
|
|
|
- }
|
|
|
- that.fList.push(obj)
|
|
|
- })
|
|
|
- })
|
|
|
+ // if (item.key == "主要成效") {
|
|
|
+ // userList = item.value
|
|
|
+ // }
|
|
|
+ // that.fList = []
|
|
|
+ // proList.forEach((i, k) => {
|
|
|
+ // let obj = {
|
|
|
+ // project: i,
|
|
|
+ // school: schList[k],
|
|
|
+ // type: typeList[k],
|
|
|
+ // merits: userList[k],
|
|
|
+ // }
|
|
|
+ // that.fList.push(obj)
|
|
|
+ // })
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -6420,6 +6457,7 @@ let app = new Vue({
|
|
|
let data = {
|
|
|
flag: that.dataFlag
|
|
|
}
|
|
|
+
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary2", data).then(res => {
|
|
|
if (res) {
|
|
|
that.configMark.data = res
|
|
|
@@ -6584,6 +6622,7 @@ let app = new Vue({
|
|
|
data.flag = false
|
|
|
}
|
|
|
let index = 0
|
|
|
+ that.organizationList = []
|
|
|
fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Dept", data).then(res => {
|
|
|
if (res) {
|
|
|
res.data.forEach(item => {
|
|
|
@@ -6594,6 +6633,7 @@ let app = new Vue({
|
|
|
}
|
|
|
})
|
|
|
if (that.fetchIndex == 3) {
|
|
|
+ // that.getDistributionInfo()
|
|
|
return
|
|
|
}
|
|
|
if (index == 3) {
|
|
|
@@ -6602,7 +6642,7 @@ let app = new Vue({
|
|
|
return
|
|
|
}
|
|
|
res.data[0].flag = true
|
|
|
- that.organizationList = res.data
|
|
|
+ that.organizationList.push(...res.data)
|
|
|
that.getDistributionInfo()
|
|
|
}
|
|
|
})
|
fengxu