From a11f0d83ce83c682f59458a590289c03057414fc Mon Sep 17 00:00:00 2001 From: gwl Date: Thu, 9 Nov 2023 16:57:40 +0800 Subject: [PATCH] fix: 修改问题、增加统计、增加查看附件 --- api/infoMarketInformation.js | 3 +++ api/organize.js | 9 +++++++++ api/total.js | 14 ++++++++++++++ common/config.js | 1 - components/news-list/news-list.vue | 2 +- main.js | 3 --- manifest.json | 4 ++-- package-lock.json | 10 +--------- package.json | 4 +--- pages/market/components/reportModule1.vue | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------ pages/market/components/reportModule2.vue | 75 +++++++++++++++++++++++++++++++++++++++------------------------------------ pages/market/components/reportModule3.vue | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------- pages/market/components/reportModule4.vue | 51 +++++++++++++++++++++++++++------------------------ pages/market/components/reportModule5.vue | 9 ++++++--- pages/market/insight.vue | 82 +++++++++++++++++++++++++++++++++++++++------------------------------------------- pages/market/newsDetails.vue | 19 ++++++++++++------- pages/market/reportDetails.vue | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- pages/market/total.vue | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------- pages/market/userDetails.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- vue.config.js | 52 ++++++++++++++++++++++++++-------------------------- 20 files changed, 580 insertions(+), 410 deletions(-) create mode 100644 api/total.js diff --git a/api/infoMarketInformation.js b/api/infoMarketInformation.js index 2404467..67c2d7e 100644 --- a/api/infoMarketInformation.js +++ b/api/infoMarketInformation.js @@ -2,3 +2,6 @@ const { http } = uni.$u // 列表和条件筛选 export const getInfoMarketInformationlist = params => http.get('/insight/infoMarketInformation/list', { params }) +export const getInfoMarketInformationDetail = id => http.get('/insight/infoMarketInformation/'+id) + + diff --git a/api/organize.js b/api/organize.js index 63683a6..c1b424c 100644 --- a/api/organize.js +++ b/api/organize.js @@ -11,6 +11,15 @@ export const getPoolCommercelist = params => http.get('/insight/poolCommerce/lis //工业用户 export const getPoolIndustrylist = params => http.get('/insight/poolIndustry/list', { params }) +//居民用户详情 +export const getPoolResidentDetail = id => http.get('/insight/poolResident/'+id ) + +//商业用户详情 +export const getPoolCommerceDetail = id => http.get('/insight/poolCommerce/'+id ) + +//工业用户详情 +export const getPoolIndustryDetail = id => http.get('/insight/poolIndustry/'+id ) + /*报告详情*/ //报告详情-组织实施落实 1 diff --git a/api/total.js b/api/total.js new file mode 100644 index 0000000..42b9a2f --- /dev/null +++ b/api/total.js @@ -0,0 +1,14 @@ +const { http } = uni.$u + +// 本财年市场摸底分析 +export const getStatisticsReport = id => http.get('/insight/statistics/report/'+id) + +// 待开发用户池数据分析 +export const getStatisticsPool = params => http.get('/insight/statistics/pool',params) +// /statistics/pool + +export const getStatisticsLogin = params => http.get('/insight/statistics/login',params) +// 访问量和浏览量 +// /statistics/login + + diff --git a/common/config.js b/common/config.js index 5c8894d..c66d45b 100644 --- a/common/config.js +++ b/common/config.js @@ -4,7 +4,6 @@ module.exports = { baseUrl: 'http://172.17.56.37:18082/api', //测试环境 // baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境 // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境 - // baseUrl: 'http://api-dashboard.yudao.iocoder.cn/app-api', // 超时 timeout: 30000, // 禁用 Cookie 等信息 diff --git a/components/news-list/news-list.vue b/components/news-list/news-list.vue index dd4a438..4966fe7 100644 --- a/components/news-list/news-list.vue +++ b/components/news-list/news-list.vue @@ -36,7 +36,7 @@ newsDetails(){ console.log("跳转"); uni.navigateTo({ - url:'/pages/market/newsDetails?detailsContent=' + JSON.stringify(this.newItem) + url:'/pages/market/newsDetails?id=' + this.newItem.infoId }) } } diff --git a/main.js b/main.js index b913018..37f6267 100644 --- a/main.js +++ b/main.js @@ -8,8 +8,6 @@ import echarts from '@/components/echarts-uniapp/echarts-uniapp.vue'; // vuex import store from './store' -import dayjs from 'dayjs' - import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "./utils/dict"; @@ -21,7 +19,6 @@ Vue.prototype.$store = store Vue.prototype.getDictDatas = getDictDatas Vue.prototype.getDictDatas2 = getDictDatas2 Vue.prototype.getDictDataLabel = getDictDataLabel -Vue.prototype.$dayjs = dayjs Vue.prototype.DICT_TYPE = DICT_TYPE Vue.component('echarts',echarts) diff --git a/manifest.json b/manifest.json index c2510a6..973e1ee 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "市场资讯", "appid" : "__UNI__A1179CD", "description" : "市场资讯", - "versionName" : "1.0.0", - "versionCode" : "100", + "versionName" : "0.1.1", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/package-lock.json b/package-lock.json index ae4495f..59e231f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,5 @@ { "name": "echarts for uniapp", "version": "0.0.1", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "dayjs": { - "version": "1.11.10", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" - } - } + "lockfileVersion": 1 } diff --git a/package.json b/package.json index 7fbf4aa..9b89e3a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,5 @@ "通用组件" ] }, - "dependencies": { - "dayjs": "^1.11.10" - } + "dependencies": {} } diff --git a/pages/market/components/reportModule1.vue b/pages/market/components/reportModule1.vue index f920f79..c56944e 100644 --- a/pages/market/components/reportModule1.vue +++ b/pages/market/components/reportModule1.vue @@ -8,25 +8,33 @@ 组长 - + + 副组长 - + 成员 - + + 填报人 - + @@ -34,7 +42,7 @@ - + 实施情况 @@ -44,19 +52,21 @@ - + 预算主体附件 - + - - + + {{item.fileName}} + + + 查看 - 查看 - + @@ -81,22 +91,56 @@ export default { components: {}, props: { - reportData:{ - type:Object - } + reportData: { + type: Object + }, }, data() { return { + isShowUrl: false, } }, computed: { }, - onLoad() { - + mounted() { + setTimeout(() => { + this.init() + }, 500) }, methods: { - + calcIcon(type) { + if (type == '.xlsx' || type == '.xls') { + return '/static/images/icon/EXCEL.png' + } else if (type == '.pdf') { + return '/static/images/icon/PDF.png' + } else if (type == '.docx' || type == '.doc') { + return '/static/images/icon/DOC.png' + } + }, + init() { + this.reportData.attachmentsUrl = JSON.parse(this.reportData.attachmentsUrl); + if (this.reportData.attachmentsUrl.length) { + this.isShowUrl = true + } + console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl))); + }, + viewAttachments(urls) { + uni.getSystemInfo({ + success: function(res) { + var platform = res.platform.toLowerCase(); + console.log(platform); + // 如果是安卓设备 + if (platform === 'android' || platform === 'windows') { + window.open(urls, '_blank'); + } + // 如果是 iOS 设备 + else if (platform === 'ios') { + window.location.href = urls + } + } + }); + } } } @@ -125,10 +169,10 @@ } .attachmentCss { - padding: 20rpx; - border-radius: 20px; - background-color: #f8f9fd; - box-sizing: border-box; + padding: 20rpx; + border-radius: 20px; + background-color: #f8f9fd; + box-sizing: border-box; } .flexCss { @@ -143,10 +187,11 @@ justify-content: flex-start; align-items: center; } + .textCss { width: 466rpx; height: 35rpx; - margin:0 4px; + margin: 0 4px; background-color: rgba(255, 255, 255, 0); box-sizing: border-box; font-family: '苹方 中等', '苹方', sans-serif; @@ -169,7 +214,7 @@ } .largeAmountOfTextCss { - text-indent:1em; + text-indent: 1em; margin-top: 38rpx; padding: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx; diff --git a/pages/market/components/reportModule2.vue b/pages/market/components/reportModule2.vue index 143afc9..22b7ad5 100644 --- a/pages/market/components/reportModule2.vue +++ b/pages/market/components/reportModule2.vue @@ -29,6 +29,9 @@ attachment: { type: Object }, + fiscalYear:{ + type:String + } }, data() { return { @@ -843,7 +846,7 @@ { cardType: 3, required: true, - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear}财年(预计)`, + title: `新建居民用户(含乡镇新房)_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -864,7 +867,7 @@ { cardType: 3, required: true, - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 1}财年`, + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -885,7 +888,7 @@ { cardType: 3, required: true, - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 2}财年`, + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -906,7 +909,7 @@ { cardType: 3, required: true, - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 3}财年`, + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -927,7 +930,7 @@ { cardType: 3, required: true, - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 4}财年`, + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -949,7 +952,7 @@ { cardType: 3, required: true, - title: `城市老居民用户_${this.attachment.fiscalYear}财年(预计)`, + title: `城市老居民用户_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -970,7 +973,7 @@ { cardType: 3, required: true, - title: `城市老居民用户_${this.attachment.fiscalYear - 1}财年`, + title: `城市老居民用户_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -991,7 +994,7 @@ { cardType: 3, required: true, - title: `城市老居民用户_${this.attachment.fiscalYear - 2}财年`, + title: `城市老居民用户_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -1012,7 +1015,7 @@ { cardType: 3, required: true, - title: `城市老居民用户_${this.attachment.fiscalYear - 3}财年`, + title: `城市老居民用户_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -1033,7 +1036,7 @@ { cardType: 3, required: true, - title: `城市老居民用户_${this.attachment.fiscalYear - 4}财年`, + title: `城市老居民用户_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -1055,7 +1058,7 @@ { cardType: 3, required: true, - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear}财年(预计)`, + title: `农村气代媒(含气代柴薪)_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -1076,7 +1079,7 @@ { cardType: 3, required: true, - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 1}财年`, + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -1097,7 +1100,7 @@ { cardType: 3, required: true, - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 2}财年`, + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -1118,7 +1121,7 @@ { cardType: 3, required: true, - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 3}财年`, + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -1139,7 +1142,7 @@ { cardType: 3, required: true, - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 4}财年`, + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -1161,7 +1164,7 @@ { cardType: 3, required: true, - title: `乡村燃气居民_${this.attachment.fiscalYear}财年(预计)`, + title: `乡村燃气居民_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -1182,7 +1185,7 @@ { cardType: 3, required: true, - title: `乡村燃气居民_${this.attachment.fiscalYear - 1}财年`, + title: `乡村燃气居民_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -1203,7 +1206,7 @@ { cardType: 3, required: true, - title: `乡村燃气居民_${this.attachment.fiscalYear - 2}财年`, + title: `乡村燃气居民_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -1224,7 +1227,7 @@ { cardType: 3, required: true, - title: `乡村燃气居民_${this.attachment.fiscalYear - 3}财年`, + title: `乡村燃气居民_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -1245,7 +1248,7 @@ { cardType: 3, required: true, - title: `乡村燃气居民_${this.attachment.fiscalYear - 4}财年`, + title: `乡村燃气居民_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -1267,7 +1270,7 @@ { cardType: 3, required: true, - title: `商业用户_${this.attachment.fiscalYear}财年(预计)`, + title: `商业用户_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -1288,7 +1291,7 @@ { cardType: 3, required: true, - title: `商业用户_${this.attachment.fiscalYear - 1}财年`, + title: `商业用户_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -1309,7 +1312,7 @@ { cardType: 3, required: true, - title: `商业用户_${this.attachment.fiscalYear - 2}财年`, + title: `商业用户_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -1330,7 +1333,7 @@ { cardType: 3, required: true, - title: `商业用户_${this.attachment.fiscalYear - 3}财年`, + title: `商业用户_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -1351,7 +1354,7 @@ { cardType: 3, required: true, - title: `商业用户_${this.attachment.fiscalYear - 4}财年`, + title: `商业用户_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -1373,7 +1376,7 @@ { cardType: 3, required: true, - title: `工业用户_${this.attachment.fiscalYear}财年(预计)`, + title: `工业用户_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -1394,7 +1397,7 @@ { cardType: 3, required: true, - title: `工业用户_${this.attachment.fiscalYear - 1}财年`, + title: `工业用户_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -1415,7 +1418,7 @@ { cardType: 3, required: true, - title: `工业用户_${this.attachment.fiscalYear - 2}财年`, + title: `工业用户_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -1436,7 +1439,7 @@ { cardType: 3, required: true, - title: `工业用户_${this.attachment.fiscalYear - 3}财年`, + title: `工业用户_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -1457,7 +1460,7 @@ { cardType: 3, required: true, - title: `工业用户_${this.attachment.fiscalYear - 4}财年`, + title: `工业用户_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -1479,7 +1482,7 @@ { cardType: 3, required: true, - title: `合计_${this.attachment.fiscalYear}财年(预计)`, + title: `合计_${this.fiscalYear}财年(预计)`, }, { cardType: 1, @@ -1500,7 +1503,7 @@ { cardType: 3, required: true, - title: `合计_${this.attachment.fiscalYear - 1}财年`, + title: `合计_${this.fiscalYear - 1}财年`, }, { cardType: 1, @@ -1521,7 +1524,7 @@ { cardType: 3, required: true, - title: `合计_${this.attachment.fiscalYear - 2}财年`, + title: `合计_${this.fiscalYear - 2}财年`, }, { cardType: 1, @@ -1542,7 +1545,7 @@ { cardType: 3, required: true, - title: `合计_${this.attachment.fiscalYear - 3}财年`, + title: `合计_${this.fiscalYear - 3}财年`, }, { cardType: 1, @@ -1563,7 +1566,7 @@ { cardType: 3, required: true, - title: `合计_${this.attachment.fiscalYear - 4}财年`, + title: `合计_${this.fiscalYear - 4}财年`, }, { cardType: 1, @@ -1828,7 +1831,7 @@ }, mounted() { this.initData() - // this.fiscalYear = this.attachment.fiscalYear; + // this.fiscalYear = this.fiscalYear; }, methods: { initData() { diff --git a/pages/market/components/reportModule3.vue b/pages/market/components/reportModule3.vue index c429bbd..cc0ab40 100644 --- a/pages/market/components/reportModule3.vue +++ b/pages/market/components/reportModule3.vue @@ -37,6 +37,9 @@ newBuildingItem: { type: Object }, + fiscalYear:{ + type:String + } }, data() { return { @@ -54,7 +57,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, value: "", key: "cityNewInstalled", id: "0" @@ -62,7 +65,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "cityNewInstalled", id: "1" @@ -70,7 +73,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "cityNewInstalled", id: "2" @@ -78,7 +81,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, value: "", key: "cityNewInstalled", id: "3" @@ -92,7 +95,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, value: "", key: "auctionArea", id: "0" @@ -100,7 +103,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "auctionArea", id: "1" @@ -108,7 +111,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "auctionArea", id: "2" @@ -116,7 +119,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, value: "", key: "auctionArea", id: "3" @@ -130,7 +133,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, value: "", key: "newStartArea", id: "0" @@ -138,7 +141,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "newStartArea", id: "1" @@ -146,7 +149,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "newStartArea", id: "2" @@ -154,7 +157,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, value: "", key: "newStartArea", id: "3" @@ -168,7 +171,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`, value: "", key: "newCompletedArea", id: "0" @@ -176,7 +179,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`, value: "", key: "newCompletedArea", id: "1" @@ -184,7 +187,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`, value: "", key: "newCompletedArea", id: "2" @@ -192,7 +195,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`, value: "", key: "newCompletedArea", id: "3" @@ -201,13 +204,13 @@ data2: [{ cardType: 4, required: true, - title: `${this.reportData.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.reportData.fiscalYear - 2}财年-${this.reportData.fiscalYear - 1}财年已签约且在${this.reportData.fiscalYear}财年安装确认项目`, + title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`, value: "2023年玉林市城市总体规划", }, { cardType: 3, required: true, - title: `${this.reportData.fiscalYear - 2}财年及之前签约且在${this.reportData.fiscalYear}财年安装`, + title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装`, }, { cardType: 1, @@ -235,15 +238,15 @@ data3: [{ cardType: 4, required: true, - title: `预计${this.reportData.fiscalYear}-${parseInt(this.reportData.fiscalYear)+2}财年安装确认项目 - (预计${parseInt(this.reportData.fiscalYear)}财年签约， - ${this.reportData.fiscalYear}财年、${parseInt(this.reportData.fiscalYear)+1}财年、${parseInt(this.reportData.fiscalYear)+2}财年安装)`, + 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.reportData.fiscalYear)}财年`, + title: `${parseInt(this.fiscalYear)}财年`, }, { cardType: 1, @@ -296,7 +299,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)}财年小计`, + title: `${parseInt(this.fiscalYear)}财年小计`, value: "", key: "currentInstallSubtotal" }, @@ -305,7 +308,7 @@ { cardType: 3, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年`, + title: `${parseInt(this.fiscalYear)+1}财年`, }, { cardType: 1, @@ -358,7 +361,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年小计`, + title: `${parseInt(this.fiscalYear)+1}财年小计`, value: "", key: "afterInstallSubtotal" }, @@ -366,7 +369,7 @@ { cardType: 3, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年`, + title: `${parseInt(this.fiscalYear)+2}财年`, }, { cardType: 1, @@ -419,7 +422,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年小计`, + title: `${parseInt(this.fiscalYear)+2}财年小计`, value: "", key: "lastInstallSubtotal" }, @@ -590,43 +593,43 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 4}财年`, + title: `${parseInt(this.fiscalYear) - 4}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 3}财年`, + title: `${parseInt(this.fiscalYear) - 3}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 2}财年`, + title: `${parseInt(this.fiscalYear) - 2}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 1}财年`, + title: `${parseInt(this.fiscalYear) - 1}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`, + title: `${parseInt(this.fiscalYear)}财年(预计)`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`, + title: `${parseInt(this.fiscalYear)+1}财年(预计)`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`, + title: `${parseInt(this.fiscalYear)+2}财年(预计)`, value: "" }, @@ -638,43 +641,43 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 4}财年`, + title: `${parseInt(this.fiscalYear) - 4}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 3}财年`, + title: `${parseInt(this.fiscalYear) - 3}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 2}财年`, + title: `${parseInt(this.fiscalYear) - 2}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 1}财年`, + title: `${parseInt(this.fiscalYear) - 1}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`, + title: `${parseInt(this.fiscalYear)}财年(预计)`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`, + title: `${parseInt(this.fiscalYear)+1}财年(预计)`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`, + title: `${parseInt(this.fiscalYear)+2}财年(预计)`, value: "" }, @@ -686,43 +689,43 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 4}财年`, + title: `${parseInt(this.fiscalYear) - 4}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 3}财年`, + title: `${parseInt(this.fiscalYear) - 3}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 2}财年`, + title: `${parseInt(this.fiscalYear) - 2}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear) - 1}财年`, + title: `${parseInt(this.fiscalYear) - 1}财年`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`, + title: `${parseInt(this.fiscalYear)}财年(预计)`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`, + title: `${parseInt(this.fiscalYear)+1}财年(预计)`, value: "" }, { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`, + title: `${parseInt(this.fiscalYear)+2}财年(预计)`, value: "" }, ], @@ -1240,12 +1243,12 @@ data14: [{ cardType: 4, required: true, - title: `分析现有居民、工商业用户、加气站及批发、管输等用气情况，预测${this.reportData.fiscalYear}财年销气量`, + title: `分析现有居民、工商业用户、加气站及批发、管输等用气情况，预测${this.fiscalYear}财年销气量`, }, { cardType: 3, required: true, - title: `截至目前已通气用户在${this.reportData.fiscalYear}财年的基础用气量`, + title: `截至目前已通气用户在${this.fiscalYear}财年的基础用气量`, }, { cardType: 1, @@ -1307,7 +1310,7 @@ { cardType: 3, required: true, - title: `预计到${parseInt(this.reportData.fiscalYear)-1}财年底通气/点火的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`, + title: `预计到${parseInt(this.fiscalYear)-1}财年底通气/点火的用户在${parseInt(this.fiscalYear)}财年带来气量增长`, }, { cardType: 1, @@ -1370,8 +1373,8 @@ { cardType: 3, required: true, - title: `${parseInt(this.reportData.fiscalYear)-1}财年签约但在${parseInt(this.reportData.fiscalYear)}财年 - 点火通气的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`, + title: `${parseInt(this.fiscalYear)-1}财年签约但在${parseInt(this.fiscalYear)}财年 + 点火通气的用户在${parseInt(this.fiscalYear)}财年带来气量增长`, }, { cardType: 1, @@ -1433,7 +1436,7 @@ { cardType: 3, required: true, - title: `预计${parseInt(this.reportData.fiscalYear)}财年新签约点火通气的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`, + title: `预计${parseInt(this.fiscalYear)}财年新签约点火通气的用户在${parseInt(this.fiscalYear)}财年带来气量增长`, }, { cardType: 1, @@ -1495,7 +1498,7 @@ { cardType: 3, required: true, - title: `${parseInt(this.reportData.fiscalYear)}财年销气预测合计`, + title: `${parseInt(this.fiscalYear)}财年销气预测合计`, }, { cardType: 1, diff --git a/pages/market/components/reportModule4.vue b/pages/market/components/reportModule4.vue index a8ee6fc..3c4f5bd 100644 --- a/pages/market/components/reportModule4.vue +++ b/pages/market/components/reportModule4.vue @@ -16,6 +16,9 @@ reportData: { type: Object }, + fiscalYear:{ + type:String + } }, data() { return { @@ -27,7 +30,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "contractGoal", id: "0" @@ -35,7 +38,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "contractGoal", id: "1" @@ -43,7 +46,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "contractGoal", id: "2" @@ -56,7 +59,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "newUserGoal", id: "0" @@ -64,7 +67,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "newUserGoal", id: "1" @@ -72,7 +75,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "newUserGoal", id: "2" @@ -86,7 +89,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "oldUserGoal", id: "0" @@ -94,7 +97,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "oldUserGoal", id: "1" @@ -102,7 +105,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "oldUserGoal", id: "2" @@ -116,7 +119,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "townsUserGoal", id: "0" @@ -124,7 +127,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "townsUserGoal", id: "1" @@ -132,7 +135,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "townsUserGoal", id: "2" @@ -146,7 +149,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "commerceGoal", id: "0" @@ -154,7 +157,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "commerceGoal", id: "1" @@ -162,7 +165,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "commerceGoal", id: "2" @@ -176,7 +179,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "industryGoal", id: "0" @@ -184,7 +187,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "industryGoal", id: "1" @@ -192,7 +195,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "industryGoal", id: "2" @@ -206,7 +209,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "installUserGoal", id: "0" @@ -214,7 +217,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "installUserGoal", id: "1" @@ -222,7 +225,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "installUserGoal", id: "2" @@ -236,7 +239,7 @@ { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标`, + title: `${this.fiscalYear}财年目标`, value: "", key: "salesNumberGoal", id: "0" @@ -244,7 +247,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, + title: `${parseInt(this.fiscalYear)+1}财年目标`, value: "", key: "salesNumberGoal", id: "1" @@ -252,7 +255,7 @@ { cardType: 1, required: true, - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, + title: `${parseInt(this.fiscalYear)+2}财年目标`, value: "", key: "salesNumberGoal", id: "2" diff --git a/pages/market/components/reportModule5.vue b/pages/market/components/reportModule5.vue index dc1bccf..1b27ec8 100644 --- a/pages/market/components/reportModule5.vue +++ b/pages/market/components/reportModule5.vue @@ -1,6 +1,6 @@ @@ -15,20 +15,23 @@ reportData: { type: Object }, + fiscalYear:{ + type:String + } }, data() { return { data1: [{ cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标计划签约(户)`, + title: `${this.fiscalYear}财年目标计划签约(户)`, value: "", key:"planSignHousehold" }, { cardType: 1, required: true, - title: `${this.reportData.fiscalYear}财年目标计划安装(户)`, + title: `${this.fiscalYear}财年目标计划安装(户)`, value: "", key:"planInstallHousehold" }, diff --git a/pages/market/insight.vue b/pages/market/insight.vue index f59be22..e5cd23d 100644 --- a/pages/market/insight.vue +++ b/pages/market/insight.vue @@ -18,7 +18,7 @@ }" itemStyle="height: 78rpx;" @click="tabChange1"> - 财年 + {{fiscalYear?fiscalYear:'财年'}} @@ -38,9 +38,9 @@ + height="74rpx" bgColor="#F5F6FA" @search="search" @clear="clearInit"> - + @@ -56,11 +56,11 @@ {{item.statusName}} + @click="jumpReportDetails(item.reportNo,item.fiscalYear)"> - + @@ -75,7 +75,7 @@ 详情地址: {{item.address || ""}} - + { - console.log("市场摸底列表", res); - if (res.code === 200) { - this.newList1 = res.rows; - this.total1 = res.total; - } - }) + this.updateList1(); }, typeChange(i) { this.keyword = ""; @@ -205,25 +196,16 @@ this.current ? this.updateList2() : this.updateList1(); }, updateList1() { - let Params - if (this.keyword && this.current1 !== -1 && this.fiscalYear !== "") { - Params = { - reportName: this.keyword, - statusCode: this.current1, - fiscalYear: this.fiscalYear, - } - } else if (this.keyword !== "") { - Params = { - reportName: this.keyword, - } - } else if (this.current1 !== 0) { - Params = { - statusCode: this.current1 - 1 - } - } else if (this.fiscalYear !== "") { - Params = { - fiscalYear: this.fiscalYear - } + let Params = {}; + if(this.keyword){ + Params.reportName = this.keyword + } + if(this.current1 !== -1 && this.current1 !== 0) + { + Params.statusCode = this.current1 - 1; + } + if(this.fiscalYear !== ""){ + Params.fiscalYear = this.fiscalYear } console.log("市场摸底查询参数",Params); Params = { @@ -242,6 +224,7 @@ console.log(this.newList1); } }) + this.checkTotal(); }, updateList2() { let Params = {}; @@ -295,6 +278,7 @@ console.log("待开发", this.newList2); }, checkTotal() { + console.log("查询是否更多"); let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize if (this.total1 < allTotal) { this.status1 = "nomore" @@ -309,6 +293,10 @@ this.queryParameter.pageNum = 1; this.queryParameter.pageSize = 10; }, + clearInit(){ + this.keyword = "" + this.search() + }, tabChange1(e) { console.log(e); this.resetQuery() @@ -326,13 +314,17 @@ // this.fiscalYear = Number(new Date()); }, confirmYear() { - this.$nextTick(()=>{ + setTimeout(()=>{ let year = this.$u.timeFormat(this.yaerModal, 'yyyy'); this.fiscalYear = year; this.fiscalYearShow = false; console.log(this.fiscalYear); this.resetQuery(); - }) + this.updateList1(); + },0) + // this.$nextTick(()=>{ + + // }) }, resetDate() { console.log("重置"); @@ -352,12 +344,12 @@ }, jumpUserDetails(item) { uni.navigateTo({ - url: `/pages/market/userDetails?type=${this.current2}&details=${JSON.stringify(item)}` + url: `/pages/market/userDetails?type=${this.current2}&id=${item.id}` }) }, - jumpReportDetails(id) { + jumpReportDetails(id,fiscalYear) { uni.navigateTo({ - url: "/pages/market/reportDetails?reportNo=" + id + url: `/pages/market/reportDetails?reportNo=${id}&fiscalYear=${fiscalYear}` }) } } @@ -367,6 +359,7 @@ diff --git a/pages/market/total.vue b/pages/market/total.vue index 55eaf35..ece750a 100644 --- a/pages/market/total.vue +++ b/pages/market/total.vue @@ -7,7 +7,7 @@ 本财年报告已上报数 - 23300 + {{statistics.totalNum}} @@ -16,7 +16,7 @@ 待开发居民用户 - 23300 + {{statistics.resident}} @@ -24,7 +24,7 @@ 待开发商业用户 - 23300 + {{statistics.business}} @@ -32,7 +32,7 @@ 待开发工业用户 - 23300 + {{statistics.industry}} @@ -52,21 +52,25 @@ - + diff --git a/vue.config.js b/vue.config.js index 25aa2d4..8a1ec01 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,27 +1,27 @@ -module.exports = { - // 配置路径别名 - configureWebpack: { - devServer: { - // 调试时允许内网穿透，让外网的人访问到本地调试的H5页面 - disableHostCheck: true, - // /本地调试时打开 - port: '18082', //代理端口,不固定8222，可以是其他的 - open: false, //项目启动时是否自动打开浏览器 - proxy: { - '/api': { - target: 'http://172.17.56.37/api', //测试接口地址 - // target: 'http://172.17.56.16/api', //正式接口地址 - // ws:true, //允许ws跨域 - secure:true, //类型:https=false http=true - changeOrigin: true, //是否跨域 - pathRewrite:{ // 重写路径 - '^/api':'' - } - } - }, +// module.exports = { +// // 配置路径别名 +// configureWebpack: { +// devServer: { +// // 调试时允许内网穿透，让外网的人访问到本地调试的H5页面 +// disableHostCheck: true, +// // /本地调试时打开 +// port: '18082', //代理端口,不固定8222，可以是其他的 +// open: false, //项目启动时是否自动打开浏览器 +// proxy: { +// '/api': { +// target: 'http://172.17.56.37/api', //测试接口地址 +// // target: 'http://172.17.56.16/api', //正式接口地址 +// // ws:true, //允许ws跨域 +// secure:true, //类型:https=false http=true +// changeOrigin: true, //是否跨域 +// pathRewrite:{ // 重写路径 +// '^/api':'' +// } +// } +// }, - // /本地调试时打开 - } - }, - productionSourceMap: false, -} +// // /本地调试时打开 +// } +// }, +// productionSourceMap: false, +// } -- libgit2 0.21.2