gas-market / market-insight-app

Download as
Browse Code »

Commit a11f0d83ce83c682f59458a590289c03057414fc

Authored by 郭伟龙
1 parent 73397f00
Exists in develop and in 1 other branch charge

fix: 修改问题、增加统计、增加查看附件

Showing 20 changed files with 580 additions and 410 deletions   Show diff stats
api/infoMarketInformation.js
  Diff comments   View file @a11f0d8
@@ -2,3 +2,6 @@ const { http } = uni.$u @@ -2,3 +2,6 @@ const { http } = uni.$u
2 // 列表和条件筛选 2 // 列表和条件筛选
3 export const getInfoMarketInformationlist = params => http.get('/insight/infoMarketInformation/list', { params }) 3 export const getInfoMarketInformationlist = params => http.get('/insight/infoMarketInformation/list', { params })
4 4
  5 +export const getInfoMarketInformationDetail = id => http.get('/insight/infoMarketInformation/'+id)
  6 +
  7 +
api/organize.js
  Diff comments   View file @a11f0d8
@@ -11,6 +11,15 @@ export const getPoolCommercelist = params => http.get('/insight/poolCommerce/lis @@ -11,6 +11,15 @@ export const getPoolCommercelist = params => http.get('/insight/poolCommerce/lis
11 //工业用户 11 //工业用户
12 export const getPoolIndustrylist = params => http.get('/insight/poolIndustry/list', { params }) 12 export const getPoolIndustrylist = params => http.get('/insight/poolIndustry/list', { params })
13 13
  14 +//居民用户详情
  15 +export const getPoolResidentDetail = id => http.get('/insight/poolResident/'+id )
  16 +
  17 +//商业用户详情
  18 +export const getPoolCommerceDetail = id => http.get('/insight/poolCommerce/'+id )
  19 +
  20 +//工业用户详情
  21 +export const getPoolIndustryDetail = id => http.get('/insight/poolIndustry/'+id )
  22 +
14 /*报告详情*/ 23 /*报告详情*/
15 24
16 //报告详情-组织实施落实 1 25 //报告详情-组织实施落实 1
api/total.js 0 → 100644
  Diff comments   View file @a11f0d8
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +const { http } = uni.$u
  2 +
  3 +// 本财年市场摸底分析
  4 +export const getStatisticsReport = id => http.get('/insight/statistics/report/'+id)
  5 +
  6 +// 待开发用户池数据分析
  7 +export const getStatisticsPool = params => http.get('/insight/statistics/pool',params)
  8 +// /statistics/pool
  9 +
  10 +export const getStatisticsLogin = params => http.get('/insight/statistics/login',params)
  11 +// 访问量和浏览量
  12 +// /statistics/login
  13 +
  14 +
common/config.js
  Diff comments   View file @a11f0d8
@@ -4,7 +4,6 @@ module.exports = { @@ -4,7 +4,6 @@ module.exports = {
4 baseUrl: 'http://172.17.56.37:18082/api', //测试环境 4 baseUrl: 'http://172.17.56.37:18082/api', //测试环境
5 // baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境 5 // baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境
6 // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境 6 // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境
7 - // baseUrl: 'http://api-dashboard.yudao.iocoder.cn/app-api',  
8 // 超时 7 // 超时
9 timeout: 30000, 8 timeout: 30000,
10 // 禁用 Cookie 等信息 9 // 禁用 Cookie 等信息
components/news-list/news-list.vue
  Diff comments   View file @a11f0d8
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 newsDetails(){ 36 newsDetails(){
37 console.log("跳转"); 37 console.log("跳转");
38 uni.navigateTo({ 38 uni.navigateTo({
39 - url:'/pages/market/newsDetails?detailsContent=' + JSON.stringify(this.newItem) 39 + url:'/pages/market/newsDetails?id=' + this.newItem.infoId
40 }) 40 })
41 } 41 }
42 } 42 }
@@ -8,8 +8,6 @@ import echarts from '@/components/echarts-uniapp/echarts-uniapp.vue'; @@ -8,8 +8,6 @@ import echarts from '@/components/echarts-uniapp/echarts-uniapp.vue';
8 // vuex 8 // vuex
9 import store from './store' 9 import store from './store'
10 10
11 -import dayjs from 'dayjs'  
12 -  
13 import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "./utils/dict"; 11 import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "./utils/dict";
14 12
15 13
@@ -21,7 +19,6 @@ Vue.prototype.$store = store @@ -21,7 +19,6 @@ Vue.prototype.$store = store
21 Vue.prototype.getDictDatas = getDictDatas 19 Vue.prototype.getDictDatas = getDictDatas
22 Vue.prototype.getDictDatas2 = getDictDatas2 20 Vue.prototype.getDictDatas2 = getDictDatas2
23 Vue.prototype.getDictDataLabel = getDictDataLabel 21 Vue.prototype.getDictDataLabel = getDictDataLabel
24 -Vue.prototype.$dayjs = dayjs  
25 Vue.prototype.DICT_TYPE = DICT_TYPE 22 Vue.prototype.DICT_TYPE = DICT_TYPE
26 23
27 Vue.component('echarts',echarts) 24 Vue.component('echarts',echarts)
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 "name" : "市场资讯", 2 "name" : "市场资讯",
3 "appid" : "__UNI__A1179CD", 3 "appid" : "__UNI__A1179CD",
4 "description" : "市场资讯", 4 "description" : "市场资讯",
5 - "versionName" : "1.0.0",  
6 - "versionCode" : "100", 5 + "versionName" : "0.1.1",
  6 + "versionCode" : 101,
7 "transformPx" : false, 7 "transformPx" : false,
8 /* 5+App特有相关 */ 8 /* 5+App特有相关 */
9 "app-plus" : { 9 "app-plus" : {
package-lock.json
  Diff comments   View file @a11f0d8
1 { 1 {
2 "name": "echarts for uniapp", 2 "name": "echarts for uniapp",
3 "version": "0.0.1", 3 "version": "0.0.1",
4 - "lockfileVersion": 1,  
5 - "requires": true,  
6 - "dependencies": {  
7 - "dayjs": {  
8 - "version": "1.11.10",  
9 - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",  
10 - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="  
11 - }  
12 - } 4 + "lockfileVersion": 1
13 } 5 }
@@ -13,7 +13,5 @@ @@ -13,7 +13,5 @@
13 "通用组件" 13 "通用组件"
14 ] 14 ]
15 }, 15 },
16 - "dependencies": {  
17 - "dayjs": "^1.11.10"  
18 - } 16 + "dependencies": {}
19 } 17 }
pages/market/components/reportModule1.vue
  Diff comments   View file @a11f0d8
@@ -8,25 +8,33 @@ @@ -8,25 +8,33 @@
8 <view class="u-demo-block"> 8 <view class="u-demo-block">
9 <text class="u-demo-block__title">组长</text> 9 <text class="u-demo-block__title">组长</text>
10 <view class="u-demo-block__content" style="margin-top: 15px;"> 10 <view class="u-demo-block__content" style="margin-top: 15px;">
11 - <u--input :value="reportData.leader" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 11 + <u--input :value="reportData.leader" disabled
  12 + suffixIconStyle="color: #909399"></u--input>
  13 + <!-- <u--input :value="reportData.leader" disabled suffixIcon="arrow-down"
  14 + suffixIconStyle="color: #909399"></u--input> -->
12 </view> 15 </view>
13 </view> 16 </view>
14 <view class="u-demo-block"> 17 <view class="u-demo-block">
15 <text class="u-demo-block__title">副组长</text> 18 <text class="u-demo-block__title">副组长</text>
16 <view class="u-demo-block__content" style="margin-top: 15px;"> 19 <view class="u-demo-block__content" style="margin-top: 15px;">
17 - <u--input :value="reportData.deputyLeader" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 20 + <u--input :value="reportData.deputyLeader" disabled
  21 + suffixIconStyle="color: #909399"></u--input>
18 </view> 22 </view>
19 </view> 23 </view>
20 <view class="u-demo-block"> 24 <view class="u-demo-block">
21 <text class="u-demo-block__title">成员</text> 25 <text class="u-demo-block__title">成员</text>
22 <view class="u-demo-block__content" style="margin-top: 15px;"> 26 <view class="u-demo-block__content" style="margin-top: 15px;">
23 - <u--input :value="reportData.member" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 27 + <u--input :value="reportData.member" disabled
  28 + suffixIconStyle="color: #909399"></u--input>
  29 + <!-- <u--textarea v-model="reportData.member" disabled
  30 + suffixIconStyle="color: #909399"></u--textarea> -->
24 </view> 31 </view>
25 </view> 32 </view>
26 <view class="u-demo-block"> 33 <view class="u-demo-block">
27 <text class="u-demo-block__title">填报人</text> 34 <text class="u-demo-block__title">填报人</text>
28 <view class="u-demo-block__content" style="margin-top: 15px;"> 35 <view class="u-demo-block__content" style="margin-top: 15px;">
29 - <u--input :value="reportData.createBy" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 36 + <u--input :value="reportData.createBy" disabled
  37 + suffixIconStyle="color: #909399"></u--input>
30 </view> 38 </view>
31 </view> 39 </view>
32 </view> 40 </view>
@@ -34,7 +42,7 @@ @@ -34,7 +42,7 @@
34 </u-collapse> 42 </u-collapse>
35 </view> 43 </view>
36 <view class="cardCss"> 44 <view class="cardCss">
37 - <u-collapse :border="false" :value="['3']"> 45 + <u-collapse :border="false" :value="['2']">
38 <u-collapse-item name="2"> 46 <u-collapse-item name="2">
39 <text slot="title" class="slot-title">实施情况</text> 47 <text slot="title" class="slot-title">实施情况</text>
40 <view class="largeAmountOfTextCss"> 48 <view class="largeAmountOfTextCss">
@@ -44,19 +52,21 @@ @@ -44,19 +52,21 @@
44 </u-collapse> 52 </u-collapse>
45 </view> 53 </view>
46 54
47 - <view class="cardCss"> 55 + <view class="cardCss" v-if="isShowUrl">
48 <u-collapse :border="false" :value="['3']"> 56 <u-collapse :border="false" :value="['3']">
49 <u-collapse-item name="3"> 57 <u-collapse-item name="3">
50 <text slot="title" class="slot-title">预算主体附件</text> 58 <text slot="title" class="slot-title">预算主体附件</text>
51 <view class="attachmentCss"> 59 <view class="attachmentCss">
52 - <view class="flexCss"> 60 + <view class="flexCss" v-for="(item,index) in reportData.attachmentsUrl" :key="index">
53 <view class="leftCss overflow-one-lines"> 61 <view class="leftCss overflow-one-lines">
54 - <u-icon size="18" name="/static/images/icon/PDF.png"></u-icon>  
55 - <view class="textCss overflow-one-lines"></view> 62 + <u-icon size="18" :name="calcIcon(item.extension)"></u-icon>
  63 + <view class="textCss overflow-one-lines">{{item.fileName}}</view>
  64 + </view>
  65 + <view class="rightCss">
  66 + <view @click="viewAttachments(item.url)">查看</view>
56 </view> 67 </view>
57 - <view class="rightCss"> 查看 </view>  
58 </view> 68 </view>
59 - <view class="flexCss"> 69 + <!-- <view class="flexCss">
60 <view class="leftCss overflow-one-lines"> 70 <view class="leftCss overflow-one-lines">
61 <u-icon size="18" name="/static/images/icon/EXCEL.png"></u-icon> 71 <u-icon size="18" name="/static/images/icon/EXCEL.png"></u-icon>
62 <view class="textCss overflow-one-lines"></view> 72 <view class="textCss overflow-one-lines"></view>
@@ -69,7 +79,7 @@ @@ -69,7 +79,7 @@
69 <view class="textCss overflow-one-lines"></view> 79 <view class="textCss overflow-one-lines"></view>
70 </view> 80 </view>
71 <view class="rightCss"> 查看 </view> 81 <view class="rightCss"> 查看 </view>
72 - </view> 82 + </view> -->
73 </view> 83 </view>
74 </u-collapse-item> 84 </u-collapse-item>
75 </u-collapse> 85 </u-collapse>
@@ -81,22 +91,56 @@ @@ -81,22 +91,56 @@
81 export default { 91 export default {
82 components: {}, 92 components: {},
83 props: { 93 props: {
84 - reportData:{  
85 - type:Object  
86 - } 94 + reportData: {
  95 + type: Object
  96 + },
87 }, 97 },
88 data() { 98 data() {
89 return { 99 return {
  100 + isShowUrl: false,
90 } 101 }
91 }, 102 },
92 computed: { 103 computed: {
93 104
94 }, 105 },
95 - onLoad() {  
96 - 106 + mounted() {
  107 + setTimeout(() => {
  108 + this.init()
  109 + }, 500)
97 }, 110 },
98 methods: { 111 methods: {
99 - 112 + calcIcon(type) {
  113 + if (type == '.xlsx' || type == '.xls') {
  114 + return '/static/images/icon/EXCEL.png'
  115 + } else if (type == '.pdf') {
  116 + return '/static/images/icon/PDF.png'
  117 + } else if (type == '.docx' || type == '.doc') {
  118 + return '/static/images/icon/DOC.png'
  119 + }
  120 + },
  121 + init() {
  122 + this.reportData.attachmentsUrl = JSON.parse(this.reportData.attachmentsUrl);
  123 + if (this.reportData.attachmentsUrl.length) {
  124 + this.isShowUrl = true
  125 + }
  126 + console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl)));
  127 + },
  128 + viewAttachments(urls) {
  129 + uni.getSystemInfo({
  130 + success: function(res) {
  131 + var platform = res.platform.toLowerCase();
  132 + console.log(platform);
  133 + // 如果是安卓设备
  134 + if (platform === 'android' || platform === 'windows') {
  135 + window.open(urls, '_blank');
  136 + }
  137 + // 如果是 iOS 设备
  138 + else if (platform === 'ios') {
  139 + window.location.href = urls
  140 + }
  141 + }
  142 + });
  143 + }
100 } 144 }
101 } 145 }
102 </script> 146 </script>
@@ -125,10 +169,10 @@ @@ -125,10 +169,10 @@
125 } 169 }
126 170
127 .attachmentCss { 171 .attachmentCss {
128 - padding: 20rpx;  
129 - border-radius: 20px;  
130 - background-color: #f8f9fd;  
131 - box-sizing: border-box; 172 + padding: 20rpx;
  173 + border-radius: 20px;
  174 + background-color: #f8f9fd;
  175 + box-sizing: border-box;
132 } 176 }
133 177
134 .flexCss { 178 .flexCss {
@@ -143,10 +187,11 @@ @@ -143,10 +187,11 @@
143 justify-content: flex-start; 187 justify-content: flex-start;
144 align-items: center; 188 align-items: center;
145 } 189 }
  190 +
146 .textCss { 191 .textCss {
147 width: 466rpx; 192 width: 466rpx;
148 height: 35rpx; 193 height: 35rpx;
149 - margin:0 4px; 194 + margin: 0 4px;
150 background-color: rgba(255, 255, 255, 0); 195 background-color: rgba(255, 255, 255, 0);
151 box-sizing: border-box; 196 box-sizing: border-box;
152 font-family: '苹方 中等', '苹方', sans-serif; 197 font-family: '苹方 中等', '苹方', sans-serif;
@@ -169,7 +214,7 @@ @@ -169,7 +214,7 @@
169 } 214 }
170 215
171 .largeAmountOfTextCss { 216 .largeAmountOfTextCss {
172 - text-indent:1em; 217 + text-indent: 1em;
173 margin-top: 38rpx; 218 margin-top: 38rpx;
174 padding: 20rpx 20rpx 20rpx 20rpx; 219 padding: 20rpx 20rpx 20rpx 20rpx;
175 border-radius: 20rpx; 220 border-radius: 20rpx;
pages/market/components/reportModule2.vue
  Diff comments   View file @a11f0d8
@@ -29,6 +29,9 @@ @@ -29,6 +29,9 @@
29 attachment: { 29 attachment: {
30 type: Object 30 type: Object
31 }, 31 },
  32 + fiscalYear:{
  33 + type:String
  34 + }
32 }, 35 },
33 data() { 36 data() {
34 return { 37 return {
@@ -843,7 +846,7 @@ @@ -843,7 +846,7 @@
843 { 846 {
844 cardType: 3, 847 cardType: 3,
845 required: true, 848 required: true,
846 - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear}财年(预计)`, 849 + title: `新建居民用户(含乡镇新房)_${this.fiscalYear}财年(预计)`,
847 }, 850 },
848 { 851 {
849 cardType: 1, 852 cardType: 1,
@@ -864,7 +867,7 @@ @@ -864,7 +867,7 @@
864 { 867 {
865 cardType: 3, 868 cardType: 3,
866 required: true, 869 required: true,
867 - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 1}财年`, 870 + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 1}财年`,
868 }, 871 },
869 { 872 {
870 cardType: 1, 873 cardType: 1,
@@ -885,7 +888,7 @@ @@ -885,7 +888,7 @@
885 { 888 {
886 cardType: 3, 889 cardType: 3,
887 required: true, 890 required: true,
888 - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 2}财年`, 891 + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 2}财年`,
889 }, 892 },
890 { 893 {
891 cardType: 1, 894 cardType: 1,
@@ -906,7 +909,7 @@ @@ -906,7 +909,7 @@
906 { 909 {
907 cardType: 3, 910 cardType: 3,
908 required: true, 911 required: true,
909 - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 3}财年`, 912 + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 3}财年`,
910 }, 913 },
911 { 914 {
912 cardType: 1, 915 cardType: 1,
@@ -927,7 +930,7 @@ @@ -927,7 +930,7 @@
927 { 930 {
928 cardType: 3, 931 cardType: 3,
929 required: true, 932 required: true,
930 - title: `新建居民用户(含乡镇新房)_${this.attachment.fiscalYear - 4}财年`, 933 + title: `新建居民用户(含乡镇新房)_${this.fiscalYear - 4}财年`,
931 }, 934 },
932 { 935 {
933 cardType: 1, 936 cardType: 1,
@@ -949,7 +952,7 @@ @@ -949,7 +952,7 @@
949 { 952 {
950 cardType: 3, 953 cardType: 3,
951 required: true, 954 required: true,
952 - title: `城市老居民用户_${this.attachment.fiscalYear}财年(预计)`, 955 + title: `城市老居民用户_${this.fiscalYear}财年(预计)`,
953 }, 956 },
954 { 957 {
955 cardType: 1, 958 cardType: 1,
@@ -970,7 +973,7 @@ @@ -970,7 +973,7 @@
970 { 973 {
971 cardType: 3, 974 cardType: 3,
972 required: true, 975 required: true,
973 - title: `城市老居民用户_${this.attachment.fiscalYear - 1}财年`, 976 + title: `城市老居民用户_${this.fiscalYear - 1}财年`,
974 }, 977 },
975 { 978 {
976 cardType: 1, 979 cardType: 1,
@@ -991,7 +994,7 @@ @@ -991,7 +994,7 @@
991 { 994 {
992 cardType: 3, 995 cardType: 3,
993 required: true, 996 required: true,
994 - title: `城市老居民用户_${this.attachment.fiscalYear - 2}财年`, 997 + title: `城市老居民用户_${this.fiscalYear - 2}财年`,
995 }, 998 },
996 { 999 {
997 cardType: 1, 1000 cardType: 1,
@@ -1012,7 +1015,7 @@ @@ -1012,7 +1015,7 @@
1012 { 1015 {
1013 cardType: 3, 1016 cardType: 3,
1014 required: true, 1017 required: true,
1015 - title: `城市老居民用户_${this.attachment.fiscalYear - 3}财年`, 1018 + title: `城市老居民用户_${this.fiscalYear - 3}财年`,
1016 }, 1019 },
1017 { 1020 {
1018 cardType: 1, 1021 cardType: 1,
@@ -1033,7 +1036,7 @@ @@ -1033,7 +1036,7 @@
1033 { 1036 {
1034 cardType: 3, 1037 cardType: 3,
1035 required: true, 1038 required: true,
1036 - title: `城市老居民用户_${this.attachment.fiscalYear - 4}财年`, 1039 + title: `城市老居民用户_${this.fiscalYear - 4}财年`,
1037 }, 1040 },
1038 { 1041 {
1039 cardType: 1, 1042 cardType: 1,
@@ -1055,7 +1058,7 @@ @@ -1055,7 +1058,7 @@
1055 { 1058 {
1056 cardType: 3, 1059 cardType: 3,
1057 required: true, 1060 required: true,
1058 - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear}财年(预计)`, 1061 + title: `农村气代媒(含气代柴薪)_${this.fiscalYear}财年(预计)`,
1059 }, 1062 },
1060 { 1063 {
1061 cardType: 1, 1064 cardType: 1,
@@ -1076,7 +1079,7 @@ @@ -1076,7 +1079,7 @@
1076 { 1079 {
1077 cardType: 3, 1080 cardType: 3,
1078 required: true, 1081 required: true,
1079 - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 1}财年`, 1082 + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 1}财年`,
1080 }, 1083 },
1081 { 1084 {
1082 cardType: 1, 1085 cardType: 1,
@@ -1097,7 +1100,7 @@ @@ -1097,7 +1100,7 @@
1097 { 1100 {
1098 cardType: 3, 1101 cardType: 3,
1099 required: true, 1102 required: true,
1100 - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 2}财年`, 1103 + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 2}财年`,
1101 }, 1104 },
1102 { 1105 {
1103 cardType: 1, 1106 cardType: 1,
@@ -1118,7 +1121,7 @@ @@ -1118,7 +1121,7 @@
1118 { 1121 {
1119 cardType: 3, 1122 cardType: 3,
1120 required: true, 1123 required: true,
1121 - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 3}财年`, 1124 + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 3}财年`,
1122 }, 1125 },
1123 { 1126 {
1124 cardType: 1, 1127 cardType: 1,
@@ -1139,7 +1142,7 @@ @@ -1139,7 +1142,7 @@
1139 { 1142 {
1140 cardType: 3, 1143 cardType: 3,
1141 required: true, 1144 required: true,
1142 - title: `农村气代媒(含气代柴薪)_${this.attachment.fiscalYear - 4}财年`, 1145 + title: `农村气代媒(含气代柴薪)_${this.fiscalYear - 4}财年`,
1143 }, 1146 },
1144 { 1147 {
1145 cardType: 1, 1148 cardType: 1,
@@ -1161,7 +1164,7 @@ @@ -1161,7 +1164,7 @@
1161 { 1164 {
1162 cardType: 3, 1165 cardType: 3,
1163 required: true, 1166 required: true,
1164 - title: `乡村燃气居民_${this.attachment.fiscalYear}财年(预计)`, 1167 + title: `乡村燃气居民_${this.fiscalYear}财年(预计)`,
1165 }, 1168 },
1166 { 1169 {
1167 cardType: 1, 1170 cardType: 1,
@@ -1182,7 +1185,7 @@ @@ -1182,7 +1185,7 @@
1182 { 1185 {
1183 cardType: 3, 1186 cardType: 3,
1184 required: true, 1187 required: true,
1185 - title: `乡村燃气居民_${this.attachment.fiscalYear - 1}财年`, 1188 + title: `乡村燃气居民_${this.fiscalYear - 1}财年`,
1186 }, 1189 },
1187 { 1190 {
1188 cardType: 1, 1191 cardType: 1,
@@ -1203,7 +1206,7 @@ @@ -1203,7 +1206,7 @@
1203 { 1206 {
1204 cardType: 3, 1207 cardType: 3,
1205 required: true, 1208 required: true,
1206 - title: `乡村燃气居民_${this.attachment.fiscalYear - 2}财年`, 1209 + title: `乡村燃气居民_${this.fiscalYear - 2}财年`,
1207 }, 1210 },
1208 { 1211 {
1209 cardType: 1, 1212 cardType: 1,
@@ -1224,7 +1227,7 @@ @@ -1224,7 +1227,7 @@
1224 { 1227 {
1225 cardType: 3, 1228 cardType: 3,
1226 required: true, 1229 required: true,
1227 - title: `乡村燃气居民_${this.attachment.fiscalYear - 3}财年`, 1230 + title: `乡村燃气居民_${this.fiscalYear - 3}财年`,
1228 }, 1231 },
1229 { 1232 {
1230 cardType: 1, 1233 cardType: 1,
@@ -1245,7 +1248,7 @@ @@ -1245,7 +1248,7 @@
1245 { 1248 {
1246 cardType: 3, 1249 cardType: 3,
1247 required: true, 1250 required: true,
1248 - title: `乡村燃气居民_${this.attachment.fiscalYear - 4}财年`, 1251 + title: `乡村燃气居民_${this.fiscalYear - 4}财年`,
1249 }, 1252 },
1250 { 1253 {
1251 cardType: 1, 1254 cardType: 1,
@@ -1267,7 +1270,7 @@ @@ -1267,7 +1270,7 @@
1267 { 1270 {
1268 cardType: 3, 1271 cardType: 3,
1269 required: true, 1272 required: true,
1270 - title: `商业用户_${this.attachment.fiscalYear}财年(预计)`, 1273 + title: `商业用户_${this.fiscalYear}财年(预计)`,
1271 }, 1274 },
1272 { 1275 {
1273 cardType: 1, 1276 cardType: 1,
@@ -1288,7 +1291,7 @@ @@ -1288,7 +1291,7 @@
1288 { 1291 {
1289 cardType: 3, 1292 cardType: 3,
1290 required: true, 1293 required: true,
1291 - title: `商业用户_${this.attachment.fiscalYear - 1}财年`, 1294 + title: `商业用户_${this.fiscalYear - 1}财年`,
1292 }, 1295 },
1293 { 1296 {
1294 cardType: 1, 1297 cardType: 1,
@@ -1309,7 +1312,7 @@ @@ -1309,7 +1312,7 @@
1309 { 1312 {
1310 cardType: 3, 1313 cardType: 3,
1311 required: true, 1314 required: true,
1312 - title: `商业用户_${this.attachment.fiscalYear - 2}财年`, 1315 + title: `商业用户_${this.fiscalYear - 2}财年`,
1313 }, 1316 },
1314 { 1317 {
1315 cardType: 1, 1318 cardType: 1,
@@ -1330,7 +1333,7 @@ @@ -1330,7 +1333,7 @@
1330 { 1333 {
1331 cardType: 3, 1334 cardType: 3,
1332 required: true, 1335 required: true,
1333 - title: `商业用户_${this.attachment.fiscalYear - 3}财年`, 1336 + title: `商业用户_${this.fiscalYear - 3}财年`,
1334 }, 1337 },
1335 { 1338 {
1336 cardType: 1, 1339 cardType: 1,
@@ -1351,7 +1354,7 @@ @@ -1351,7 +1354,7 @@
1351 { 1354 {
1352 cardType: 3, 1355 cardType: 3,
1353 required: true, 1356 required: true,
1354 - title: `商业用户_${this.attachment.fiscalYear - 4}财年`, 1357 + title: `商业用户_${this.fiscalYear - 4}财年`,
1355 }, 1358 },
1356 { 1359 {
1357 cardType: 1, 1360 cardType: 1,
@@ -1373,7 +1376,7 @@ @@ -1373,7 +1376,7 @@
1373 { 1376 {
1374 cardType: 3, 1377 cardType: 3,
1375 required: true, 1378 required: true,
1376 - title: `工业用户_${this.attachment.fiscalYear}财年(预计)`, 1379 + title: `工业用户_${this.fiscalYear}财年(预计)`,
1377 }, 1380 },
1378 { 1381 {
1379 cardType: 1, 1382 cardType: 1,
@@ -1394,7 +1397,7 @@ @@ -1394,7 +1397,7 @@
1394 { 1397 {
1395 cardType: 3, 1398 cardType: 3,
1396 required: true, 1399 required: true,
1397 - title: `工业用户_${this.attachment.fiscalYear - 1}财年`, 1400 + title: `工业用户_${this.fiscalYear - 1}财年`,
1398 }, 1401 },
1399 { 1402 {
1400 cardType: 1, 1403 cardType: 1,
@@ -1415,7 +1418,7 @@ @@ -1415,7 +1418,7 @@
1415 { 1418 {
1416 cardType: 3, 1419 cardType: 3,
1417 required: true, 1420 required: true,
1418 - title: `工业用户_${this.attachment.fiscalYear - 2}财年`, 1421 + title: `工业用户_${this.fiscalYear - 2}财年`,
1419 }, 1422 },
1420 { 1423 {
1421 cardType: 1, 1424 cardType: 1,
@@ -1436,7 +1439,7 @@ @@ -1436,7 +1439,7 @@
1436 { 1439 {
1437 cardType: 3, 1440 cardType: 3,
1438 required: true, 1441 required: true,
1439 - title: `工业用户_${this.attachment.fiscalYear - 3}财年`, 1442 + title: `工业用户_${this.fiscalYear - 3}财年`,
1440 }, 1443 },
1441 { 1444 {
1442 cardType: 1, 1445 cardType: 1,
@@ -1457,7 +1460,7 @@ @@ -1457,7 +1460,7 @@
1457 { 1460 {
1458 cardType: 3, 1461 cardType: 3,
1459 required: true, 1462 required: true,
1460 - title: `工业用户_${this.attachment.fiscalYear - 4}财年`, 1463 + title: `工业用户_${this.fiscalYear - 4}财年`,
1461 }, 1464 },
1462 { 1465 {
1463 cardType: 1, 1466 cardType: 1,
@@ -1479,7 +1482,7 @@ @@ -1479,7 +1482,7 @@
1479 { 1482 {
1480 cardType: 3, 1483 cardType: 3,
1481 required: true, 1484 required: true,
1482 - title: `合计_${this.attachment.fiscalYear}财年(预计)`, 1485 + title: `合计_${this.fiscalYear}财年(预计)`,
1483 }, 1486 },
1484 { 1487 {
1485 cardType: 1, 1488 cardType: 1,
@@ -1500,7 +1503,7 @@ @@ -1500,7 +1503,7 @@
1500 { 1503 {
1501 cardType: 3, 1504 cardType: 3,
1502 required: true, 1505 required: true,
1503 - title: `合计_${this.attachment.fiscalYear - 1}财年`, 1506 + title: `合计_${this.fiscalYear - 1}财年`,
1504 }, 1507 },
1505 { 1508 {
1506 cardType: 1, 1509 cardType: 1,
@@ -1521,7 +1524,7 @@ @@ -1521,7 +1524,7 @@
1521 { 1524 {
1522 cardType: 3, 1525 cardType: 3,
1523 required: true, 1526 required: true,
1524 - title: `合计_${this.attachment.fiscalYear - 2}财年`, 1527 + title: `合计_${this.fiscalYear - 2}财年`,
1525 }, 1528 },
1526 { 1529 {
1527 cardType: 1, 1530 cardType: 1,
@@ -1542,7 +1545,7 @@ @@ -1542,7 +1545,7 @@
1542 { 1545 {
1543 cardType: 3, 1546 cardType: 3,
1544 required: true, 1547 required: true,
1545 - title: `合计_${this.attachment.fiscalYear - 3}财年`, 1548 + title: `合计_${this.fiscalYear - 3}财年`,
1546 }, 1549 },
1547 { 1550 {
1548 cardType: 1, 1551 cardType: 1,
@@ -1563,7 +1566,7 @@ @@ -1563,7 +1566,7 @@
1563 { 1566 {
1564 cardType: 3, 1567 cardType: 3,
1565 required: true, 1568 required: true,
1566 - title: `合计_${this.attachment.fiscalYear - 4}财年`, 1569 + title: `合计_${this.fiscalYear - 4}财年`,
1567 }, 1570 },
1568 { 1571 {
1569 cardType: 1, 1572 cardType: 1,
@@ -1828,7 +1831,7 @@ @@ -1828,7 +1831,7 @@
1828 }, 1831 },
1829 mounted() { 1832 mounted() {
1830 this.initData() 1833 this.initData()
1831 - // this.fiscalYear = this.attachment.fiscalYear; 1834 + // this.fiscalYear = this.fiscalYear;
1832 }, 1835 },
1833 methods: { 1836 methods: {
1834 initData() { 1837 initData() {
pages/market/components/reportModule3.vue
  Diff comments   View file @a11f0d8
@@ -37,6 +37,9 @@ @@ -37,6 +37,9 @@
37 newBuildingItem: { 37 newBuildingItem: {
38 type: Object 38 type: Object
39 }, 39 },
  40 + fiscalYear:{
  41 + type:String
  42 + }
40 }, 43 },
41 data() { 44 data() {
42 return { 45 return {
@@ -54,7 +57,7 @@ @@ -54,7 +57,7 @@
54 { 57 {
55 cardType: 1, 58 cardType: 1,
56 required: true, 59 required: true,
57 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, 60 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`,
58 value: "", 61 value: "",
59 key: "cityNewInstalled", 62 key: "cityNewInstalled",
60 id: "0" 63 id: "0"
@@ -62,7 +65,7 @@ @@ -62,7 +65,7 @@
62 { 65 {
63 cardType: 1, 66 cardType: 1,
64 required: true, 67 required: true,
65 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, 68 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`,
66 value: "", 69 value: "",
67 key: "cityNewInstalled", 70 key: "cityNewInstalled",
68 id: "1" 71 id: "1"
@@ -70,7 +73,7 @@ @@ -70,7 +73,7 @@
70 { 73 {
71 cardType: 1, 74 cardType: 1,
72 required: true, 75 required: true,
73 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, 76 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`,
74 value: "", 77 value: "",
75 key: "cityNewInstalled", 78 key: "cityNewInstalled",
76 id: "2" 79 id: "2"
@@ -78,7 +81,7 @@ @@ -78,7 +81,7 @@
78 { 81 {
79 cardType: 1, 82 cardType: 1,
80 required: true, 83 required: true,
81 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, 84 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`,
82 value: "", 85 value: "",
83 key: "cityNewInstalled", 86 key: "cityNewInstalled",
84 id: "3" 87 id: "3"
@@ -92,7 +95,7 @@ @@ -92,7 +95,7 @@
92 { 95 {
93 cardType: 1, 96 cardType: 1,
94 required: true, 97 required: true,
95 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, 98 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`,
96 value: "", 99 value: "",
97 key: "auctionArea", 100 key: "auctionArea",
98 id: "0" 101 id: "0"
@@ -100,7 +103,7 @@ @@ -100,7 +103,7 @@
100 { 103 {
101 cardType: 1, 104 cardType: 1,
102 required: true, 105 required: true,
103 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, 106 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`,
104 value: "", 107 value: "",
105 key: "auctionArea", 108 key: "auctionArea",
106 id: "1" 109 id: "1"
@@ -108,7 +111,7 @@ @@ -108,7 +111,7 @@
108 { 111 {
109 cardType: 1, 112 cardType: 1,
110 required: true, 113 required: true,
111 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, 114 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`,
112 value: "", 115 value: "",
113 key: "auctionArea", 116 key: "auctionArea",
114 id: "2" 117 id: "2"
@@ -116,7 +119,7 @@ @@ -116,7 +119,7 @@
116 { 119 {
117 cardType: 1, 120 cardType: 1,
118 required: true, 121 required: true,
119 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, 122 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`,
120 value: "", 123 value: "",
121 key: "auctionArea", 124 key: "auctionArea",
122 id: "3" 125 id: "3"
@@ -130,7 +133,7 @@ @@ -130,7 +133,7 @@
130 { 133 {
131 cardType: 1, 134 cardType: 1,
132 required: true, 135 required: true,
133 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, 136 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`,
134 value: "", 137 value: "",
135 key: "newStartArea", 138 key: "newStartArea",
136 id: "0" 139 id: "0"
@@ -138,7 +141,7 @@ @@ -138,7 +141,7 @@
138 { 141 {
139 cardType: 1, 142 cardType: 1,
140 required: true, 143 required: true,
141 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, 144 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`,
142 value: "", 145 value: "",
143 key: "newStartArea", 146 key: "newStartArea",
144 id: "1" 147 id: "1"
@@ -146,7 +149,7 @@ @@ -146,7 +149,7 @@
146 { 149 {
147 cardType: 1, 150 cardType: 1,
148 required: true, 151 required: true,
149 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, 152 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`,
150 value: "", 153 value: "",
151 key: "newStartArea", 154 key: "newStartArea",
152 id: "2" 155 id: "2"
@@ -154,7 +157,7 @@ @@ -154,7 +157,7 @@
154 { 157 {
155 cardType: 1, 158 cardType: 1,
156 required: true, 159 required: true,
157 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, 160 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`,
158 value: "", 161 value: "",
159 key: "newStartArea", 162 key: "newStartArea",
160 id: "3" 163 id: "3"
@@ -168,7 +171,7 @@ @@ -168,7 +171,7 @@
168 { 171 {
169 cardType: 1, 172 cardType: 1,
170 required: true, 173 required: true,
171 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 4}年`, 174 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 4}年`,
172 value: "", 175 value: "",
173 key: "newCompletedArea", 176 key: "newCompletedArea",
174 id: "0" 177 id: "0"
@@ -176,7 +179,7 @@ @@ -176,7 +179,7 @@
176 { 179 {
177 cardType: 1, 180 cardType: 1,
178 required: true, 181 required: true,
179 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 3}年`, 182 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 3}年`,
180 value: "", 183 value: "",
181 key: "newCompletedArea", 184 key: "newCompletedArea",
182 id: "1" 185 id: "1"
@@ -184,7 +187,7 @@ @@ -184,7 +187,7 @@
184 { 187 {
185 cardType: 1, 188 cardType: 1,
186 required: true, 189 required: true,
187 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 2}年`, 190 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 2}年`,
188 value: "", 191 value: "",
189 key: "newCompletedArea", 192 key: "newCompletedArea",
190 id: "2" 193 id: "2"
@@ -192,7 +195,7 @@ @@ -192,7 +195,7 @@
192 { 195 {
193 cardType: 1, 196 cardType: 1,
194 required: true, 197 required: true,
195 - title: `${this.reportData.fiscalYear == "" ? "" : this.reportData.fiscalYear - 1}年(预计)`, 198 + title: `${this.fiscalYear == "" ? "" : this.fiscalYear - 1}年(预计)`,
196 value: "", 199 value: "",
197 key: "newCompletedArea", 200 key: "newCompletedArea",
198 id: "3" 201 id: "3"
@@ -201,13 +204,13 @@ @@ -201,13 +204,13 @@
201 data2: [{ 204 data2: [{
202 cardType: 4, 205 cardType: 4,
203 required: true, 206 required: true,
204 - title: `${this.reportData.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.reportData.fiscalYear - 2}财年-${this.reportData.fiscalYear - 1}财年已签约且在${this.reportData.fiscalYear}财年安装确认项目`, 207 + title: `${this.fiscalYear}年楼盘户数预计在未来三年安装确认的新建楼盘信息:预计${this.fiscalYear - 2}财年-${this.fiscalYear - 1}财年已签约且在${this.fiscalYear}财年安装确认项目`,
205 value: "2023年玉林市城市总体规划", 208 value: "2023年玉林市城市总体规划",
206 }, 209 },
207 { 210 {
208 cardType: 3, 211 cardType: 3,
209 required: true, 212 required: true,
210 - title: `${this.reportData.fiscalYear - 2}财年及之前签约且在${this.reportData.fiscalYear}财年安装`, 213 + title: `${this.fiscalYear - 2}财年及之前签约且在${this.fiscalYear}财年安装`,
211 }, 214 },
212 { 215 {
213 cardType: 1, 216 cardType: 1,
@@ -235,15 +238,15 @@ @@ -235,15 +238,15 @@
235 data3: [{ 238 data3: [{
236 cardType: 4, 239 cardType: 4,
237 required: true, 240 required: true,
238 - title: `预计${this.reportData.fiscalYear}-${parseInt(this.reportData.fiscalYear)+2}财年安装确认项目  
239 - (预计${parseInt(this.reportData.fiscalYear)}财年签约，  
240 - ${this.reportData.fiscalYear}财年、${parseInt(this.reportData.fiscalYear)+1}财年、${parseInt(this.reportData.fiscalYear)+2}财年安装)`, 241 + title: `预计${this.fiscalYear}-${parseInt(this.fiscalYear)+2}财年安装确认项目
  242 + (预计${parseInt(this.fiscalYear)}财年签约，
  243 + ${this.fiscalYear}财年、${parseInt(this.fiscalYear)+1}财年、${parseInt(this.fiscalYear)+2}财年安装)`,
241 }, 244 },
242 // 23财年 245 // 23财年
243 { 246 {
244 cardType: 3, 247 cardType: 3,
245 required: true, 248 required: true,
246 - title: `${parseInt(this.reportData.fiscalYear)}财年`, 249 + title: `${parseInt(this.fiscalYear)}财年`,
247 }, 250 },
248 { 251 {
249 cardType: 1, 252 cardType: 1,
@@ -296,7 +299,7 @@ @@ -296,7 +299,7 @@
296 { 299 {
297 cardType: 1, 300 cardType: 1,
298 required: true, 301 required: true,
299 - title: `${parseInt(this.reportData.fiscalYear)}财年小计`, 302 + title: `${parseInt(this.fiscalYear)}财年小计`,
300 value: "", 303 value: "",
301 key: "currentInstallSubtotal" 304 key: "currentInstallSubtotal"
302 }, 305 },
@@ -305,7 +308,7 @@ @@ -305,7 +308,7 @@
305 { 308 {
306 cardType: 3, 309 cardType: 3,
307 required: true, 310 required: true,
308 - title: `${parseInt(this.reportData.fiscalYear)+1}财年`, 311 + title: `${parseInt(this.fiscalYear)+1}财年`,
309 }, 312 },
310 { 313 {
311 cardType: 1, 314 cardType: 1,
@@ -358,7 +361,7 @@ @@ -358,7 +361,7 @@
358 { 361 {
359 cardType: 1, 362 cardType: 1,
360 required: true, 363 required: true,
361 - title: `${parseInt(this.reportData.fiscalYear)+1}财年小计`, 364 + title: `${parseInt(this.fiscalYear)+1}财年小计`,
362 value: "", 365 value: "",
363 key: "afterInstallSubtotal" 366 key: "afterInstallSubtotal"
364 }, 367 },
@@ -366,7 +369,7 @@ @@ -366,7 +369,7 @@
366 { 369 {
367 cardType: 3, 370 cardType: 3,
368 required: true, 371 required: true,
369 - title: `${parseInt(this.reportData.fiscalYear)+2}财年`, 372 + title: `${parseInt(this.fiscalYear)+2}财年`,
370 }, 373 },
371 { 374 {
372 cardType: 1, 375 cardType: 1,
@@ -419,7 +422,7 @@ @@ -419,7 +422,7 @@
419 { 422 {
420 cardType: 1, 423 cardType: 1,
421 required: true, 424 required: true,
422 - title: `${parseInt(this.reportData.fiscalYear)+2}财年小计`, 425 + title: `${parseInt(this.fiscalYear)+2}财年小计`,
423 value: "", 426 value: "",
424 key: "lastInstallSubtotal" 427 key: "lastInstallSubtotal"
425 }, 428 },
@@ -590,43 +593,43 @@ @@ -590,43 +593,43 @@
590 { 593 {
591 cardType: 1, 594 cardType: 1,
592 required: true, 595 required: true,
593 - title: `${parseInt(this.reportData.fiscalYear) - 4}财年`, 596 + title: `${parseInt(this.fiscalYear) - 4}财年`,
594 value: "" 597 value: ""
595 }, 598 },
596 { 599 {
597 cardType: 1, 600 cardType: 1,
598 required: true, 601 required: true,
599 - title: `${parseInt(this.reportData.fiscalYear) - 3}财年`, 602 + title: `${parseInt(this.fiscalYear) - 3}财年`,
600 value: "" 603 value: ""
601 }, 604 },
602 { 605 {
603 cardType: 1, 606 cardType: 1,
604 required: true, 607 required: true,
605 - title: `${parseInt(this.reportData.fiscalYear) - 2}财年`, 608 + title: `${parseInt(this.fiscalYear) - 2}财年`,
606 value: "" 609 value: ""
607 }, 610 },
608 { 611 {
609 cardType: 1, 612 cardType: 1,
610 required: true, 613 required: true,
611 - title: `${parseInt(this.reportData.fiscalYear) - 1}财年`, 614 + title: `${parseInt(this.fiscalYear) - 1}财年`,
612 value: "" 615 value: ""
613 }, 616 },
614 { 617 {
615 cardType: 1, 618 cardType: 1,
616 required: true, 619 required: true,
617 - title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`, 620 + title: `${parseInt(this.fiscalYear)}财年(预计)`,
618 value: "" 621 value: ""
619 }, 622 },
620 { 623 {
621 cardType: 1, 624 cardType: 1,
622 required: true, 625 required: true,
623 - title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`, 626 + title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
624 value: "" 627 value: ""
625 }, 628 },
626 { 629 {
627 cardType: 1, 630 cardType: 1,
628 required: true, 631 required: true,
629 - title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`, 632 + title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
630 value: "" 633 value: ""
631 }, 634 },
632 635
@@ -638,43 +641,43 @@ @@ -638,43 +641,43 @@
638 { 641 {
639 cardType: 1, 642 cardType: 1,
640 required: true, 643 required: true,
641 - title: `${parseInt(this.reportData.fiscalYear) - 4}财年`, 644 + title: `${parseInt(this.fiscalYear) - 4}财年`,
642 value: "" 645 value: ""
643 }, 646 },
644 { 647 {
645 cardType: 1, 648 cardType: 1,
646 required: true, 649 required: true,
647 - title: `${parseInt(this.reportData.fiscalYear) - 3}财年`, 650 + title: `${parseInt(this.fiscalYear) - 3}财年`,
648 value: "" 651 value: ""
649 }, 652 },
650 { 653 {
651 cardType: 1, 654 cardType: 1,
652 required: true, 655 required: true,
653 - title: `${parseInt(this.reportData.fiscalYear) - 2}财年`, 656 + title: `${parseInt(this.fiscalYear) - 2}财年`,
654 value: "" 657 value: ""
655 }, 658 },
656 { 659 {
657 cardType: 1, 660 cardType: 1,
658 required: true, 661 required: true,
659 - title: `${parseInt(this.reportData.fiscalYear) - 1}财年`, 662 + title: `${parseInt(this.fiscalYear) - 1}财年`,
660 value: "" 663 value: ""
661 }, 664 },
662 { 665 {
663 cardType: 1, 666 cardType: 1,
664 required: true, 667 required: true,
665 - title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`, 668 + title: `${parseInt(this.fiscalYear)}财年(预计)`,
666 value: "" 669 value: ""
667 }, 670 },
668 { 671 {
669 cardType: 1, 672 cardType: 1,
670 required: true, 673 required: true,
671 - title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`, 674 + title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
672 value: "" 675 value: ""
673 }, 676 },
674 { 677 {
675 cardType: 1, 678 cardType: 1,
676 required: true, 679 required: true,
677 - title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`, 680 + title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
678 value: "" 681 value: ""
679 }, 682 },
680 683
@@ -686,43 +689,43 @@ @@ -686,43 +689,43 @@
686 { 689 {
687 cardType: 1, 690 cardType: 1,
688 required: true, 691 required: true,
689 - title: `${parseInt(this.reportData.fiscalYear) - 4}财年`, 692 + title: `${parseInt(this.fiscalYear) - 4}财年`,
690 value: "" 693 value: ""
691 }, 694 },
692 { 695 {
693 cardType: 1, 696 cardType: 1,
694 required: true, 697 required: true,
695 - title: `${parseInt(this.reportData.fiscalYear) - 3}财年`, 698 + title: `${parseInt(this.fiscalYear) - 3}财年`,
696 value: "" 699 value: ""
697 }, 700 },
698 { 701 {
699 cardType: 1, 702 cardType: 1,
700 required: true, 703 required: true,
701 - title: `${parseInt(this.reportData.fiscalYear) - 2}财年`, 704 + title: `${parseInt(this.fiscalYear) - 2}财年`,
702 value: "" 705 value: ""
703 }, 706 },
704 { 707 {
705 cardType: 1, 708 cardType: 1,
706 required: true, 709 required: true,
707 - title: `${parseInt(this.reportData.fiscalYear) - 1}财年`, 710 + title: `${parseInt(this.fiscalYear) - 1}财年`,
708 value: "" 711 value: ""
709 }, 712 },
710 { 713 {
711 cardType: 1, 714 cardType: 1,
712 required: true, 715 required: true,
713 - title: `${parseInt(this.reportData.fiscalYear)}财年(预计)`, 716 + title: `${parseInt(this.fiscalYear)}财年(预计)`,
714 value: "" 717 value: ""
715 }, 718 },
716 { 719 {
717 cardType: 1, 720 cardType: 1,
718 required: true, 721 required: true,
719 - title: `${parseInt(this.reportData.fiscalYear)+1}财年(预计)`, 722 + title: `${parseInt(this.fiscalYear)+1}财年(预计)`,
720 value: "" 723 value: ""
721 }, 724 },
722 { 725 {
723 cardType: 1, 726 cardType: 1,
724 required: true, 727 required: true,
725 - title: `${parseInt(this.reportData.fiscalYear)+2}财年(预计)`, 728 + title: `${parseInt(this.fiscalYear)+2}财年(预计)`,
726 value: "" 729 value: ""
727 }, 730 },
728 ], 731 ],
@@ -1240,12 +1243,12 @@ @@ -1240,12 +1243,12 @@
1240 data14: [{ 1243 data14: [{
1241 cardType: 4, 1244 cardType: 4,
1242 required: true, 1245 required: true,
1243 - title: `分析现有居民、工商业用户、加气站及批发、管输等用气情况，预测${this.reportData.fiscalYear}财年销气量`, 1246 + title: `分析现有居民、工商业用户、加气站及批发、管输等用气情况，预测${this.fiscalYear}财年销气量`,
1244 }, 1247 },
1245 { 1248 {
1246 cardType: 3, 1249 cardType: 3,
1247 required: true, 1250 required: true,
1248 - title: `截至目前已通气用户在${this.reportData.fiscalYear}财年的基础用气量`, 1251 + title: `截至目前已通气用户在${this.fiscalYear}财年的基础用气量`,
1249 }, 1252 },
1250 { 1253 {
1251 cardType: 1, 1254 cardType: 1,
@@ -1307,7 +1310,7 @@ @@ -1307,7 +1310,7 @@
1307 { 1310 {
1308 cardType: 3, 1311 cardType: 3,
1309 required: true, 1312 required: true,
1310 - title: `预计到${parseInt(this.reportData.fiscalYear)-1}财年底通气/点火的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`, 1313 + title: `预计到${parseInt(this.fiscalYear)-1}财年底通气/点火的用户在${parseInt(this.fiscalYear)}财年带来气量增长`,
1311 }, 1314 },
1312 { 1315 {
1313 cardType: 1, 1316 cardType: 1,
@@ -1370,8 +1373,8 @@ @@ -1370,8 +1373,8 @@
1370 { 1373 {
1371 cardType: 3, 1374 cardType: 3,
1372 required: true, 1375 required: true,
1373 - title: `${parseInt(this.reportData.fiscalYear)-1}财年签约但在${parseInt(this.reportData.fiscalYear)}财年  
1374 - 点火通气的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`, 1376 + title: `${parseInt(this.fiscalYear)-1}财年签约但在${parseInt(this.fiscalYear)}财年
  1377 + 点火通气的用户在${parseInt(this.fiscalYear)}财年带来气量增长`,
1375 }, 1378 },
1376 { 1379 {
1377 cardType: 1, 1380 cardType: 1,
@@ -1433,7 +1436,7 @@ @@ -1433,7 +1436,7 @@
1433 { 1436 {
1434 cardType: 3, 1437 cardType: 3,
1435 required: true, 1438 required: true,
1436 - title: `预计${parseInt(this.reportData.fiscalYear)}财年新签约点火通气的用户在${parseInt(this.reportData.fiscalYear)}财年带来气量增长`, 1439 + title: `预计${parseInt(this.fiscalYear)}财年新签约点火通气的用户在${parseInt(this.fiscalYear)}财年带来气量增长`,
1437 }, 1440 },
1438 { 1441 {
1439 cardType: 1, 1442 cardType: 1,
@@ -1495,7 +1498,7 @@ @@ -1495,7 +1498,7 @@
1495 { 1498 {
1496 cardType: 3, 1499 cardType: 3,
1497 required: true, 1500 required: true,
1498 - title: `${parseInt(this.reportData.fiscalYear)}财年销气预测合计`, 1501 + title: `${parseInt(this.fiscalYear)}财年销气预测合计`,
1499 }, 1502 },
1500 { 1503 {
1501 cardType: 1, 1504 cardType: 1,
pages/market/components/reportModule4.vue
  Diff comments   View file @a11f0d8
@@ -16,6 +16,9 @@ @@ -16,6 +16,9 @@
16 reportData: { 16 reportData: {
17 type: Object 17 type: Object
18 }, 18 },
  19 + fiscalYear:{
  20 + type:String
  21 + }
19 }, 22 },
20 data() { 23 data() {
21 return { 24 return {
@@ -27,7 +30,7 @@ @@ -27,7 +30,7 @@
27 { 30 {
28 cardType: 1, 31 cardType: 1,
29 required: true, 32 required: true,
30 - title: `${this.reportData.fiscalYear}财年目标`, 33 + title: `${this.fiscalYear}财年目标`,
31 value: "", 34 value: "",
32 key: "contractGoal", 35 key: "contractGoal",
33 id: "0" 36 id: "0"
@@ -35,7 +38,7 @@ @@ -35,7 +38,7 @@
35 { 38 {
36 cardType: 1, 39 cardType: 1,
37 required: true, 40 required: true,
38 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 41 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
39 value: "", 42 value: "",
40 key: "contractGoal", 43 key: "contractGoal",
41 id: "1" 44 id: "1"
@@ -43,7 +46,7 @@ @@ -43,7 +46,7 @@
43 { 46 {
44 cardType: 1, 47 cardType: 1,
45 required: true, 48 required: true,
46 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 49 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
47 value: "", 50 value: "",
48 key: "contractGoal", 51 key: "contractGoal",
49 id: "2" 52 id: "2"
@@ -56,7 +59,7 @@ @@ -56,7 +59,7 @@
56 { 59 {
57 cardType: 1, 60 cardType: 1,
58 required: true, 61 required: true,
59 - title: `${this.reportData.fiscalYear}财年目标`, 62 + title: `${this.fiscalYear}财年目标`,
60 value: "", 63 value: "",
61 key: "newUserGoal", 64 key: "newUserGoal",
62 id: "0" 65 id: "0"
@@ -64,7 +67,7 @@ @@ -64,7 +67,7 @@
64 { 67 {
65 cardType: 1, 68 cardType: 1,
66 required: true, 69 required: true,
67 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 70 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
68 value: "", 71 value: "",
69 key: "newUserGoal", 72 key: "newUserGoal",
70 id: "1" 73 id: "1"
@@ -72,7 +75,7 @@ @@ -72,7 +75,7 @@
72 { 75 {
73 cardType: 1, 76 cardType: 1,
74 required: true, 77 required: true,
75 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 78 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
76 value: "", 79 value: "",
77 key: "newUserGoal", 80 key: "newUserGoal",
78 id: "2" 81 id: "2"
@@ -86,7 +89,7 @@ @@ -86,7 +89,7 @@
86 { 89 {
87 cardType: 1, 90 cardType: 1,
88 required: true, 91 required: true,
89 - title: `${this.reportData.fiscalYear}财年目标`, 92 + title: `${this.fiscalYear}财年目标`,
90 value: "", 93 value: "",
91 key: "oldUserGoal", 94 key: "oldUserGoal",
92 id: "0" 95 id: "0"
@@ -94,7 +97,7 @@ @@ -94,7 +97,7 @@
94 { 97 {
95 cardType: 1, 98 cardType: 1,
96 required: true, 99 required: true,
97 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 100 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
98 value: "", 101 value: "",
99 key: "oldUserGoal", 102 key: "oldUserGoal",
100 id: "1" 103 id: "1"
@@ -102,7 +105,7 @@ @@ -102,7 +105,7 @@
102 { 105 {
103 cardType: 1, 106 cardType: 1,
104 required: true, 107 required: true,
105 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 108 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
106 value: "", 109 value: "",
107 key: "oldUserGoal", 110 key: "oldUserGoal",
108 id: "2" 111 id: "2"
@@ -116,7 +119,7 @@ @@ -116,7 +119,7 @@
116 { 119 {
117 cardType: 1, 120 cardType: 1,
118 required: true, 121 required: true,
119 - title: `${this.reportData.fiscalYear}财年目标`, 122 + title: `${this.fiscalYear}财年目标`,
120 value: "", 123 value: "",
121 key: "townsUserGoal", 124 key: "townsUserGoal",
122 id: "0" 125 id: "0"
@@ -124,7 +127,7 @@ @@ -124,7 +127,7 @@
124 { 127 {
125 cardType: 1, 128 cardType: 1,
126 required: true, 129 required: true,
127 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 130 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
128 value: "", 131 value: "",
129 key: "townsUserGoal", 132 key: "townsUserGoal",
130 id: "1" 133 id: "1"
@@ -132,7 +135,7 @@ @@ -132,7 +135,7 @@
132 { 135 {
133 cardType: 1, 136 cardType: 1,
134 required: true, 137 required: true,
135 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 138 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
136 value: "", 139 value: "",
137 key: "townsUserGoal", 140 key: "townsUserGoal",
138 id: "2" 141 id: "2"
@@ -146,7 +149,7 @@ @@ -146,7 +149,7 @@
146 { 149 {
147 cardType: 1, 150 cardType: 1,
148 required: true, 151 required: true,
149 - title: `${this.reportData.fiscalYear}财年目标`, 152 + title: `${this.fiscalYear}财年目标`,
150 value: "", 153 value: "",
151 key: "commerceGoal", 154 key: "commerceGoal",
152 id: "0" 155 id: "0"
@@ -154,7 +157,7 @@ @@ -154,7 +157,7 @@
154 { 157 {
155 cardType: 1, 158 cardType: 1,
156 required: true, 159 required: true,
157 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 160 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
158 value: "", 161 value: "",
159 key: "commerceGoal", 162 key: "commerceGoal",
160 id: "1" 163 id: "1"
@@ -162,7 +165,7 @@ @@ -162,7 +165,7 @@
162 { 165 {
163 cardType: 1, 166 cardType: 1,
164 required: true, 167 required: true,
165 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 168 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
166 value: "", 169 value: "",
167 key: "commerceGoal", 170 key: "commerceGoal",
168 id: "2" 171 id: "2"
@@ -176,7 +179,7 @@ @@ -176,7 +179,7 @@
176 { 179 {
177 cardType: 1, 180 cardType: 1,
178 required: true, 181 required: true,
179 - title: `${this.reportData.fiscalYear}财年目标`, 182 + title: `${this.fiscalYear}财年目标`,
180 value: "", 183 value: "",
181 key: "industryGoal", 184 key: "industryGoal",
182 id: "0" 185 id: "0"
@@ -184,7 +187,7 @@ @@ -184,7 +187,7 @@
184 { 187 {
185 cardType: 1, 188 cardType: 1,
186 required: true, 189 required: true,
187 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 190 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
188 value: "", 191 value: "",
189 key: "industryGoal", 192 key: "industryGoal",
190 id: "1" 193 id: "1"
@@ -192,7 +195,7 @@ @@ -192,7 +195,7 @@
192 { 195 {
193 cardType: 1, 196 cardType: 1,
194 required: true, 197 required: true,
195 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 198 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
196 value: "", 199 value: "",
197 key: "industryGoal", 200 key: "industryGoal",
198 id: "2" 201 id: "2"
@@ -206,7 +209,7 @@ @@ -206,7 +209,7 @@
206 { 209 {
207 cardType: 1, 210 cardType: 1,
208 required: true, 211 required: true,
209 - title: `${this.reportData.fiscalYear}财年目标`, 212 + title: `${this.fiscalYear}财年目标`,
210 value: "", 213 value: "",
211 key: "installUserGoal", 214 key: "installUserGoal",
212 id: "0" 215 id: "0"
@@ -214,7 +217,7 @@ @@ -214,7 +217,7 @@
214 { 217 {
215 cardType: 1, 218 cardType: 1,
216 required: true, 219 required: true,
217 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 220 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
218 value: "", 221 value: "",
219 key: "installUserGoal", 222 key: "installUserGoal",
220 id: "1" 223 id: "1"
@@ -222,7 +225,7 @@ @@ -222,7 +225,7 @@
222 { 225 {
223 cardType: 1, 226 cardType: 1,
224 required: true, 227 required: true,
225 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 228 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
226 value: "", 229 value: "",
227 key: "installUserGoal", 230 key: "installUserGoal",
228 id: "2" 231 id: "2"
@@ -236,7 +239,7 @@ @@ -236,7 +239,7 @@
236 { 239 {
237 cardType: 1, 240 cardType: 1,
238 required: true, 241 required: true,
239 - title: `${this.reportData.fiscalYear}财年目标`, 242 + title: `${this.fiscalYear}财年目标`,
240 value: "", 243 value: "",
241 key: "salesNumberGoal", 244 key: "salesNumberGoal",
242 id: "0" 245 id: "0"
@@ -244,7 +247,7 @@ @@ -244,7 +247,7 @@
244 { 247 {
245 cardType: 1, 248 cardType: 1,
246 required: true, 249 required: true,
247 - title: `${parseInt(this.reportData.fiscalYear)+1}财年目标`, 250 + title: `${parseInt(this.fiscalYear)+1}财年目标`,
248 value: "", 251 value: "",
249 key: "salesNumberGoal", 252 key: "salesNumberGoal",
250 id: "1" 253 id: "1"
@@ -252,7 +255,7 @@ @@ -252,7 +255,7 @@
252 { 255 {
253 cardType: 1, 256 cardType: 1,
254 required: true, 257 required: true,
255 - title: `${parseInt(this.reportData.fiscalYear)+2}财年目标`, 258 + title: `${parseInt(this.fiscalYear)+2}财年目标`,
256 value: "", 259 value: "",
257 key: "salesNumberGoal", 260 key: "salesNumberGoal",
258 id: "2" 261 id: "2"
pages/market/components/reportModule5.vue
  Diff comments   View file @a11f0d8
1 <template> 1 <template>
2 <view class="ComCss"> 2 <view class="ComCss">
3 - <cardMoudule :cardData="data1" :required="false" :title="reportData.fiscalYear+'财年市场开发目标'"></cardMoudule> 3 + <cardMoudule :cardData="data1" :required="false" :title="fiscalYear+'财年市场开发目标'"></cardMoudule>
4 <cardMoudule :cardData="data2" :required="true" title="市场开发对策"></cardMoudule> 4 <cardMoudule :cardData="data2" :required="true" title="市场开发对策"></cardMoudule>
5 </view> 5 </view>
6 </template> 6 </template>
@@ -15,20 +15,23 @@ @@ -15,20 +15,23 @@
15 reportData: { 15 reportData: {
16 type: Object 16 type: Object
17 }, 17 },
  18 + fiscalYear:{
  19 + type:String
  20 + }
18 }, 21 },
19 data() { 22 data() {
20 return { 23 return {
21 data1: [{ 24 data1: [{
22 cardType: 1, 25 cardType: 1,
23 required: true, 26 required: true,
24 - title: `${this.reportData.fiscalYear}财年目标计划签约(户)`, 27 + title: `${this.fiscalYear}财年目标计划签约(户)`,
25 value: "", 28 value: "",
26 key:"planSignHousehold" 29 key:"planSignHousehold"
27 }, 30 },
28 { 31 {
29 cardType: 1, 32 cardType: 1,
30 required: true, 33 required: true,
31 - title: `${this.reportData.fiscalYear}财年目标计划安装(户)`, 34 + title: `${this.fiscalYear}财年目标计划安装(户)`,
32 value: "", 35 value: "",
33 key:"planInstallHousehold" 36 key:"planInstallHousehold"
34 }, 37 },
pages/market/insight.vue
  Diff comments   View file @a11f0d8
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 }" itemStyle="height: 78rpx;" @click="tabChange1"> 18 }" itemStyle="height: 78rpx;" @click="tabChange1">
19 <view slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="openFiscalYearChoice"> 19 <view slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="openFiscalYearChoice">
20 <view style="display:flex;"><u-icon name="clock" size="18" bold></u-icon> 20 <view style="display:flex;"><u-icon name="clock" size="18" bold></u-icon>
21 - <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">财年</text> 21 + <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">{{fiscalYear?fiscalYear:'财年'}}</text>
22 </view> 22 </view>
23 </view> 23 </view>
24 </u-tabs> 24 </u-tabs>
@@ -38,9 +38,9 @@ @@ -38,9 +38,9 @@
38 </u-tabs> 38 </u-tabs>
39 </view> 39 </view>
40 <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)" 40 <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)"
41 - height="74rpx" bgColor="#F5F6FA" @search="search"></u-search> 41 + height="74rpx" bgColor="#F5F6FA" @search="search" @clear="clearInit"></u-search>
42 </u-sticky> 42 </u-sticky>
43 - <view class="listBodyCss"> 43 + <view class="listBodyCss" :style="newList1.length || newList2.length ?{'background':'#f2f4f3'}:{'background':'#fff'}">
44 <view class="" v-if="!current"> 44 <view class="" v-if="!current">
45 <u-empty text="暂无报告" icon="/static/images/icon/nodata.png" v-if="newList1.length <= 0"></u-empty> 45 <u-empty text="暂无报告" icon="/static/images/icon/nodata.png" v-if="newList1.length <= 0"></u-empty>
46 <view class="reportCss" v-for="(item,index) in newList1" :key="index"> 46 <view class="reportCss" v-for="(item,index) in newList1" :key="index">
@@ -56,11 +56,11 @@ @@ -56,11 +56,11 @@
56 <view class="textCss" :style="{'color':statusCss(item.statusCode)}"> {{item.statusName}} </view> 56 <view class="textCss" :style="{'color':statusCss(item.statusCode)}"> {{item.statusName}} </view>
57 <view class="btnCss"> 57 <view class="btnCss">
58 <u-button color="#CF000D" style="width: 160rpx;height: 60rpx;" shape="circle" text="查看详情" 58 <u-button color="#CF000D" style="width: 160rpx;height: 60rpx;" shape="circle" text="查看详情"
59 - @click="jumpReportDetails(item.reportNo)"></u-button> 59 + @click="jumpReportDetails(item.reportNo,item.fiscalYear)"></u-button>
60 </view> 60 </view>
61 </view> 61 </view>
62 </view> 62 </view>
63 - <u-loadmore :status="status1" v-if="newList1.length > 0" /> 63 + <u-loadmore marginTop="50rpx" :status="status1" v-if="newList1.length > 0" />
64 </view> 64 </view>
65 <view v-else> 65 <view v-else>
66 <u-empty text="暂无内容" icon="/static/images/icon/nodata.png" v-if="newList2.length <= 0"></u-empty> 66 <u-empty text="暂无内容" icon="/static/images/icon/nodata.png" v-if="newList2.length <= 0"></u-empty>
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 <view class="top2 overflow-one-lines"> 详情地址: {{item.address || ""}}</view> 75 <view class="top2 overflow-one-lines"> 详情地址: {{item.address || ""}}</view>
76 </view> 76 </view>
77 </view> 77 </view>
78 - <u-loadmore :status="status2" v-if="newList2.length > 0" /> 78 + <u-loadmore marginTop="50rpx" :status="status2" v-if="newList2.length > 0" />
79 </view> 79 </view>
80 </view> 80 </view>
81 <u-datetime-picker :show="fiscalYearShow" v-model="yaerModal" cancelText="重置" @confirm="confirmYear" 81 <u-datetime-picker :show="fiscalYearShow" v-model="yaerModal" cancelText="重置" @confirm="confirmYear"
@@ -90,9 +90,6 @@ @@ -90,9 +90,6 @@
90 getPoolCommercelist, 90 getPoolCommercelist,
91 getPoolIndustrylist 91 getPoolIndustrylist
92 } from '@/api/organize.js' 92 } from '@/api/organize.js'
93 - import {  
94 - $moment  
95 - } from '@/uni_modules/uview-ui';  
96 export default { 93 export default {
97 components: {}, 94 components: {},
98 props: { 95 props: {
@@ -190,13 +187,7 @@ @@ -190,13 +187,7 @@
190 return colors[code]; 187 return colors[code];
191 }, 188 },
192 initData() { 189 initData() {
193 - getOrganizelist().then(res => {  
194 - console.log("市场摸底列表", res);  
195 - if (res.code === 200) {  
196 - this.newList1 = res.rows;  
197 - this.total1 = res.total;  
198 - }  
199 - }) 190 + this.updateList1();
200 }, 191 },
201 typeChange(i) { 192 typeChange(i) {
202 this.keyword = ""; 193 this.keyword = "";
@@ -205,25 +196,16 @@ @@ -205,25 +196,16 @@
205 this.current ? this.updateList2() : this.updateList1(); 196 this.current ? this.updateList2() : this.updateList1();
206 }, 197 },
207 updateList1() { 198 updateList1() {
208 - let Params  
209 - if (this.keyword && this.current1 !== -1 && this.fiscalYear !== "") {  
210 - Params = {  
211 - reportName: this.keyword,  
212 - statusCode: this.current1,  
213 - fiscalYear: this.fiscalYear,  
214 - }  
215 - } else if (this.keyword !== "") {  
216 - Params = {  
217 - reportName: this.keyword,  
218 - }  
219 - } else if (this.current1 !== 0) {  
220 - Params = {  
221 - statusCode: this.current1 - 1  
222 - }  
223 - } else if (this.fiscalYear !== "") {  
224 - Params = {  
225 - fiscalYear: this.fiscalYear  
226 - } 199 + let Params = {};
  200 + if(this.keyword){
  201 + Params.reportName = this.keyword
  202 + }
  203 + if(this.current1 !== -1 && this.current1 !== 0)
  204 + {
  205 + Params.statusCode = this.current1 - 1;
  206 + }
  207 + if(this.fiscalYear !== ""){
  208 + Params.fiscalYear = this.fiscalYear
227 } 209 }
228 console.log("市场摸底查询参数",Params); 210 console.log("市场摸底查询参数",Params);
229 Params = { 211 Params = {
@@ -242,6 +224,7 @@ @@ -242,6 +224,7 @@
242 console.log(this.newList1); 224 console.log(this.newList1);
243 } 225 }
244 }) 226 })
  227 + this.checkTotal();
245 }, 228 },
246 updateList2() { 229 updateList2() {
247 let Params = {}; 230 let Params = {};
@@ -295,6 +278,7 @@ @@ -295,6 +278,7 @@
295 console.log("待开发", this.newList2); 278 console.log("待开发", this.newList2);
296 }, 279 },
297 checkTotal() { 280 checkTotal() {
  281 + console.log("查询是否更多");
298 let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize 282 let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
299 if (this.total1 < allTotal) { 283 if (this.total1 < allTotal) {
300 this.status1 = "nomore" 284 this.status1 = "nomore"
@@ -309,6 +293,10 @@ @@ -309,6 +293,10 @@
309 this.queryParameter.pageNum = 1; 293 this.queryParameter.pageNum = 1;
310 this.queryParameter.pageSize = 10; 294 this.queryParameter.pageSize = 10;
311 }, 295 },
  296 + clearInit(){
  297 + this.keyword = ""
  298 + this.search()
  299 + },
312 tabChange1(e) { 300 tabChange1(e) {
313 console.log(e); 301 console.log(e);
314 this.resetQuery() 302 this.resetQuery()
@@ -326,13 +314,17 @@ @@ -326,13 +314,17 @@
326 // this.fiscalYear = Number(new Date()); 314 // this.fiscalYear = Number(new Date());
327 }, 315 },
328 confirmYear() { 316 confirmYear() {
329 - this.$nextTick(()=>{ 317 + setTimeout(()=>{
330 let year = this.$u.timeFormat(this.yaerModal, 'yyyy'); 318 let year = this.$u.timeFormat(this.yaerModal, 'yyyy');
331 this.fiscalYear = year; 319 this.fiscalYear = year;
332 this.fiscalYearShow = false; 320 this.fiscalYearShow = false;
333 console.log(this.fiscalYear); 321 console.log(this.fiscalYear);
334 this.resetQuery(); 322 this.resetQuery();
335 - }) 323 + this.updateList1();
  324 + },0)
  325 + // this.$nextTick(()=>{
  326 +
  327 + // })
336 }, 328 },
337 resetDate() { 329 resetDate() {
338 console.log("重置"); 330 console.log("重置");
@@ -352,12 +344,12 @@ @@ -352,12 +344,12 @@
352 }, 344 },
353 jumpUserDetails(item) { 345 jumpUserDetails(item) {
354 uni.navigateTo({ 346 uni.navigateTo({
355 - url: `/pages/market/userDetails?type=${this.current2}&details=${JSON.stringify(item)}` 347 + url: `/pages/market/userDetails?type=${this.current2}&id=${item.id}`
356 }) 348 })
357 }, 349 },
358 - jumpReportDetails(id) { 350 + jumpReportDetails(id,fiscalYear) {
359 uni.navigateTo({ 351 uni.navigateTo({
360 - url: "/pages/market/reportDetails?reportNo=" + id 352 + url: `/pages/market/reportDetails?reportNo=${id}&fiscalYear=${fiscalYear}`
361 }) 353 })
362 } 354 }
363 } 355 }
@@ -367,6 +359,7 @@ @@ -367,6 +359,7 @@
367 <style lang="scss" scoped> 359 <style lang="scss" scoped>
368 .ConCss { 360 .ConCss {
369 background: #f2f4f3; 361 background: #f2f4f3;
  362 + height: 100%;
370 } 363 }
371 364
372 .topFCss { 365 .topFCss {
@@ -407,7 +400,7 @@ @@ -407,7 +400,7 @@
407 bottom: 0; 400 bottom: 0;
408 left: 50%; 401 left: 50%;
409 transform: translateX(-50%); 402 transform: translateX(-50%);
410 - min-width: 168rpx; 403 + width:100%;
411 /* 图片宽度 */ 404 /* 图片宽度 */
412 height: 14rpx; 405 height: 14rpx;
413 /* 图片高度 */ 406 /* 图片高度 */
@@ -431,7 +424,10 @@ @@ -431,7 +424,10 @@
431 justify-content: space-between; 424 justify-content: space-between;
432 } 425 }
433 426
434 - .listBodyCss {} 427 + .listBodyCss {
  428 + position: relative;
  429 + min-height: 65vh;
  430 + }
435 431
436 .topTitleCss { 432 .topTitleCss {
437 display: flex; 433 display: flex;
@@ -485,7 +481,7 @@ @@ -485,7 +481,7 @@
485 display: flex; 481 display: flex;
486 justify-content: space-between; 482 justify-content: space-between;
487 padding: 30rpx; 483 padding: 30rpx;
488 - border-radius: 20px; 484 + border-radius: 10px;
489 background-color: #ffffff; 485 background-color: #ffffff;
490 box-sizing: border-box; 486 box-sizing: border-box;
491 } 487 }
pages/market/newsDetails.vue
  Diff comments   View file @a11f0d8
@@ -6,8 +6,7 @@ @@ -6,8 +6,7 @@
6 {{ detailsContent.title }} 6 {{ detailsContent.title }}
7 </view> 7 </view>
8 <view class="releaseTimeCss"> 8 <view class="releaseTimeCss">
9 - 发布时间：{{ detailsContent.publishTime }}  
10 - <!-- 发布时间：{{ $u.timeFormat(detailsContent.publishTime, 'yyyy年mm月dd日 hh:MM:ss')}} --> 9 + 发布时间：{{ $u.timeFormat(detailsContent.publishTime,'yyyy年mm月dd日 hh:MM:ss') || ""}}
11 </view> 10 </view>
12 <rich-text :nodes="detailsContent.details"> 11 <rich-text :nodes="detailsContent.details">
13 </rich-text> 12 </rich-text>
@@ -16,6 +15,7 @@ @@ -16,6 +15,7 @@
16 </template> 15 </template>
17 16
18 <script> 17 <script>
  18 + import {getInfoMarketInformationDetail} from '@/api/infoMarketInformation.js'
19 export default { 19 export default {
20 components: {}, 20 components: {},
21 props: { 21 props: {
@@ -23,20 +23,25 @@ @@ -23,20 +23,25 @@
23 }, 23 },
24 data() { 24 data() {
25 return { 25 return {
26 - detailsContent:{} 26 + detailsContent:{},
  27 + id:"",
27 } 28 }
28 }, 29 },
29 computed: { 30 computed: {
30 31
31 }, 32 },
32 onLoad(data) { 33 onLoad(data) {
33 - let resData = JSON.parse(data.detailsContent)  
34 - console.log(resData);  
35 - if(data){  
36 - this.detailsContent = resData; 34 + if(data.id){
  35 + this.id = data.id;
37 } 36 }
  37 + this.initData();
38 }, 38 },
39 methods: { 39 methods: {
  40 + initData(){
  41 + getInfoMarketInformationDetail(this.id).then((res) =>{
  42 + this.detailsContent = res.data;
  43 + })
  44 + },
40 leftClick() { 45 leftClick() {
41 console.log('leftClick'); 46 console.log('leftClick');
42 }, 47 },
pages/market/reportDetails.vue
  Diff comments   View file @a11f0d8
1 <template> 1 <template>
2 <view class="ComCss"> 2 <view class="ComCss">
3 - <u-navbar class="navBarCss" :title="reportData1.reportName"  
4 - :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick" :autoBack="true"  
5 - safeAreaInsetTop placeholder />  
6 - <view class="topCss">  
7 - <u-tabs :list="tabList" @click="modifyCur" :current="current" lineColor="#f56c6c" :activeStyle="{ 3 + <u-sticky bgColor="#fff" customNavHeight="0" offsetTop="0">
  4 + <u-navbar class="navBarCss" :title="reportData1.reportName"
  5 + :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick" :autoBack="true"
  6 + safeAreaInsetTop placeholder />
  7 + <view class="topCss">
  8 + <u-tabs :list="tabList" @click="modifyCur" :current="current" lineColor="#f56c6c" :activeStyle="{
8 color: '#cf000d', 9 color: '#cf000d',
9 fontWeight: 'bold', 10 fontWeight: 'bold',
10 transform: 'scale(1.1)', 11 transform: 'scale(1.1)',
11 fontSize:'32rpx' 12 fontSize:'32rpx'
12 }" itemStyle="height: 78rpx;padding:22rpx 34rpx"> 13 }" itemStyle="height: 78rpx;padding:22rpx 34rpx">
13 - </u-tabs>  
14 - </view> 14 + </u-tabs>
  15 + </view>
  16 + </u-sticky>
15 <view class="bodyCss"> 17 <view class="bodyCss">
16 <reportModule1 v-if="current == 0" :reportData="reportData1"></reportModule1> 18 <reportModule1 v-if="current == 0" :reportData="reportData1"></reportModule1>
17 - <reportModule2 v-if="current == 1" :reportData="reportData2" :attachment="reportData2attachment"></reportModule2>  
18 - <reportModule3 v-if="current == 2" :reportData="reportData3" :newBuildingInfo="reportData3newBuildingInfo" :newBuildingItem="reportData3newBuildingItem"></reportModule3>  
19 - <reportModule4 v-if="current == 3" :reportData="reportData4"></reportModule4>  
20 - <reportModule5 v-if="current == 4" :reportData="reportData5"></reportModule5> 19 + <reportModule2 v-if="current == 1" :reportData="reportData2" :attachment="reportData2attachment" :fiscalYear="fiscalYear">
  20 + </reportModule2>
  21 + <reportModule3 v-if="current == 2" :newBuildingInfo="reportData3newBuildingInfo"
  22 + :newBuildingItem="reportData3newBuildingItem" :fiscalYear="fiscalYear"></reportModule3>
  23 + <reportModule4 v-if="current == 3" :reportData="reportData4" :fiscalYear="fiscalYear"></reportModule4>
  24 + <reportModule5 v-if="current == 4" :reportData="reportData5" :fiscalYear="fiscalYear"></reportModule5>
21 </view> 25 </view>
22 </view> 26 </view>
23 </template> 27 </template>
@@ -52,15 +56,16 @@ @@ -52,15 +56,16 @@
52 data() { 56 data() {
53 return { 57 return {
54 current: 0, 58 current: 0,
55 - reportNo:null,  
56 - reportData1:{},  
57 - reportData2:{},  
58 - reportData2attachment:{},  
59 - reportData3:{},  
60 - reportData3newBuildingInfo:{},  
61 - reportData3newBuildingItem:{},  
62 - reportData4:{},  
63 - reportData5:{}, 59 + reportNo: null,
  60 + fiscalYear:"",
  61 + reportData1: {},
  62 + reportData2: {},
  63 + reportData2attachment: {},
  64 + reportData3: {},
  65 + reportData3newBuildingInfo: {},
  66 + reportData3newBuildingItem: {},
  67 + reportData4: {},
  68 + reportData5: {},
64 tabList: [{ 69 tabList: [{
65 name: '组织实施落实' 70 name: '组织实施落实'
66 }, { 71 }, {
@@ -78,65 +83,66 @@ @@ -78,65 +83,66 @@
78 83
79 }, 84 },
80 onLoad(data) { 85 onLoad(data) {
81 - if(data){ 86 + if (data) {
82 this.reportNo = data.reportNo; 87 this.reportNo = data.reportNo;
  88 + this.fiscalYear = data.fiscalYear;
83 } 89 }
84 console.log(this.reportNo); 90 console.log(this.reportNo);
85 this.initData() 91 this.initData()
86 }, 92 },
87 methods: { 93 methods: {
88 - modifyCur(data){ 94 + modifyCur(data) {
89 this.current = data.index; 95 this.current = data.index;
90 96
91 }, 97 },
92 - initData(){  
93 - getOrganize(this.reportNo).then(res =>{  
94 - if(res.code === 200){ 98 + async initData() {
  99 + await getOrganize(this.reportNo).then(res => {
  100 + if (res.code === 200) {
95 this.reportData1 = res.data; 101 this.reportData1 = res.data;
96 } 102 }
97 - console.log("1、组织",this.reportData1); 103 + console.log("1、组织", JSON.parse(JSON.stringify(this.reportData1)));
98 }) 104 })
99 - getGeneralOverview(this.reportNo).then(res =>{  
100 - if(res.code === 200){ 105 + await getGeneralOverview(this.reportNo).then(res => {
  106 + if (res.code === 200) {
101 this.reportData2 = res.data; 107 this.reportData2 = res.data;
102 } 108 }
103 - console.log("2、天然气",this.reportData2); 109 + console.log("2、天然气", JSON.parse(JSON.stringify(this.reportData2)));
104 }) 110 })
105 - getGeneralOverviewAttach(this.reportNo).then(res =>{  
106 - if(res.code === 200){ 111 + await getGeneralOverviewAttach(this.reportNo).then(res => {
  112 + if (res.code === 200) {
107 this.reportData2attachment = res.data; 113 this.reportData2attachment = res.data;
108 } 114 }
109 - console.log("3、天然气附表",this.reportData2attachment); 115 + console.log("3、天然气附表", JSON.parse(JSON.stringify(this.reportData2attachment)));
110 }) 116 })
111 - getBusinessAnalyze(this.reportNo).then(res =>{  
112 - if(res.code === 200){ 117 + await getBusinessAnalyze(this.reportNo).then(res => {
  118 + if (res.code === 200) {
113 this.reportData3 = res.data; 119 this.reportData3 = res.data;
114 } 120 }
115 - console.log("4、重点业务市场分析",this.reportData3); 121 + console.log("4、重点业务市场分析", JSON.parse(JSON.stringify(this.reportData3)));
116 }) 122 })
117 - getNewBuildingInfo(this.reportNo).then(res =>{  
118 - if(res.code === 200){ 123 + await getNewBuildingInfo(this.reportNo).then(res => {
  124 + if (res.code === 200) {
119 this.reportData3newBuildingInfo = res.data; 125 this.reportData3newBuildingInfo = res.data;
120 } 126 }
121 - console.log("5、楼盘预计未来三年确认的新建楼盘信息",this.reportData3newBuildingInfo); 127 + console.log("5、楼盘预计未来三年确认的新建楼盘信息", JSON.parse(JSON.stringify(this.reportData3newBuildingInfo)));
122 }) 128 })
123 - getNewBuildingItem(this.reportNo).then(res =>{  
124 - if(res.code === 200){ 129 + await getNewBuildingItem(this.reportNo).then(res => {
  130 + if (res.code === 200) {
125 this.reportData3newBuildingItem = res.data; 131 this.reportData3newBuildingItem = res.data;
126 } 132 }
127 - console.log("6、预计未来三年安装确认项目",this.reportData3newBuildingItem); 133 + console.log("6、预计未来三年安装确认项目", JSON.parse(JSON.stringify(this.reportData3newBuildingItem)));
128 }) 134 })
129 - getDevelopmentPlan(this.reportNo).then(res =>{  
130 - if(res.code === 200){ 135 + await getDevelopmentPlan(this.reportNo).then(res => {
  136 + if (res.code === 200) {
131 this.reportData4 = res.data; 137 this.reportData4 = res.data;
132 } 138 }
133 - console.log("7、未来发展规划",this.reportData4); 139 + console.log("7、未来发展规划", JSON.parse(JSON.stringify(this.reportData4)));
134 }) 140 })
135 - getTargetSuggestion(this.reportNo).then(res =>{  
136 - if(res.code === 200){ 141 + await getTargetSuggestion(this.reportNo).then(res => {
  142 + if (res.code === 200) {
137 this.reportData5 = res.data; 143 this.reportData5 = res.data;
138 } 144 }
139 - console.log("8、目标思路建议",this.reportData5); 145 + console.log("8、目标思路建议", JSON.parse(JSON.stringify(this.reportData5)));
140 }) 146 })
141 } 147 }
142 } 148 }
@@ -147,10 +153,10 @@ @@ -147,10 +153,10 @@
147 .ComCss { 153 .ComCss {
148 background: #f2f4f3; 154 background: #f2f4f3;
149 } 155 }
150 - .topCss{ 156 +
  157 + .topCss {
151 background: #fff; 158 background: #fff;
152 } 159 }
153 - .bodyCss {  
154 160
155 - } 161 + .bodyCss {}
156 </style> 162 </style>
pages/market/total.vue
  Diff comments   View file @a11f0d8
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 本财年报告已上报数 7 本财年报告已上报数
8 </view> 8 </view>
9 <view class="numCss"> 9 <view class="numCss">
10 - 23300 10 + {{statistics.totalNum}}
11 </view> 11 </view>
12 </view> 12 </view>
13 <view class="flexCss"> 13 <view class="flexCss">
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 待开发居民用户 16 待开发居民用户
17 </view> 17 </view>
18 <view class="numCss"> 18 <view class="numCss">
19 - 23300 19 + {{statistics.resident}}
20 </view> 20 </view>
21 </view> 21 </view>
22 <view class="cardCss"> 22 <view class="cardCss">
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 待开发商业用户 24 待开发商业用户
25 </view> 25 </view>
26 <view class="numCss"> 26 <view class="numCss">
27 - 23300 27 + {{statistics.business}}
28 </view> 28 </view>
29 </view> 29 </view>
30 <view class="cardCss"> 30 <view class="cardCss">
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 待开发工业用户 32 待开发工业用户
33 </view> 33 </view>
34 <view class="numCss"> 34 <view class="numCss">
35 - 23300 35 + {{statistics.industry}}
36 </view> 36 </view>
37 </view> 37 </view>
38 </view> 38 </view>
@@ -52,21 +52,25 @@ @@ -52,21 +52,25 @@
52 <echarts class="pie-chart" :option="pieOption2" canvasId="pie2"></echarts> 52 <echarts class="pie-chart" :option="pieOption2" canvasId="pie2"></echarts>
53 </view> 53 </view>
54 </view> 54 </view>
55 - <view class="charCardCss"> 55 + <!-- <view class="charCardCss">
56 <view class="charTitleCss"> 56 <view class="charTitleCss">
57 近4年待开发用户池数据情况 57 近4年待开发用户池数据情况
58 </view> 58 </view>
59 <view class="charbox"> 59 <view class="charbox">
60 <echarts class="line-chart" :option="lineOption" canvasId="line"></echarts> 60 <echarts class="line-chart" :option="lineOption" canvasId="line"></echarts>
61 </view> 61 </view>
62 - </view> 62 + </view> -->
63 </view> 63 </view>
64 </template> 64 </template>
65 65
66 <script> 66 <script>
  67 + import {
  68 + getStatisticsReport,
  69 + getStatisticsPool,
  70 + getStatisticsLogin
  71 + } from '@/api/total.js'
67 export default { 72 export default {
68 - components: {  
69 - }, 73 + components: {},
70 props: { 74 props: {
71 75
72 }, 76 },
@@ -75,30 +79,101 @@ @@ -75,30 +79,101 @@
75 pieOption: {}, 79 pieOption: {},
76 pieOption2: {}, 80 pieOption2: {},
77 lineOption: {}, 81 lineOption: {},
78 - 82 + fiscalYear: "",
  83 + statistics: {
  84 + totalNum: "",
  85 + resident: "",
  86 + business: "",
  87 + industry: ""
  88 + },
  89 + data1: [],
  90 + data2: [],
  91 + data3: [],
  92 + total1: 0,
  93 + total2: 0,
79 } 94 }
80 }, 95 },
81 mounted() { 96 mounted() {
82 - this.refreshData() 97 +
83 }, 98 },
84 computed: { 99 computed: {
85 100
86 }, 101 },
87 - onLoad() {}, 102 + onLoad() {
  103 + this.initData()
  104 + },
88 methods: { 105 methods: {
  106 + async initData() {
  107 + this.fiscalYear = this.$u.timeFormat("", 'yyyy');
  108 + await getStatisticsReport(this.fiscalYear).then(res => {
  109 + if (res.code === 200) {
  110 + let data = res.data;
  111 + this.statistics.totalNum = data.pass + data.revise;
  112 + this.data1 = [{
  113 + value: data.submit,
  114 + name: '待申报'
  115 + },
  116 + {
  117 + value: data.review,
  118 + name: '待评审'
  119 + },
  120 + {
  121 + value: data.revise,
  122 + name: '待修改'
  123 + },
  124 + {
  125 + value: data.pass,
  126 + name: '已通过'
  127 + },
  128 + {
  129 + value: data.unCreate,
  130 + name: '未创建'
  131 + },
  132 + ]
  133 + this.total1 = data.total
  134 + console.log("报告", this.data1);
  135 + }
  136 + })
  137 + await getStatisticsPool().then(res => {
  138 + if (res.code === 200) {
  139 + let data = res.data;
  140 + this.statistics.resident = data.resident;
  141 + this.statistics.business = data.commerce;
  142 + this.statistics.industry = data.industry;
  143 + this.data2 = [{
  144 + value: data.resident,
  145 + name: '待开发居民用户数'
  146 + },
  147 + {
  148 + value: data.commerce,
  149 + name: '待开发商业用户数'
  150 + },
  151 + {
  152 + value: data.industry,
  153 + name: '待开发工业用户数'
  154 + },
  155 + ]
  156 + this.total2 = data.total
  157 + }
  158 + })
  159 + this.refreshData()
  160 + },
89 refreshData() { 161 refreshData() {
  162 + let that = this;
90 this.pieOption = { 163 this.pieOption = {
91 tooltip: { 164 tooltip: {
92 trigger: 'item' 165 trigger: 'item'
93 }, 166 },
94 legend: { 167 legend: {
  168 + top: 'middle',
  169 + right: '10%',
95 orient: 'vertical', 170 orient: 'vertical',
96 - // x:'right',  
97 - y: 'center',  
98 - right: 50, 171 + itemWidth: 8,
  172 + itemGap: 14,
99 icon: 'circle', 173 icon: 'circle',
100 - align: 'left' 174 + data: this.data1.map(item => item.name)
101 }, 175 },
  176 + color: ['#5875EB', '#FFA500', '#E74C3C', '#15C2C3', '#666666'],
102 series: [{ 177 series: [{
103 name: '摸底分析', 178 name: '摸底分析',
104 type: 'pie', 179 type: 'pie',
@@ -106,42 +181,36 @@ @@ -106,42 +181,36 @@
106 radius: ['65%', '80%'], 181 radius: ['65%', '80%'],
107 avoidLabelOverlap: false, 182 avoidLabelOverlap: false,
108 label: { 183 label: {
109 - show: false,  
110 - position: 'center'  
111 - },  
112 - emphasis: {  
113 - label: { 184 + position: 'outer',
  185 + alignTo: 'edge',
  186 + margin: 0,
  187 + normal: {
114 show: true, 188 show: true,
115 - fontSize: 20,  
116 - lineHeight: 26,  
117 - fontWeight: 'bold',  
118 - formatter: '{b}\n{c}' 189 + position: 'center',
  190 + color: '#4c4a4a',
  191 + formatter: '{total|' + this.total1 + '}' + '\n\r' + '{active|总预算主体数}',
  192 + rich: {
  193 + total: {
  194 + fontSize: 20,
  195 + fontFamily: '微软雅黑',
  196 + color: '#45496a'
  197 + },
  198 + active: {
  199 + fontSize: 14,
  200 + fontFamily: '苹方 中等',
  201 + color: '#999',
  202 + lineHeight: 30
  203 + }
  204 + }
  205 + },
  206 + emphasis: { //中间文字显示
  207 + show: true
119 } 208 }
120 }, 209 },
121 labelLine: { 210 labelLine: {
122 show: true 211 show: true
123 }, 212 },
124 - data: [{  
125 - value: 1048,  
126 - name: '待申报'  
127 - },  
128 - {  
129 - value: 735,  
130 - name: '待评审'  
131 - },  
132 - {  
133 - value: 580,  
134 - name: '待修改'  
135 - },  
136 - {  
137 - value: 484,  
138 - name: '已通过'  
139 - },  
140 - {  
141 - value: 300,  
142 - name: '未创建'  
143 - }  
144 - ] 213 + data: this.data1
145 }] 214 }]
146 }; 215 };
147 this.pieOption2 = { 216 this.pieOption2 = {
@@ -150,47 +219,52 @@ @@ -150,47 +219,52 @@
150 }, 219 },
151 legend: { 220 legend: {
152 orient: 'vertical', 221 orient: 'vertical',
153 - // x:'right',  
154 y: 'center', 222 y: 'center',
155 right: 10, 223 right: 10,
  224 + itemWidth: 8,
  225 + itemGap: 14,
156 icon: 'circle', 226 icon: 'circle',
157 - align: 'left' 227 + align: 'left',
  228 + data: this.data2.map(item => item.name)
158 }, 229 },
  230 + color: ['#15C2C3', '#5875EB', '#E74C3C' ],
159 series: [{ 231 series: [{
160 - name: '摸底分析', 232 + name: '待开发用户池数据分析',
161 type: 'pie', 233 type: 'pie',
162 right: 100, 234 right: 100,
163 radius: ['65%', '80%'], 235 radius: ['65%', '80%'],
164 avoidLabelOverlap: false, 236 avoidLabelOverlap: false,
165 label: { 237 label: {
166 - show: false,  
167 - position: 'center'  
168 - },  
169 - emphasis: {  
170 - label: { 238 + position: 'outer',
  239 + alignTo: 'edge',
  240 + margin: 0,
  241 + normal: {
171 show: true, 242 show: true,
172 - fontSize: 15,  
173 - lineHeight: 26,  
174 - fontWeight: 'bold',  
175 - formatter: '{b}\n{c}' 243 + position: 'center',
  244 + color: '#4c4a4a',
  245 + formatter: '{total|' + this.total2 + '}' + '\n\r' + '{active|总待开发用户数}',
  246 + rich: {
  247 + total: {
  248 + fontSize: 20,
  249 + fontFamily: '微软雅黑',
  250 + color: '#45496a'
  251 + },
  252 + active: {
  253 + fontSize: 14,
  254 + fontFamily: '苹方 中等',
  255 + color: '#999',
  256 + lineHeight: 30
  257 + }
  258 + }
  259 + },
  260 + emphasis: { //中间文字显示
  261 + show: true
176 } 262 }
177 }, 263 },
178 labelLine: { 264 labelLine: {
179 show: true 265 show: true
180 }, 266 },
181 - data: [{  
182 - value: 1048,  
183 - name: '待开发居民用户'  
184 - },  
185 - {  
186 - value: 735,  
187 - name: '待开发商业用户'  
188 - },  
189 - {  
190 - value: 580,  
191 - name: '待开发工业用户'  
192 - },  
193 - ] 267 + data: this.data2
194 }] 268 }]
195 }; 269 };
196 this.lineOption = { 270 this.lineOption = {
@@ -201,12 +275,12 @@ @@ -201,12 +275,12 @@
201 trigger: 'axis' 275 trigger: 'axis'
202 }, 276 },
203 legend: { 277 legend: {
204 - right:10,  
205 - top:'10%', 278 + right: 10,
  279 + top: '10%',
206 icon: 'roundRect', 280 icon: 'roundRect',
207 itemWidth: 10, 281 itemWidth: 10,
208 itemHeight: 2, 282 itemHeight: 2,
209 - itemGap:20, 283 + itemGap: 20,
210 data: ['民居用户', '商业用户', '工业用户'] 284 data: ['民居用户', '商业用户', '工业用户']
211 }, 285 },
212 grid: { 286 grid: {
@@ -257,6 +331,7 @@ @@ -257,6 +331,7 @@
257 <style lang="scss" scoped> 331 <style lang="scss" scoped>
258 .ComCss { 332 .ComCss {
259 background: #f2f4f3; 333 background: #f2f4f3;
  334 + padding: 0 0 10rpx 0;
260 } 335 }
261 336
262 .bigCardCss { 337 .bigCardCss {
@@ -306,7 +381,7 @@ @@ -306,7 +381,7 @@
306 .charCardCss { 381 .charCardCss {
307 margin: 0rpx 24rpx 20rpx 24rpx; 382 margin: 0rpx 24rpx 20rpx 24rpx;
308 height: 486rpx; 383 height: 486rpx;
309 - padding: 16rpx 2rpx 2rpx 20rpx; 384 + padding: 16rpx 2rpx 20rpx 20rpx;
310 border-radius: 20rpx; 385 border-radius: 20rpx;
311 background-color: #ffffff; 386 background-color: #ffffff;
312 box-sizing: border-box; 387 box-sizing: border-box;
pages/market/userDetails.vue
  Diff comments   View file @a11f0d8
@@ -11,39 +11,39 @@ @@ -11,39 +11,39 @@
11 <view class="" v-if="type == 0"> 11 <view class="" v-if="type == 0">
12 <view class="flexCss"> 12 <view class="flexCss">
13 <view class="leftCss overflow-one-lines"> 区域 </view> 13 <view class="leftCss overflow-one-lines"> 区域 </view>
14 - <view class="rightCss overflow-one-lines"> {{allData.area}} </view> 14 + <view class="rightCss overflow-one-lines"> {{allData.area || ""}} </view>
15 </view> 15 </view>
16 <view class="flexCss"> 16 <view class="flexCss">
17 <view class="leftCss overflow-one-lines"> 预算主体 </view> 17 <view class="leftCss overflow-one-lines"> 预算主体 </view>
18 - <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view> 18 + <view class="rightCss overflow-one-lines"> {{allData.budgetSubject || ""}} </view>
19 </view> 19 </view>
20 <view class="flexCss"> 20 <view class="flexCss">
21 <view class="leftCss overflow-one-lines"> 身份证号 </view> 21 <view class="leftCss overflow-one-lines"> 身份证号 </view>
22 - <view class="rightCss overflow-one-lines"> {{allData.idNumber}} </view> 22 + <view class="rightCss overflow-one-lines"> {{allData.idNumber || ""}} </view>
23 </view> 23 </view>
24 <view class="flexCss"> 24 <view class="flexCss">
25 <view class="leftCss overflow-one-lines"> 房屋所在城市 </view> 25 <view class="leftCss overflow-one-lines"> 房屋所在城市 </view>
26 - <view class="rightCss overflow-one-lines"> {{allData.city}} </view> 26 + <view class="rightCss overflow-one-lines"> {{allData.city || ""}} </view>
27 </view> 27 </view>
28 <view class="flexCss"> 28 <view class="flexCss">
29 <view class="leftCss overflow-one-lines"> 房屋所在街道 </view> 29 <view class="leftCss overflow-one-lines"> 房屋所在街道 </view>
30 - <view class="rightCss overflow-one-lines"> {{allData.street}} </view> 30 + <view class="rightCss overflow-one-lines"> {{allData.street || ""}} </view>
31 </view> 31 </view>
32 <view class="flexCss"> 32 <view class="flexCss">
33 <view class="leftCss overflow-one-lines"> 房屋所在小区 </view> 33 <view class="leftCss overflow-one-lines"> 房屋所在小区 </view>
34 - <view class="rightCss overflow-one-lines"> {{allData.communityName}} </view> 34 + <view class="rightCss overflow-one-lines"> {{allData.communityName || ""}} </view>
35 </view> 35 </view>
36 <view class="flexCss"> 36 <view class="flexCss">
37 <view class="leftCss overflow-one-lines"> 房屋所在楼层 </view> 37 <view class="leftCss overflow-one-lines"> 房屋所在楼层 </view>
38 - <view class="rightCss overflow-one-lines"> {{allData.floor}} </view> 38 + <view class="rightCss overflow-one-lines"> {{allData.floor || ""}} </view>
39 </view> 39 </view>
40 <view class="flexCss"> 40 <view class="flexCss">
41 <view class="leftCss overflow-one-lines"> 房屋门牌号 </view> 41 <view class="leftCss overflow-one-lines"> 房屋门牌号 </view>
42 - <view class="rightCss overflow-one-lines"> {{allData.houseNumber}} </view> 42 + <view class="rightCss overflow-one-lines"> {{allData.houseNumber || ""}} </view>
43 </view> 43 </view>
44 <view class="flexCss"> 44 <view class="flexCss">
45 <view class="leftCss overflow-one-lines"> 房主姓名 </view> 45 <view class="leftCss overflow-one-lines"> 房主姓名 </view>
46 - <view class="rightCss overflow-one-lines"> {{allData.householdName}} </view> 46 + <view class="rightCss overflow-one-lines"> {{allData.householdName || ""}} </view>
47 </view> 47 </view>
48 <view class="flexCss"> 48 <view class="flexCss">
49 <view class="leftCss overflow-one-lines"> 房主年龄 </view> 49 <view class="leftCss overflow-one-lines"> 房主年龄 </view>
@@ -51,38 +51,38 @@ @@ -51,38 +51,38 @@
51 </view> 51 </view>
52 <view class="flexCss"> 52 <view class="flexCss">
53 <view class="leftCss overflow-one-lines"> 联系电话 </view> 53 <view class="leftCss overflow-one-lines"> 联系电话 </view>
54 - <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view> 54 + <view class="rightCss overflow-one-lines"> {{allData.phoneNumber || ""}} </view>
55 </view> 55 </view>
56 </view> 56 </view>
57 <!-- 商业基本信息 --> 57 <!-- 商业基本信息 -->
58 <view class="" v-if="type == 1"> 58 <view class="" v-if="type == 1">
59 <view class="flexCss"> 59 <view class="flexCss">
60 <view class="leftCss overflow-one-lines"> 区域 </view> 60 <view class="leftCss overflow-one-lines"> 区域 </view>
61 - <view class="rightCss overflow-one-lines"> {{allData.area}} </view> 61 + <view class="rightCss overflow-one-lines"> {{allData.area || ""}} </view>
62 </view> 62 </view>
63 <view class="flexCss"> 63 <view class="flexCss">
64 <view class="leftCss overflow-one-lines"> 预算主体 </view> 64 <view class="leftCss overflow-one-lines"> 预算主体 </view>
65 - <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view> 65 + <view class="rightCss overflow-one-lines"> {{allData.budgetSubject || ""}} </view>
66 </view> 66 </view>
67 <view class="flexCss"> 67 <view class="flexCss">
68 <view class="leftCss overflow-one-lines"> 纳税人识别号 </view> 68 <view class="leftCss overflow-one-lines"> 纳税人识别号 </view>
69 - <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber}} </view> 69 + <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber || ""}} </view>
70 </view> 70 </view>
71 <view class="flexCss"> 71 <view class="flexCss">
72 <view class="leftCss overflow-one-lines"> 房屋所在城市 </view> 72 <view class="leftCss overflow-one-lines"> 房屋所在城市 </view>
73 - <view class="rightCss overflow-one-lines"> {{allData.city}} </view> 73 + <view class="rightCss overflow-one-lines"> {{allData.city || ""}} </view>
74 </view> 74 </view>
75 <view class="flexCss"> 75 <view class="flexCss">
76 <view class="leftCss overflow-one-lines"> 房屋所在街道 </view> 76 <view class="leftCss overflow-one-lines"> 房屋所在街道 </view>
77 - <view class="rightCss overflow-one-lines"> {{allData.street}} </view> 77 + <view class="rightCss overflow-one-lines"> {{allData.street || ""}} </view>
78 </view> 78 </view>
79 <view class="flexCss"> 79 <view class="flexCss">
80 <view class="leftCss overflow-one-lines"> 所在场所门牌号 </view> 80 <view class="leftCss overflow-one-lines"> 所在场所门牌号 </view>
81 - <view class="rightCss overflow-one-lines"> {{allData.houseNumber}} </view> 81 + <view class="rightCss overflow-one-lines"> {{allData.houseNumber || ""}} </view>
82 </view> 82 </view>
83 <view class="flexCss"> 83 <view class="flexCss">
84 <view class="leftCss overflow-one-lines"> 所在场所经营者姓名 </view> 84 <view class="leftCss overflow-one-lines"> 所在场所经营者姓名 </view>
85 - <view class="rightCss overflow-one-lines"> {{allData.householdName}} </view> 85 + <view class="rightCss overflow-one-lines"> {{allData.householdName || ""}} </view>
86 </view> 86 </view>
87 <view class="flexCss"> 87 <view class="flexCss">
88 <view class="leftCss overflow-one-lines"> 经营业主年龄 </view> 88 <view class="leftCss overflow-one-lines"> 经营业主年龄 </view>
@@ -90,30 +90,30 @@ @@ -90,30 +90,30 @@
90 </view> 90 </view>
91 <view class="flexCss"> 91 <view class="flexCss">
92 <view class="leftCss overflow-one-lines"> 联系电话 </view> 92 <view class="leftCss overflow-one-lines"> 联系电话 </view>
93 - <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view> 93 + <view class="rightCss overflow-one-lines"> {{allData.phoneNumber || ""}} </view>
94 </view> 94 </view>
95 </view> 95 </view>
96 <!-- 工业基本信息 --> 96 <!-- 工业基本信息 -->
97 <view class="" v-if="type == 2"> 97 <view class="" v-if="type == 2">
98 <view class="flexCss"> 98 <view class="flexCss">
99 <view class="leftCss overflow-one-lines"> 区域 </view> 99 <view class="leftCss overflow-one-lines"> 区域 </view>
100 - <view class="rightCss overflow-one-lines"> {{allData.area}} </view> 100 + <view class="rightCss overflow-one-lines"> {{allData.area || ""}} </view>
101 </view> 101 </view>
102 <view class="flexCss"> 102 <view class="flexCss">
103 <view class="leftCss overflow-one-lines"> 预算主体 </view> 103 <view class="leftCss overflow-one-lines"> 预算主体 </view>
104 - <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view> 104 + <view class="rightCss overflow-one-lines"> {{allData.budgetSubject || ""}} </view>
105 </view> 105 </view>
106 <view class="flexCss"> 106 <view class="flexCss">
107 <view class="leftCss overflow-one-lines"> 统一社会信息代码 </view> 107 <view class="leftCss overflow-one-lines"> 统一社会信息代码 </view>
108 - <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber}} </view> 108 + <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber || ""}} </view>
109 </view> 109 </view>
110 <view class="flexCss"> 110 <view class="flexCss">
111 <view class="leftCss overflow-one-lines"> 地址 </view> 111 <view class="leftCss overflow-one-lines"> 地址 </view>
112 - <view class="rightCss overflow-one-lines"> {{allData.address}} </view> 112 + <view class="rightCss overflow-one-lines"> {{allData.address || ""}} </view>
113 </view> 113 </view>
114 <view class="flexCss"> 114 <view class="flexCss">
115 <view class="leftCss overflow-one-lines"> 客户联系人 </view> 115 <view class="leftCss overflow-one-lines"> 客户联系人 </view>
116 - <view class="rightCss overflow-one-lines"> {{allData.contactPerson}} </view> 116 + <view class="rightCss overflow-one-lines"> {{allData.contactPerson || ""}} </view>
117 </view> 117 </view>
118 <view class="flexCss"> 118 <view class="flexCss">
119 <view class="leftCss overflow-one-lines"> 职务 </view> 119 <view class="leftCss overflow-one-lines"> 职务 </view>
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 </view> 121 </view>
122 <view class="flexCss"> 122 <view class="flexCss">
123 <view class="leftCss overflow-one-lines"> 电话 </view> 123 <view class="leftCss overflow-one-lines"> 电话 </view>
124 - <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view> 124 + <view class="rightCss overflow-one-lines"> {{allData.phoneNumber || ""}} </view>
125 </view> 125 </view>
126 </view> 126 </view>
127 </view> 127 </view>
@@ -142,11 +142,11 @@ @@ -142,11 +142,11 @@
142 </view> 142 </view>
143 <view class="flexCss"> 143 <view class="flexCss">
144 <view class="leftCss overflow-one-lines"> 房屋户型 </view> 144 <view class="leftCss overflow-one-lines"> 房屋户型 </view>
145 - <view class="rightCss overflow-one-lines"> {{allData.houseType}} </view> 145 + <view class="rightCss overflow-one-lines"> {{allData.houseType || ""}} </view>
146 </view> 146 </view>
147 <view class="flexCss"> 147 <view class="flexCss">
148 <view class="leftCss overflow-one-lines"> 房屋面积 </view> 148 <view class="leftCss overflow-one-lines"> 房屋面积 </view>
149 - <view class="rightCss overflow-one-lines"> {{allData.houseArea}} </view> 149 + <view class="rightCss overflow-one-lines"> {{allData.houseArea || ""}} </view>
150 </view> 150 </view>
151 <view class="flexCss"> 151 <view class="flexCss">
152 <view class="leftCss overflow-one-lines"> 房屋建设年限 </view> 152 <view class="leftCss overflow-one-lines"> 房屋建设年限 </view>
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 </view> 202 </view>
203 <view class="flexCss"> 203 <view class="flexCss">
204 <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view> 204 <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view>
205 - <view class="rightCss overflow-one-lines"> {{allData.currentPrice}} </view> 205 + <view class="rightCss overflow-one-lines"> {{allData.currentPrice || ""}} </view>
206 </view> 206 </view>
207 <view class="flexCss"> 207 <view class="flexCss">
208 <view class="leftCss overflow-one-lines"> 用户报装意愿 </view> 208 <view class="leftCss overflow-one-lines"> 用户报装意愿 </view>
@@ -210,18 +210,18 @@ @@ -210,18 +210,18 @@
210 </view> 210 </view>
211 <view class="flexCss"> 211 <view class="flexCss">
212 <view class="leftCss overflow-one-lines"> 不报装原因 </view> 212 <view class="leftCss overflow-one-lines"> 不报装原因 </view>
213 - <view class="rightCss overflow-one-lines"> {{allData.reason}} </view> 213 + <view class="rightCss overflow-one-lines"> {{allData.reason || ""}} </view>
214 </view> 214 </view>
215 <view class="flexCss"> 215 <view class="flexCss">
216 <view class="leftCss overflow-one-lines"> 创建时间 </view> 216 <view class="leftCss overflow-one-lines"> 创建时间 </view>
217 <!-- {{$u.timeFormat(timestamp, 'yyyy年mm月dd日')}} --> 217 <!-- {{$u.timeFormat(timestamp, 'yyyy年mm月dd日')}} -->
218 - <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view> 218 + <view class="rightCss overflow-one-lines"> {{ $u.timeFormat(allData.sysCtime, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
219 </view> 219 </view>
220 </view> 220 </view>
221 <view class="" v-if="type == 1"> 221 <view class="" v-if="type == 1">
222 <view class="flexCss"> 222 <view class="flexCss">
223 <view class="leftCss overflow-one-lines"> 场所面积 </view> 223 <view class="leftCss overflow-one-lines"> 场所面积 </view>
224 - <view class="rightCss overflow-one-lines"> {{allData.houseArea}} </view> 224 + <view class="rightCss overflow-one-lines"> {{allData.houseArea || ""}} </view>
225 </view> 225 </view>
226 <view class="flexCss"> 226 <view class="flexCss">
227 <view class="leftCss overflow-one-lines"> 经营范围 </view> 227 <view class="leftCss overflow-one-lines"> 经营范围 </view>
@@ -265,28 +265,27 @@ @@ -265,28 +265,27 @@
265 </view> 265 </view>
266 <view class="flexCss"> 266 <view class="flexCss">
267 <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view> 267 <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view>
268 - <view class="rightCss overflow-one-lines"> {{allData.currentPrice}} </view> 268 + <view class="rightCss overflow-one-lines"> {{allData.currentPrice || ""}} </view>
269 </view> 269 </view>
270 <view class="flexCss"> 270 <view class="flexCss">
271 <view class="leftCss overflow-one-lines"> 预计最大开口气量（最大日用气量） </view> 271 <view class="leftCss overflow-one-lines"> 预计最大开口气量（最大日用气量） </view>
272 - <view class="rightCss overflow-one-lines"> {{allData.predictMax}} </view> 272 + <view class="rightCss overflow-one-lines"> {{allData.predictMax || ""}} </view>
273 </view> 273 </view>
274 <view class="flexCss"> 274 <view class="flexCss">
275 <view class="leftCss overflow-one-lines"> 预计签约日期 </view> 275 <view class="leftCss overflow-one-lines"> 预计签约日期 </view>
276 - <view class="rightCss overflow-one-lines"> {{allData.predictSign}} </view> 276 + <view class="rightCss overflow-one-lines"> {{$u.timeFormat(allData.predictSign, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
277 </view> 277 </view>
278 <view class="flexCss"> 278 <view class="flexCss">
279 <view class="leftCss overflow-one-lines"> 预计安装日期 </view> 279 <view class="leftCss overflow-one-lines"> 预计安装日期 </view>
280 - <view class="rightCss overflow-one-lines"> {{allData.predictInstall}} </view> 280 + <view class="rightCss overflow-one-lines"> {{$u.timeFormat(allData.predictInstall, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
281 </view> 281 </view>
282 <view class="flexCss"> 282 <view class="flexCss">
283 <view class="leftCss overflow-one-lines"> 预计日用气量 </view> 283 <view class="leftCss overflow-one-lines"> 预计日用气量 </view>
284 - <view class="rightCss overflow-one-lines"> {{allData.predictUse}} </view> 284 + <view class="rightCss overflow-one-lines"> {{allData.predictUse || ""}} </view>
285 </view> 285 </view>
286 <view class="flexCss"> 286 <view class="flexCss">
287 <view class="leftCss overflow-one-lines"> 更新时间 </view> 287 <view class="leftCss overflow-one-lines"> 更新时间 </view>
288 - <!-- {{$u.timeFormat(timestamp, 'yyyy年mm月dd日')}} -->  
289 - <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view> 288 + <view class="rightCss overflow-one-lines"> {{$u.timeFormat(allData.sysCtime, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
290 </view> 289 </view>
291 </view> 290 </view>
292 <view class="" v-if="type == 2"> 291 <view class="" v-if="type == 2">
@@ -304,7 +303,7 @@ @@ -304,7 +303,7 @@
304 </view> 303 </view>
305 <view class="flexCss"> 304 <view class="flexCss">
306 <view class="leftCss overflow-one-lines"> 行业分类 </view> 305 <view class="leftCss overflow-one-lines"> 行业分类 </view>
307 - <view class="rightCss overflow-one-lines"> {{allData.industryType}} </view> 306 + <view class="rightCss overflow-one-lines"> {{allData.industryType || ""}} </view>
308 </view> 307 </view>
309 <view class="flexCss"> 308 <view class="flexCss">
310 <view class="leftCss overflow-one-lines"> 最近管道距离 </view> 309 <view class="leftCss overflow-one-lines"> 最近管道距离 </view>
@@ -312,20 +311,19 @@ @@ -312,20 +311,19 @@
312 </view> 311 </view>
313 <view class="flexCss"> 312 <view class="flexCss">
314 <view class="leftCss overflow-one-lines"> 预计最大开口气量 </view> 313 <view class="leftCss overflow-one-lines"> 预计最大开口气量 </view>
315 - <view class="rightCss overflow-one-lines"> {{allData.predictMax}} </view> 314 + <view class="rightCss overflow-one-lines"> {{allData.predictMax || ""}} </view>
316 </view> 315 </view>
317 <view class="flexCss"> 316 <view class="flexCss">
318 <view class="leftCss overflow-one-lines"> 预计签约日期 </view> 317 <view class="leftCss overflow-one-lines"> 预计签约日期 </view>
319 - <view class="rightCss overflow-one-lines"> {{ $dayjs().UTC(allData.predictSign).format('YYYY') || ""}} </view> 318 + <view class="rightCss overflow-one-lines"> {{$u.timeFormat(allData.predictSign, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
320 </view> 319 </view>
321 <view class="flexCss"> 320 <view class="flexCss">
322 <view class="leftCss overflow-one-lines"> 预计安装日期 </view> 321 <view class="leftCss overflow-one-lines"> 预计安装日期 </view>
323 - <!-- <view class="rightCss overflow-one-lines"> {{ $dayjs(allData.predictInstall).format('yyyy') || ""}} </view> -->  
324 - <view class="rightCss overflow-one-lines"> {{ allData.predictInstall || ""}} </view> 322 + <view class="rightCss overflow-one-lines"> {{$u.timeFormat(allData.predictInstall, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
325 </view> 323 </view>
326 <view class="flexCss"> 324 <view class="flexCss">
327 <view class="leftCss overflow-one-lines"> 预计日用气量 </view> 325 <view class="leftCss overflow-one-lines"> 预计日用气量 </view>
328 - <view class="rightCss overflow-one-lines"> {{allData.predictUse}} </view> 326 + <view class="rightCss overflow-one-lines"> {{allData.predictUse || ""}} </view>
329 </view> 327 </view>
330 <view class="flexCss"> 328 <view class="flexCss">
331 <view class="leftCss overflow-one-lines"> 耗能设备名称 </view> 329 <view class="leftCss overflow-one-lines"> 耗能设备名称 </view>
@@ -333,7 +331,7 @@ @@ -333,7 +331,7 @@
333 </view> 331 </view>
334 <view class="flexCss"> 332 <view class="flexCss">
335 <view class="leftCss overflow-one-lines"> 耗能设备型号 </view> 333 <view class="leftCss overflow-one-lines"> 耗能设备型号 </view>
336 - <view class="rightCss overflow-one-lines"> {{allData.machineModel}} </view> 334 + <view class="rightCss overflow-one-lines"> {{allData.machineModel || ""}} </view>
337 </view> 335 </view>
338 <view class="flexCss"> 336 <view class="flexCss">
339 <view class="leftCss overflow-one-lines"> 用能类型 </view> 337 <view class="leftCss overflow-one-lines"> 用能类型 </view>
@@ -341,7 +339,7 @@ @@ -341,7 +339,7 @@
341 </view> 339 </view>
342 <view class="flexCss"> 340 <view class="flexCss">
343 <view class="leftCss overflow-one-lines"> 更新时间 </view> 341 <view class="leftCss overflow-one-lines"> 更新时间 </view>
344 - <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view> 342 + <view class="rightCss overflow-one-lines"> {{$u.timeFormat(allData.sysCtime, 'yyyy年mm月dd日 hh:MM:ss') || ""}} </view>
345 </view> 343 </view>
346 </view> 344 </view>
347 345
@@ -351,7 +349,13 @@ @@ -351,7 +349,13 @@
351 </view> 349 </view>
352 </template> 350 </template>
353 351
  352 +
354 <script> 353 <script>
  354 + import {
  355 + getPoolResidentDetail,
  356 + getPoolCommerceDetail,
  357 + getPoolIndustryDetail,
  358 + } from '@/api/organize.js'
355 export default { 359 export default {
356 components: {}, 360 components: {},
357 props: { 361 props: {
@@ -360,8 +364,9 @@ @@ -360,8 +364,9 @@
360 data() { 364 data() {
361 return { 365 return {
362 type: null, 366 type: null,
363 - allData: {}, 367 + allData:{},
364 title: "", 368 title: "",
  369 + id:"",
365 } 370 }
366 }, 371 },
367 computed: { 372 computed: {
@@ -370,16 +375,30 @@ @@ -370,16 +375,30 @@
370 onLoad(data) { 375 onLoad(data) {
371 if (data) { 376 if (data) {
372 this.type = data.type; 377 this.type = data.type;
373 - this.allData = JSON.parse(data.details); 378 + this.id = data.id;
374 } 379 }
375 this.initData() 380 this.initData()
376 - console.log(this.allData); 381 + console.log(this.type,this.id);
377 }, 382 },
378 methods: { 383 methods: {
379 initData() { 384 initData() {
380 const titleArr = ['居民用户详情', '商业用户详情', '工业用户详情'] 385 const titleArr = ['居民用户详情', '商业用户详情', '工业用户详情']
381 this.title = titleArr[this.type] 386 this.title = titleArr[this.type]
382 - } 387 + if(this.type === '0'){
  388 + getPoolResidentDetail(this.id).then((res) =>{
  389 + this.allData = res.data;
  390 + })
  391 + }else if(this.type === '1'){
  392 + getPoolCommerceDetail(this.id).then((res) =>{
  393 + this.allData = res.data;
  394 + })
  395 + }else if(this.type === '2'){
  396 + getPoolIndustryDetail(this.id).then((res) =>{
  397 + this.allData = res.data;
  398 + })
  399 + }
  400 + },
  401 +
383 } 402 }
384 } 403 }
385 </script> 404 </script>
1 -module.exports = {  
2 - // 配置路径别名  
3 - configureWebpack: {  
4 - devServer: {  
5 - // 调试时允许内网穿透，让外网的人访问到本地调试的H5页面  
6 - disableHostCheck: true,  
7 - // /本地调试时打开  
8 - port: '18082', //代理端口,不固定8222，可以是其他的  
9 - open: false, //项目启动时是否自动打开浏览器  
10 - proxy: {  
11 - '/api': {  
12 - target: 'http://172.17.56.37/api', //测试接口地址  
13 - // target: 'http://172.17.56.16/api', //正式接口地址  
14 - // ws:true, //允许ws跨域  
15 - secure:true, //类型:https=false http=true  
16 - changeOrigin: true, //是否跨域  
17 - pathRewrite:{ // 重写路径  
18 - '^/api':''  
19 - }  
20 - }  
21 - }, 1 +// module.exports = {
  2 +// // 配置路径别名
  3 +// configureWebpack: {
  4 +// devServer: {
  5 +// // 调试时允许内网穿透，让外网的人访问到本地调试的H5页面
  6 +// disableHostCheck: true,
  7 +// // /本地调试时打开
  8 +// port: '18082', //代理端口,不固定8222，可以是其他的
  9 +// open: false, //项目启动时是否自动打开浏览器
  10 +// proxy: {
  11 +// '/api': {
  12 +// target: 'http://172.17.56.37/api', //测试接口地址
  13 +// // target: 'http://172.17.56.16/api', //正式接口地址
  14 +// // ws:true, //允许ws跨域
  15 +// secure:true, //类型:https=false http=true
  16 +// changeOrigin: true, //是否跨域
  17 +// pathRewrite:{ // 重写路径
  18 +// '^/api':''
  19 +// }
  20 +// }
  21 +// },
22 22
23 - // /本地调试时打开  
24 - }  
25 - },  
26 - productionSourceMap: false,  
27 -} 23 +// // /本地调试时打开
  24 +// }
  25 +// },
  26 +// productionSourceMap: false,
  27 +// }