|
|
@@ -2,7 +2,7 @@ let app = new Vue({
|
|
|
el: '#app',
|
|
|
data () {
|
|
|
return {
|
|
|
- boardType:'', // 哪边的项目看板
|
|
|
+ boardType: '', // 哪边的项目看板
|
|
|
pullShow: false, // 选择年份弹窗
|
|
|
pollList: [2021, 2022, 2023, 2024],
|
|
|
mockData: true,// 是否使用修改的数据
|
|
|
@@ -103,8 +103,6 @@ let app = new Vue({
|
|
|
this.getAppToken()
|
|
|
setTimeout(() => {
|
|
|
this.changeTopColor()
|
|
|
- // 大屏二
|
|
|
- this.initChinaChart()
|
|
|
// 大屏三
|
|
|
this.initChartR5()
|
|
|
this.changeYellow()
|
|
|
@@ -224,12 +222,12 @@ let app = new Vue({
|
|
|
this.getDate6()
|
|
|
|
|
|
// 右边
|
|
|
- this.getDate7()
|
|
|
- this.getDate8()
|
|
|
- this.getDate9()
|
|
|
- this.getDate10()
|
|
|
- // this.getDate11() // 右下A
|
|
|
- this.getDate12() // 右下B
|
|
|
+ // this.getDate7()
|
|
|
+ // this.getDate8()
|
|
|
+ // this.getDate9()
|
|
|
+ // this.getDate10()
|
|
|
+ // // this.getDate11() // 右下A
|
|
|
+ // this.getDate12() // 右下B
|
|
|
|
|
|
// 中间
|
|
|
this.getDate14()
|
|
|
@@ -243,7 +241,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- "mdnb_combofield": "A",
|
|
|
+ "mdnb_combofield": this.mockData ? 'B' : 'A',
|
|
|
"mdnb_datefield": "2023-01-01",
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
@@ -266,7 +264,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- "mdnb_combofield": "A",
|
|
|
+ "mdnb_combofield": this.mockData ? 'B' : 'A',
|
|
|
"mdnb_datefield": "2023-01-01",
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
@@ -300,37 +298,36 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- "mdnb_combofield": "A",
|
|
|
+ "mdnb_combofield": this.mockData ? 'B' : 'A',
|
|
|
"mdnb_datefield": "2023-01-01",
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tqcebjfx', value).then(res => {
|
|
|
let dataList = this.classify(res.data.rows[0].mdnb_entryentity, 'mdnb_textfield1')
|
|
|
- // console.log('看看分组情况', dataList, res.data.rows[0].mdnb_entryentity)
|
|
|
// 传统产业分析
|
|
|
- dataList[0].data.forEach((item, index) => {
|
|
|
- left7[index].num = item.mdnb_integerfield13
|
|
|
- left7[index].y = item.mdnb_amountfield8
|
|
|
- })
|
|
|
+ for (let i = 0; i < left7.length; i++) {
|
|
|
+ left7[i].num = dataList[0].data[i].mdnb_integerfield13
|
|
|
+ left7[i].y = dataList[0].data[i].mdnb_amountfield8
|
|
|
+ }
|
|
|
this.initChartL5()
|
|
|
// 战略性新兴产业
|
|
|
- dataList[1].data.forEach((item, index) => {
|
|
|
- left8[index].num = item.mdnb_integerfield13
|
|
|
- left8[index].y = item.mdnb_amountfield8
|
|
|
- })
|
|
|
- this.initChartL6()
|
|
|
+ // for(let i = 0;i<left8.length;i++){
|
|
|
+ // left8[i].num = dataList[1].data[i].mdnb_integerfield13
|
|
|
+ // left8[i].y = dataList[1].data[i].mdnb_amountfield8
|
|
|
+ // }
|
|
|
+ // this.initChartL6()
|
|
|
// 特色优势产业
|
|
|
- dataList[2].data.forEach((item, index) => {
|
|
|
- left9[index].num = item.mdnb_integerfield13
|
|
|
- left9[index].y = item.mdnb_amountfield8
|
|
|
- })
|
|
|
- this.initChartL7()
|
|
|
+ // for(let i = 0;i<left9.length;i++){
|
|
|
+ // left9[i].num = dataList[2].data[i].mdnb_integerfield13
|
|
|
+ // left9[i].y = dataList[2].data[i].mdnb_amountfield8
|
|
|
+ // }
|
|
|
+ // this.initChartL7()
|
|
|
// 公共基础等产业
|
|
|
- dataList[3].data.forEach((item, index) => {
|
|
|
- left10[index].num = item.mdnb_integerfield13
|
|
|
- left10[index].y = item.mdnb_amountfield8
|
|
|
- })
|
|
|
+ for (let i = 0; i < left10.length; i++) {
|
|
|
+ left10[i].num = dataList[3].data[i].mdnb_integerfield13
|
|
|
+ left10[i].y = dataList[3].data[i].mdnb_amountfield8
|
|
|
+ }
|
|
|
this.initChartL8()
|
|
|
resolve(1);
|
|
|
})
|
|
|
@@ -343,7 +340,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- "mdnb_combofield": "A",
|
|
|
+ "mdnb_combofield": this.mockData ? 'B' : 'A',
|
|
|
"mdnb_datefield": "2023-01-01",
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
@@ -401,7 +398,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- "mdnb_combofield": "A",
|
|
|
+ "mdnb_combofield": this.mockData ? 'B' : 'A',
|
|
|
"mdnb_datefield": "2023-01-01",
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
@@ -425,7 +422,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- "mdnb_combofield": "A",
|
|
|
+ "mdnb_combofield": this.mockData ? 'B' : 'A',
|
|
|
"mdnb_datefield": "2023-01-01",
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
@@ -450,7 +447,7 @@ let app = new Vue({
|
|
|
})
|
|
|
this.storageRecordConfig.data = dataList
|
|
|
this.storageRecordConfig = { ...this.storageRecordConfig }
|
|
|
- center8 = dataList
|
|
|
+ // center8 = dataList
|
|
|
resolve(1);
|
|
|
})
|
|
|
});
|
|
|
@@ -541,7 +538,6 @@ let app = new Vue({
|
|
|
right5[2][index][1] = item.mdnb_amount_fb
|
|
|
right5[2][index][2] = item.mdnb_amount_f
|
|
|
})
|
|
|
- console.log(right5,'?????????????')
|
|
|
this.initChartR2()
|
|
|
resolve(1);
|
|
|
})
|
|
|
@@ -594,6 +590,7 @@ let app = new Vue({
|
|
|
},
|
|
|
// 中间大屏数据
|
|
|
getDate14 () {
|
|
|
+ let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
@@ -612,19 +609,19 @@ let app = new Vue({
|
|
|
center1[2] = res.data.keyIndicators.property
|
|
|
center1[3] = res.data.keyIndicators.invest
|
|
|
// 投资产业分布
|
|
|
- for(let i = 0;i<center2.length;i++){
|
|
|
- center2[i].y = res.data.distribution[i].amount
|
|
|
- center2[i].num = res.data.distribution[i].count
|
|
|
- center2[i].typeno = res.data.distribution[i].typeno
|
|
|
+ for (let i = 0; i < center2.length; i++) {
|
|
|
+ center2[i].y = res.data.distribution[i].amount
|
|
|
+ center2[i].num = res.data.distribution[i].count
|
|
|
+ center2[i].typeno = res.data.distribution[i].typeno
|
|
|
}
|
|
|
// 投资执行情况
|
|
|
res.data.implementationStatus.forEach((item, index) => {
|
|
|
- center3[index].value = item.plan
|
|
|
- center3[index].value2 = item.reality
|
|
|
+ center3[index].value = that.yuanChange(item.plan)
|
|
|
+ center3[index].value2 = that.yuanChange(item.reality)
|
|
|
})
|
|
|
// 五个一体化
|
|
|
res.data.five.forEach((item, index) => {
|
|
|
- center6[index] = { name: item.type, value: item.amount, typeno: item.typeno }
|
|
|
+ center6[index] = { name: item.type, value: that.yuanChange(item.amount), typeno: item.typeno }
|
|
|
})
|
|
|
// 投资阶段分析
|
|
|
res.data.investmentStage.forEach((item, index) => {
|
|
|
@@ -632,23 +629,22 @@ let app = new Vue({
|
|
|
})
|
|
|
// 重点项目监控
|
|
|
center8 = []
|
|
|
+ this.originalConfig6 = res.data.projectMonitoring
|
|
|
res.data.projectMonitoring.forEach((item, index) => {
|
|
|
- center8.push({ value: item.amount, name: item.name, office: item.group, typeno: item.typeno })
|
|
|
+ center8.push({ value: item.amount, name: item.name, office: item.group })
|
|
|
})
|
|
|
// 中国地图
|
|
|
- // center5 = []
|
|
|
- // res.data.investmentMap.forEach((item, index) => {
|
|
|
- // center5.push({ name: item.address, value: item.amount, value2: item.value2 })
|
|
|
- // })
|
|
|
- // 山西地图
|
|
|
- // center5 = []
|
|
|
- // res.data.investmentMap.forEach((item, index) => {
|
|
|
- // center5.push({ name: item.address, value: item.amount, value2: item.value2 })
|
|
|
- // })
|
|
|
+ centerChina = []
|
|
|
+ res.data.investmentMap.forEach((item, index) => {
|
|
|
+ centerChina.push({ name: item.address, value: item.amount, value2: item.value2 })
|
|
|
+ })
|
|
|
// 项目状态
|
|
|
proState.projectStatus1 = res.data.projectStatus.projectStatus1
|
|
|
proState.projectStatus2 = res.data.projectStatus.projectStatus2
|
|
|
proState.projectStatus3 = res.data.projectStatus.projectStatus3
|
|
|
+ setTimeout(() => {
|
|
|
+ that.initChinaChart()
|
|
|
+ })
|
|
|
resolve(1);
|
|
|
})
|
|
|
});
|
|
|
@@ -711,7 +707,7 @@ let app = new Vue({
|
|
|
});
|
|
|
},
|
|
|
// 左边穿透一级
|
|
|
- leftPenetrateOne (mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeNum, type, param, paramCTwo) {
|
|
|
+ leftPenetrateOne (mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeNum, type, param, typeCTwo, paramCTwo) {
|
|
|
this.boardType = 'left'
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
@@ -767,14 +763,18 @@ let app = new Vue({
|
|
|
}
|
|
|
if (mdnb_textfield20) {
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/ejct', value).then(res => {
|
|
|
- // res.data.forEach((item, index) => {
|
|
|
- // that.config6.data[index] = []
|
|
|
- // that.config6.data[index][0] = item.mdnb_project_name
|
|
|
- // that.config6.data[index][2] = item.mdnb_implement_org
|
|
|
- // that.config6.data[index][3] = item.mdnb_insdrutytype1
|
|
|
- // that.config6.data[index][4] = item.mdnb_insdrutytype2
|
|
|
- // })
|
|
|
- // that.config6 = { ...that.config6 }
|
|
|
+ that.originalConfig6 = res.data.rows[0].mdnb_entryentity11
|
|
|
+ that.config6.data = []
|
|
|
+ res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
|
|
|
+ that.config6.data[index] = []
|
|
|
+ that.config6.data[index][0] = item.mdnb_textfield6
|
|
|
+ that.config6.data[index][1] = item.mdnb_textfield7
|
|
|
+ that.config6.data[index][2] = item.mdnb_textfield8
|
|
|
+ that.config6.data[index][3] = item.mdnb_textfield9
|
|
|
+ that.config6.data[index][4] = item.mdnb_textfield10
|
|
|
+ that.config6.data[index][5] = item.mdnb_amountfield22
|
|
|
+ })
|
|
|
+ that.config6 = { ...that.config6 }
|
|
|
that.projectListTipShow = true
|
|
|
resolve(1);
|
|
|
})
|
|
|
@@ -798,7 +798,7 @@ let app = new Vue({
|
|
|
}
|
|
|
},
|
|
|
// 中间穿透一级 一个柱状图还是两个
|
|
|
- centerPenetrateOne (type, param, typeNum, typeCTwo, paramCTwo,portType) {
|
|
|
+ centerPenetrateOne (type, param, typeNum, typeCTwo, paramCTwo, portType) {
|
|
|
this.boardType = 'center'
|
|
|
let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
@@ -854,7 +854,7 @@ let app = new Vue({
|
|
|
}
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
- this.initChartLTip('center', '', '', '', '', typeCTwo, paramCTwo,portType)
|
|
|
+ this.initChartLTip('center', '', '', '', '', typeCTwo, paramCTwo, portType)
|
|
|
})
|
|
|
} else if (typeNum == 2) {
|
|
|
common4 = []
|
|
|
@@ -865,24 +865,36 @@ let app = new Vue({
|
|
|
common4 = res.data.topData.map(item => item.amount)
|
|
|
common5 = res.data.bottomData.map(item => item.amount)
|
|
|
} else {
|
|
|
- if (param == '新建') {
|
|
|
+ if (param == 'new') {
|
|
|
res.data.keyIndicators.forEach((item, index) => {
|
|
|
common4.push(item.newamount)
|
|
|
common5.push(item.newcount)
|
|
|
})
|
|
|
- } else if (param == '续建') {
|
|
|
+ } else if (param == 'renew') {
|
|
|
res.data.keyIndicators.forEach((item, index) => {
|
|
|
common4.push(item.renewamount)
|
|
|
common5.push(item.renewcount)
|
|
|
})
|
|
|
+ } else if (param == '太原市') {
|
|
|
+ res.data.investmentMap.forEach((item, index) => {
|
|
|
+ common4.push(item.value2)
|
|
|
+ common5.push(item.amount)
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- this.initChartLTip2('center', '', '', '', '', type, param, typeCTwo, paramCTwo,portType)
|
|
|
- this.initChartLTip3('center', '', '', '', '', type, param, typeCTwo, paramCTwo,portType)
|
|
|
+ this.initChartLTip2('center', '', '', '', '', type, param, typeCTwo, paramCTwo, portType)
|
|
|
+ this.initChartLTip3('center', '', '', '', '', type, param, typeCTwo, paramCTwo, portType)
|
|
|
})
|
|
|
} else if (typeNum == 3) {
|
|
|
- that.initProvinceChart()
|
|
|
+ // 山西地图
|
|
|
+ center5 = []
|
|
|
+ res.data.investmentMap.forEach((item, index) => {
|
|
|
+ center5.push({ name: item.address, value: item.amount, value2: item.value2 })
|
|
|
+ })
|
|
|
+ setTimeout(() => {
|
|
|
+ that.initProvinceChart()
|
|
|
+ });
|
|
|
}
|
|
|
resolve(1);
|
|
|
})
|
|
|
@@ -890,7 +902,7 @@ let app = new Vue({
|
|
|
},
|
|
|
// 中间穿透二级
|
|
|
centerPenetrateTwo (type, param, orgNum, portType) {
|
|
|
- console.log('走了这里了',type, param, orgNum, portType)
|
|
|
+ console.log(type, param, orgNum, portType, '?????????+++++')
|
|
|
this.boardType = 'center'
|
|
|
let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
@@ -904,7 +916,6 @@ let app = new Vue({
|
|
|
}
|
|
|
if (portType == 1) {
|
|
|
get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/MainPageMonthReportProject', value).then(res => {
|
|
|
- console.log('看看二级穿透', res)
|
|
|
that.config6.data = []
|
|
|
that.originalConfig6 = res.data
|
|
|
res.data.forEach((item, index) => {
|
|
|
@@ -918,8 +929,29 @@ let app = new Vue({
|
|
|
resolve(1);
|
|
|
})
|
|
|
} else if (portType == 2) {
|
|
|
- get('/ierp/kapi/v2/mdnb/mdnb_xmkb_ext/presetdata/MainPagePlanProject', value).then(res => {
|
|
|
- console.log('看看二级穿透', res)
|
|
|
+ get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/MainPagePlanProject', value).then(res => {
|
|
|
+ that.config6.data = []
|
|
|
+ that.originalConfig6 = res.data
|
|
|
+ res.data.forEach((item, index) => {
|
|
|
+ that.config6.data[index] = []
|
|
|
+ that.config6.data[index][0] = item.projectname
|
|
|
+ that.config6.data[index][2] = item.orgName
|
|
|
+ that.config6.data[index][5] = item.amount
|
|
|
+ })
|
|
|
+ that.config6 = { ...that.config6 }
|
|
|
+ that.projectListTipShow = true
|
|
|
+ resolve(1);
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ value = {
|
|
|
+ access_token: this.access_token,
|
|
|
+ mock: this.mockData,
|
|
|
+ presetYear: this.year,
|
|
|
+ type: 'investmentMap',
|
|
|
+ param: '太原市',
|
|
|
+ orgNum
|
|
|
+ }
|
|
|
+ get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/MainPageMonthReportProject', value).then(res => {
|
|
|
that.config6.data = []
|
|
|
that.originalConfig6 = res.data
|
|
|
res.data.forEach((item, index) => {
|
|
|
@@ -959,29 +991,40 @@ let app = new Vue({
|
|
|
return a ? a.number.slice(0, 4) : ''
|
|
|
},
|
|
|
// 找项目编码
|
|
|
- findProjectCode (a, b,type) {
|
|
|
- if(type == 'center'){
|
|
|
- let c = this.originalConfig6.find(item => {
|
|
|
- return item.projectname == a && item.orgName == b
|
|
|
- })
|
|
|
- return c.projectno
|
|
|
- }else if(type == 'right'){
|
|
|
+ findProjectCode (a, b, type) {
|
|
|
+ console.log(a, b, type, '????????', this.originalConfig6)
|
|
|
+ if (type == 'center') {
|
|
|
+ let c = this.originalConfig6.find(item => {
|
|
|
+ return item.name == b && item.group == a
|
|
|
+ })
|
|
|
+ return c.typeno
|
|
|
+ } else if (type == 'right') {
|
|
|
let c = this.originalConfig6.find(item => {
|
|
|
return item.mdnb_project_name == a && item.mdnb_org == b
|
|
|
})
|
|
|
return c.mdnb_projectnumber
|
|
|
+ } else if (type == 'left') {
|
|
|
+ let c = this.originalConfig6.find(item => {
|
|
|
+ return item.mdnb_textfield6 == a && item.mdnb_textfield8 == b
|
|
|
+ })
|
|
|
+ return c.mdnb_textfield14
|
|
|
}
|
|
|
},
|
|
|
// 去项目看板
|
|
|
- goLookBoard (e) {
|
|
|
+ goLookBoard (e, f) {
|
|
|
+ if (f) {
|
|
|
+ this.boardType = f
|
|
|
+ this.boardUrl = `http://172.21.3.68:8081/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://172.21.3.68:8081/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[1], this.boardType)}`
|
|
|
+ } else {
|
|
|
+ this.boardUrl = `http://172.21.3.68:8081/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://172.21.3.68:8081/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[2], this.boardType)}`
|
|
|
+ }
|
|
|
// this.findProjectCode(e.row[0],e.row[2])
|
|
|
// 当前页面打开
|
|
|
// window.location.href = `http://192.168.2.111:8080/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://192.168.2.111:8080/ierp/index.html?formId=mdnb_threetoproject&prj=PL_ZZGY_0_2023_000036`
|
|
|
// 新页面打开
|
|
|
// window.open('http://192.168.2.111:8080/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://192.168.2.111:8080/ierp/index.html?formId=mdnb_threetoproject&prj=PL_ZZGY_0_2023_000036')
|
|
|
- this.boardUrl = `http://172.21.3.68:8081/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://172.21.3.68:8081/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[2],this.boardType)}`
|
|
|
this.boardTipShow = true
|
|
|
- console.log(this.boardUrl,'跳转去的项目看板地址')
|
|
|
+ console.log(this.boardUrl, '跳转去的项目看板地址')
|
|
|
},
|
|
|
// 根据key分组
|
|
|
classify (arr, k) {
|
|
|
@@ -1045,7 +1088,7 @@ let app = new Vue({
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- initChartLTip (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo,portType) {
|
|
|
+ initChartLTip (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo, portType) {
|
|
|
this.myChartTip1 = echarts.init(document.getElementById("echartSingleTip"));
|
|
|
let option = {
|
|
|
grid: {
|
|
|
@@ -1202,7 +1245,7 @@ let app = new Vue({
|
|
|
} else if (location == 'left') {
|
|
|
that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name)
|
|
|
} else if (location == 'center') {
|
|
|
- that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name),portType)
|
|
|
+ that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType)
|
|
|
}
|
|
|
} else {
|
|
|
that.projectListTipShow = true
|
|
|
@@ -1210,7 +1253,7 @@ let app = new Vue({
|
|
|
})
|
|
|
that.myChartTip1.setOption(option);
|
|
|
},
|
|
|
- initChartLTip2 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo,portType) {
|
|
|
+ initChartLTip2 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo, portType) {
|
|
|
this.myChartTip2 = echarts.init(document.getElementById("echartSingleTip2"));
|
|
|
let option = {
|
|
|
grid: {
|
|
|
@@ -1345,7 +1388,7 @@ let app = new Vue({
|
|
|
} else if (location == 'left') {
|
|
|
that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name)
|
|
|
} else if (location == 'center') {
|
|
|
- that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name),portType)
|
|
|
+ that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType)
|
|
|
}
|
|
|
} else {
|
|
|
that.projectListTipShow = true
|
|
|
@@ -1353,7 +1396,7 @@ let app = new Vue({
|
|
|
})
|
|
|
that.myChartTip2.setOption(option);
|
|
|
},
|
|
|
- initChartLTip3 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
|
|
|
+ initChartLTip3 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo, portType) {
|
|
|
this.myChartTip3 = echarts.init(document.getElementById("echartSingleTip3"));
|
|
|
let option = {
|
|
|
grid: {
|
|
|
@@ -1485,7 +1528,7 @@ let app = new Vue({
|
|
|
} else if (location == 'left') {
|
|
|
that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name)
|
|
|
} else if (location == 'center') {
|
|
|
- that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name))
|
|
|
+ that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType)
|
|
|
}
|
|
|
} else {
|
|
|
that.projectListTipShow = true
|
|
|
@@ -2541,7 +2584,8 @@ let app = new Vue({
|
|
|
point: {
|
|
|
events: {
|
|
|
click: function (e) {
|
|
|
- that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -2635,7 +2679,8 @@ let app = new Vue({
|
|
|
point: {
|
|
|
events: {
|
|
|
click: function (e) { //点击事件
|
|
|
- that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
|
|
|
},
|
|
|
mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
|
|
|
//console.log(e)
|
|
|
@@ -2652,7 +2697,8 @@ let app = new Vue({
|
|
|
point: {
|
|
|
events: {
|
|
|
click: function (e) {
|
|
|
- that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -2683,7 +2729,8 @@ let app = new Vue({
|
|
|
point: {
|
|
|
events: {
|
|
|
click: function (e) {
|
|
|
- that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '')
|
|
|
+ that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -3637,7 +3684,7 @@ let app = new Vue({
|
|
|
}
|
|
|
let that = this
|
|
|
that.left7Chart.on('click', function (param) {
|
|
|
- that.showChartLTipDouble(param.name, 'left', '项目阶段分析', '固定资产进度分布', param.name, param.seriesName)
|
|
|
+ that.showChartLTipDouble(param.name, 'left', '项目阶段分析', '固定资产分析', param.name, param.seriesName)
|
|
|
})
|
|
|
that.left7Chart.setOption(option)
|
|
|
tools.loopShowTooltip(that.left7Chart, option, {
|
|
|
@@ -4384,7 +4431,7 @@ let app = new Vue({
|
|
|
let that = this
|
|
|
this.mapChart.on('click', function (params) {
|
|
|
if (params.name == '太原市') {
|
|
|
- that.showChartLTipDouble(params.name, 'center', '', '', '', '', '', 'investmentMap', '山西省')
|
|
|
+ that.showChartLTipDouble(params.name, 'center', '', '', '', '', 'investmentMap', '太原市', '山西省')
|
|
|
}
|
|
|
})
|
|
|
tools.loopShowTooltip(this.mapChart, option, {
|
|
|
@@ -4394,42 +4441,7 @@ let app = new Vue({
|
|
|
this.mapChart.setOption(option)
|
|
|
},
|
|
|
initChinaChart () {
|
|
|
- var data = [{ name: '河北', value: 60.35, value2: 28 },
|
|
|
- { name: '山西', value: 4060.35, value2: 29 },
|
|
|
- { name: '辽宁', value: 260.35, value2: 30 },
|
|
|
- { name: '吉林', value: 360.35, value2: 30 },
|
|
|
- { name: '黑龙江', value: 460.35, value2: 30 },
|
|
|
- { name: '江苏', value: 560.35, value2: 30 },
|
|
|
- { name: '浙江', value: 60.35, value2: 28 },
|
|
|
- { name: '安徽', value: 160.35, value2: 29 },
|
|
|
- { name: '福建', value: 260.35, value2: 30 },
|
|
|
- { name: '江西', value: 360.35, value2: 30 },
|
|
|
- { name: '山东', value: 460.35, value2: 30 },
|
|
|
- { name: '河南', value: 560.35, value2: 30 },
|
|
|
- { name: '湖北', value: 60.35, value2: 28 },
|
|
|
- { name: '湖南', value: 160.35, value2: 29 },
|
|
|
- { name: '广东', value: 260.35, value2: 30 },
|
|
|
- { name: '海南', value: 360.35, value2: 30 },
|
|
|
- { name: '四川', value: 6.35, value2: 30 },
|
|
|
- { name: '贵州', value: 560.35, value2: 30 },
|
|
|
- { name: '云南', value: 60.35, value2: 28 },
|
|
|
- { name: '陕西', value: 160.35, value2: 29 },
|
|
|
- { name: '甘肃', value: 260.35, value2: 30 },
|
|
|
- { name: '青海', value: 360.35, value2: 30 },
|
|
|
- { name: '台湾', value: 460.35, value2: 30 },
|
|
|
- { name: '内蒙古', value: 560.35, value2: 30 },
|
|
|
- { name: '广西', value: 60.35, value2: 28 },
|
|
|
- { name: '西藏', value: 160.35, value2: 29 },
|
|
|
- { name: '宁夏', value: 260.35, value2: 30 },
|
|
|
- { name: '新疆', value: 360.35, value2: 30 },
|
|
|
- { name: '北京', value: 460.35, value2: 30 },
|
|
|
- { name: '天津', value: 560.35, value2: 30 },
|
|
|
- { name: '上海', value: 260.35, value2: 30 },
|
|
|
- { name: '重庆', value: 360.35, value2: 30 },
|
|
|
- { name: '香港', value: 460.35, value2: 30 },
|
|
|
- { name: '澳门', value: 560.35, value2: 30 },]
|
|
|
-
|
|
|
-
|
|
|
+ var data = centerChina
|
|
|
this.geoCoordMap = []
|
|
|
/*获取地图数据*/
|
|
|
this.mapChart = echarts.init(this.$refs['chinaMap'])
|
|
|
@@ -4615,8 +4627,7 @@ let app = new Vue({
|
|
|
// },
|
|
|
// },
|
|
|
xAxis: {
|
|
|
- data: commonCompany,
|
|
|
- // data: center6.map(item => item.name),
|
|
|
+ data: center6.map(item => item.name),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -4718,7 +4729,7 @@ let app = new Vue({
|
|
|
that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'ccheiamount', '', '', '', '', 'five', '3', 2)
|
|
|
} else if (param.name == '煤炭和数字') {
|
|
|
that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cdiamount', '', '', '', '', 'five', '4', 2)
|
|
|
- } else if (param.name == '煤炭和降碳') {
|
|
|
+ } else if (param.name == '煤炭和降炭') {
|
|
|
that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cciamount', '', '', '', '', 'five', '5', 2)
|
|
|
}
|
|
|
})
|
|
|
@@ -4974,11 +4985,12 @@ let app = new Vue({
|
|
|
let dataList = []
|
|
|
center8.map(item => {
|
|
|
if (this.versions) {
|
|
|
- dataList.push([item[0], item[1], item[2] + '亿'])
|
|
|
+ dataList.push([item.office, item.name, this.yuanChange(item.value) + '亿', item.typeno])
|
|
|
} else {
|
|
|
dataList.push([item.office, item.name, item.value + '亿'])
|
|
|
}
|
|
|
})
|
|
|
+
|
|
|
this.storageRecordConfig2.data = dataList
|
|
|
this.storageRecordConfig2 = { ...this.storageRecordConfig2 }
|
|
|
},
|
zhbyyy