|
|
@@ -5,6 +5,14 @@ let app = new Vue({
|
|
|
data () {
|
|
|
return {
|
|
|
// paymentShow:false, // 定薪酬弹窗
|
|
|
+ echartC1:{
|
|
|
+ national:'',
|
|
|
+ province:''
|
|
|
+ },
|
|
|
+ echartC2:{
|
|
|
+ national:'',
|
|
|
+ province:''
|
|
|
+ },
|
|
|
app_token: '',
|
|
|
twinkle7: [],
|
|
|
twinkle8: [],
|
|
|
@@ -203,32 +211,29 @@ let app = new Vue({
|
|
|
}
|
|
|
},
|
|
|
beforeMount () {
|
|
|
- dataL7[0].forEach((item, index) => {
|
|
|
- if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
|
|
|
- let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
|
|
|
- this.twinkle7.push(obj)
|
|
|
- }
|
|
|
- })
|
|
|
- // if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
|
|
|
- dataL8[0].forEach((item, index) => {
|
|
|
- if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
|
|
|
- let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
|
|
|
- this.twinkle8.push(obj)
|
|
|
- }
|
|
|
- })
|
|
|
- // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
|
|
|
- fjxdataL2[0].forEach((item, index) => {
|
|
|
- if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
|
|
|
- let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
|
|
|
- this.twinkleR6.push(obj)
|
|
|
- }
|
|
|
- })
|
|
|
-
|
|
|
- console.log(this.twinkleR6)
|
|
|
+ // dataL7[0].forEach((item, index) => {
|
|
|
+ // if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
|
|
|
+ // let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
|
|
|
+ // this.twinkle7.push(obj)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // // if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
|
|
|
+ // dataL8[0].forEach((item, index) => {
|
|
|
+ // if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
|
|
|
+ // let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
|
|
|
+ // this.twinkle8.push(obj)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
|
|
|
+ // fjxdataL2[0].forEach((item, index) => {
|
|
|
+ // if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
|
|
|
+ // let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
|
|
|
+ // this.twinkleR6.push(obj)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
},
|
|
|
mounted () {
|
|
|
- let a = [1,2,3,4,5,6,7]
|
|
|
- console.log(a.slice(1,3,'??????'))
|
|
|
+ let a = [1, 2, 3, 4, 5, 6, 7]
|
|
|
if (!sessionStorage.getItem('accounts', this.accounts)) {
|
|
|
window.location.href = './login/login.html'
|
|
|
return
|
|
|
@@ -278,10 +283,17 @@ let app = new Vue({
|
|
|
// "language": "zh_CN"
|
|
|
|
|
|
// SIT环境
|
|
|
+ // "appId": "CockpitScreen",
|
|
|
+ // "appSecuret": "JSCdpsjgl@539126",
|
|
|
+ // "tenantid": "test",
|
|
|
+ // "accountId": "1484008912330950656",
|
|
|
+ // "language": "zh_CN"
|
|
|
+
|
|
|
+ // UAT环境
|
|
|
"appId": "CockpitScreen",
|
|
|
"appSecuret": "JSCdpsjgl@539126",
|
|
|
- "tenantid": "test",
|
|
|
- "accountId": "1484008912330950656",
|
|
|
+ "tenantid": "uatierp",
|
|
|
+ "accountId": "1490670568960163840",
|
|
|
"language": "zh_CN"
|
|
|
}
|
|
|
post('/ierp/api/getAppToken.do', value).then(res => {
|
|
|
@@ -300,20 +312,28 @@ let app = new Vue({
|
|
|
// "usertype": "UserName"
|
|
|
|
|
|
// SIT环境
|
|
|
+ // "user": "jiashicangjiekou",
|
|
|
+ // "apptoken": this.app_token,
|
|
|
+ // "tenantid": "test",
|
|
|
+ // "accountId": "1484008912330950656",
|
|
|
+ // "usertype": "UserName"
|
|
|
+
|
|
|
+ // UAT环境
|
|
|
"user": "jiashicangjiekou",
|
|
|
"apptoken": this.app_token,
|
|
|
- "tenantid": "test",
|
|
|
- "accountId": "1484008912330950656",
|
|
|
+ "tenantid": "uatierp",
|
|
|
+ "accountId": "1490670568960163840",
|
|
|
"usertype": "UserName"
|
|
|
}
|
|
|
post('/ierp/api/login.do', value).then(res => {
|
|
|
this.access_token = res.data.access_token
|
|
|
- Promise.all([this.getData(), this.getInstitutional()])
|
|
|
- .then((arr) => {
|
|
|
- // 生成图表
|
|
|
- this.generateEcharts()
|
|
|
- })
|
|
|
- .catch((err) => console.log(err));
|
|
|
+ // Promise.all([this.getData(), this.getInstitutional()])
|
|
|
+ // .then((arr) => {
|
|
|
+ // // 生成图表
|
|
|
+ // this.generateEcharts()
|
|
|
+ // })
|
|
|
+ // .catch((err) => console.log(err));
|
|
|
+ this.getInstitutional()
|
|
|
})
|
|
|
},
|
|
|
// 获取组织机构
|
|
|
@@ -331,6 +351,7 @@ let app = new Vue({
|
|
|
return { name: item.orgName, id: item.orgNumber, orgLogoNum: item.orgLogoNum }
|
|
|
})
|
|
|
this.commonOption.xAxis.data = this.companyList.map(item => item.name)
|
|
|
+ this.getData()
|
|
|
resolve(1);
|
|
|
})
|
|
|
});
|
|
|
@@ -479,6 +500,10 @@ let app = new Vue({
|
|
|
c2[1].push(item['ZBPZ0040'])
|
|
|
c2[0].push(item['ZBPZ0041'])
|
|
|
})
|
|
|
+ this.echartC1.national = res.orgData.area9.card1[0].ZBPZ0097
|
|
|
+ this.echartC1.province = res.orgData.area9.card1[0].ZBPZ0096
|
|
|
+ this.echartC2.national = res.orgData.area9.card2[0].ZBPZ0099
|
|
|
+ this.echartC2.province = res.orgData.area9.card2[0].ZBPZ0098
|
|
|
|
|
|
// 左边
|
|
|
// 定机制
|
|
|
@@ -504,7 +529,7 @@ let app = new Vue({
|
|
|
dataR3[1] = []
|
|
|
res.orgData.area4.card3.forEach(item => {
|
|
|
dataR3[0].push(item['ZBPZ0054'])
|
|
|
- dataR3[0].push(item['ZBPZ0055'])
|
|
|
+ dataR3[1].push(item['ZBPZ0055'])
|
|
|
})
|
|
|
// 各省属企业"退二进一"完成情况
|
|
|
dataR4[0] = []
|
|
|
@@ -547,6 +572,28 @@ let app = new Vue({
|
|
|
res.orgData.area6.card2.forEach(item => {
|
|
|
fjxdataL4[0].push(item['ZBPZ0065'])
|
|
|
})
|
|
|
+ // 数据整理
|
|
|
+ dataL7[0].forEach((item, index) => {
|
|
|
+ if (dataL7[1][index] < 0 && dataL7[0][index] > 0) {
|
|
|
+ let obj = { value: [companyList[index].name, dataL7[0][index]], symbolSize: 15 }
|
|
|
+ this.twinkle7.push(obj)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // if (dataL8[1][params.dataIndex] < 0 && params.value > 0) {
|
|
|
+ dataL8[0].forEach((item, index) => {
|
|
|
+ if (dataL8[1][index] < 0 && dataL8[0][index] > 0) {
|
|
|
+ let obj = { value: [companyList[index].name, dataL8[0][index]], symbolSize: 15 }
|
|
|
+ this.twinkle8.push(obj)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // params.value > 0 && fjxdataL2[0][params.dataIndex] < 0
|
|
|
+ fjxdataL2[0].forEach((item, index) => {
|
|
|
+ if (fjxdataL2[1][index] > 0 && fjxdataL2[0][index] < 0) {
|
|
|
+ let obj = { value: [companyList[index].name, fjxdataL2[1][index]], symbolSize: 15 }
|
|
|
+ this.twinkleR6.push(obj)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.generateEcharts()
|
|
|
resolve(1)
|
|
|
})
|
|
|
});
|
|
|
@@ -597,7 +644,11 @@ let app = new Vue({
|
|
|
this.tipNum = index
|
|
|
},
|
|
|
handleGoPage (id, name) {
|
|
|
- window.location.href = './index2.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
|
|
|
+ if (name == '晋能控股') {
|
|
|
+ window.location.href = './index2JNKG.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
|
|
|
+ } else {
|
|
|
+ window.location.href = './index2.html?id=' + id + `&access_token=${this.access_token}` + `&name=${name}`
|
|
|
+ }
|
|
|
},
|
|
|
numFormat (value) {
|
|
|
if (!value) return '0'
|
|
|
@@ -1672,7 +1723,7 @@ let app = new Vue({
|
|
|
data: [
|
|
|
{
|
|
|
name: '省属企业平均水平',
|
|
|
- yAxis: 50.13,
|
|
|
+ yAxis: this.echartC1.national,
|
|
|
lineStyle: {
|
|
|
color: '#fff',
|
|
|
},
|
|
|
@@ -1700,7 +1751,7 @@ let app = new Vue({
|
|
|
// },
|
|
|
{
|
|
|
name: '央企平均水平',
|
|
|
- yAxis: 69.4,
|
|
|
+ yAxis: this.echartC1.province,
|
|
|
lineStyle: {
|
|
|
color: '#fff',
|
|
|
},
|
|
|
@@ -1825,7 +1876,7 @@ let app = new Vue({
|
|
|
data: [
|
|
|
{
|
|
|
name: '省属企业平均水平',
|
|
|
- yAxis: 67.09,
|
|
|
+ yAxis: this.echartC2.province,
|
|
|
lineStyle: {
|
|
|
color: '#fff',
|
|
|
},
|
|
|
@@ -1839,7 +1890,7 @@ let app = new Vue({
|
|
|
},
|
|
|
{
|
|
|
name: '央企平均水平',
|
|
|
- yAxis: 81,
|
|
|
+ yAxis: this.echartC2.national,
|
|
|
lineStyle: {
|
|
|
color: '#fff',
|
|
|
},
|