From 3ec10d9e8303dbdd40b812b1592d5da599482ffc Mon Sep 17 00:00:00 2001 From: guoweilong Date: Mon, 25 Mar 2024 18:40:01 +0800 Subject: [PATCH] update:同步pc端表单 --- api/auth.js | 5 +++-- main.js | 2 ++ manifest.json | 6 +++--- pages.json | 27 ++++++++++++--------------- pages/login/mobile.vue | 10 ++++++++-- pages/market/components/cardMoudule.vue | 44 ++++++++++++++++++++++++++++++++++++++------ pages/market/components/reportModule1.vue | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- pages/market/components/reportModule2.vue | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------ pages/market/components/reportModule3.vue | 1128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/market/components/reportModule4.vue | 2397 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------- pages/market/components/reportModule5.vue | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- pages/market/insight.vue | 4 ++-- pages/market/reportDetails.vue | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- pages/market/total.vue | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- 14 files changed, 3341 insertions(+), 961 deletions(-) diff --git a/api/auth.js b/api/auth.js index 417f095..6366a81 100644 --- a/api/auth.js +++ b/api/auth.js @@ -7,8 +7,9 @@ const { //使用手机 + 密码登录 export const passwordLogin = data => { - data.password = encrypt(data.password); - return http.post('/auth/login', data) + let formData = {...data}; + formData.password = encrypt(formData.password); + return http.post('/auth/login', formData) } // export function passwordLogin(username, password, code, uuid) { diff --git a/main.js b/main.js index 08b5442..c4bbc5d 100644 --- a/main.js +++ b/main.js @@ -14,6 +14,8 @@ import { dDingJudgeEnvPlatform } from 'utils/isDing.js' import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "./utils/dict"; +window.wx = {} + // 将 dict 方法挂载到全局对象上 Vue.config.productionTip = false diff --git a/manifest.json b/manifest.json index 86c5957..723d410 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "市场资讯", "appid" : "__UNI__A1179CD", "description" : "市场资讯", - "versionName" : "0.1.1", - "versionCode" : 101, + "versionName" : "0.3.0", + "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -75,7 +75,7 @@ "base" : "./" }, "devServer" : { - "https" : true + "https" : false } } } diff --git a/pages.json b/pages.json index 608ebbd..cae9104 100644 --- a/pages.json +++ b/pages.json @@ -2,24 +2,24 @@ "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { "path": "pages/login/mobile" - }, - { + },{ "path": "pages/market/index", "style": { "navigationBarTitleText": "市场资讯", "navigationStyle": "custom", "enablePullDownRefresh": true } - }, { - "path": "pages/market/newsDetails", - "style": { - "navigationBarTitleText": "资讯详情", - "navigationStyle": "custom" - } - }, { + },{ "path": "pages/market/total", "style": { "navigationBarTitleText": "数据统计", + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + },{ + "path": "pages/market/newsDetails", + "style": { + "navigationBarTitleText": "资讯详情", "navigationStyle": "custom" } }, { @@ -72,20 +72,17 @@ "text": "数据统计", "iconPath": "/static/images/tabbar/total.png", "selectedIconPath": "/static/images/tabbar/total-active.png" - }, - { + },{ "pagePath": "pages/market/insight", "text": "市场洞察", "iconPath": "/static/images/tabbar/insight.png", "selectedIconPath": "/static/images/tabbar/insight-active.png" - }, - { + },{ "pagePath": "pages/market/researchReport", "text": "研究报告", "iconPath": "/static/images/tabbar/report.png", "selectedIconPath": "/static/images/tabbar/report-active.png" - }, - { + },{ "pagePath": "pages/market/knowledgeBase", "text": "知识库", "iconPath": "/static/images/tabbar/knowledgeBase.png", diff --git a/pages/login/mobile.vue b/pages/login/mobile.vue index 8b82cfe..40940ca 100644 --- a/pages/login/mobile.vue +++ b/pages/login/mobile.vue @@ -53,7 +53,7 @@ 记住密码 - 登录 + 登录 @@ -139,6 +139,9 @@ uni.switchTab({ url: '/pages/market/index' }) + // uni.navigateTo({ + // url: '/pages/market/total' + // }) }, 300) }).catch(err => { // alert(JSON.stringify(err)) @@ -226,8 +229,11 @@ this.rememberPassword() this.$store.dispatch('loadDictDatas') setTimeout(() => { + // uni.navigateTo({ + // url: '/pages/market/total' + // }) uni.switchTab({ - url: '/pages/market/index' + url: '/pages/market/total' }) }, 300) }).catch(error =>{ diff --git a/pages/market/components/cardMoudule.vue b/pages/market/components/cardMoudule.vue index 42a63c7..7e0f553 100644 --- a/pages/market/components/cardMoudule.vue +++ b/pages/market/components/cardMoudule.vue @@ -17,14 +17,21 @@ - {{ item.value }} + + {{ item.value }} + + + 无 + - - - * - {{item.title}} + + + + {{item.title}} + + @@ -32,8 +39,23 @@ {{ item.title }} - + + + + * + {{item.title}} + + + + {{ item.value }} + + + 无 + + + + @@ -87,7 +109,17 @@ color: #333333; } + .secondTextCss { + display: flex; + justify-content: center; + align-items: center; + font-weight: bold; + color: #333333 !important; + } + .u-demo-block__title { + display: flex; + flex-direction: column; background-color: rgba(255, 255, 255, 0); box-sizing: border-box; font-family: '苹方 中等', '苹方', sans-serif; diff --git a/pages/market/components/reportModule1.vue b/pages/market/components/reportModule1.vue index 851368d..b9c7e8f 100644 --- a/pages/market/components/reportModule1.vue +++ b/pages/market/components/reportModule1.vue @@ -39,32 +39,34 @@ - - 实施情况 - - - {{reportData.implementationSituation || ""}} - - + + 实施情况 + + + {{reportData.implementationSituation || ""}} + + + + - - 预算主体附件 - - - - - {{item.fileName}} - - - 查看 - - + + 预算主体附件 + + + + + {{item.fileName}} - + + 查看 + + + + @@ -74,8 +76,11 @@ import { getInsightFileList } from '@/api/organize.js' + import cardMoudule from "./cardMoudule.vue" export default { - components: {}, + components: { + cardMoudule + }, props: { reportData: { type: Object @@ -84,7 +89,44 @@ data() { return { isShowUrl: false, - fileList:[], + fileList: [], + fiveLooksData: [ + { + cardType: 5, + required: true, + title: '看行业/趋势', + value: "", + key: "seeProfession" + }, + { + cardType: 5, + required: true, + title: '看市场/客户', + value: "", + key: "seeMarket" + }, + { + cardType: 5, + required: true, + title: '看竞争', + value: "", + key: "seeCompete" + }, + { + cardType: 5, + required: true, + title: '看自身', + value: "", + key: "seeSelf" + }, + { + cardType: 5, + required: true, + title: '看机会', + value: "", + key: "seeChance" + }, + ] } }, computed: { @@ -108,16 +150,23 @@ init() { if (this.reportData.attachmentsUrl == "") { this.isShowUrl = false - }else{ + } else { this.isShowUrl = true } let uuid = this.reportData.attachmentsUrl; - getInsightFileList(uuid).then(res=>{ - if(res.code === 200){ + getInsightFileList(uuid).then(res => { + if (res.code === 200) { this.fileList = res.rows } }) - console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl))); + // 获取五看 + this.fiveLooksData.forEach(data => { + if (data.key in this.reportData) { + data.value = this.reportData[data.key]; + } + }); + console.log(this.fiveLooksData); + // console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl))); }, viewAttachments(urls) { diff --git a/pages/market/components/reportModule2.vue b/pages/market/components/reportModule2.vue index 22b7ad5..8bc9ec9 100644 --- a/pages/market/components/reportModule2.vue +++ b/pages/market/components/reportModule2.vue @@ -4,8 +4,8 @@ - - + @@ -29,8 +29,8 @@ attachment: { type: Object }, - fiscalYear:{ - type:String + fiscalYear: { + type: String } }, data() { @@ -76,7 +76,7 @@ key: "conduitTime" }, { - cardType: 1, + cardType: 5, required: true, title: '特许经营区域范围的行政区划(或与政府约定的经营区域范围)', value: "", @@ -90,7 +90,7 @@ key: "manageArea" }, { - cardType: 1, + cardType: 5, required: true, title: '经营区域城市建成区行政区划', value: "", @@ -1771,7 +1771,7 @@ cardType: 2, required: true, title: '预算主体名称', - key:"selectAnalyze", + key: "selectAnalyze", value: "", }], teamStatus: [{ @@ -1779,49 +1779,49 @@ required: true, title: '现有部门经理(人)', value: "", - key:"departmentManagerNumber" + key: "departmentManagerNumber" }, { cardType: 1, required: true, title: '现有副经理(人)', value: "", - key:"assistantManagerNumber" + key: "assistantManagerNumber" }, { cardType: 1, required: true, title: '现有主管(人)', value: "", - key:"directorNumber" + key: "directorNumber" }, { cardType: 1, required: true, title: '现有业务员(人)', value: "", - key:"salesmanNumber" + key: "salesmanNumber" }, { cardType: 1, required: true, title: '现有内勤(人)', value: "", - key:"officeStaffNumber" + key: "officeStaffNumber" }, { cardType: 1, required: true, title: '现有其他人员(人)', value: "", - key:"otherNumber" + key: "otherNumber" }, { cardType: 1, required: true, title: '现有合计(人)', value: "", - key:"totalNumber" + key: "totalNumber" }, ], } @@ -1835,76 +1835,111 @@ }, methods: { initData() { - this.population.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.urbanDevelopment.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.natureOfBusiness.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.regionalPopulation.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.gasCompetition1.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.gasCompetition2.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.guarantee.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - //城市新用户发展规模 - this.builtUpArea.forEach(data => { - if (data.key in this.attachment) { - let Arr = this.attachment[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.ruralAreas.forEach(data => { - if (data.key in this.attachment) { - let Arr = this.attachment[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.completionStatus.forEach(data => { - if (data.key in this.attachment) { - let Arr = this.attachment[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.naturalGas.forEach(data => { - if (data.key in this.attachment) { - let Arr = this.attachment[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.energyAnalysis.forEach(data => { - if (data.key in this.attachment) { - data.value = this.attachment[data.key]; - } - }); - this.teamStatus.forEach(data => { - if (data.key in this.attachment) { - data.value = this.attachment[data.key]; - } - }); + + // 逗号分隔分配 + const updateData = (dataArray, reportData) => { + dataArray.forEach(data => { + if (data.key in reportData) { + let Arr = reportData[data.key].split(","); + data.value = Arr[data.id]; + } + }); + }; + + // key直接分配 + const updateDataByKey = (dataArray, reportData) => { + dataArray.forEach(data => { + if (data.key in reportData) { + data.value = reportData[data.key]; + } + }); + }; + + updateData(this.builtUpArea, this.attachment); + updateData(this.ruralAreas, this.attachment); + updateData(this.completionStatus, this.attachment); + updateData(this.naturalGas, this.attachment); + + updateDataByKey(this.population, this.reportData); + updateDataByKey(this.urbanDevelopment, this.reportData); + updateDataByKey(this.natureOfBusiness, this.reportData); + updateDataByKey(this.regionalPopulation, this.reportData); + updateDataByKey(this.guarantee, this.reportData); + updateDataByKey(this.energyAnalysis, this.attachment); + updateDataByKey(this.teamStatus, this.attachment); + + // this.population.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + // this.urbanDevelopment.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + // this.natureOfBusiness.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + // this.regionalPopulation.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + //移除 + // this.gasCompetition1.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + //移除 + // this.gasCompetition2.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + // this.guarantee.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + // //城市新用户发展规模 + // this.builtUpArea.forEach(data => { + // if (data.key in this.attachment) { + // let Arr = this.attachment[data.key].split(","); + // data.value = Arr[data.id]; + // } + // }); + // this.ruralAreas.forEach(data => { + // if (data.key in this.attachment) { + // let Arr = this.attachment[data.key].split(","); + // data.value = Arr[data.id]; + // } + // }); + // this.completionStatus.forEach(data => { + // if (data.key in this.attachment) { + // let Arr = this.attachment[data.key].split(","); + // data.value = Arr[data.id]; + // } + // }); + // this.naturalGas.forEach(data => { + // if (data.key in this.attachment) { + // let Arr = this.attachment[data.key].split(","); + // data.value = Arr[data.id]; + // } + // }); + // this.energyAnalysis.forEach(data => { + // if (data.key in this.attachment) { + // data.value = this.attachment[data.key]; + // } + // }); + // this.teamStatus.forEach(data => { + // if (data.key in this.attachment) { + // data.value = this.attachment[data.key]; + // } + // }); } } } diff --git a/pages/market/components/reportModule3.vue b/pages/market/components/reportModule3.vue index c7c969b..34cf73e 100644 --- a/pages/market/components/reportModule3.vue +++ b/pages/market/components/reportModule3.vue @@ -5,6 +5,7 @@ + @@ -57,34 +58,34 @@ { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "cityNewInstalled", - id: "0" + id: "3" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "cityNewInstalled", - id: "1" + id: "2" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, value: "", key: "cityNewInstalled", - id: "2" + id: "1" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, value: "", key: "cityNewInstalled", - id: "3" + id: "0" }, //政府拍卖/转让/拆迁土地面积合计 { @@ -95,34 +96,34 @@ { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "auctionArea", - id: "0" + id: "3" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "auctionArea", - id: "1" + id: "2" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, value: "", key: "auctionArea", - id: "2" + id: "1" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, value: "", key: "auctionArea", - id: "3" + id: "0" }, //新开工住宅房地面积 { @@ -133,34 +134,34 @@ { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "newStartArea", - id: "0" + id: "3" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "newStartArea", - id: "1" + id: "2" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, value: "", key: "newStartArea", - id: "2" + id: "1" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, value: "", key: "newStartArea", - id: "3" + id: "0" }, //新竣工住宅房地产面积 { @@ -171,274 +172,38 @@ { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "newCompletedArea", - id: "0" + id: "3" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "newCompletedArea", - id: "1" + id: "2" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年`, value: "", key: "newCompletedArea", - id: "2" + id: "1" }, { cardType: 1, required: true, - title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear}年(预计)`, value: "", key: "newCompletedArea", - id: "3" + id: "0" }, ], - data2: [ - // { - // cardType: 4, - // required: true, - // title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`, - // }, - // { - // cardType: 3, - // required: true, - // title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装`, - // }, - // { - // cardType: 1, - // required: true, - // title: '小区名称', - // value: "", - // key: "communityName", - // }, - // { - // cardType: 1, - // required: true, - // title: '总规模户数', - // value: "", - // key: "householdNumber", - // }, - // { - // cardType: 1, - // required: true, - // title: '预计安装户数', - // value: "", - // key: "predictInstallNumber", - // }, - - ], - data3:[], - // data3: [{ - // cardType: 4, - // required: true, - // title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目 - // (预计${parseInt(this.fiscalYear)}财年签约， - // ${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`, - // }, - // // 23财年 - // { - // cardType: 3, - // required: true, - // title: `${parseInt(this.fiscalYear)}财年`, - // }, - // { - // cardType: 1, - // required: true, - // title: '楼盘名称', - // value: "", - // key: "buildingItemDetail1", - // id: "name" - // }, - // { - // cardType: 1, - // required: true, - // title: '楼盘类型', - // value: "", - // key: "buildingItemDetail1", - // id: "type" - // }, - // { - // cardType: 1, - // required: true, - // title: '开发商名称', - // value: "", - // key: "buildingItemDetail1", - // id: "devName" - // }, - // { - // cardType: 1, - // required: true, - // title: '预计管道天燃气安装户数', - // value: "", - // key: "buildingItemDetail1", - // id: "number" - // }, - // { - // cardType: 1, - // required: true, - // title: '签约时间(含计划签约)', - // value: "", - // key: "buildingItemDetail1", - // id: "time" - // }, - // { - // cardType: 1, - // required: true, - // title: '预计燃气安装', - // value: "", - // key: "buildingItemDetail1", - // id: "installTime" - // }, - // { - // cardType: 1, - // required: true, - // title: `${parseInt(this.fiscalYear)}财年小计`, - // value: "", - // key: "currentInstallSubtotal" - // }, - - // // 24财年 - // { - // cardType: 3, - // required: true, - // title: `${parseInt(this.fiscalYear)+1}财年`, - // }, - // { - // cardType: 1, - // required: true, - // title: '楼盘名称', - // value: "", - // key: "buildingItemDetail2", - // id: "name" - // }, - // { - // cardType: 1, - // required: true, - // title: '楼盘类型', - // value: "", - // key: "buildingItemDetail2", - // id: "type" - // }, - // { - // cardType: 1, - // required: true, - // title: '开发商名称', - // value: "", - // key: "buildingItemDetail2", - // id: "devName" - // }, - // { - // cardType: 1, - // required: true, - // title: '预计管道天燃气安装户数', - // value: "", - // key: "buildingItemDetail2", - // id: "number" - // }, - // { - // cardType: 1, - // required: true, - // title: '签约时间(含计划签约)', - // value: "", - // key: "buildingItemDetail2", - // id: "time" - // }, - // { - // cardType: 1, - // required: true, - // title: '预计燃气安装', - // value: "", - // key: "buildingItemDetail2", - // id: "installTime" - // }, - // { - // cardType: 1, - // required: true, - // title: `${parseInt(this.fiscalYear)+1}财年小计`, - // value: "", - // key: "afterInstallSubtotal" - // }, - // // 25财年 - // { - // cardType: 3, - // required: true, - // title: `${parseInt(this.fiscalYear)+2}财年`, - // }, - // { - // cardType: 1, - // required: true, - // title: '楼盘名称', - // value: "", - // key: "buildingItemDetail3", - // id: "name" - // }, - // { - // cardType: 1, - // required: true, - // title: '楼盘类型', - // value: "", - // key: "buildingItemDetail3", - // id: "type" - // }, - // { - // cardType: 1, - // required: true, - // title: '开发商名称', - // value: "", - // key: "buildingItemDetail3", - // id: "devName" - // }, - // { - // cardType: 1, - // required: true, - // title: '预计管道天燃气安装户数', - // value: "", - // key: "buildingItemDetail3", - // id: "number" - // }, - // { - // cardType: 1, - // required: true, - // title: '签约时间(含计划签约)', - // value: "", - // key: "buildingItemDetail3", - // id: "time" - // }, - // { - // cardType: 1, - // required: true, - // title: '预计燃气安装', - // value: "", - // key: "buildingItemDetail3", - // id: "installTime" - // }, - // { - // cardType: 1, - // required: true, - // title: `${parseInt(this.fiscalYear)+2}财年小计`, - // value: "", - // key: "lastInstallSubtotal" - // }, - // { - // cardType: 3, - // required: true, - // title: `合计`, - // }, - // { - // cardType: 1, - // required: true, - // title: `预计管道天燃气安装户数`, - // key: "installTotal" - // }, - // ], + data2: [], + data3: [], data4: [{ cardType: 4, required: true, @@ -521,16 +286,16 @@ required: true, title: '数量', value: "", - key:"cityResidentNumber", - id:'0' + key: "cityResidentNumber", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"cityResidentNumber", - id:'1' + key: "cityResidentNumber", + id: '1' }, { cardType: 3, @@ -542,16 +307,16 @@ required: true, title: '数量', value: "", - key:"cityResidentHousehold", - id:'0' + key: "cityResidentHousehold", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"cityResidentHousehold", - id:'1' + key: "cityResidentHousehold", + id: '1' }, { cardType: 3, @@ -563,16 +328,16 @@ required: true, title: '数量', value: "", - key:"cityUseHousehold", - id:'0' + key: "cityUseHousehold", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"cityUseHousehold", - id:'1' + key: "cityUseHousehold", + id: '1' }, { cardType: 3, @@ -584,16 +349,16 @@ required: true, title: '数量', value: "", - key:"continuousUseHousehold", - id:'0' + key: "continuousUseHousehold", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"continuousUseHousehold", - id:'1' + key: "continuousUseHousehold", + id: '1' }, { cardType: 3, @@ -605,16 +370,16 @@ required: true, title: '数量', value: "", - key:"uninstallHousehold", - id:'0' + key: "uninstallHousehold", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"uninstallHousehold", - id:'1' + key: "uninstallHousehold", + id: '1' }, { cardType: 3, @@ -626,16 +391,16 @@ required: true, title: '数量', value: "", - key:"receivableHousehold", - id:'0' + key: "receivableHousehold", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"receivableHousehold", - id:'1' + key: "receivableHousehold", + id: '1' }, { cardType: 3, @@ -647,207 +412,266 @@ required: true, title: '数量', value: "", - key:"remainHousehold", - id:'0' + key: "remainHousehold", + id: '0' }, { cardType: 1, required: true, title: '异常情况说明', value: "", - key:"remainHousehold", - id:'1' + key: "remainHousehold", + id: '1' } ], - data6: [{ + data5add: [{ cardType: 4, required: true, - title: '过去及未来三年城区老居民用户财务确认安装户数及回款户数、金额情况', + title: '当地瓶装液化气居民用户现状', }, { cardType: 3, required: true, - title: '年度财务确认安装数', + title: '居民市场', }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear) - 4}财年`, + title: '经营区域城区瓶装液化气居民用户总数量（户）', value: "", - key:"confirmInstallNumber", - id:"0" + key: "newMarketResident", + id: "0" + }, + { + cardType: 1, + required: true, + title: '已财务安装确定的瓶装液化气居民用户数量（户）', + value: "", + key: "newMarketResident", + id: "1" + }, + { + cardType: 5, + required: true, + title: '目前当地针对居民用户已落实“瓶改管”主要有利政策"', + value: "", + key: "newMarketResident", + id: "2" + }, + { + cardType: 5, + required: true, + title: '2024年计划落实“瓶改管”主要有利政策', + value: "", + key: "newMarketResident", + id: "3" + }, + { + cardType: 1, + required: true, + title: '预计未来2-3年可通过“瓶改管”开发的居民户数', + value: "", + key: "newMarketResident", + id: "4" + }, + { + cardType: 1, + required: true, + title: '预计2024年可通过“瓶改管”开发的老居民户数（户）', + value: "", + key: "newMarketResident", + id: "5" + }, + ], + data6: [{ + cardType: 4, + required: true, + title: '过去及未来三年城区老居民用户财务确认安装户数及回款户数、金额情况', + }, + { + cardType: 3, + required: true, + title: '年度财务确认安装数', }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 3}财年`, value: "", - key:"confirmInstallNumber", - id:"1" + key: "confirmInstallNumber", + id: "0" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 2}财年`, value: "", - key:"confirmInstallNumber", - id:"2" + key: "confirmInstallNumber", + id: "1" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 1}财年`, value: "", - key:"confirmInstallNumber", - id:"3" + key: "confirmInstallNumber", + id: "2" }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)}财年(预计)`, + title: `${parseInt(this.fiscalYear)}财年(本年预计)`, value: "", - key:"confirmInstallNumber", - id:"4" + key: "confirmInstallNumber", + id: "3" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear)+1}财年(预计)`, value: "", - key:"confirmInstallNumber", - id:"5" + key: "confirmInstallNumber", + id: "4" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear)+2}财年(预计)`, value: "", - key:"confirmInstallNumber", - id:"6" + key: "confirmInstallNumber", + id: "5" }, - { - cardType: 3, + cardType: 1, required: true, - title: '实际新增报装回款户数(含应收款户)', + title: `${parseInt(this.fiscalYear)+3}财年(预计)`, + value: "", + key: "confirmInstallNumber", + id: "6" }, + { - cardType: 1, + cardType: 3, required: true, - title: `${parseInt(this.fiscalYear) - 4}财年`, - value: "", - key:"newRefundHousehold", - id:"0" + title: '实际新增报装回款户数(含应收款户)', }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 3}财年`, value: "", - key:"newRefundHousehold", - id:"1" + key: "newRefundHousehold", + id: "0" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 2}财年`, value: "", - key:"newRefundHousehold", - id:"2" + key: "newRefundHousehold", + id: "1" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 1}财年`, value: "", - key:"newRefundHousehold", - id:"3" + key: "newRefundHousehold", + id: "2" }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)}财年(预计)`, + title: `${parseInt(this.fiscalYear)}财年(本年预计)`, value: "", - key:"newRefundHousehold", - id:"4" + key: "newRefundHousehold", + id: "3" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear)+1}财年(预计)`, value: "", - key:"newRefundHousehold", - id:"5" + key: "newRefundHousehold", + id: "4" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear)+2}财年(预计)`, value: "", - key:"newRefundHousehold", - id:"6" + key: "newRefundHousehold", + id: "5" }, - { - cardType: 3, + cardType: 1, required: true, - title: '年老户安装费回款金额(万元)', + title: `${parseInt(this.fiscalYear)+3}财年(预计)`, + value: "", + key: "newRefundHousehold", + id: "6" }, + { - cardType: 1, + cardType: 3, required: true, - title: `${parseInt(this.fiscalYear) - 4}财年`, - value: "", - key:"oldRefundAmount", - id:"0" + title: '老户安装费回款金额(万元)', }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 3}财年`, value: "", - key:"oldRefundAmount", - id:"1" + key: "oldRefundAmount", + id: "0" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 2}财年`, value: "", - key:"oldRefundAmount", - id:"2" + key: "oldRefundAmount", + id: "1" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear) - 1}财年`, value: "", - key:"oldRefundAmount", - id:"3" + key: "oldRefundAmount", + id: "2" }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)}财年(预计)`, + title: `${parseInt(this.fiscalYear)}财年(本年预计)`, value: "", - key:"oldRefundAmount", - id:"4" + key: "oldRefundAmount", + id: "3" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear)+1}财年(预计)`, value: "", - key:"oldRefundAmount", - id:"5" + key: "oldRefundAmount", + id: "4" }, { cardType: 1, required: true, title: `${parseInt(this.fiscalYear)+2}财年(预计)`, value: "", - key:"oldRefundAmount", - id:"6" + key: "oldRefundAmount", + id: "5" + }, + { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+3}财年(预计)`, + value: "", + key: "oldRefundAmount", + id: "6" }, ], data7: [{ @@ -943,6 +767,10 @@ title: '管网已覆盖_镇区', }, { + cardType: 4, + title: '镇区', + }, + { cardType: 1, required: true, title: '个数', @@ -1013,6 +841,10 @@ title: '管网已覆盖_自然村', }, { + cardType: 4, + title: '自然村', + }, + { cardType: 1, required: true, title: '个数', @@ -1083,6 +915,10 @@ title: '管网未覆盖、但符合农村燃气投资标准_镇区', }, { + cardType: 4, + title: '镇区', + }, + { cardType: 1, required: true, title: '个数', @@ -1153,6 +989,10 @@ title: '管网未覆盖、但符合农村燃气投资标准_自然村', }, { + cardType: 4, + title: '自然村', + }, + { cardType: 1, required: true, title: '个数', @@ -1733,217 +1573,397 @@ console.log("newBuildingItem", JSON.parse(JSON.stringify(this.newBuildingItem))); console.log("newBuildingInfo", JSON.parse(JSON.stringify(this.newBuildingInfo))); console.log("reportData", JSON.parse(JSON.stringify(this.reportData))); - this.data1.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); + // 逗号分隔分配 + const updateData = (dataArray, reportData) => { + dataArray.forEach(data => { + if (data.key in reportData) { + let Arr = reportData[data.key].split(","); + data.value = Arr[data.id]; + } + }); + }; + + // key直接分配 + const updateDataByKey = (dataArray, reportData) => { + dataArray.forEach(data => { + if (data.key in reportData) { + data.value = reportData[data.key]; + } + }); + }; + + + updateData(this.data1, this.reportData); + updateData(this.data4, this.reportData); + updateData(this.data5, this.reportData); + updateData(this.data5add, this.reportData); + updateData(this.data6, this.reportData); + updateData(this.data10, this.reportData); + updateData(this.data14, this.reportData); + + updateDataByKey(this.data7, this.reportData); + updateDataByKey(this.data8, this.reportData); + updateDataByKey(this.data9, this.reportData); + updateDataByKey(this.data11, this.reportData); + updateDataByKey(this.data12, this.reportData); + updateDataByKey(this.data13, this.reportData); + updateDataByKey(this.data15, this.reportData); + updateDataByKey(this.data16, this.reportData); + updateDataByKey(this.data17, this.reportData); + updateDataByKey(this.data18, this.reportData); /* 动态添加data2 标题1=>列表1=>小计1=>标题2=>列表2=>小计2=>合计 */ //标题1 - this.data2.push( - {cardType: 4,required: true,title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`,}, - {cardType: 3,required: true,title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装`}, - ) - //列表1 - this.newBuildingInfo.newBuildingInfoDetails1.map(info1 => { - console.log(info1); - if (info1.name && info1.number && info1.predict) { - this.data2.push( - {cardType: 1,required: true,title: '小区名称',value: info1.name,key: "communityName"}, - {cardType: 1,required: true,title: '总规模户数',value: info1.number,key: "householdNumber"}, - {cardType: 1,required: true,title: '预计安装户数',value: info1.predict,key: "predictInstallNumber"}, - ) - } - }) + this.data2.push({ + cardType: 4, + required: true, + title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`, + }, { + cardType: 3, + required: true, + title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装` + }, ) + // 类型1动态列表1 + if (this.newBuildingInfo.newBuildingInfoDetails1 && this.newBuildingInfo.newBuildingInfoDetails1.length) { + this.newBuildingInfo.newBuildingInfoDetails1.map(info1 => { + console.log(info1); + if (info1.name && info1.number && info1.predict) { + this.data2.push({ + cardType: 1, + required: true, + title: '小区名称', + value: info1.name, + key: "communityName" + }, { + cardType: 1, + required: true, + title: '总规模户数', + value: info1.number, + key: "householdNumber" + }, { + cardType: 1, + required: true, + title: '预计安装户数', + value: info1.predict, + key: "predictInstallNumber" + }, ) + } + }) + } //小计1 - this.data2.push( - {cardType: 3,required: true,title: '小计'}, - {cardType: 1,required: true,title: '总规模户数',value: this.newBuildingInfo.householdNumberSubtotalBefore,key: "xjhouseholdNumber"}, - {cardType: 1,required: true,title: '预计安装户数',value: this.newBuildingInfo.predictInstallSubtotalBefore,key: "xjpredictInstallNumber"}, - ) + this.data2.push({ + cardType: 3, + required: true, + title: '小计' + }, { + cardType: 1, + required: true, + title: '总规模户数', + value: this.reportData.householdNumberSubtotalBefore || 0, + key: "xjhouseholdNumber" + }, { + cardType: 1, + required: true, + title: '预计安装户数', + value: this.reportData.predictInstallSubtotalBefore || 0, + key: "xjpredictInstallNumber" + }, ) //标题2 - this.data2.push( - {cardType: 3,required: true,title: `${this.fiscalYear - 1}财年签约且在${this.fiscalYear}财年安装`}, - ) - //列表2 - this.newBuildingInfo.newBuildingInfoDetails2.map(info2 => { - if (info2.name && info2.number && info2.predict) { - this.data2.push( - {cardType: 1,required: true,title: '小区名称',value: info2.name,key: "communityName"}, - {cardType: 1,required: true,title: '总规模户数',value: info2.number,key: "householdNumber"}, - {cardType: 1,required: true,title: '预计安装户数',value: info2.predict,key: "predictInstallNumber"}, - ) - } - }) + this.data2.push({ + cardType: 3, + required: true, + title: `${this.fiscalYear - 1}财年签约且在${this.fiscalYear}财年安装` + }, ) + // 类型1动态列表2 + if (this.newBuildingInfo.newBuildingInfoDetails2 && this.newBuildingInfo.newBuildingInfoDetails2.length) { + this.newBuildingInfo.newBuildingInfoDetails2.map(info2 => { + // if (info2.name && info2.number && info2.predict) { + this.data2.push({ + cardType: 1, + required: true, + title: '小区名称', + value: info2.name || "", + key: "communityName" + }, { + cardType: 1, + required: true, + title: '总规模户数', + value: info2.number || "", + key: "householdNumber" + }, { + cardType: 1, + required: true, + title: '预计安装户数', + value: info2.predict || "", + key: "predictInstallNumber" + }, ) + // } + }) + } + //小计2 - this.data2.push( - {cardType: 3,required: true,title: '小计'}, - {cardType: 1,required: true,title: '总规模户数',value: this.newBuildingInfo.householdNumberSubtotal,key: "xjhouseholdNumber"}, - {cardType: 1,required: true,title: '预计安装户数',value: this.newBuildingInfo.predictInstallSubtotal,key: "xjpredictInstallNumber"}, - ) + this.data2.push({ + cardType: 3, + required: true, + title: '小计' + }, { + cardType: 1, + required: true, + title: '总规模户数', + value: this.reportData.householdNumberSubtotal || 0, + key: "xjhouseholdNumber" + }, { + cardType: 1, + required: true, + title: '预计安装户数', + value: this.reportData.predictInstallSubtotal || 0, + key: "xjpredictInstallNumber" + }, ) //合计标题 - this.data2.push( - {cardType: 3,required: true,title: '合计'}, - {cardType: 1,required: true,title: '总规模户数',value: this.newBuildingInfo.householdNumberTotal,key: "hjhouseholdNumber"}, - {cardType: 1,required: true,title: '预计安装户数',value: this.newBuildingInfo.predictInstallTotal,key: "hjpredictInstallNumber"}, - ) + this.data2.push({ + cardType: 3, + required: true, + title: '合计' + }, { + cardType: 1, + required: true, + title: '总规模户数', + value: this.reportData.householdNumberTotal || 0, + key: "hjhouseholdNumber" + }, { + cardType: 1, + required: true, + title: '预计安装户数', + value: this.reportData.predictInstallTotal || 0, + key: "hjpredictInstallNumber" + }, ) + console.log('动态列表1', JSON.parse(JSON.stringify(this.data2))); + // 当前财年 + this.data3.push({ + cardType: 4, + required: true, + title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目(预计${parseInt(this.fiscalYear)}财年签约，${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`, + }, { + cardType: 3, + required: true, + title: `${parseInt(this.fiscalYear)}财年`, + }, ) - // console.log(this.data2); - // 当前财年 - this.data3.push( - {cardType: 4,required: true,title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目(预计${parseInt(this.fiscalYear)}财年签约，${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`,}, - {cardType: 3,required: true,title: `${parseInt(this.fiscalYear)}财年`,}, - ) + // 类型2动态列表1 + if (this.newBuildingItem.buildingItemDetail1 && this.newBuildingItem.buildingItemDetail1.length) { this.newBuildingItem.buildingItemDetail1.map(build1 => { - if (build1.devName && build1.installTime && build1.name && build1.number && build1.time && build1.type) { - console.log(build1); - this.data3.push( - {cardType: 1,required: true,title: '楼盘名称',value:build1.name,key: "buildingItemDetail1",id: "name"}, - {cardType: 1,required: true,title: '楼盘类型',value: build1.type,key: "buildingItemDetail1",id: "type"}, - {cardType: 1,required: true,title: '开发商名称',value: build1.devName,key: "buildingItemDetail1",id: "devName"}, - {cardType: 1,required: true,title: '预计管道天燃气安装户数',value: build1.number,key: "buildingItemDetail1",id: "number"}, - {cardType: 1,required: true,title: '签约时间(含计划签约)',value: build1.time,key: "buildingItemDetail1",id: "time"}, - {cardType: 1,required: true,title: '预计燃气安装',value: build1.installTime,key: "buildingItemDetail1",id: "installTime"}, - {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)}财年小计`,value: this.newBuildingItem.currentInstallSubtotal,key: "currentInstallSubtotal"}, - ) - } + // if (build1.devName && build1.installTime && build1.name && build1.number && build1.time && build1.type) { + console.log(build1); + this.data3.push({ + cardType: 1, + required: true, + title: '楼盘名称', + value: build1.name || "", + key: "buildingItemDetail1", + id: "name" + }, { + cardType: 1, + required: true, + title: '楼盘类型', + value: build1.type || "", + key: "buildingItemDetail1", + id: "type" + }, { + cardType: 1, + required: true, + title: '开发商名称', + value: build1.devName || "", + key: "buildingItemDetail1", + id: "devName" + }, { + cardType: 1, + required: true, + title: '预计管道天燃气安装户数', + value: build1.number || "", + key: "buildingItemDetail1", + id: "number" + }, { + cardType: 1, + required: true, + title: '签约时间(含计划签约)', + value: build1.time || "", + key: "buildingItemDetail1", + id: "time" + }, { + cardType: 1, + required: true, + title: '预计燃气安装', + value: build1.installTime || "", + key: "buildingItemDetail1", + id: "installTime" + }, + // {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)}财年小计`,value: this.reportData.currentInstallSubtotal || "",key: "currentInstallSubtotal"}, + ) + // } }) - this.data3.push( - {cardType: 3,required: true,title: `${parseInt(this.fiscalYear)+1}财年`,}, - ) + } + + // 财年小计 + this.data3.push({ + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年小计`, + value: this.reportData.currentInstallSubtotal || "", + key: "currentInstallSubtotal" + }) + // 下一年标题 + this.data3.push({ + cardType: 3, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年`, + }, ) + + // 类型1动态列表2 + if (this.newBuildingItem.buildingItemDetail2 && this.newBuildingItem.buildingItemDetail2.length) { + this.newBuildingItem.buildingItemDetail2.map(build2 => { - if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { - console.log(build2); - this.data3.push( - {cardType: 1,required: true,title: '楼盘名称',value:build2.name,key: "buildingItemDetail2",id: "name"}, - {cardType: 1,required: true,title: '楼盘类型',value: build2.type,key: "buildingItemDetail2",id: "type"}, - {cardType: 1,required: true,title: '开发商名称',value: build2.devName,key: "buildingItemDetail2",id: "devName"}, - {cardType: 1,required: true,title: '预计管道天燃气安装户数',value: build2.number,key: "buildingItemDetail2",id: "number"}, - {cardType: 1,required: true,title: '签约时间(含计划签约)',value: build2.time,key: "buildingItemDetail2",id: "time"}, - {cardType: 1,required: true,title: '预计燃气安装',value: build2.installTime,key: "buildingItemDetail2",id: "installTime"}, - {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)+1}财年小计`,value: this.newBuildingItem.afterInstallSubtotal,key: "afterInstallSubtotal"}, - ) - } - }) - this.data3.push( - {cardType: 3,required: true,title: `${parseInt(this.fiscalYear)+2}财年`,}, - ) - this.newBuildingItem.buildingItemDetail3.map(build2 => { - if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { - console.log(build2); - this.data3.push( - {cardType: 1,required: true,title: '楼盘名称',value:build2.name,key: "buildingItemDetail3",id: "name"}, - {cardType: 1,required: true,title: '楼盘类型',value: build2.type,key: "buildingItemDetail3",id: "type"}, - {cardType: 1,required: true,title: '开发商名称',value: build2.devName,key: "buildingItemDetail3",id: "devName"}, - {cardType: 1,required: true,title: '预计管道天燃气安装户数',value: build2.number,key: "buildingItemDetail3",id: "number"}, - {cardType: 1,required: true,title: '签约时间(含计划签约)',value: build2.time,key: "buildingItemDetail3",id: "time"}, - {cardType: 1,required: true,title: '预计燃气安装',value: build2.installTime,key: "buildingItemDetail3",id: "installTime"}, - {cardType: 1,required: true,title: `${parseInt(this.fiscalYear)+2}财年小计`,value: this.newBuildingItem.lastInstallSubtotal,key: "lastInstallSubtotal"}, - ) - } + // if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { + console.log(build2); + this.data3.push({ + cardType: 1, + required: true, + title: '楼盘名称', + value: build2.name || "", + key: "buildingItemDetail2", + id: "name" + }, { + cardType: 1, + required: true, + title: '楼盘类型', + value: build2.type || "", + key: "buildingItemDetail2", + id: "type" + }, { + cardType: 1, + required: true, + title: '开发商名称', + value: build2.devName || "", + key: "buildingItemDetail2", + id: "devName" + }, { + cardType: 1, + required: true, + title: '预计管道天燃气安装户数', + value: build2.number || "", + key: "buildingItemDetail2", + id: "number" + }, { + cardType: 1, + required: true, + title: '签约时间(含计划签约)', + value: build2.time || "", + key: "buildingItemDetail2", + id: "time" + }, { + cardType: 1, + required: true, + title: '预计燃气安装', + value: build2.installTime || "", + key: "buildingItemDetail2", + id: "installTime" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年小计`, + value: this.reportData.afterInstallSubtotal || "", + key: "afterInstallSubtotal" + }, ) + // } }) - this.data3.push( - {cardType: 1,required: true,title: '合计',value: this.newBuildingItem.installTotal,key: "installTotal"}, - ) - // console.log(this.data3); - // this.data3.forEach(data => { - // if (data.key in this.newBuildingItem) { - // // console.log(this.newBuildingItem[data.key]); - // if (this.newBuildingItem[data.key].length > 0) { - // data.value = this.newBuildingItem[data.key][0][data.id]; - // } else { - // data.value = this.newBuildingItem[data.key] - // } - // } - // }); - // console.log(this.data3); + } - this.data4.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); + this.data3.push({ + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年小计`, + value: this.reportData.afterInstallSubtotal || "", + key: "afterInstallSubtotal" + }) - this.data5.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); - + this.data3.push({ + cardType: 3, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年`, + }, ) - this.data6.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); + // 类型2动态列表3 + if (this.newBuildingItem.buildingItemDetail3 && this.newBuildingItem.buildingItemDetail3.length) { + this.newBuildingItem.buildingItemDetail3.map(build2 => { + // if (build2.devName && build2.installTime && build2.name && build2.number && build2.time && build2.type) { + console.log(build2); + this.data3.push({ + cardType: 1, + required: true, + title: '楼盘名称', + value: build2.name || "", + key: "buildingItemDetail3", + id: "name" + }, { + cardType: 1, + required: true, + title: '楼盘类型', + value: build2.type || "", + key: "buildingItemDetail3", + id: "type" + }, { + cardType: 1, + required: true, + title: '开发商名称', + value: build2.devName || "", + key: "buildingItemDetail3", + id: "devName" + }, { + cardType: 1, + required: true, + title: '预计管道天燃气安装户数', + value: build2.number || "", + key: "buildingItemDetail3", + id: "number" + }, { + cardType: 1, + required: true, + title: '签约时间(含计划签约)', + value: build2.time || "", + key: "buildingItemDetail3", + id: "time" + }, { + cardType: 1, + required: true, + title: '预计燃气安装', + value: build2.installTime || "", + key: "buildingItemDetail3", + id: "installTime" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年小计`, + value: this.reportData.lastInstallSubtotal || "", + key: "lastInstallSubtotal" + }, ) + // } + }) + } + this.data3.push({ + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年小计`, + value: this.reportData.lastInstallSubtotal || "", + key: "lastInstallSubtotal" + }) - this.data7.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data8.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data9.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data10.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.data11.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data12.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data13.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data14.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.data15.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data16.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data17.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data18.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); + this.data3.push({ + cardType: 1, + required: true, + title: '合计', + value: this.newBuildingItem.installTotal || 0, + key: "installTotal" + }, ) + console.log('动态列表2', JSON.parse(JSON.stringify(this.data3))); } } } diff --git a/pages/market/components/reportModule4.vue b/pages/market/components/reportModule4.vue index 3c4f5bd..fdfa458 100644 --- a/pages/market/components/reportModule4.vue +++ b/pages/market/components/reportModule4.vue @@ -1,8 +1,13 @@ @@ -16,264 +21,2394 @@ reportData: { type: Object }, - fiscalYear:{ - type:String + fiscalYear: { + type: String } }, data() { return { + // data1: [{ + // cardType: 3, + // required: true, + // title: '用户签约(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "contractGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "contractGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "contractGoal", + // id: "2" + // }, + // { + // cardType: 3, + // required: true, + // title: '新户(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "newUserGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "newUserGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "newUserGoal", + // id: "2" + // }, + + // { + // cardType: 3, + // required: true, + // title: '老户(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "oldUserGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "oldUserGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "oldUserGoal", + // id: "2" + // }, + + // { + // cardType: 3, + // required: true, + // title: '乡镇(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "townsUserGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "townsUserGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "townsUserGoal", + // id: "2" + // }, + + // { + // cardType: 3, + // required: true, + // title: '工商福(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "commerceGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "commerceGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "commerceGoal", + // id: "2" + // }, + + // { + // cardType: 3, + // required: true, + // title: '工业(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "industryGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "industryGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "industryGoal", + // id: "2" + // }, + + // { + // cardType: 3, + // required: true, + // title: '用户安装(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "installUserGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "installUserGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "installUserGoal", + // id: "2" + // }, + + // { + // cardType: 3, + // required: true, + // title: '销气量(户)', + // }, + // { + // cardType: 1, + // required: true, + // title: `${this.fiscalYear}财年目标`, + // value: "", + // key: "salesNumberGoal", + // id: "0" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+1}财年目标`, + // value: "", + // key: "salesNumberGoal", + // id: "1" + // }, + // { + // cardType: 1, + // required: true, + // title: `${parseInt(this.fiscalYear)+2}财年目标`, + // value: "", + // key: "salesNumberGoal", + // id: "2" + // } + // ], data1: [{ cardType: 3, + title: '净利润' + }, + { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newNetProfit", + id: "0" + }, + { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newNetProfit", + id: "1" + }, + { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newNetProfit", + id: "2" + }, + { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newNetProfit", + id: "2" + }, + { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newNetProfit", + id: "2" + }, + ], + data2: [{ + cardType: 3, + title: "新户（户）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallNew", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallNew", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallNew", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallNew", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallNew", + id: "4" + }, + // 老户 + { + cardType: 3, + title: "老户（户）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallOld", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallOld", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallOld", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallOld", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallOld", + id: "4" + }, + // 乡村燃气新建居民(户) + { + cardType: 3, + title: "乡村燃气新建居民(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallVillageNew", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallVillageNew", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallVillageNew", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallVillageNew", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallVillageNew", + id: "4" + }, + // 乡村燃气存量居民(户) + { + cardType: 3, + title: "乡村燃气存量居民(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallVillageOld", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallVillageOld", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallVillageOld", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallVillageOld", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallVillageOld", + id: "4" + }, + // 农村气代煤居民(户) + { + cardType: 3, + title: "农村气代煤居民(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallGasCoal", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallGasCoal", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallGasCoal", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallGasCoal", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallGasCoal", + id: "4" + }, + // 工业(户) + { + cardType: 3, + title: "工业(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallIndustry", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallIndustry", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallIndustry", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallIndustry", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallIndustry", + id: "4" + }, + // 商业(户) + { + cardType: 3, + title: "商业(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallCommerce", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallCommerce", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallCommerce", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallCommerce", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallCommerce", + id: "4" + }, + // 其中：小微商(户) + { + cardType: 3, + title: "其中：小微商(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallSmallEnterprise", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallSmallEnterprise", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallSmallEnterprise", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallSmallEnterprise", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallSmallEnterprise", + id: "4" + }, + // 安装户数合计(户) + { + cardType: 3, + title: "安装户数合计(户)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newInstallTotal", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newInstallTotal", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newInstallTotal", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newInstallTotal", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newInstallTotal", + id: "4" + }, + ], + data3: [{ + // 往年应收账款回款（万元） + cardType: 3, + title: "往年应收账款回款（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPrevious", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPrevious", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPrevious", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPrevious", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPrevious", + id: "4" + }, + // 其中：新户（万元） + { + cardType: 3, + title: "其中：新户（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPreviousNew", + id: "0" + }, { + cardType: 1, required: true, - title: '用户签约(户)', + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPreviousNew", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPreviousNew", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPreviousNew", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPreviousNew", + id: "4" + }, + // 其中：老户(万元) + { + cardType: 3, + title: "其中：老户(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPreviousOld", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPreviousOld", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPreviousOld", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPreviousOld", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPreviousOld", + id: "4" + }, + // 其中：乡村燃气居民(万元) + { + cardType: 3, + title: "其中：乡村燃气居民(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPreviousVillage", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPreviousVillage", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPreviousVillage", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPreviousVillage", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPreviousVillage", + id: "4" + }, + // 其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元) + { + cardType: 3, + title: "其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPreviousGov", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPreviousGov", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPreviousGov", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPreviousGov", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPreviousGov", + id: "4" + }, + // 其中：工商业安装费(万元) + { + cardType: 3, + title: "其中：工商业安装费(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPreviousCost", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPreviousCost", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPreviousCost", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPreviousCost", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPreviousCost", + id: "4" + }, + // 往年燃气费欠款回款(万元) + { + cardType: 3, + title: "往年燃气费欠款回款(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundPreviousArrearage", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundPreviousArrearage", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundPreviousArrearage", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundPreviousArrearage", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundPreviousArrearage", + id: "4" + }, + // 当年安装费回款(万元) + { + cardType: 3, + title: "当年安装费回款(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisInstallArrearage", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisInstallArrearage", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisInstallArrearage", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisInstallArrearage", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisInstallArrearage", + id: "4" + }, + // 其中：新户(万元) + { + cardType: 3, + title: "其中：新户(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisNew", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisNew", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisNew", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisNew", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisNew", + id: "4" + }, + // 其中：老户(万元) + { + cardType: 3, + title: "其中：老户(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisOld", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisOld", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisOld", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisOld", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisOld", + id: "4" + }, + // 其中：乡村燃气居民(万元) + { + cardType: 3, + title: "其中：乡村燃气居民(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisVillage", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisVillage", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisVillage", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisVillage", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisVillage", + id: "4" + }, + // 其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元) + { + cardType: 3, + title: "其中：政府补贴（含煤改气、壁挂炉、老旧小区改造、运营补贴等）(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisGov", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisGov", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisGov", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisGov", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisGov", + id: "4" + }, + // 其中：工商业安装费(万元) + { + cardType: 3, + title: "其中：工商业安装费(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisIndustry", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisIndustry", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisIndustry", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisIndustry", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisIndustry", + id: "4" + }, + // 当年燃气费回款(万元) + { + cardType: 3, + title: "当年燃气费回款(万元)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newRefundThisGasArrearage", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newRefundThisGasArrearage", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newRefundThisGasArrearage", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newRefundThisGasArrearage", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newRefundThisGasArrearage", + id: "4" + }, + ], + data4: [{ + // 零售气量（万方） + cardType: 3, + title: "零售气量（万方）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSell", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSell", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSell", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSell", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSell", + id: "4" + }, + // 民用户销售气量（万方） + { + cardType: 3, + title: "民用户销售气量（万方）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellResident", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellResident", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellResident", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellResident", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellResident", + id: "4" + }, + // 其中：民用采暖(万方) + { + cardType: 3, + title: "其中：民用采暖(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellHeating", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellHeating", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellHeating", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellHeating", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellHeating", + id: "4" + }, + // 工业户销售气量(万方) + { + cardType: 3, + title: "工业户销售气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellIndustry", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellIndustry", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellIndustry", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellIndustry", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellIndustry", + id: "4" + }, + // 商福户销售气量(万方) + { + cardType: 3, + title: "商福户销售气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellCommerce", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellCommerce", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellCommerce", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellCommerce", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellCommerce", + id: "4" + }, + // CNG加气量(万方) + { + cardType: 3, + title: "CNG加气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellCng", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellCng", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellCng", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellCng", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellCng", + id: "4" + }, + // LNG加气量(万方) + { + cardType: 3, + title: "LNG加气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellLng", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellLng", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellLng", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellLng", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellLng", + id: "4" + }, + // 母站销气量(万方) + { + cardType: 3, + title: "母站销气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellStation", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellStation", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellStation", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellStation", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellStation", + id: "4" + }, + // 批发气量（管输）(万方) + { + cardType: 3, + title: "批发气量（管输）(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellWholesale", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellWholesale", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellWholesale", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellWholesale", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellWholesale", + id: "4" + }, + // 贸易气量(万方) + { + cardType: 3, + title: "贸易气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellTrade", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellTrade", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellTrade", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellTrade", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellTrade", + id: "4" + }, + // 管道气贸易气量(万方) + { + cardType: 3, + title: "管道气贸易气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellConduit", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellConduit", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellConduit", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellConduit", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellConduit", + id: "4" + }, + // LNG贸易气量(万方) + { + cardType: 3, + title: "LNG贸易气量(万方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newSellLngTrade", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newSellLngTrade", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newSellLngTrade", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newSellLngTrade", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newSellLngTrade", + id: "4" }, + ], + data5: [ + // 综合销气毛差（元/方） { + cardType: 3, + title: "综合销气毛差（元/方）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "contractGoal", + key: "newBalanceSell", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "contractGoal", + key: "newBalanceSell", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "contractGoal", + key: "newBalanceSell", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newBalanceSell", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newBalanceSell", + id: "4" }, + // 其中：居民（元/方） { cardType: 3, + title: "其中：居民（元/方）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newBalanceResident", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newBalanceResident", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newBalanceResident", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newBalanceResident", + id: "3" + }, { + cardType: 1, required: true, - title: '新户(户)', + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newBalanceResident", + id: "4" }, + // 其中：非居民(元/方) { + cardType: 3, + title: "其中：非居民(元/方)" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "newUserGoal", + key: "newBalanceNoResident", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "newUserGoal", + key: "newBalanceNoResident", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "newUserGoal", + key: "newBalanceNoResident", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newBalanceNoResident", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newBalanceNoResident", + id: "4" }, - + // 其中：批发及其他(元/方) { cardType: 3, + title: "其中：批发及其他(元/方)" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newBalanceWholesale", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newBalanceWholesale", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newBalanceWholesale", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newBalanceWholesale", + id: "3" + }, { + cardType: 1, required: true, - title: '老户(户)', + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newBalanceWholesale", + id: "4" }, - { + ], + data6: [{ + // 安装毛利（万元） + cardType: 3, + title: "安装毛利（万元）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "oldUserGoal", + key: "newProfitInstall", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "oldUserGoal", + key: "newProfitInstall", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "oldUserGoal", + key: "newProfitInstall", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitInstall", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitInstall", + id: "4" }, - + // 居民接驳毛利（万元） { cardType: 3, + title: "居民接驳毛利（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newProfitInstallResident", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newProfitInstallResident", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitInstallResident", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitInstallResident", + id: "3" + }, { + cardType: 1, required: true, - title: '乡镇(户)', + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitInstallResident", + id: "4" }, + // 工商户接驳毛利（万元） { + cardType: 3, + title: "工商户接驳毛利（万元）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "townsUserGoal", + key: "newProfitInstallCommerce", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "townsUserGoal", + key: "newProfitInstallCommerce", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "townsUserGoal", + key: "newProfitInstallCommerce", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitInstallCommerce", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitInstallCommerce", + id: "4" }, - + // 销气毛利（万元） { cardType: 3, + title: "销气毛利（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newProfitSell", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newProfitSell", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitSell", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitSell", + id: "3" + }, { + cardType: 1, required: true, - title: '工商福(户)', + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitSell", + id: "4" }, + // 居民气量毛利（万元） { + cardType: 3, + title: "居民气量毛利（万元）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "commerceGoal", + key: "newProfitSellResident", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "commerceGoal", + key: "newProfitSellResident", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "commerceGoal", + key: "newProfitSellResident", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitSellResident", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitSellResident", + id: "4" }, - + // 工商户气量毛利（万元） { cardType: 3, + title: "工商户气量毛利（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newProfitSellCommerce", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newProfitSellCommerce", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitSellCommerce", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitSellCommerce", + id: "3" + }, { + cardType: 1, required: true, - title: '工业(户)', + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitSellCommerce", + id: "4" }, + // 汽车加气毛利（万元） { + cardType: 3, + title: "汽车加气毛利（万元）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "industryGoal", + key: "newProfitSellCar", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "industryGoal", + key: "newProfitSellCar", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "industryGoal", + key: "newProfitSellCar", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitSellCar", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitSellCar", + id: "4" }, - + // 批发贸易类销气毛利（万元） { cardType: 3, + title: "批发贸易类销气毛利（万元）" + }, { + cardType: 1, required: true, - title: '用户安装(户)', + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newProfitSellTrade", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newProfitSellTrade", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitSellTrade", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitSellTrade", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitSellTrade", + id: "4" }, + // 其他毛利（补贴类）（万元） { + cardType: 3, + title: "其他毛利（补贴类）（万元）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "installUserGoal", + key: "newProfitOther", id: "0" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "installUserGoal", + key: "newProfitOther", id: "1" - }, - { + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)}财年预计`, value: "", - key: "installUserGoal", + key: "newProfitOther", id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitOther", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitOther", + id: "4" }, - + // 新兴业务类毛利（万元） { cardType: 3, + title: "新兴业务类毛利（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newProfitNew", + id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newProfitNew", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitNew", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitNew", + id: "3" + }, { + cardType: 1, required: true, - title: '销气量(户)', + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitNew", + id: "4" }, + // 毛利合计（万元） { + cardType: 3, + title: "毛利合计（万元）" + }, { cardType: 1, required: true, - title: `${this.fiscalYear}财年目标`, + title: `${parseInt(this.fiscalYear)-2}财年完成`, value: "", - key: "salesNumberGoal", + key: "newProfitTotal", id: "0" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-1}财年完成`, + value: "", + key: "newProfitTotal", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitTotal", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitTotal", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitTotal", + id: "4" }, + // 费用总额（含折旧摊销及税金、人工成本、财务费用、可控费用）（万元） { + cardType: 3, + title: "费用总额（含折旧摊销及税金、人工成本、财务费用、可控费用）（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newProfitTotalCost", + id: "0" + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "salesNumberGoal", + key: "newProfitTotalCost", id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newProfitTotalCost", + id: "2" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newProfitTotalCost", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newProfitTotalCost", + id: "4" }, + // 净利润合计（万元） { + cardType: 3, + title: "净利润合计（万元）" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)-2}财年完成`, + value: "", + key: "newNetProfitTotal", + id: "0" + }, { cardType: 1, required: true, - title: `${parseInt(this.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)-1}财年完成`, value: "", - key: "salesNumberGoal", + key: "newNetProfitTotal", + id: "1" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)}财年预计`, + value: "", + key: "newNetProfitTotal", id: "2" - } + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+1}财年预计`, + value: "", + key: "newNetProfitTotal", + id: "3" + }, { + cardType: 1, + required: true, + title: `${parseInt(this.fiscalYear)+2}财年预计`, + value: "", + key: "newNetProfitTotal", + id: "4" + }, ], - data2: [{ + data7: [{ cardType: 2, required: true, title: '整体开发思路', value: "", - key:"developmentIdea" + key: "developmentIdea" }], - data3: [{ + data8: [{ cardType: 2, required: true, title: '所需要资源配置', value: "", - key:"resourceAllocation" + key: "resourceAllocation" }], } }, @@ -285,22 +2420,50 @@ }, methods: { initData() { - this.data1.forEach(data => { - if (data.key in this.reportData) { - let Arr = this.reportData[data.key].split(","); - data.value = Arr[data.id]; - } - }); - this.data2.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); - this.data3.forEach(data => { - if (data.key in this.reportData) { - data.value = this.reportData[data.key]; - } - }); + // 逗号分隔分配 + const updateData = (dataArray, reportData) => { + dataArray.forEach(data => { + if (data.key in reportData) { + let Arr = reportData[data.key].split(","); + data.value = Arr[data.id]; + } + }); + }; + + // key直接分配 + const updateDataByKey = (dataArray, reportData) => { + dataArray.forEach(data => { + if (data.key in reportData) { + data.value = reportData[data.key]; + } + }); + }; + + updateData(this.data1, this.reportData); + updateData(this.data2, this.reportData); + updateData(this.data3, this.reportData); + updateData(this.data4, this.reportData); + updateData(this.data5, this.reportData); + updateData(this.data6, this.reportData); + + updateDataByKey(this.data7, this.reportData); + updateDataByKey(this.data8, this.reportData) + // this.data1.forEach(data => { + // if (data.key in this.reportData) { + // let Arr = this.reportData[data.key].split(","); + // data.value = Arr[data.id]; + // } + // }); + // this.data7.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + // this.data8.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); } } } diff --git a/pages/market/components/reportModule5.vue b/pages/market/components/reportModule5.vue index 1b27ec8..76ab755 100644 --- a/pages/market/components/reportModule5.vue +++ b/pages/market/components/reportModule5.vue @@ -1,7 +1,8 @@ @@ -15,8 +16,8 @@ reportData: { type: Object }, - fiscalYear:{ - type:String + fiscalYear: { + type: String } }, data() { @@ -26,14 +27,14 @@ required: true, title: `${this.fiscalYear}财年目标计划签约(户)`, value: "", - key:"planSignHousehold" + key: "planSignHousehold" }, { cardType: 1, required: true, title: `${this.fiscalYear}财年目标计划安装(户)`, value: "", - key:"planInstallHousehold" + key: "planInstallHousehold" }, { cardType: 3, @@ -44,17 +45,17 @@ cardType: 1, required: true, title: '计划签约', - value:"", - key:"newUserPlan", - id:"0" + value: "", + key: "newUserPlan", + id: "0" }, { cardType: 1, required: true, title: '计划安装', - value:"", - key:"newUserPlan", - id:"1" + value: "", + key: "newUserPlan", + id: "1" }, { @@ -66,17 +67,17 @@ cardType: 1, required: true, title: '计划签约', - value:"", - key:"oldUserPlan", - id:"0" + value: "", + key: "oldUserPlan", + id: "0" }, { cardType: 1, required: true, title: '计划安装', - value:"", - key:"oldUserPlan", - id:"1" + value: "", + key: "oldUserPlan", + id: "1" }, { @@ -88,17 +89,17 @@ cardType: 1, required: true, title: '计划签约', - value:"", - key:"townsUserPlan", - id:"0" + value: "", + key: "townsUserPlan", + id: "0" }, { cardType: 1, required: true, title: '计划安装', - value:"", - key:"townsUserPlan", - id:"1" + value: "", + key: "townsUserPlan", + id: "1" }, { @@ -110,17 +111,17 @@ cardType: 1, required: true, title: '计划签约', - value:"", - key:"commerceUserPlan", - id:"0" + value: "", + key: "commerceUserPlan", + id: "0" }, { cardType: 1, required: true, title: '计划安装', - value:"", - key:"commerceUserPlan", - id:"1" + value: "", + key: "commerceUserPlan", + id: "1" }, { @@ -132,17 +133,17 @@ cardType: 1, required: true, title: '计划签约', - value:"", - key:"industryUserPlan", - id:"0" + value: "", + key: "industryUserPlan", + id: "0" }, { cardType: 1, required: true, title: '计划安装', - value:"", - key:"industryUserPlan", - id:"1" + value: "", + key: "industryUserPlan", + id: "1" }, { @@ -154,22 +155,21 @@ cardType: 1, required: true, title: '计划签约', - value:"", - key:"totalPlan", - id:"0" + value: "", + key: "totalPlan", + id: "0" }, { cardType: 1, required: true, title: '计划安装', - value:"", - key:"totalPlan", - id:"1" + value: "", + key: "totalPlan", + id: "1" }, ], - data2: [ - { + data2: [{ cardType: 3, required: true, title: '新建房地产', @@ -178,7 +178,7 @@ cardType: 2, required: true, value: "", - key:"newBuildingIdea" + key: "newBuildingIdea" }, { @@ -190,7 +190,7 @@ cardType: 2, required: true, value: "", - key:"oldBuildingIdea" + key: "oldBuildingIdea" }, { @@ -202,7 +202,7 @@ cardType: 2, required: true, value: "", - key:"villageBuildingIdea" + key: "villageBuildingIdea" }, { @@ -214,9 +214,44 @@ cardType: 2, required: true, value: "", - key:"commerceIdea" + key: "commerceIdea" + }, + ], + data3: [{ + cardType: 5, + required: true, + title: "当前财年及未来3年业绩达成支撑举措", + value: "", + key: "achievedMeasure" + }, + { + cardType: 5, + required: true, + title: "重点目标客户开发计划", + value: "", + key: "newBuildingIdea" + }, + { + cardType: 5, + required: true, + title: "工程投资", + value: "", + key: "oldBuildingIdea" + }, + { + cardType: 5, + required: true, + title: "费用计划", + value: "", + key: "villageBuildingIdea" + }, + { + cardType: 5, + required: true, + title: "内部赋能计划", + value: "", + key: "commerceIdea" }, - ], } }, @@ -230,15 +265,20 @@ initData() { this.data1.forEach(data => { if (data.key in this.reportData) { - if(data.key != "planInstallHousehold" && data.key != "planSignHousehold"){ + if (data.key != "planInstallHousehold" && data.key != "planSignHousehold") { let Arr = this.reportData[data.key].split(","); data.value = Arr[data.id]; - }else{ + } else { data.value = this.reportData[data.key] } } }); - this.data2.forEach(data => { + // this.data2.forEach(data => { + // if (data.key in this.reportData) { + // data.value = this.reportData[data.key]; + // } + // }); + this.data3.forEach(data => { if (data.key in this.reportData) { data.value = this.reportData[data.key]; } diff --git a/pages/market/insight.vue b/pages/market/insight.vue index 6f3d493..a68b7a9 100644 --- a/pages/market/insight.vue +++ b/pages/market/insight.vue @@ -112,7 +112,7 @@ newList1: [], newList2: [], fiscalYearShow: false, - yaerModal: "", + yaerModal: Number(new Date()), fiscalYear: "", status1: "loadmore", status2: "loadmore", @@ -515,4 +515,4 @@ .u-empty { background: #fff !important; } - \ No newline at end of file + diff --git a/pages/market/reportDetails.vue b/pages/market/reportDetails.vue index 51ce400..31c45f5 100644 --- a/pages/market/reportDetails.vue +++ b/pages/market/reportDetails.vue @@ -23,6 +23,8 @@ :newBuildingItem="reportData3newBuildingItem" :fiscalYear="fiscalYear"> + @@ -58,6 +60,7 @@ data() { return { current: 0, + scrollTop: 0, reportNo: null, fiscalYear: "", reportData1: {}, @@ -69,21 +72,24 @@ reportData4: {}, reportData5: {}, tabList: [{ - name: '组织实施落实' + name: '"五看"市场调研' }, { name: '天燃气市场总体概况', }, { name: '重点业务市场分析' }, { - name: '未来发展规划、 所需资源配置 ' + name: '三定（定战略控制点、定目标）' }, { - name: '目标思路建议' + name: '三定（定策略）' }], } }, computed: { }, + onPageScroll(e) { + this.scrollTop = e.scrollTop; + }, onLoad(data) { if (data) { this.reportNo = data.reportNo; @@ -98,54 +104,82 @@ }, async initData() { - await getOrganize(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData1 = res.data; - } - console.log("1、组织", JSON.parse(JSON.stringify(this.reportData1))); - }) - await getGeneralOverview(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData2 = res.data; - } - console.log("2、天然气", JSON.parse(JSON.stringify(this.reportData2))); - }) - await getGeneralOverviewAttach(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData2attachment = res.data; - } - console.log("3、天然气附表", JSON.parse(JSON.stringify(this.reportData2attachment))); - }) - await getBusinessAnalyze(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData3 = res.data; - } - console.log("4、重点业务市场分析", JSON.parse(JSON.stringify(this.reportData3))); - }) - await getNewBuildingInfo(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData3newBuildingInfo = res.data; - } - console.log("5、楼盘预计未来三年确认的新建楼盘信息", JSON.parse(JSON.stringify(this.reportData3newBuildingInfo))); - }) - await getNewBuildingItem(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData3newBuildingItem = res.data; - } - console.log("6、预计未来三年安装确认项目", JSON.parse(JSON.stringify(this.reportData3newBuildingItem))); - }) - await getDevelopmentPlan(this.reportNo).then(res => { - if (res.code === 200) { - this.reportData4 = res.data; - } - console.log("7、未来发展规划", JSON.parse(JSON.stringify(this.reportData4))); - }) - await getTargetSuggestion(this.reportNo).then(res => { + // await Promise.all([ + // this.feachData(this.getOrganize, 'reportData1', '1、组织'), + // this.feachData(this.getGeneralOverview, 'reportData2', '2、天然气'), + // this.feachData(this.getGeneralOverviewAttach, 'reportData2attachment', '3、天然气附表'), + // this.feachData(this.getBusinessAnalyze, 'reportData3', '4、重点业务市场分析'), + // this.feachData(this.getNewBuildingInfo, 'reportData3newBuildingInfo', '5、楼盘预计未来三年确认的新建楼盘信息'), + // this.feachData(this.getNewBuildingItem, 'reportData3newBuildingItem', '6、预计未来三年安装确认项目'), + // this.feachData(this.getDevelopmentPlan, 'reportData4', '7、未来发展规划'), + // this.feachData(this.getTargetSuggestion, 'reportData5', '8、目标思路建议') + // ]); + const getData = async (getDataFunc, dataField, logMessage) => { + const res = await getDataFunc(this.reportNo); if (res.code === 200) { - this.reportData5 = res.data; + this[dataField] = res.data; } - console.log("8、目标思路建议", JSON.parse(JSON.stringify(this.reportData5))); - }) + console.log(logMessage, JSON.parse(JSON.stringify(this[dataField]))); + }; + + await Promise.all([ + getData(getOrganize, 'reportData1', '1、组织'), + getData(getGeneralOverview, 'reportData2', '2、天然气'), + getData(getGeneralOverviewAttach, 'reportData2attachment', '3、天然气附表'), + getData(getBusinessAnalyze, 'reportData3', '4、重点业务市场分析'), + getData(getNewBuildingInfo, 'reportData3newBuildingInfo', '5、楼盘预计未来三年确认的新建楼盘信息'), + getData(getNewBuildingItem, 'reportData3newBuildingItem', '6、预计未来三年安装确认项目'), + getData(getDevelopmentPlan, 'reportData4', '7、未来发展规划'), + getData(getTargetSuggestion, 'reportData5', '8、目标思路建议') + ]); + // await getOrganize(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData1 = res.data; + // } + // console.log("1、组织", JSON.parse(JSON.stringify(this.reportData1))); + // }) + // await getGeneralOverview(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData2 = res.data; + // } + // console.log("2、天然气", JSON.parse(JSON.stringify(this.reportData2))); + // }) + // await getGeneralOverviewAttach(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData2attachment = res.data; + // } + // console.log("3、天然气附表", JSON.parse(JSON.stringify(this.reportData2attachment))); + // }) + // await getBusinessAnalyze(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData3 = res.data; + // } + // console.log("4、重点业务市场分析", JSON.parse(JSON.stringify(this.reportData3))); + // }) + // await getNewBuildingInfo(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData3newBuildingInfo = res.data; + // } + // console.log("5、楼盘预计未来三年确认的新建楼盘信息", JSON.parse(JSON.stringify(this.reportData3newBuildingInfo))); + // }) + // await getNewBuildingItem(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData3newBuildingItem = res.data; + // } + // console.log("6、预计未来三年安装确认项目", JSON.parse(JSON.stringify(this.reportData3newBuildingItem))); + // }) + // await getDevelopmentPlan(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData4 = res.data; + // } + // console.log("7、未来发展规划", JSON.parse(JSON.stringify(this.reportData4))); + // }) + // await getTargetSuggestion(this.reportNo).then(res => { + // if (res.code === 200) { + // this.reportData5 = res.data; + // } + // console.log("8、目标思路建议", JSON.parse(JSON.stringify(this.reportData5))); + // }) } } } diff --git a/pages/market/total.vue b/pages/market/total.vue index ca39ec7..c3cc13b 100644 --- a/pages/market/total.vue +++ b/pages/market/total.vue @@ -254,7 +254,14 @@ } else { await this.getHistogram(query) } + if (this.isZbOrQy && this.reportCharBarData.length) { + // const newData = Array(10).fill({ + // time: '中国燃气', + // residentUserValue: Math.floor(Math.random() * 101), + // businessUserValue: Math.floor(Math.random() * 101), + // customerUserValue: Math.floor(Math.random() * 101) + // }); this.reportCharBarData.map(item => { this.data3.push({ time: item.entityName, @@ -262,6 +269,7 @@ businessUserValue: item.list[0]?.commerceAndIndustry || 0, customerUserValue: item.list[0]?.customerRecoveryProgress || 0 }) + // this.data3 = this.data3.concat(newData); }) console.log("区域或总部内容", this.data3); } @@ -306,9 +314,11 @@ data: this.data3.map(item => item.customerUserValue), } ] + console.log("series", series); this.pieOption = { tooltip: { - trigger: 'item' + trigger: 'item', + confine: true }, legend: { top: 'middle', @@ -334,7 +344,7 @@ show: true, position: 'center', color: '#4c4a4a', - formatter: '{total|' + this.total1 + '}' + '\n\r' + '{active|总预算主体数}', + formatter: '{total|' + this.total1 + '}' + '\n\r' + '{active|本财年总预算主体数}', rich: { total: { fontSize: 20, @@ -361,7 +371,8 @@ }; this.pieOption2 = { tooltip: { - trigger: 'item' + trigger: 'item', + confine: true }, legend: { orient: 'vertical', @@ -415,7 +426,8 @@ }; this.lineOption = { tooltip: { - trigger: 'axis' + trigger: 'axis', + confine: true }, legend: { right: 10, @@ -432,54 +444,42 @@ bottom: '3%', containLabel: true }, - // dataZoom: [{ - // type: "slider", // 滑动条型数据区域缩放组件 - // show: true, // 是否显示组件(用于 x 轴使用) - // start: 70, // 数据窗口范围的起始百分比(范围是：0 ~ 100。表示 0% ~ 100%) - // end: 100, // 数据窗口范围的结束百分比(范围是：0 ~ 100。表示 0% ~ 100%) - // height: 30, // 组件的高度(水平布局默认 30，竖直布局默认自适应) - // handleSize: '30%', // 控制手柄的尺寸，可以是像素大小，也可以是相对于 dataZoom 组件宽度的百分比，默认跟 dataZoom 宽度相同 - // handleStyle: { - // // color: '#fff', // 图形的颜色 - // // borderColor: 'red', // 图形的描边颜色 - // // borderWidth: 1, // 描边线宽。为 0 时无描边 - // borderType: 'solid' // 描边类型 solid.实线(默认) dashed.虚线 dotted.点虚线 - // }, // 两侧缩放手柄的样式配置 - // showDataShadow: false, // 是否在 dataZoom-silder 组件中显示数据阴影。数据阴影可以简单地反应数据走势 - // }, { - // type: "inside", // 内置型数据区域缩放组件(即在坐标系内平移与缩放) - // start: 70, // 数据窗口范围的起始百分比(范围是：0 ~ 100。表示 0% ~ 100%) - // end: 100 // 数据窗口范围的结束百分比(范围是：0 ~ 100。表示 0% ~ 100%) - // }, { - // type: "slider", // 滑动条型数据区域缩放组件 - // show: false, // 是否显示组件(用于 y 轴使用) - // width: "5%", // 组件的宽度(竖直布局默认 30，水平布局默认自适应) - // height: "70%", // 组件的高度(水平布局默认 30，竖直布局默认自适应) - // yAxisIndex: 0, // 组件控制的 y 轴(即下方 yAxis 数组的索引值) - // filterMode: "empty", // none.不过滤数据只改变数轴范围 empty.当前数据窗口外的数据设置为空，不影响其他轴的数据范围 其他访问https://echarts.apache.org/zh/option.html#dataZoom-slider.filterMode - // handleSize: '30%', // 控制手柄的尺寸，可以是像素大小，也可以是相对于 dataZoom 组件宽度的百分比，默认跟 dataZoom 宽度相同 - // handleStyle: { - // // color: '#fff', // 图形的颜色 - // // borderColor: 'red', // 图形的描边颜色 - // // borderWidth: 1, // 描边线宽。为 0 时无描边 - // borderType: 'solid' // 描边类型 solid.实线(默认) dashed.虚线 dotted.点虚线 - // }, // 两侧缩放手柄的样式配置 - // showDataShadow: false, // 是否在 dataZoom-silder 组件中显示数据阴影。数据阴影可以简单地反应数据走势 - // left: "93%" // 组件离容器左侧的距离 - // }], // 区域缩放 - toolbox: { - feature: { - saveAsImage: {} - } - }, + dataZoom: [{ + type: 'inside', // 放大和缩小 + orient: 'vertical', + }, { + type: 'inside', + }, { + start: 0, //默认为0 + end: 100, //默认为100 + type: 'slider', + show: true, + handleSize: 0, //滑动条的 左右2个滑动条的大小 + startValue: 0, // 初始显示值 + endValue: 500000, // 结束显示值,自己定 + height: 5, //组件高度 + left: '10%', //左边的距离 + right: '10%', //右边的距离 + bottom: 15, //底边的距离 + borderColor: "#ccc", + fillerColor: '#4cccfe', + borderRadius: 5, + backgroundColor: '#efefef', //两边未选中的滑动条区域的颜色 + showDataShadow: false, //是否显示数据阴影 默认auto + showDetail: false, //即拖拽时候是否显示详细数值信息 默认true + realtime: true, //是否实时更新 + filterMode: 'filter', + }], xAxis: { show: true, type: 'category', boundaryGap: true, + scrollShow: true, data: this.data3.map(item => item.time), axisLabel: { fontSize: 14, color: '#666666', + // interval:1, formatter: function(value) { if (that.isZbOrQy) { if (value.length > 3) { @@ -502,17 +502,18 @@