|
|
@@ -2,7 +2,7 @@ let app = new Vue({
|
|
|
el: '#app',
|
|
|
data () {
|
|
|
return {
|
|
|
- fling:false, //水球光泽
|
|
|
+ fling: false, //水球光泽
|
|
|
centerOriginalConfig6: '',
|
|
|
rightAdd: {},// 左边新增筛选参数
|
|
|
projectNum: '', // 项目列表弹窗顶部类目筛选条件
|
|
|
@@ -337,7 +337,6 @@ let app = new Vue({
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tqtzjhfx', value).then(res => {
|
|
|
- console.log(res)
|
|
|
if (res.data.rows.length > 0) {
|
|
|
let dataList = res.data.rows[0]
|
|
|
left4 = []
|
|
|
@@ -387,10 +386,9 @@ let app = new Vue({
|
|
|
dataList[0].data.forEach((item, i) => {
|
|
|
left7[i] = {}
|
|
|
left7[i].num = item.mdnb_integerfield13
|
|
|
- left7[i].y = item.mdnb_amountfield8
|
|
|
+ left7[i].y = that.yuanChange(item.mdnb_amountfield8)
|
|
|
left7[i].name = item.mdnb_textfield2
|
|
|
})
|
|
|
- console.log(left7,'?????????????')
|
|
|
this.initChartL5()
|
|
|
// 战略性新兴产业
|
|
|
// if (dataList[1].data.length > left8.length || dataList[1].data.length == left8.length) {
|
|
|
@@ -403,7 +401,7 @@ let app = new Vue({
|
|
|
dataList[1].data.forEach((item, i) => {
|
|
|
left8[i] = {}
|
|
|
left8[i].num = item.mdnb_integerfield13
|
|
|
- left8[i].y = item.mdnb_amountfield8
|
|
|
+ left8[i].y = that.yuanChange(item.mdnb_amountfield8)
|
|
|
left8[i].name = item.mdnb_textfield2
|
|
|
})
|
|
|
this.initChartL6()
|
|
|
@@ -418,18 +416,25 @@ let app = new Vue({
|
|
|
dataList[2].data.forEach((item, i) => {
|
|
|
left9[i] = {}
|
|
|
left9[i].num = item.mdnb_integerfield13
|
|
|
- left9[i].y = item.mdnb_amountfield8
|
|
|
+ left9[i].y = that.yuanChange(item.mdnb_amountfield8)
|
|
|
left9[i].name = item.mdnb_textfield2
|
|
|
})
|
|
|
this.initChartL7()
|
|
|
// 公共基础等产业
|
|
|
- if (dataList[3].data.length > left10.length || dataList[3].data.length == left10.length) {
|
|
|
- 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()
|
|
|
- }
|
|
|
+ // if (dataList[3].data.length > left10.length || dataList[3].data.length == left10.length) {
|
|
|
+ // 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()
|
|
|
+ // }
|
|
|
+ dataList[3].data.forEach((item, i) => {
|
|
|
+ left10[i] = {}
|
|
|
+ left10[i].num = item.mdnb_integerfield13
|
|
|
+ left10[i].y = that.yuanChange(item.mdnb_amountfield8)
|
|
|
+ left10[i].name = item.mdnb_textfield2
|
|
|
+ })
|
|
|
+ this.initChartL8()
|
|
|
}
|
|
|
resolve(1);
|
|
|
})
|
|
|
@@ -554,7 +559,7 @@ let app = new Vue({
|
|
|
dataList[index] = []
|
|
|
dataList[index][0] = item.data[0].mdnb_textfield18
|
|
|
dataList[index][1] = item.data[0].mdnb_textfield3
|
|
|
- dataList[index][2] = that.yuanChange(item.data[0].mdnb_amountfield24) + '亿'
|
|
|
+ dataList[index][2] = that.numFormat(that.yuanChange(item.data[0].mdnb_amountfield24)) + '亿'
|
|
|
})
|
|
|
this.storageRecordConfig.data = dataList
|
|
|
this.storageRecordConfig = { ...this.storageRecordConfig }
|
|
|
@@ -657,6 +662,7 @@ let app = new Vue({
|
|
|
},
|
|
|
// 项目风险分析A
|
|
|
getDate11 () {
|
|
|
+ let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
@@ -667,9 +673,9 @@ let app = new Vue({
|
|
|
}
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getUnitNoSolveDangerDate', value).then(res => {
|
|
|
res.data.forEach((item, index) => {
|
|
|
- right6[index].value = item.mdnb_height
|
|
|
- right6[index].value2 = item.mdnb_midle
|
|
|
- right6[index].value3 = item.mdnb_bottom
|
|
|
+ right6[index].value = that.yuanChange(item.mdnb_height)
|
|
|
+ right6[index].value2 = that.yuanChange(item.mdnb_midle)
|
|
|
+ right6[index].value3 = that.yuanChange(item.mdnb_bottom)
|
|
|
})
|
|
|
this.initChartR3()
|
|
|
resolve(1);
|
|
|
@@ -710,7 +716,6 @@ let app = new Vue({
|
|
|
presetYear: this.year - 1
|
|
|
}
|
|
|
get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/getKeyData', value).then(res => {
|
|
|
- console.log(res.data, '???????????')
|
|
|
// 头部指标
|
|
|
if (!res.data) {
|
|
|
return
|
|
|
@@ -725,14 +730,22 @@ let app = new Vue({
|
|
|
center1[2] = res.data.keyIndicators.property
|
|
|
center1[3] = res.data.keyIndicators.invest
|
|
|
// 投资产业分布
|
|
|
- console.log(res.data.distribution, '________')
|
|
|
if (res.data.distribution.length != 0) {
|
|
|
- for (let i = 0; i < center2.length; i++) {
|
|
|
- center2[i].y = that.yuanChange(res.data.distribution[i].amount)
|
|
|
- center2[i].value = that.yuanChange(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 = that.yuanChange(res.data.distribution[i].amount)
|
|
|
+ // center2[i].value = that.yuanChange(res.data.distribution[i].amount)
|
|
|
+ // center2[i].num = res.data.distribution[i].count
|
|
|
+ // center2[i].typeno = res.data.distribution[i].typeno
|
|
|
+ // }
|
|
|
+ center2 = []
|
|
|
+ res.data.distribution.forEach((item, i) => {
|
|
|
+ center2[i] = {}
|
|
|
+ center2[i].name = item.type
|
|
|
+ center2[i].y = that.yuanChange(item.amount)
|
|
|
+ center2[i].value = that.yuanChange(item.amount)
|
|
|
+ center2[i].num = item.count
|
|
|
+ center2[i].typeno = item.typeno
|
|
|
+ })
|
|
|
}
|
|
|
// 投资执行情况
|
|
|
res.data.implementationStatus.forEach((item, index) => {
|
|
|
@@ -760,9 +773,9 @@ let app = new Vue({
|
|
|
centerChina.push({ name: item.address, value: that.yuanChange(item.amount), value2: item.value2 })
|
|
|
})
|
|
|
// 项目状态
|
|
|
- proState.projectStatus1 = res.data.projectStatus.projectStatus1
|
|
|
- proState.projectStatus2 = res.data.projectStatus.projectStatus2
|
|
|
- proState.projectStatus3 = res.data.projectStatus.projectStatus3
|
|
|
+ proState.projectStatus1 = that.numFormat(res.data.projectStatus.projectStatus1)
|
|
|
+ proState.projectStatus2 = that.numFormat(res.data.projectStatus.projectStatus2)
|
|
|
+ proState.projectStatus3 = that.numFormat(res.data.projectStatus.projectStatus3)
|
|
|
setTimeout(() => {
|
|
|
that.initChinaChart()
|
|
|
})
|
|
|
@@ -883,6 +896,7 @@ let app = new Vue({
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/yjct', value).then(res => {
|
|
|
+ console.log(res.data.rows, '??????????')
|
|
|
if (res.data.rows.length > 0) {
|
|
|
if (typeNum == 2) {
|
|
|
common4 = []
|
|
|
@@ -896,6 +910,10 @@ let app = new Vue({
|
|
|
this.initChartLTip3('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
|
|
|
})
|
|
|
} else if (typeNum == 1) {
|
|
|
+ common3 = []
|
|
|
+ res.data.rows[0].mdnb_entryentity12.forEach((item, index) => {
|
|
|
+ common3.push(item.mdnb_amountfield12)
|
|
|
+ })
|
|
|
this.initChartLTip('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
|
|
|
}
|
|
|
}
|
|
|
@@ -929,7 +947,7 @@ let app = new Vue({
|
|
|
if (res.data.rows.length > 0) {
|
|
|
that.originalConfig6 = res.data.rows[0].mdnb_entryentity11
|
|
|
that.config6.data = []
|
|
|
- console.log(this.projectNum,res.data.rows,'???????????')
|
|
|
+ console.log(this.projectNum, res.data.rows, '???????????')
|
|
|
if (this.projectNum == 211 || this.projectNum == 212) {
|
|
|
that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '已占用额度（万元）']
|
|
|
res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
|
|
|
@@ -1099,7 +1117,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
mock: this.mockData,
|
|
|
- presetYear: this.year - 1 ,
|
|
|
+ presetYear: this.year - 1,
|
|
|
type,
|
|
|
param
|
|
|
}
|
|
|
@@ -1108,43 +1126,43 @@ let app = new Vue({
|
|
|
common3 = []
|
|
|
res.data.keyIndicators.forEach((item, index) => {
|
|
|
if (param == 'cyplanamount') {
|
|
|
- common3.push(item.cyplanamount)
|
|
|
+ common3.push(that.yuanChange(item.cyplanamount))
|
|
|
}
|
|
|
if (param == 'cyplancount') {
|
|
|
- common3.push(item.cyplanamount)
|
|
|
+ common3.push(that.yuanChange(item.cyplanamount))
|
|
|
}
|
|
|
if (param == 'szplanamount') {
|
|
|
- common3.push(item.szplanamount)
|
|
|
+ common3.push(that.yuanChange(item.szplanamount))
|
|
|
}
|
|
|
if (param == 'szplancount') {
|
|
|
- common3.push(item.szplancount)
|
|
|
+ common3.push(that.yuanChange(item.szplancount))
|
|
|
}
|
|
|
if (param == 'investamount') {
|
|
|
- common3.push(item.investamount)
|
|
|
+ common3.push(that.yuanChange(item.investamount))
|
|
|
}
|
|
|
if (param == 'projectcount') {
|
|
|
- common3.push(item.projectcount)
|
|
|
+ common3.push(that.yuanChange(item.projectcount))
|
|
|
}
|
|
|
if (param == 'gdzcamount') {
|
|
|
- common3.push(item.projectcount)
|
|
|
+ common3.push(that.yuanChange(item.projectcount))
|
|
|
}
|
|
|
if (param == 'gqtzamount') {
|
|
|
- common3.push(item.projectcount)
|
|
|
+ common3.push(that.yuanChange(item.projectcount))
|
|
|
}
|
|
|
if (param == 'ceiamount') {
|
|
|
- common3.push(item.ceiamount)
|
|
|
+ common3.push(that.yuanChange(item.ceiamount))
|
|
|
}
|
|
|
if (param == 'cpneiamount') {
|
|
|
- common3.push(item.cpneiamount)
|
|
|
+ common3.push(that.yuanChange(item.cpneiamount))
|
|
|
}
|
|
|
if (param == 'ccheiamount') {
|
|
|
- common3.push(item.ccheiamount)
|
|
|
+ common3.push(that.yuanChange(item.ccheiamount))
|
|
|
}
|
|
|
if (param == 'cdiamount') {
|
|
|
- common3.push(item.cdiamount)
|
|
|
+ common3.push(that.yuanChange(item.cdiamount))
|
|
|
}
|
|
|
if (param == 'cciamount') {
|
|
|
- common3.push(item.cciamount)
|
|
|
+ common3.push(that.yuanChange(item.cciamount))
|
|
|
}
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
@@ -1156,23 +1174,23 @@ let app = new Vue({
|
|
|
if (type == 'distribution') {
|
|
|
that.changeLine = false
|
|
|
that.lineCommonCompany = res.data.topData.map(item => item.type)
|
|
|
- common4 = res.data.topData.map(item => item.amount)
|
|
|
- common5 = res.data.bottomData.map(item => item.amount)
|
|
|
+ common4 = res.data.topData.map(item => that.yuanChange(item.amount))
|
|
|
+ common5 = res.data.bottomData.map(item => that.yuanChange(item.amount))
|
|
|
} else {
|
|
|
if (param == 'new') {
|
|
|
res.data.keyIndicators.forEach((item, index) => {
|
|
|
- common4.push(item.newamount)
|
|
|
- common5.push(item.newcount)
|
|
|
+ common4.push(item.newcount)
|
|
|
+ common5.push(that.yuanChange(item.newamount))
|
|
|
})
|
|
|
} else if (param == 'renew') {
|
|
|
res.data.keyIndicators.forEach((item, index) => {
|
|
|
- common4.push(item.renewamount)
|
|
|
- common5.push(item.renewcount)
|
|
|
+ common4.push(item.renewcount)
|
|
|
+ common5.push(that.yuanChange(item.renewamount))
|
|
|
})
|
|
|
} else if (param == '太原市') {
|
|
|
res.data.investmentMap.forEach((item, index) => {
|
|
|
common4.push(item.value2)
|
|
|
- common5.push(item.amount)
|
|
|
+ common5.push(that.yuanChange(item.amount))
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -1591,6 +1609,9 @@ let app = new Vue({
|
|
|
// 坐标轴指示器，坐标轴触发有效
|
|
|
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
|
|
|
},
|
|
|
+ formatter: data => {
|
|
|
+ return `${data[0].name}</br>${data[0].seriesName}：${that.numFormat(data[0].value)}亿`
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: '#FFF', // 文字的颜色
|
|
|
fontSize: '20', // 文字字体大小
|
|
|
@@ -1658,29 +1679,6 @@ let app = new Vue({
|
|
|
},
|
|
|
},
|
|
|
series: [
|
|
|
- // {
|
|
|
- // name: "2022年额度",
|
|
|
- // type: "bar",
|
|
|
- // data: [263.23, 402.18, 73.28, 144.80, 25.56, 8.23, 0, 12.97, 8.56, -1.72, 0, 0, 0, 76.90, 5.03, 9.14, 0, 0],
|
|
|
- // showBackground: false,
|
|
|
- // backgroundStyle: {
|
|
|
- // color: "#18416F",
|
|
|
- // },
|
|
|
- // barWidth: "10%",
|
|
|
- // itemStyle: {
|
|
|
- // barBorderRadius: [10, 10, 0, 0],
|
|
|
- // color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
|
|
|
- // {
|
|
|
- // offset: 0,
|
|
|
- // color: '#082550',
|
|
|
- // },
|
|
|
- // {
|
|
|
- // offset: 1,
|
|
|
- // color: '#69c0ff',
|
|
|
- // },
|
|
|
- // ]),
|
|
|
- // },
|
|
|
- // },
|
|
|
{
|
|
|
name: "总额度",
|
|
|
type: "bar",
|
|
|
@@ -1721,7 +1719,7 @@ let app = new Vue({
|
|
|
},
|
|
|
};
|
|
|
tools.loopShowTooltip(this.myChartTip1, option, {
|
|
|
- nterval: 2000,
|
|
|
+ interval: 2000,
|
|
|
loopSeries: true,
|
|
|
})
|
|
|
let that = this
|
|
|
@@ -1756,6 +1754,9 @@ let app = new Vue({
|
|
|
// 坐标轴指示器，坐标轴触发有效
|
|
|
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
|
|
|
},
|
|
|
+ formatter: data => {
|
|
|
+ return `${data[0].name}</br>${data[0].seriesName}：${that.numFormat(data[0].value)}个`
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: '#FFF', // 文字的颜色
|
|
|
fontSize: '20', // 文字字体大小
|
|
|
@@ -1864,7 +1865,7 @@ let app = new Vue({
|
|
|
},
|
|
|
};
|
|
|
tools.loopShowTooltip(this.myChartTip2, option, {
|
|
|
- nterval: 2000,
|
|
|
+ interval: 2000,
|
|
|
loopSeries: true,
|
|
|
})
|
|
|
let that = this
|
|
|
@@ -1899,6 +1900,9 @@ let app = new Vue({
|
|
|
// 坐标轴指示器，坐标轴触发有效
|
|
|
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
|
|
|
},
|
|
|
+ formatter: data => {
|
|
|
+ return `${data[0].name}</br>${data[0].seriesName}：${that.numFormat(data[0].value)}亿`
|
|
|
+ },
|
|
|
textStyle: {
|
|
|
color: '#FFF', // 文字的颜色
|
|
|
fontSize: '20', // 文字字体大小
|
|
|
@@ -1966,7 +1970,7 @@ let app = new Vue({
|
|
|
},
|
|
|
},
|
|
|
},
|
|
|
- series: [,
|
|
|
+ series: [
|
|
|
{
|
|
|
name: "总额度",
|
|
|
type: "bar",
|
|
|
@@ -2003,10 +2007,6 @@ let app = new Vue({
|
|
|
y: 5,
|
|
|
},
|
|
|
};
|
|
|
- tools.loopShowTooltip(this.myChartTip3, option, {
|
|
|
- nterval: 2000,
|
|
|
- loopSeries: true,
|
|
|
- })
|
|
|
let that = this
|
|
|
that.myChartTip3.on('click', function (param) {
|
|
|
if (that.versions) {
|
|
|
@@ -2022,6 +2022,10 @@ let app = new Vue({
|
|
|
}
|
|
|
})
|
|
|
that.myChartTip3.setOption(option);
|
|
|
+ tools.loopShowTooltip(that.myChartTip3, option, {
|
|
|
+ interval: 2000,
|
|
|
+ loopSeries: true,
|
|
|
+ })
|
|
|
},
|
|
|
closeTap () {
|
|
|
this.changeLine = true
|
|
|
@@ -2494,7 +2498,7 @@ let app = new Vue({
|
|
|
formatter: function (e) {
|
|
|
let num = chartData[this.colorIndex].num
|
|
|
this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
|
|
|
- return `${this.key}：<b>${this.percentage}%</b><br/><b>${this.y}</b>亿，<b>${num}个</b>`
|
|
|
+ return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.numFormat(this.y)}</b>亿，<b>${that.numFormat(num)}个</b>`
|
|
|
},
|
|
|
//pointFormat:
|
|
|
},
|
|
|
@@ -2742,7 +2746,7 @@ let app = new Vue({
|
|
|
//console.log(this)
|
|
|
let num = chartData[this.colorIndex].num
|
|
|
this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
|
|
|
- return `${this.key}：<b>${this.percentage}%</b><br/><b>${this.y}</b>亿，<b>${num}个</b>`
|
|
|
+ return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.numFormat(this.y)}</b>亿，<b>${that.numFormat(num)}个</b>`
|
|
|
},
|
|
|
//pointFormat:
|
|
|
},
|
|
|
@@ -2873,7 +2877,7 @@ let app = new Vue({
|
|
|
show: true,
|
|
|
trigger: "axis",
|
|
|
formatter: data => {
|
|
|
- return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${data[0].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${data[1].value + data[0].value}亿`
|
|
|
+ return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${that.numFormat(data[0].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${that.numFormat(data[1].value + data[0].value)}亿`
|
|
|
},
|
|
|
axisPointer: {
|
|
|
// 坐标轴指示器，坐标轴触发有效
|
|
|
@@ -3149,7 +3153,7 @@ let app = new Vue({
|
|
|
//console.log(this)
|
|
|
let num = chartData[this.colorIndex].num
|
|
|
this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
|
|
|
- return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
|
|
|
+ return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.numFormat(this.y)}</b>亿，<b>${that.numFormat(num)}个</b>`
|
|
|
},
|
|
|
//pointFormat:
|
|
|
},
|
|
|
@@ -3361,7 +3365,7 @@ let app = new Vue({
|
|
|
//console.log(this)
|
|
|
let num = chartData[this.colorIndex].num
|
|
|
this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
|
|
|
- return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
|
|
|
+ return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.numFormat(this.y)}</b>亿，<b>${that.numFormat(num)}个</b>`
|
|
|
},
|
|
|
//pointFormat:
|
|
|
},
|
|
|
@@ -3570,7 +3574,7 @@ let app = new Vue({
|
|
|
//console.log(this)
|
|
|
let num = chartData[this.colorIndex].num
|
|
|
this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
|
|
|
- return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
|
|
|
+ return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.numFormat(this.y)}</b>亿，<b>${that.numFormat(num)}个</b>`
|
|
|
},
|
|
|
//pointFormat:
|
|
|
},
|
|
|
@@ -3780,7 +3784,7 @@ let app = new Vue({
|
|
|
//console.log(this)
|
|
|
let num = chartData[this.colorIndex].num
|
|
|
this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
|
|
|
- return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
|
|
|
+ return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.numFormat(this.y)}</b>亿，<b>${that.numFormat(num)}个</b>`
|
|
|
},
|
|
|
//pointFormat:
|
|
|
},
|
|
|
@@ -4053,7 +4057,7 @@ let app = new Vue({
|
|
|
tooltip: {
|
|
|
trigger: "axis",
|
|
|
formatter: function (params) {
|
|
|
- var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + '：' + params[0].data[2] + '个，' + params[0].data[3] + '亿' + '<br/>' + params[1].marker + params[1].data[1] + '：' + params[1].data[2] + '个，' + params[1].data[3] + '亿';
|
|
|
+ var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + '：' + that.numFormat(params[0].data[2]) + '个，' + that.numFormat(params[0].data[3]) + '亿' + '<br/>' + params[1].marker + params[1].data[1] + '：' + that.numFormat(params[1].data[2]) + '个，' + that.numFormat(params[1].data[3]) + '亿';
|
|
|
return tip
|
|
|
},
|
|
|
textStyle: {
|
|
|
@@ -4205,7 +4209,7 @@ let app = new Vue({
|
|
|
tooltip: {
|
|
|
trigger: "axis",
|
|
|
formatter: function (params) {
|
|
|
- var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + '：' + params[0].data[2] + '个，' + params[0].data[3] + '亿' + '<br/>' + params[1].marker + params[1].data[1] + '：' + params[1].data[2] + '个，' + params[1].data[3] + '亿';
|
|
|
+ var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + '：' + that.numFormat(params[0].data[2]) + '个，' + that.numFormat(params[0].data[3]) + '亿' + '<br/>' + params[1].marker + params[1].data[1] + '：' + that.numFormat(params[1].data[2]) + '个，' + that.numFormat(params[1].data[3]) + '亿';
|
|
|
return tip
|
|
|
},
|
|
|
textStyle: {
|
|
|
@@ -4977,7 +4981,6 @@ let app = new Vue({
|
|
|
],
|
|
|
}
|
|
|
that.center2Chart.on('click', function (param) {
|
|
|
- that.projectListTipShow = true
|
|
|
param.seriesName == '计划投资' ? that.projectNum = 1131 : that.projectNum = 1132
|
|
|
that.centerPenetrateTwo('', '', that.findCode(param.name), param.seriesName == '计划投资' ? 2 : 1)
|
|
|
})
|
|
|
@@ -5176,9 +5179,9 @@ let app = new Vue({
|
|
|
}
|
|
|
let that = this
|
|
|
this.mapChart.on('click', function (params) {
|
|
|
- if (params.name == '太原市') {
|
|
|
- that.showChartLTipDouble(params.name, 'center', '', '', '', '', 'investmentMap', '太原市', '山西省', '', '', 118)
|
|
|
- }
|
|
|
+ // if (params.name == '太原市') {
|
|
|
+ that.showChartLTipDouble(params.name, 'center', '', '', '', '', 'investmentMap', params.name, '山西省', '', '', 118)
|
|
|
+ // }
|
|
|
})
|
|
|
tools.loopShowTooltip(this.mapChart, option, {
|
|
|
interval: 2000,
|
|
|
@@ -5189,6 +5192,7 @@ let app = new Vue({
|
|
|
initChinaChart () {
|
|
|
var data = centerChina
|
|
|
this.geoCoordMap = []
|
|
|
+ let that = this
|
|
|
/*获取地图数据*/
|
|
|
this.mapChart = echarts.init(this.$refs['chinaMap'])
|
|
|
echarts.registerMap('china', china)
|
|
|
@@ -5231,8 +5235,8 @@ let app = new Vue({
|
|
|
if (params.componentSubType == 'scatter') {
|
|
|
let tipHtml = `
|
|
|
<div class="tooltip-cont">
|
|
|
- <p>项目数量：<span>${data[params.dataIndex].value2}个</span></p>
|
|
|
- <p>总投资额：<span>${params.data.value[2]}亿</span></p>
|
|
|
+ <p>项目数量：<span>${that.numFormat(data[params.dataIndex].value2)}个</span></p>
|
|
|
+ <p>总投资额：<span>${that.numFormat(params.data.value[2])}亿</span></p>
|
|
|
</div>`
|
|
|
callback(ticket, tipHtml)
|
|
|
return tipHtml
|
|
|
@@ -5240,8 +5244,8 @@ let app = new Vue({
|
|
|
if (params.componentSubType == 'map') {
|
|
|
let tipHtml = `
|
|
|
<div class="tooltip-cont">
|
|
|
- <p>项目数量：<span>${data[params.dataIndex].value2}个</span></p>
|
|
|
- <p>总投资额：<span>${params.data.value}亿</span></p>
|
|
|
+ <p>项目数量：<span>${that.numFormat(data[params.dataIndex].value2)}个</span></p>
|
|
|
+ <p>总投资额：<span>${that.numFormat(params.data.value)}亿</span></p>
|
|
|
</div>`
|
|
|
callback(ticket, tipHtml)
|
|
|
return tipHtml
|
|
|
@@ -5319,7 +5323,6 @@ let app = new Vue({
|
|
|
},
|
|
|
],
|
|
|
}
|
|
|
- let that = this
|
|
|
this.mapChart.on('click', function (params) {
|
|
|
if (params.name == '山西') {
|
|
|
// that.showChartLTipDouble(params.name, 'center', '', '', '', '', '', 'investmentMap', '山西省')
|
|
|
@@ -5350,7 +5353,9 @@ let app = new Vue({
|
|
|
let option = {
|
|
|
tooltip: {
|
|
|
trigger: 'axis',
|
|
|
- formatter: '{a0}：{c0}' + '亿', //+ '<br/>'+ '{a1}：{c1}' + '%',
|
|
|
+ formatter: data => {
|
|
|
+ return `${data[0].name}<br />${data[0].seriesName}：${that.numFormat(data[0].value)}亿`
|
|
|
+ },
|
|
|
axisPointer: {
|
|
|
// type: 'cross',',
|
|
|
},
|
|
|
@@ -5839,7 +5844,6 @@ let app = new Vue({
|
|
|
},
|
|
|
initProjectList () {
|
|
|
let dataList = []
|
|
|
- console.log(center8, '?????????')
|
|
|
center8.map(item => {
|
|
|
if (this.versions) {
|
|
|
dataList.push([item.office, item.name, this.yuanChange(item.value) + '亿', item.typeno])
|
|
|
@@ -5884,7 +5888,7 @@ let app = new Vue({
|
|
|
let option = {
|
|
|
tooltip: {
|
|
|
formatter: data => {
|
|
|
- return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${data[0].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${data[1].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color.colorStops[0].color}"></span> ${data[2].seriesName}：${data[2].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[3].color.colorStops[0].color}"></span> ${data[3].seriesName}：${data[3].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[4].color.colorStops[0].color}"></span> ${data[4].seriesName}：${data[4].value}亿`
|
|
|
+ return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${that.numFormat(data[0].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${that.numFormat(data[1].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color.colorStops[0].color}"></span> ${data[2].seriesName}：${that.numFormat(data[2].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[3].color.colorStops[0].color}"></span> ${data[3].seriesName}：${that.numFormat(data[3].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[4].color.colorStops[0].color}"></span> ${data[4].seriesName}：${that.numFormat(data[4].value)}亿`
|
|
|
},
|
|
|
textStyle: {
|
|
|
color: '#FFF', // 文字的颜色
|
|
|
@@ -5945,7 +5949,6 @@ let app = new Vue({
|
|
|
},
|
|
|
xAxis: {
|
|
|
data: commonCompany,
|
|
|
- // data: right4.map(item => item.name),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -6212,7 +6215,7 @@ let app = new Vue({
|
|
|
fontFamily: 'Microsoft YaHei'
|
|
|
},
|
|
|
formatter: data => {
|
|
|
- return `${data[0].value[0]}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color}"></span> ${data[0].seriesName}：${data[0].data[2]}亿<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color}"></span> ${data[1].seriesName}：${data[1].data[2]}亿<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color}"></span> ${data[2].seriesName}：${data[2].data[2]}亿`
|
|
|
+ return `${data[0].value[0]}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color}"></span> ${data[0].seriesName}：${that.numFormat(data[0].data[2])}亿<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color}"></span> ${data[1].seriesName}：${that.numFormat(data[1].data[2])}亿<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color}"></span> ${data[2].seriesName}：${that.numFormat(data[2].data[2])}亿`
|
|
|
},
|
|
|
axisPointer: {
|
|
|
// // type: 'cross',',
|
|
|
@@ -6221,7 +6224,7 @@ let app = new Vue({
|
|
|
grid: {
|
|
|
top: '10%',
|
|
|
right: '4%',
|
|
|
- left: '5%',
|
|
|
+ left: '7%',
|
|
|
bottom: '5%',
|
|
|
},
|
|
|
yAxis: {
|
|
|
@@ -6253,7 +6256,6 @@ let app = new Vue({
|
|
|
},
|
|
|
xAxis: {
|
|
|
data: commonCompany,
|
|
|
- // data: right5[0].map(item => item[0]),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -6289,7 +6291,7 @@ let app = new Vue({
|
|
|
itemStyle: itemStyle,
|
|
|
data: right5[0],
|
|
|
symbolSize: function (data) {
|
|
|
- return Math.sqrt(Math.abs(data[2])) * 9;
|
|
|
+ return Math.sqrt(Math.abs(data[2])) * 200;
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
@@ -6298,7 +6300,7 @@ let app = new Vue({
|
|
|
itemStyle: itemStyle,
|
|
|
data: right5[1],
|
|
|
symbolSize: function (data) {
|
|
|
- return Math.sqrt(Math.abs(data[2])) * 9;
|
|
|
+ return Math.sqrt(Math.abs(data[2])) * 200;
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
@@ -6307,7 +6309,7 @@ let app = new Vue({
|
|
|
itemStyle: itemStyle,
|
|
|
data: right5[2],
|
|
|
symbolSize: function (data) {
|
|
|
- return Math.sqrt(Math.abs(data[2])) * 9;
|
|
|
+ return Math.sqrt(Math.abs(data[2])) * 200;
|
|
|
},
|
|
|
}
|
|
|
]
|
|
|
@@ -6366,7 +6368,7 @@ let app = new Vue({
|
|
|
let option = {
|
|
|
tooltip: {
|
|
|
formatter: data => {
|
|
|
- return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${data[0].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${data[1].value}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color.colorStops[0].color}"></span> ${data[2].seriesName}：${data[2].value}亿`
|
|
|
+ return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${that.numFormat(data[0].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${that.numFormat(data[1].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color.colorStops[0].color}"></span> ${data[2].seriesName}：${that.numFormat(data[2].value)}亿`
|
|
|
},
|
|
|
trigger: 'axis',
|
|
|
axisPointer: {
|
zhbyyy