|
|
@@ -2,16 +2,17 @@ let app = new Vue({
|
|
|
el: '#app',
|
|
|
data () {
|
|
|
return {
|
|
|
+ boardType:'', // 哪边的项目看板
|
|
|
pullShow: false, // 选择年份弹窗
|
|
|
pollList: [2021, 2022, 2023, 2024],
|
|
|
- mockData:false,// 是否使用修改的数据
|
|
|
+ mockData: true,// 是否使用修改的数据
|
|
|
year: 2023, // 选择的年份
|
|
|
boardUrl: '', // 跳转路径
|
|
|
boardTipShow: false, // 项目看板弹窗专用
|
|
|
lineCommonCompany: [], //双柱状图弹窗上面的折线图x轴
|
|
|
commonCompanyAll: [], // 公司包括编码
|
|
|
changeLine: true,
|
|
|
- versions: false,
|
|
|
+ versions: true,
|
|
|
app_token: '',
|
|
|
centerShow: false, // 中间内容显示
|
|
|
echartR4Chart: '',// 倒数第二个专用
|
|
|
@@ -72,49 +73,7 @@ let app = new Vue({
|
|
|
evenRowBGC: "#0C284A",
|
|
|
},
|
|
|
originalConfig6: [],
|
|
|
- config6: {
|
|
|
- rowNum: 15,
|
|
|
- waitTime: 1000,
|
|
|
- headerHeight: '100',
|
|
|
- header: ["项目名称", "所属组织", '实施主体', '产业类别I级', '产业类别II级', '2022年投资完成额（万元）'],
|
|
|
- data: [
|
|
|
- ["6万吨/年PBAT项目", "华阳新材", "华阳生物降解公司", "战略性新兴产业", "新材料", "20,340.00"],
|
|
|
- ["2万吨/年生物降解改性材料及塑料制品项目", "华阳新材", "华阳生物降解公司", "战略性新兴产业", "新材料", "5,270.00"],
|
|
|
- ["2万吨/年全系列生物降解新材料项目", "华阳新材", "华阳新材", "战略性新兴产业", "新材料", "5,560.00"],
|
|
|
- ["开元煤层气发电项目", "华阳新材", "阳煤扬德公司", "战略性新兴产业", "煤层气", "880.00"],
|
|
|
- ["平舒翟下庄煤层气发电项目", "华阳新材", "阳煤扬德公司", "战略性新兴产业", "煤层气", "570.00"],
|
|
|
- ["5GW高效光伏组件制造项目一期2GW", "华阳新材", "华储光电公司", "战略性新兴产业", "新能源", "10,000.00"],
|
|
|
- ["钠离子电池正极材料千吨级生产项目", "华阳新材", "华钠铜能公司", "战略性新兴产业", "新能源", "6,060.00"],
|
|
|
- ["钠离子电池负极材料千吨级生产项目", "华阳新材", "华钠碳能公司", "战略性新兴产业", "新能源", "4,080.00"],
|
|
|
- ["1GWh钠离子Pack电池生产线建设项目", "华阳新材", "华钠芯能公司", "战略性新兴产业", "新能源", "2790.00"],
|
|
|
- ["天成光储网充项目", "华阳新材", "新阳公司", "战略性新兴产业", "新能源", "1680.00"],
|
|
|
- ["宏厦三建绿色建材工业园区项目", "华阳新材", "宏厦三建", "战略性新兴产业", "新材料", "2,550.00"],
|
|
|
- ["亚美公司超低排放改造及节能技改项目", "华阳新材", "亚美公司", "战略性新兴产业", "其他", "20,101.00"],
|
|
|
- ["超净滤材项目", "华阳新材", "华阳科创城", "战略性新兴产业", "新材料", "5,510.00"],
|
|
|
- ["华阳集团网络安全工作顶层设计及整体整改项目", "华阳新材", "华阳集团", "战略性新兴产业", "新一代信息技术", "814.00"],
|
|
|
- ["山西科技创新城阳煤设计研发中心项目", "华阳新材", "碳基合成新材料公司", "战略性新兴产业", "其他", "12,930.00"],
|
|
|
- ["阳煤西110kv变电站及线路建设工程", "华阳新材", "华阳股份", "战略性新兴产业", "其他", "7,060.00"],
|
|
|
- ["郊区35kV输变电工程", "华阳新材", "华储光电公司", "战略性新兴产业", "其他", "1,250.00"],
|
|
|
- ["环境保护及治理", "华阳新材", "华阳股份", "战略性新兴产业", "节能环保", "5,890.00"],
|
|
|
- ["增资山西新阳清洁能源有限公司", "华阳新材", "华阳股份", "战略性新兴产业", "新能源产业", "101,700.00"],
|
|
|
- ["增资阳煤集团纳谷（山西）气凝胶科创城管理有限责任公司", "华阳新材", "华阳集团", "战略性新兴产业", "新材料产业", "34,582.00"],
|
|
|
- ["太化集团普田农业有限公司股权收购及增资", "华阳新材", "华阳新材", "战略性新兴产业", "新材料产业", "7,400.00"],
|
|
|
- ["山西阳煤道得新材股权投资合伙企业（有限合伙）", "华阳新材", "华阳资本", "战略性新兴产业", "新材料产业", "5,000.00"],
|
|
|
- ["阳泉市梧桐树嘉裕阳煤智能制造股权投资合伙企业（有限合伙）", "华阳新材", "华阳资本华阳股份", "战略性新兴产业", "新材料产业", "6,576.29"],
|
|
|
- ["阳煤纳谷（山西）气凝胶经销有限责任公司", "华阳新材", "气凝胶科创城", "战略性新兴产业", "新材料产业", "4,335.00"],
|
|
|
- ["阳煤纳谷（山西）节能服务有限责任公司", "华阳新材", "气凝胶科创城", "战略性新兴产业", "新材料产业", "3,674.00"],
|
|
|
- ["华阳诺爱特（山西）新材料科技有限公司", "华阳新材", "气凝胶科创城", "战略性新兴产业", "新材料产业", "500.00"],
|
|
|
- ["华阳纳谷（北京）新材料科技有限公司", "华阳新材", "气凝胶科创城", "战略性新兴产业", "新材料产业", "250.00"],
|
|
|
- ["山西华储光电有限责任公司", "华阳新材", "山西新阳清洁能源有限公司", "战略性新兴产业", "新材料产业", "45,000.00"],
|
|
|
- ["山西华钠铜能科技有限责任公司", "华阳新材", "山西新阳清洁能源有限公司", "战略性新兴产业", "新能源产业", "900.00"],
|
|
|
- ["山西华钠碳能科技有限责任公司", "华阳新材", "山西新阳清洁能源有限公司", "战略性新兴产业", "新能源产业", "450.00"]
|
|
|
-
|
|
|
- ],
|
|
|
- align: ["center", "center", "center", "center", "center", "center", "center"],
|
|
|
- headerBGC: "#153A62",
|
|
|
- oddRowBGC: "#061F42",
|
|
|
- evenRowBGC: "#0C284A",
|
|
|
- },
|
|
|
+ config6: listPop
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
@@ -183,7 +142,7 @@ let app = new Vue({
|
|
|
that.comeIn()
|
|
|
})
|
|
|
},
|
|
|
- destroyCharts(){
|
|
|
+ destroyCharts () {
|
|
|
this.left10Chart ? this.left10Chart.dispose() : ''
|
|
|
this.left1Chart ? this.left1Chart.destroy() : ''
|
|
|
this.left2Chart ? this.left2Chart.destroy() : ''
|
|
|
@@ -212,11 +171,20 @@ let app = new Vue({
|
|
|
},
|
|
|
// 获取token
|
|
|
getAppToken () {
|
|
|
+ // dev环境
|
|
|
+ // let value = {
|
|
|
+ // "appId": "xilan1014", //系统编码
|
|
|
+ // "appSecret": "12345678910Aa@Bb@Cc", //AccessToken加密认证密钥
|
|
|
+ // "tenantid": "", //租户id
|
|
|
+ // "accountId": "", //数据中心id
|
|
|
+ // "language": "zh_CN"
|
|
|
+ // }
|
|
|
+ // SIT环境
|
|
|
let value = {
|
|
|
- "appId": "xilan1014", //系统编码
|
|
|
- "appSecret": "12345678910Aa@Bb@Cc", //AccessToken加密认证密钥
|
|
|
- "tenantid": "", //租户id
|
|
|
- "accountId": "", //数据中心id
|
|
|
+ "appId": "68dp",
|
|
|
+ "appSecret": "9ErhY^O{n?@Pc#eb7HYX",
|
|
|
+ "tenantid": "",
|
|
|
+ "accountId": "1635498801198269440",
|
|
|
"language": "zh_CN"
|
|
|
}
|
|
|
post('/ierp/api/getAppToken.do', value).then(res => {
|
|
|
@@ -227,10 +195,10 @@ let app = new Vue({
|
|
|
// 获取AccessToken
|
|
|
getAccessToken () {
|
|
|
let value = {
|
|
|
- "user": "15503076138", //登录用户手机号
|
|
|
+ "user": "19900000001", //登录用户手机号
|
|
|
"apptoken": this.app_token, //应用令牌
|
|
|
"tenantid": "", //租户id
|
|
|
- "accountId": "", //数据中心id
|
|
|
+ "accountId": "1635498801198269440",//数据中心id
|
|
|
"usertype": "Mobile"
|
|
|
}
|
|
|
post('/ierp/api/login.do', value).then(res => {
|
|
|
@@ -256,12 +224,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()
|
|
|
@@ -493,7 +461,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: '0'
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
@@ -516,7 +484,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: '0'
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
@@ -537,17 +505,17 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: '0'
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getUnitBudgetExecuteDate', value).then(res => {
|
|
|
res.data.forEach((item, index) => {
|
|
|
- right4[index].value = item.mdnb_aheadmoney
|
|
|
- right4[index].value2 = item.mdnb_edmoney
|
|
|
- right4[index].value3 = item.mdnb_smoney
|
|
|
- right4[index].value4 = item.mdnb_jmoney
|
|
|
- right4[index].value5 = item.mdnb_fkmoney
|
|
|
+ right4[index].value = this.yuanChange(item.mdnb_aheadmoney)
|
|
|
+ right4[index].value2 = this.yuanChange(item.mdnb_edmoney)
|
|
|
+ right4[index].value3 = this.yuanChange(item.mdnb_smoney)
|
|
|
+ right4[index].value4 = this.yuanChange(item.mdnb_jmoney)
|
|
|
+ right4[index].value5 = this.yuanChange(item.mdnb_fkmoney)
|
|
|
})
|
|
|
this.initChartR1()
|
|
|
resolve(1);
|
|
|
@@ -560,16 +528,20 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: '0'
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getInvestSunstractionGas', value).then(res => {
|
|
|
res.data.forEach((item, index) => {
|
|
|
- right5[0][index][1] = item.mdnb_amount_z
|
|
|
- right5[1][index][1] = item.mdnb_amount_n
|
|
|
- right5[2][index][1] = item.mdnb_amount_f
|
|
|
+ right5[0][index][1] = item.mdnb_amount_zb
|
|
|
+ right5[0][index][2] = item.mdnb_amount_z
|
|
|
+ right5[1][index][1] = item.mdnb_amount_nb
|
|
|
+ right5[1][index][2] = item.mdnb_amount_n
|
|
|
+ right5[2][index][1] = item.mdnb_amount_fb
|
|
|
+ right5[2][index][2] = item.mdnb_amount_f
|
|
|
})
|
|
|
+ console.log(right5,'?????????????')
|
|
|
this.initChartR2()
|
|
|
resolve(1);
|
|
|
})
|
|
|
@@ -581,7 +553,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: '0'
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
@@ -602,7 +574,7 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: '0'
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
@@ -640,9 +612,11 @@ let app = new Vue({
|
|
|
center1[2] = res.data.keyIndicators.property
|
|
|
center1[3] = res.data.keyIndicators.invest
|
|
|
// 投资产业分布
|
|
|
- res.data.distribution.forEach((item, index) => {
|
|
|
- center2[index] = { name: item.type, y: item.amount, num: item.count, typeno: item.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
|
|
|
@@ -654,7 +628,7 @@ let app = new Vue({
|
|
|
})
|
|
|
// 投资阶段分析
|
|
|
res.data.investmentStage.forEach((item, index) => {
|
|
|
- center7[index] = { name: item.type, value: item.num, value2: item.amount, typeno: item.typeno }
|
|
|
+ center7[index] = { name: item.type, value: Number(item.num), value2: Number(item.amount), typeno: item.typeno, sliced: false, selected: false }
|
|
|
})
|
|
|
// 重点项目监控
|
|
|
center8 = []
|
|
|
@@ -681,11 +655,12 @@ let app = new Vue({
|
|
|
},
|
|
|
// 右边穿透一级
|
|
|
rightPenetrateOne () {
|
|
|
+ this.boardType = 'right'
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: this.mockData?'1':'0'
|
|
|
+ isInsert: this.mockData ? '1' : '0'
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
@@ -704,12 +679,13 @@ let app = new Vue({
|
|
|
},
|
|
|
// 右边穿透二级
|
|
|
rightPenetrateTwo (modelName, substraction, orgName) {
|
|
|
+ this.boardType = 'right'
|
|
|
let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"request": {
|
|
|
- isInsert: this.mockData?'1':'0',
|
|
|
+ isInsert: this.mockData ? '1' : '0',
|
|
|
modelName,
|
|
|
substraction,
|
|
|
orgName
|
|
|
@@ -722,9 +698,11 @@ let app = new Vue({
|
|
|
res.data.forEach((item, index) => {
|
|
|
that.config6.data[index] = []
|
|
|
that.config6.data[index][0] = item.mdnb_project_name
|
|
|
+ that.config6.data[index][1] = item.mdnb_org
|
|
|
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.data[index][5] = item.mdnb_investment_money
|
|
|
})
|
|
|
that.config6 = { ...that.config6 }
|
|
|
that.projectListTipShow = true
|
|
|
@@ -734,16 +712,17 @@ let app = new Vue({
|
|
|
},
|
|
|
// 左边穿透一级
|
|
|
leftPenetrateOne (mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeNum, type, param, paramCTwo) {
|
|
|
+ this.boardType = 'left'
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- mdnb_combofield: this.mockData?'B':'A',
|
|
|
+ mdnb_combofield: this.mockData ? 'B' : 'A',
|
|
|
mdnb_textfield11,
|
|
|
mdnb_textfield13,
|
|
|
mdnb_textfield16,
|
|
|
mdnb_textfield23,
|
|
|
- mdnb_datefield: this.year+'-01-01'
|
|
|
+ mdnb_datefield: this.year + '-01-01'
|
|
|
},
|
|
|
pageSize: 1000
|
|
|
}
|
|
|
@@ -768,6 +747,7 @@ let app = new Vue({
|
|
|
},
|
|
|
// 左边穿透二级
|
|
|
leftPenetrateTwo (mdnb_textfield12, mdnb_textfield19, mdnb_textfield15, mdnb_textfield17, mdnb_textfield20) {
|
|
|
+ this.boardType = 'left'
|
|
|
let that = this
|
|
|
console.log(mdnb_textfield12, mdnb_textfield19, mdnb_textfield15, mdnb_textfield17, mdnb_textfield20)
|
|
|
if (that.versions) {
|
|
|
@@ -775,8 +755,8 @@ let app = new Vue({
|
|
|
let value = {
|
|
|
access_token: this.access_token,
|
|
|
"data": {
|
|
|
- mdnb_combofield: this.mockData?'B':'A',
|
|
|
- mdnb_datefield: this.year+'-03-03',
|
|
|
+ mdnb_combofield: this.mockData ? 'B' : 'A',
|
|
|
+ mdnb_datefield: this.year + '-03-03',
|
|
|
mdnb_textfield12,
|
|
|
mdnb_textfield19,
|
|
|
mdnb_textfield15,
|
|
|
@@ -818,7 +798,8 @@ let app = new Vue({
|
|
|
}
|
|
|
},
|
|
|
// 中间穿透一级 一个柱状图还是两个
|
|
|
- centerPenetrateOne (type, param, typeNum, typeCTwo, paramCTwo) {
|
|
|
+ centerPenetrateOne (type, param, typeNum, typeCTwo, paramCTwo,portType) {
|
|
|
+ this.boardType = 'center'
|
|
|
let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
@@ -873,7 +854,7 @@ let app = new Vue({
|
|
|
}
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
- this.initChartLTip('center', '', '', '', '', typeCTwo, paramCTwo)
|
|
|
+ this.initChartLTip('center', '', '', '', '', typeCTwo, paramCTwo,portType)
|
|
|
})
|
|
|
} else if (typeNum == 2) {
|
|
|
common4 = []
|
|
|
@@ -897,8 +878,8 @@ let app = new Vue({
|
|
|
}
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- this.initChartLTip2('center', '', '', '', '', type, param, typeCTwo, paramCTwo)
|
|
|
- this.initChartLTip3('center', '', '', '', '', type, param, typeCTwo, paramCTwo)
|
|
|
+ this.initChartLTip2('center', '', '', '', '', type, param, typeCTwo, paramCTwo,portType)
|
|
|
+ this.initChartLTip3('center', '', '', '', '', type, param, typeCTwo, paramCTwo,portType)
|
|
|
})
|
|
|
} else if (typeNum == 3) {
|
|
|
that.initProvinceChart()
|
|
|
@@ -909,6 +890,8 @@ let app = new Vue({
|
|
|
},
|
|
|
// 中间穿透二级
|
|
|
centerPenetrateTwo (type, param, orgNum, portType) {
|
|
|
+ console.log('走了这里了',type, param, orgNum, portType)
|
|
|
+ this.boardType = 'center'
|
|
|
let that = this
|
|
|
return new Promise((resolve, err) => {
|
|
|
let value = {
|
|
|
@@ -935,7 +918,7 @@ let app = new Vue({
|
|
|
resolve(1);
|
|
|
})
|
|
|
} else if (portType == 2) {
|
|
|
- get('/ierp/kapi/v2/mdnb/mdnb/mdnb_pmba_ext/presetdata/MainPagePlanProject', value).then(res => {
|
|
|
+ get('/ierp/kapi/v2/mdnb/mdnb_xmkb_ext/presetdata/MainPagePlanProject', value).then(res => {
|
|
|
console.log('看看二级穿透', res)
|
|
|
that.config6.data = []
|
|
|
that.originalConfig6 = res.data
|
|
|
@@ -976,22 +959,29 @@ let app = new Vue({
|
|
|
return a ? a.number.slice(0, 4) : ''
|
|
|
},
|
|
|
// 找项目编码
|
|
|
- findProjectCode (a, b) {
|
|
|
+ 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'){
|
|
|
+ let c = this.originalConfig6.find(item => {
|
|
|
+ return item.mdnb_project_name == a && item.mdnb_org == b
|
|
|
+ })
|
|
|
+ return c.mdnb_projectnumber
|
|
|
+ }
|
|
|
},
|
|
|
// 去项目看板
|
|
|
goLookBoard (e) {
|
|
|
- console.log(e.row[0], e.row[2], '8888888888')
|
|
|
// 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://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=${this.findProjectCode(e.row[0], e.row[2])}`
|
|
|
+ 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,'跳转去的项目看板地址')
|
|
|
},
|
|
|
// 根据key分组
|
|
|
classify (arr, k) {
|
|
|
@@ -1055,7 +1045,7 @@ let app = new Vue({
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- initChartLTip (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
|
|
|
+ initChartLTip (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo,portType) {
|
|
|
this.myChartTip1 = echarts.init(document.getElementById("echartSingleTip"));
|
|
|
let option = {
|
|
|
grid: {
|
|
|
@@ -1208,11 +1198,11 @@ let app = new Vue({
|
|
|
that.myChartTip1.on('click', function (param) {
|
|
|
if (that.versions) {
|
|
|
if (location == 'right') {
|
|
|
- that.rightPenetrateTwo('', '', param.name)
|
|
|
+ that.rightPenetrateTwo('', '', that.findCode(param.name))
|
|
|
} 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
|
|
|
@@ -1220,7 +1210,7 @@ let app = new Vue({
|
|
|
})
|
|
|
that.myChartTip1.setOption(option);
|
|
|
},
|
|
|
- initChartLTip2 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
|
|
|
+ initChartLTip2 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo,portType) {
|
|
|
this.myChartTip2 = echarts.init(document.getElementById("echartSingleTip2"));
|
|
|
let option = {
|
|
|
grid: {
|
|
|
@@ -1355,7 +1345,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
|
|
|
@@ -4097,7 +4087,8 @@ let app = new Vue({
|
|
|
},
|
|
|
},
|
|
|
xAxis: {
|
|
|
- data: center3.map(item => item.name),
|
|
|
+ data: commonCompany,
|
|
|
+ // data: center3.map(item => item.name),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -4242,6 +4233,31 @@ let app = new Vue({
|
|
|
}
|
|
|
return res
|
|
|
},
|
|
|
+ yuanChange (value) {
|
|
|
+ return (value / 100000000).toFixed(2)
|
|
|
+ },
|
|
|
+ // 逢三折断
|
|
|
+ numFormat (value) {
|
|
|
+ if (!value) return '0'
|
|
|
+ // var intPart = Number(value).toFixed(0) // 获取整数部分
|
|
|
+ var intPart = parseInt(value)// 获取整数部分
|
|
|
+ var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
|
|
|
+
|
|
|
+ var floatPart = '.00' // 预定义小数部分
|
|
|
+ var value2Array = value.toString().split('.')
|
|
|
+ // =2表示数据有小数位
|
|
|
+ if (value2Array.length === 2) {
|
|
|
+ floatPart = value2Array[1].toString() // 拿到小数部分
|
|
|
+ if (floatPart.length === 1) {
|
|
|
+ // 补0
|
|
|
+ return intPartFormat + '.' + floatPart + '0'
|
|
|
+ } else {
|
|
|
+ return intPartFormat + '.' + floatPart
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ return intPartFormat
|
|
|
+ }
|
|
|
+ },
|
|
|
initProvinceChart () {
|
|
|
var data = center5
|
|
|
this.geoCoordMap = []
|
|
|
@@ -4599,7 +4615,8 @@ let app = new Vue({
|
|
|
// },
|
|
|
// },
|
|
|
xAxis: {
|
|
|
- data: center6.map(item => item.name),
|
|
|
+ data: commonCompany,
|
|
|
+ // data: center6.map(item => item.name),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -5059,7 +5076,8 @@ let app = new Vue({
|
|
|
},
|
|
|
},
|
|
|
xAxis: {
|
|
|
- data: right4.map(item => item.name),
|
|
|
+ data: commonCompany,
|
|
|
+ // data: right4.map(item => item.name),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -5220,7 +5238,7 @@ let app = new Vue({
|
|
|
}
|
|
|
that.right1Chart.on('click', function (param) {
|
|
|
if (that.versions) {
|
|
|
- that.rightPenetrateTwo(2, '', param.name, 'right')
|
|
|
+ that.rightPenetrateTwo(2, '', that.findCode(param.name), 'right')
|
|
|
} else {
|
|
|
that.projectListTipShow = true
|
|
|
}
|
|
|
@@ -5322,7 +5340,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[1]}%<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[1]}%<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[1]}%`
|
|
|
+ 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]}%`
|
|
|
},
|
|
|
axisPointer: {
|
|
|
// // type: 'cross',',
|
|
|
@@ -5362,7 +5380,8 @@ let app = new Vue({
|
|
|
},
|
|
|
},
|
|
|
xAxis: {
|
|
|
- data: right5[0].map(item => item[0]),
|
|
|
+ data: commonCompany,
|
|
|
+ // data: right5[0].map(item => item[0]),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -5398,7 +5417,7 @@ let app = new Vue({
|
|
|
itemStyle: itemStyle,
|
|
|
data: right5[0],
|
|
|
symbolSize: function (data) {
|
|
|
- return Math.sqrt(Math.abs(data[1])) * 9;
|
|
|
+ return Math.sqrt(Math.abs(data[2])) * 9;
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
@@ -5407,7 +5426,7 @@ let app = new Vue({
|
|
|
itemStyle: itemStyle,
|
|
|
data: right5[1],
|
|
|
symbolSize: function (data) {
|
|
|
- return Math.sqrt(Math.abs(data[1])) * 9;
|
|
|
+ return Math.sqrt(Math.abs(data[2])) * 9;
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
@@ -5416,14 +5435,14 @@ let app = new Vue({
|
|
|
itemStyle: itemStyle,
|
|
|
data: right5[2],
|
|
|
symbolSize: function (data) {
|
|
|
- return Math.sqrt(Math.abs(data[1])) * 9;
|
|
|
+ return Math.sqrt(Math.abs(data[2])) * 9;
|
|
|
},
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
that.right2Chart.on('click', function (param) {
|
|
|
if (that.versions) {
|
|
|
- that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3, param.name, 'right')
|
|
|
+ that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3, that.findCode(param.name), 'right')
|
|
|
} else {
|
|
|
that.projectListTipShow = true
|
|
|
}
|
|
|
@@ -5536,7 +5555,8 @@ let app = new Vue({
|
|
|
},
|
|
|
},
|
|
|
xAxis: {
|
|
|
- data: right4.map(item => item.name),
|
|
|
+ data: commonCompany,
|
|
|
+ // data: right4.map(item => item.name),
|
|
|
axisLine: {
|
|
|
show: true, //隐藏X轴轴线
|
|
|
lineStyle: {
|
|
|
@@ -5660,7 +5680,7 @@ let app = new Vue({
|
|
|
}
|
|
|
that.right3Chart.on('click', function (param) {
|
|
|
if (that.versions) {
|
|
|
- that.rightPenetrateTwo('', '', param.name, 'right')
|
|
|
+ that.rightPenetrateTwo('', '', that.findCode(param.name), 'right')
|
|
|
} else {
|
|
|
that.projectListTipShow = true
|
|
|
}
|
zhbyyy