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