Commit cd70fe15fc16fddf626c3dbe25e1b0003a4bf7b2

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

feat: 联调接口

api/organize.js 0 → 100644
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
  1 +const { http } = uni.$u
  2 +// 列表和条件筛选
  3 +export const getOrganizelist = params => http.get('/organize/list', { params })
  4 +
  5 +//居民用户
  6 +export const getPoolResidentlist = params => http.get('/poolResident/list', { params })
  7 +
  8 +//商业用户
  9 +export const getPoolCommercelist = params => http.get('/poolCommerce/list', { params })
  10 +
  11 +//工业用户
  12 +export const getPoolIndustrylist = params => http.get('/poolIndustry/list', { params })
  13 +
  14 +/*报告详情*/
  15 +
  16 +//报告详情-组织实施落实 1
  17 +export const getOrganize = params => http.get('/organize/' + params )
  18 +
  19 +//报告详情-天然气市场总体概况主表 2
  20 +export const getGeneralOverview = params => http.get('/generalOverview/'+ params)
  21 +
  22 +//报告详情-天然气市场总体概况附表 3
  23 +export const getGeneralOverviewAttach = params => http.get('/generalOverviewAttach/'+ params)
  24 +
  25 +//报告详情-告详情-重点市场业务分析 4
  26 +export const getBusinessAnalyze = params => http.get('/businessAnalyze/'+ params)
  27 +
  28 +
  29 +//报告详情-预计2021财年-2022财年已签约且在2023财年安装确认项目 5
  30 +export const getNewBuildingInfo = params => http.get('/newBuildingInfo/'+ params)
  31 +
  32 +
  33 +//报告详情-预计2023-2025财年安装确认项目 6
  34 +export const getNewBuildingItem = params => http.get('/newBuildingItem/'+ params)
  35 +
  36 +//报告详情-未来发展规划,所需资源配置 7
  37 +export const getDevelopmentPlan = params => http.get('/developmentPlan/'+ params)
  38 +
  39 +//报告详情-目标思路建议 8
  40 +export const getTargetSuggestion = params => http.get('/targetSuggestion/'+ params)
  41 +
  42 +
  43 +
  44 +
  45 +
components/news-list/news-list.vue
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 {{newItem.title}} 6 {{newItem.title}}
7 </view> 7 </view>
8 <view class="bomCss overflow-one-lines"> 8 <view class="bomCss overflow-one-lines">
9 - <view class="overflow-one-lines"> {{ newItem.plate_name }} </view> 9 + <view class="overflow-one-lines"> {{ $dict(newItem.plateName) }} </view>
10 <view class="">|</view> 10 <view class="">|</view>
11 <view class="overflow-one-lines"> {{newItem.organizeName}} </view> 11 <view class="overflow-one-lines"> {{newItem.organizeName}} </view>
12 </view> 12 </view>
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 </template> 19 </template>
20 20
21 <script> 21 <script>
  22 + import logoImg from '@/static/images/empty/logo.png'
22 export default { 23 export default {
23 name: "news-list", 24 name: "news-list",
24 props: { 25 props: {
@@ -28,7 +29,7 @@ @@ -28,7 +29,7 @@
28 }, 29 },
29 data() { 30 data() {
30 return { 31 return {
31 - src: 'https://cdn.uviewui.com/uview/album/1.jpg' 32 + src: logoImg
32 }; 33 };
33 }, 34 },
34 methods:{ 35 methods:{
@@ -8,8 +8,16 @@ import echarts from &#39;@/components/echarts-uniapp/echarts-uniapp.vue&#39;; @@ -8,8 +8,16 @@ import echarts from &#39;@/components/echarts-uniapp/echarts-uniapp.vue&#39;;
8 // vuex 8 // vuex
9 import store from './store' 9 import store from './store'
10 10
  11 +import dict from '@/utils/dictionary.js'
  12 +import state from '@/utils/dictionary.js'
  13 +
  14 +
  15 +// 将 dict 方法挂载到全局对象上
  16 +
11 Vue.config.productionTip = false 17 Vue.config.productionTip = false
12 Vue.prototype.$store = store 18 Vue.prototype.$store = store
  19 +Vue.prototype.$state = state
  20 +Vue.prototype.$dict = dict
13 21
14 Vue.component('echarts',echarts) 22 Vue.component('echarts',echarts)
15 23
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 }, { 19 }, {
20 "path": "pages/market/insight", 20 "path": "pages/market/insight",
21 "style": { 21 "style": {
  22 + "enablePullDownRefresh": true,
22 "navigationBarTitleText": "市场洞察" 23 "navigationBarTitleText": "市场洞察"
23 } 24 }
24 }, { 25 }, {
pages/market/components/reportModule1.vue
@@ -8,25 +8,25 @@ @@ -8,25 +8,25 @@
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 v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 11 + <u--input :value="reportData.leader" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
12 </view> 12 </view>
13 </view> 13 </view>
14 <view class="u-demo-block"> 14 <view class="u-demo-block">
15 <text class="u-demo-block__title">副组长</text> 15 <text class="u-demo-block__title">副组长</text>
16 <view class="u-demo-block__content" style="margin-top: 15px;"> 16 <view class="u-demo-block__content" style="margin-top: 15px;">
17 - <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 17 + <u--input :value="reportData.deputyLeader" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
18 </view> 18 </view>
19 </view> 19 </view>
20 <view class="u-demo-block"> 20 <view class="u-demo-block">
21 <text class="u-demo-block__title">成员</text> 21 <text class="u-demo-block__title">成员</text>
22 <view class="u-demo-block__content" style="margin-top: 15px;"> 22 <view class="u-demo-block__content" style="margin-top: 15px;">
23 - <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 23 + <u--input :value="reportData.member" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
24 </view> 24 </view>
25 </view> 25 </view>
26 <view class="u-demo-block"> 26 <view class="u-demo-block">
27 <text class="u-demo-block__title">填报人</text> 27 <text class="u-demo-block__title">填报人</text>
28 <view class="u-demo-block__content" style="margin-top: 15px;"> 28 <view class="u-demo-block__content" style="margin-top: 15px;">
29 - <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input> 29 + <u--input :value="reportData.createBy" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
30 </view> 30 </view>
31 </view> 31 </view>
32 </view> 32 </view>
@@ -37,8 +37,8 @@ @@ -37,8 +37,8 @@
37 <u-collapse :border="false" :value="['2']"> 37 <u-collapse :border="false" :value="['2']">
38 <u-collapse-item name="2"> 38 <u-collapse-item name="2">
39 <text slot="title" class="slot-title">实施情况</text> 39 <text slot="title" class="slot-title">实施情况</text>
40 - <view class="largeAmountOfTextCss">  
41 - 为了精准掌握玉林中燃经营区域及周边市场发展态势,预测2023财年市场开发计划和未来市场发展方向,按照集团三年发展规划及高质量发展的要求,玉林中燃积极开展了一次全面、系统、深入的全方面市场调研工作。 40 + <view class="largeAmountOfTextCss" v-if="reportData.implementationSituation != '' && reportData.implementationSituation != null">
  41 + {{reportData.implementationSituation}}
42 </view> 42 </view>
43 </u-collapse-item> 43 </u-collapse-item>
44 </u-collapse> 44 </u-collapse>
@@ -81,7 +81,9 @@ @@ -81,7 +81,9 @@
81 export default { 81 export default {
82 components: {}, 82 components: {},
83 props: { 83 props: {
84 - 84 + reportData:{
  85 + type:Object
  86 + }
85 }, 87 },
86 data() { 88 data() {
87 return { 89 return {
@@ -179,7 +181,7 @@ @@ -179,7 +181,7 @@
179 text-align: left; 181 text-align: left;
180 line-height: 46rpx; 182 line-height: 46rpx;
181 } 183 }
182 - 184 +
183 /deep/.uni-input-input { 185 /deep/.uni-input-input {
184 color: #999db0; 186 color: #999db0;
185 } 187 }
pages/market/index.vue
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 </u-sticky> 8 </u-sticky>
9 <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="NewsList.length <= 0"></u-empty> 9 <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="NewsList.length <= 0"></u-empty>
10 <newsList v-for="(item,index) in NewsList" :key="index" :newItem="item" v-else></newsList> 10 <newsList v-for="(item,index) in NewsList" :key="index" :newItem="item" v-else></newsList>
  11 + <u-loadmore :status="status" v-if="NewsList.length > 0" />
11 </view> 12 </view>
12 </template> 13 </template>
13 14
@@ -19,7 +20,6 @@ @@ -19,7 +20,6 @@
19 import { 20 import {
20 listSimpleDictDatas 21 listSimpleDictDatas
21 } from '@/api/dict.js' 22 } from '@/api/dict.js'
22 - import keyboard from '../../uni_modules/uview-ui/libs/config/props/keyboard'  
23 export default { 23 export default {
24 components: { 24 components: {
25 newsList 25 newsList
@@ -31,6 +31,12 @@ @@ -31,6 +31,12 @@
31 return { 31 return {
32 keyword: "", 32 keyword: "",
33 current: 0, 33 current: 0,
  34 + status:"loadmore",
  35 + total: null,
  36 + queryParameter: {
  37 + pageNum: 1,
  38 + pageSize: 10
  39 + },
34 tabList: [{ 40 tabList: [{
35 name: "全部", 41 name: "全部",
36 }, { 42 }, {
@@ -47,10 +53,6 @@ @@ -47,10 +53,6 @@
47 name: "国际能源", 53 name: "国际能源",
48 }], 54 }],
49 NewsList: [], 55 NewsList: [],
50 - queryParameter: {  
51 - keyword: "",  
52 - plate_name: ""  
53 - }  
54 } 56 }
55 }, 57 },
56 computed: { 58 computed: {
@@ -59,50 +61,87 @@ @@ -59,50 +61,87 @@
59 onLoad() { 61 onLoad() {
60 this.initData() 62 this.initData()
61 }, 63 },
  64 + onReachBottom() {
  65 + let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
  66 + if (allTotal < this.total) {
  67 + //当前条数小于总条数 则增加请求页数
  68 + this.queryParameter.pageNum++;
  69 + this.status = 'loading';
  70 + this.updateList() //调用加载数据方法
  71 + } else {
  72 + this.status = "nomore"
  73 + // console.log('已加载全部数据')
  74 + }
  75 + },
62 onPullDownRefresh() { 76 onPullDownRefresh() {
63 - this.keyword = "" 77 + this.resetQuery();
  78 + this.keyword = "";
64 this.current = 0; 79 this.current = 0;
65 - this.initData()  
66 - uni.stopPullDownRefresh() 80 + this.initData();
  81 + setTimeout(() => {
  82 + //结束下拉刷新
  83 + uni.stopPullDownRefresh();
  84 + }, 500);
67 }, 85 },
68 methods: { 86 methods: {
69 initData() { 87 initData() {
70 - // this.updateList()  
71 - getInfoMarketInformationlist().then(res => {  
72 - console.log(res);  
73 - if (res.code === 200) {  
74 - this.NewsList = res.rows  
75 - console.log(this.NewsList);  
76 - }  
77 - }) 88 + this.updateList()
  89 + },
  90 + resetQuery(){
  91 + this.NewsList = [];
  92 + this.queryParameter = {
  93 + pageNum: 1,
  94 + pageSize: 10
  95 + }
78 }, 96 },
79 search() { 97 search() {
80 - console.log("搜索");  
81 - // if (this.keyword) {  
82 - this.updateList({  
83 - keyword: this.keyword  
84 - })  
85 - // } 98 + this.resetQuery();
  99 + this.updateList()
  100 + },
  101 + checkTotal(){
  102 + let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
  103 + if(this.total < allTotal){
  104 + this.status = "nomore"
  105 + }
86 }, 106 },
87 updateList() { 107 updateList() {
88 let Params 108 let Params
89 if (this.keyword && this.current !== -1) { 109 if (this.keyword && this.current !== -1) {
90 - Params = {keyword: this.keyword,plateName: this.current} 110 + Params = {
  111 + title: this.keyword,
  112 + plateName: this.current
  113 + }
91 } else if (this.keyword !== "") { 114 } else if (this.keyword !== "") {
92 - Params = {keyword: this.keyword,} 115 + Params = {
  116 + title: this.keyword,
  117 + }
93 } else if (this.current !== 0) { 118 } else if (this.current !== 0) {
94 - Params = {plateName: this.current - 1} 119 + Params = {
  120 + plateName: this.current - 1
  121 + }
95 } 122 }
  123 + Params = {
  124 + ...this.queryParameter,
  125 + ...Params
  126 + };
  127 + // console.log(111111, Params);
96 getInfoMarketInformationlist(Params).then(res => { 128 getInfoMarketInformationlist(Params).then(res => {
97 // console.log(res); 129 // console.log(res);
98 if (res.code === 200) { 130 if (res.code === 200) {
99 - this.NewsList = res.rows  
100 - // console.log(this.NewsList); 131 + if(this.queryParameter.pageSize > 1){
  132 + this.NewsList = [...this.NewsList,...res.rows]
  133 + }else{
  134 + this.NewsList = res.rows
  135 + }
  136 + this.total = res.total;
  137 + console.log(this.NewsList);
101 } 138 }
102 }) 139 })
  140 + this.checkTotal();
103 }, 141 },
104 tabChange(e) { 142 tabChange(e) {
105 console.log(e); 143 console.log(e);
  144 + this.resetQuery()
106 this.current = e.index 145 this.current = e.index
107 console.log(this.current); 146 console.log(this.current);
108 this.updateList() 147 this.updateList()
pages/market/insight.vue
1 <template> 1 <template>
2 <view class="ConCss"> 2 <view class="ConCss">
3 - <view class="topFCss">  
4 - <view class="tabsCss" :class="!current?'isActiveCss':''" @click="current = 0">  
5 - 市场摸底  
6 -  
7 - </view>  
8 - <view class="tabsCss" :class="current?'isActiveCss':''" @click="current = 1">  
9 - 待开发用户池 3 + <u-sticky bgColor="#fff" customNavHeight="0" offsetTop="0">
  4 + <view class="topFCss">
  5 + <view class="tabsCss" :class="!current?'isActiveCss':''" @click="typeChange(0)">
  6 + 市场摸底
  7 + </view>
  8 + <view class="tabsCss" :class="current?'isActiveCss':''" @click="typeChange(1)">
  9 + 待开发用户池
  10 + </view>
10 </view> 11 </view>
11 - </view>  
12 - <u-divider style="margin:0;"></u-divider>  
13 - <view class="topSCss" v-if="!current">  
14 - <u-tabs :list="tabList1" :current="current1" lineHeight="0" lineColor="#f56c6c" :activeStyle="{ 12 + <u-divider style="margin:0;"></u-divider>
  13 + <view class="topSCss" v-if="!current">
  14 + <u-tabs :list="tabList1" :current="current1" lineHeight="0" lineColor="#f56c6c" :activeStyle="{
15 color: '#cf000d', 15 color: '#cf000d',
16 fontWeight: 'bold', 16 fontWeight: 'bold',
17 transform: 'scale(1.1)' 17 transform: 'scale(1.1)'
18 - }" itemStyle="height: 78rpx;">  
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>  
21 - <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">财年</text> 18 + }" itemStyle="height: 78rpx;" @click="tabChange1">
  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>
  21 + <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">财年</text>
  22 + </view>
22 </view> 23 </view>
23 - </view>  
24 - </u-tabs>  
25 - </view>  
26 - <view class="topSCss" v-else>  
27 - <u-tabs :list="tabList2" :current="current2" lineHeight="0" lineColor="#f56c6c" :activeStyle="{ 24 + </u-tabs>
  25 + </view>
  26 + <view class="topSCss" v-else>
  27 + <u-tabs :list="tabList2" :current="current2" lineHeight="0" lineColor="#f56c6c" :activeStyle="{
28 color: '#cf000d', 28 color: '#cf000d',
29 fontWeight: 'bold', 29 fontWeight: 'bold',
30 transform: 'scale(1.1)' 30 transform: 'scale(1.1)'
31 - }" itemStyle="display:flex;justify-content: space-between;height: 78rpx;">  
32 - <!-- <view v-show="!current" slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="$u.toast('插槽被点击')"> 31 + }" itemStyle="display:flex;justify-content: space-between;height: 78rpx;" @click="tabChange2">
  32 + <!-- <view v-show="!current" slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="$u.toast('插槽被点击')">
33 <view style="display: flex;"> 33 <view style="display: flex;">
34 <u-icon name="clock" size="21" bold></u-icon> 34 <u-icon name="clock" size="21" bold></u-icon>
35 <text>财年</text> 35 <text>财年</text>
36 </view> 36 </view>
37 </view> --> 37 </view> -->
38 - </u-tabs>  
39 - </view>  
40 - <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)"  
41 - height="74rpx" bgColor="#F5F6FA" @search="search"></u-search> 38 + </u-tabs>
  39 + </view>
  40 + <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)"
  41 + height="74rpx" bgColor="#F5F6FA" @search="search"></u-search>
  42 + </u-sticky>
42 <view class="listBodyCss"> 43 <view class="listBodyCss">
43 - <view class="reportCss" v-if="!current" v-for="i in 5">  
44 - <view class="topTitleCss">  
45 - <view class="top1 overflow-one-lines"> 2023财年玉林中燃天然气市场调研报告 </view>  
46 - <view class="top2 overflow-one-lines"> 预算主体: </view>  
47 - <view class="top2 overflow-one-lines"> 填报人: </view>  
48 - <view class="top2 overflow-one-lines"> 状态有效时间: </view>  
49 - </view>  
50 - <view class="topStateCss">  
51 - <view class="textCss"> 状态 </view>  
52 - <view class="btnCss">  
53 - <u-button color="#CF000D" style="width: 160rpx;height: 60rpx;" shape="circle" text="查看详情" @click="jumpReportDetails"></u-button> 44 + <view class="" v-if="!current">
  45 + <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="newList1.length <= 0"></u-empty>
  46 + <view class="reportCss" v-for="(item,index) in newList1" :key="index">
  47 + <view class="topTitleCss">
  48 + <view class="top1 overflow-one-lines"> {{item.reportName || ""}} </view>
  49 + <view class="top2 overflow-one-lines"> 预算主体:{{item.budgetSubject || ""}} </view>
  50 + <view class="top2 overflow-one-lines"> 填报人: {{item.createBy || ""}}</view>
  51 + <view class="top2 overflow-one-lines"> 状态有效时间:
  52 + {{$u.timeFormat(item.validityTimeEnd, 'yyyy年mm月dd日 hh:MM:ss') || ""}}
  53 + </view>
  54 + </view>
  55 + <view class="topStateCss">
  56 + <view class="textCss" :style="{'color':statusCss(item.statusCode)}"> {{item.statusName}} </view>
  57 + <view class="btnCss">
  58 + <u-button color="#CF000D" style="width: 160rpx;height: 60rpx;" shape="circle" text="查看详情"
  59 + @click="jumpReportDetails(item.reportNo)"></u-button>
  60 + </view>
54 </view> 61 </view>
55 </view> 62 </view>
  63 + <u-loadmore :status="status1" v-if="newList1.length > 0" />
56 </view> 64 </view>
57 - <view class="reportCss" @click="jumpUserDetails" :style="'height:auto'" v-else v-for="i in 5">  
58 - <view class="topTitleCss">  
59 - <view class="top1 overflow-one-lines"> 张三 </view>  
60 - <view class="top2 overflow-one-lines"> 预算主体: </view>  
61 - <view class="top2 overflow-one-lines"> 联系方式: </view>  
62 - <view class="top2 overflow-one-lines"> 详情地址: </view> 65 + <view v-else>
  66 + <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="newList2.length <= 0"></u-empty>
  67 + <view class="reportCss" @click="jumpUserDetails(item)" :style="'height:auto'" v-else v-for="(item,index) in newList2"
  68 + :key="index">
  69 + <view class="topTitleCss">
  70 + <view class="top1 overflow-one-lines" v-if="current2 === 0"> {{item.householdName || ""}} </view>
  71 + <view class="top1 overflow-one-lines" v-else-if="current2 === 1" > {{item.householdName || ""}} </view>
  72 + <view class="top1 overflow-one-lines" v-else-if="current2 === 2"> {{item.contactPerson || ""}} </view>
  73 + <view class="top2 overflow-one-lines"> 预算主体: {{item.budgetSubject || ""}}</view>
  74 + <view class="top2 overflow-one-lines"> 联系方式: {{item.phoneNumber || ""}}</view>
  75 + <view class="top2 overflow-one-lines"> 详情地址: {{item.address || ""}}</view>
  76 + </view>
63 </view> 77 </view>
  78 + <u-loadmore :status="status2" v-if="newList2.length > 0" />
64 </view> 79 </view>
65 </view> 80 </view>
66 - <u-datetime-picker :show="fiscalYearShow" v-model="fiscalYear" cancelText="重置" @confirm="fiscalYearShow = false"  
67 - @cancel="reset" @close="fiscalYearShow = false" closeOnClickOverlay mode="year" ></u-datetime-picker> 81 + <u-datetime-picker :show="fiscalYearShow" v-model="fiscalYear" cancelText="重置" @confirm="fiscalYearShow = false"
  82 + @cancel="resetDate" @close="fiscalYearShow = false" closeOnClickOverlay mode="year"></u-datetime-picker>
68 </view> 83 </view>
69 </template> 84 </template>
70 85
71 <script> 86 <script>
72 - import { $moment } from '@/uni_modules/uview-ui'; 87 + import {
  88 + getOrganizelist,
  89 + getPoolResidentlist,
  90 + getPoolCommercelist,
  91 + getPoolIndustrylist
  92 + } from '@/api/organize.js'
  93 + import {
  94 + $moment
  95 + } from '@/uni_modules/uview-ui';
73 export default { 96 export default {
74 components: {}, 97 components: {},
75 props: { 98 props: {
@@ -81,8 +104,18 @@ @@ -81,8 +104,18 @@
81 keyword: "", 104 keyword: "",
82 current1: 0, 105 current1: 0,
83 current2: 0, 106 current2: 0,
84 - fiscalYearShow:false,  
85 - fiscalYear:"", 107 + newList1: [],
  108 + newList2: [],
  109 + fiscalYearShow: false,
  110 + fiscalYear: "",
  111 + status1: "loadmore",
  112 + status2: "loadmore",
  113 + total1: null,
  114 + total2: null,
  115 + queryParameter: {
  116 + pageNum: 1,
  117 + pageSize: 10
  118 + },
86 tabList1: [{ 119 tabList1: [{
87 name: '全部' 120 name: '全部'
88 }, { 121 }, {
@@ -107,26 +140,232 @@ @@ -107,26 +140,232 @@
107 140
108 }, 141 },
109 onLoad() { 142 onLoad() {
110 - 143 + this.initData()
  144 + },
  145 + onReachBottom() {
  146 + let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
  147 + //待开发用户池
  148 + if (this.current) {
  149 + console.log(222);
  150 + if (allTotal < this.total2) {
  151 + this.queryParameter.pageNum++;
  152 + this.status2 = 'loading';
  153 + this.updateList2()
  154 + } else {
  155 + this.status2 = 'nomore';
  156 + }
  157 + } else {
  158 + console.log(111);
  159 + //市场摸底
  160 + if (allTotal < this.total1) {
  161 + this.queryParameter.pageNum++;
  162 + this.status1 = 'loading';
  163 + this.updateList1()
  164 + } else {
  165 + this.status1 = 'nomore';
  166 + }
  167 + }
  168 + },
  169 + onPullDownRefresh() {
  170 + this.resetQuery();
  171 + this.keyword = "";
  172 + if (this.current) {
  173 + this.current2 = 0;
  174 + this.updateList2()
  175 + } else {
  176 + this.current1 = 0;
  177 + this.updateList1()
  178 + }
  179 + setTimeout(() => {
  180 + //结束下拉刷新
  181 + uni.stopPullDownRefresh();
  182 + }, 500);
111 }, 183 },
112 methods: { 184 methods: {
113 - openFiscalYearChoice(){ 185 + statusCss(code) {
  186 + const colors = ['#5875eb', '#ffa500', '#e74c3c', '#666666'];
  187 + return colors[code];
  188 + },
  189 + initData() {
  190 + getOrganizelist().then(res => {
  191 + console.log("市场摸底列表", res);
  192 + if (res.code === 200) {
  193 + this.newList1 = res.rows;
  194 + this.total1 = res.total;
  195 + }
  196 + })
  197 + },
  198 + typeChange(i) {
  199 + this.keyword = "";
  200 + this.resetQuery();
  201 + this.current = i;
  202 + this.current ? this.updateList2() : this.updateList1();
  203 + },
  204 + updateList1() {
  205 + let Params
  206 + if (this.keyword && this.current1 !== -1) {
  207 + Params = {
  208 + reportName: this.keyword,
  209 + statusCode: this.current1
  210 + }
  211 + } else if (this.keyword !== "") {
  212 + Params = {
  213 + reportName: this.keyword,
  214 + }
  215 + } else if (this.current1 !== 0) {
  216 + Params = {
  217 + statusCode: this.current1 - 1
  218 + }
  219 + }
  220 + Params = {
  221 + ...this.queryParameter,
  222 + ...Params
  223 + };
  224 + getOrganizelist(Params).then(res => {
  225 + // console.log(res);
  226 + if (res.code === 200) {
  227 + if (this.queryParameter.pageSize > 1) {
  228 + this.newList1 = [...this.newList1, ...res.rows];
  229 + } else {
  230 + this.newList1 = res.rows
  231 + }
  232 + this.total1 = res.total;
  233 + console.log(this.newList1);
  234 + }
  235 + })
  236 + },
  237 + updateList2() {
  238 + let Params
  239 + // if (this.keyword && this.current2 !== -1) {
  240 + // Params = {
  241 + // reportName: this.keyword,
  242 + // statusCode: this.current2
  243 + // }
  244 + // } else if (this.keyword !== "") {
  245 + // Params = {
  246 + // reportName: this.keyword,
  247 + // }
  248 + // } else if (this.current2 !== 0) {
  249 + // Params = {
  250 + // statusCode: this.current2 - 1
  251 + // }
  252 + // }
  253 + // Params = {
  254 + // ...this.queryParameter,
  255 + // ...Params
  256 + // };
  257 + if (this.current2 === 0) {
  258 + if(this.keyword){
  259 + Params = {
  260 + householdName: this.keyword,
  261 + }
  262 + }
  263 + getPoolResidentlist(Params).then(res => {
  264 + // console.log(res);
  265 + if (res.code === 200) {
  266 + if (this.queryParameter.pageSize > 1) {
  267 + this.newList2 = [...this.newList2, ...res.rows];
  268 + } else {
  269 + this.newList2 = res.rows
  270 + }
  271 + this.total2 = res.total;
  272 + }
  273 + })
  274 + } else if (this.current2 === 1) {
  275 + if(this.keyword){
  276 + Params = {
  277 + householdName: this.keyword,
  278 + }
  279 + }
  280 + getPoolCommercelist(Params).then(res => {
  281 + // console.log(res);
  282 + if (res.code === 200) {
  283 + if (this.queryParameter.pageSize > 1) {
  284 + this.newList2 = [...this.newList2, ...res.rows];
  285 + } else {
  286 + this.newList2 = res.rows
  287 + }
  288 + this.total2 = res.total;
  289 + }
  290 + })
  291 + } else if (this.current2 === 2) {
  292 + if(this.keyword){
  293 + Params = {
  294 + contactPerson: this.keyword,
  295 + }
  296 + }
  297 + getPoolIndustrylist(Params).then(res => {
  298 + // console.log(res);
  299 + if (res.code === 200) {
  300 + if (this.queryParameter.pageSize > 1) {
  301 + this.newList2 = [...this.newList2, ...res.rows];
  302 + } else {
  303 + this.newList2 = res.rows
  304 + }
  305 + this.total2 = res.total;
  306 + }
  307 + })
  308 + }else{
  309 +
  310 + }
  311 + this.checkTotal()
  312 + console.log("待开发", this.newList2);
  313 + },
  314 + checkTotal(){
  315 + let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
  316 + if(this.total1 < allTotal){
  317 + this.status1 = "nomore"
  318 + }
  319 + if(this.total2 < allTotal){
  320 + this.status2 = "nomore"
  321 + }
  322 + },
  323 + resetQuery() {
  324 + this.newList1 = [];
  325 + this.newList2 = [];
  326 + this.queryParameter = {
  327 + pageNum: 1,
  328 + pageSize: 10
  329 + }
  330 + },
  331 + tabChange1(e) {
  332 + console.log(e);
  333 + this.resetQuery()
  334 + this.current1 = e.index;
  335 + this.updateList1();
  336 + },
  337 + tabChange2(e) {
  338 + console.log(e);
  339 + this.current2 = e.index
  340 + this.resetQuery();
  341 + this.updateList2();
  342 + },
  343 + openFiscalYearChoice() {
114 this.fiscalYearShow = true; 344 this.fiscalYearShow = true;
115 // this.fiscalYear = Number(new Date()); 345 // this.fiscalYear = Number(new Date());
116 }, 346 },
117 - reset(){ 347 + resetDate() {
118 console.log("重置"); 348 console.log("重置");
119 this.fiscalYear = ""; 349 this.fiscalYear = "";
120 this.fiscalYearShow = false; 350 this.fiscalYearShow = false;
121 }, 351 },
122 - jumpUserDetails(){ 352 + search() {
  353 + console.log("搜索");
  354 + this.resetQuery();
  355 + if (this.current) {
  356 + this.updateList2()
  357 + } else {
  358 + this.updateList1()
  359 + }
  360 + },
  361 + jumpUserDetails(item) {
123 uni.navigateTo({ 362 uni.navigateTo({
124 - url:"/pages/market/userDetails" 363 + url: `/pages/market/userDetails?type=${this.current2}&details=${JSON.stringify(item)}`
125 }) 364 })
126 }, 365 },
127 - jumpReportDetails(){ 366 + jumpReportDetails(id) {
128 uni.navigateTo({ 367 uni.navigateTo({
129 - url:"/pages/market/reportDetails" 368 + url: "/pages/market/reportDetails?reportNo=" + id
130 }) 369 })
131 } 370 }
132 } 371 }
@@ -258,4 +497,8 @@ @@ -258,4 +497,8 @@
258 background-color: #ffffff; 497 background-color: #ffffff;
259 box-sizing: border-box; 498 box-sizing: border-box;
260 } 499 }
  500 +
  501 + .u-empty {
  502 + background: #fff !important;
  503 + }
261 </style> 504 </style>
pages/market/newsDetails.vue
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 {{ detailsContent.title }} 6 {{ detailsContent.title }}
7 </view> 7 </view>
8 <view class="releaseTimeCss"> 8 <view class="releaseTimeCss">
9 - {{ detailsContent.publishTime}} 9 + 发布时间:{{ $u.timeFormat(detailsContent.publishTime, 'yyyy年mm月dd日 hh:MM:ss')}}
10 </view> 10 </view>
11 <rich-text :nodes="detailsContent.details"> 11 <rich-text :nodes="detailsContent.details">
12 </rich-text> 12 </rich-text>
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
29 29
30 }, 30 },
31 onLoad(data) { 31 onLoad(data) {
32 - console.log(data);  
33 let resData = JSON.parse(data.detailsContent) 32 let resData = JSON.parse(data.detailsContent)
  33 + console.log(resData);
34 if(data){ 34 if(data){
35 this.detailsContent = resData; 35 this.detailsContent = resData;
36 } 36 }
pages/market/reportDetails.vue
1 <template> 1 <template>
2 <view class="ComCss"> 2 <view class="ComCss">
3 - <u-navbar class="navBarCss" title="2023财年玉林中燃天然气市场调研报告" 3 + <u-navbar class="navBarCss" :title="reportData1.reportName"
4 :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick" :autoBack="true" 4 :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick" :autoBack="true"
5 safeAreaInsetTop placeholder /> 5 safeAreaInsetTop placeholder />
6 <view class="topCss"> 6 <view class="topCss">
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 </u-tabs> 13 </u-tabs>
14 </view> 14 </view>
15 <view class="bodyCss"> 15 <view class="bodyCss">
16 - <reportModule1 v-if="current == 0"></reportModule1> 16 + <reportModule1 v-if="current == 0" :reportData="reportData1"></reportModule1>
17 <reportModule2 v-if="current == 1"></reportModule2> 17 <reportModule2 v-if="current == 1"></reportModule2>
18 <reportModule3 v-if="current == 2"></reportModule3> 18 <reportModule3 v-if="current == 2"></reportModule3>
19 <reportModule4 v-if="current == 3"></reportModule4> 19 <reportModule4 v-if="current == 3"></reportModule4>
@@ -23,6 +23,16 @@ @@ -23,6 +23,16 @@
23 </template> 23 </template>
24 24
25 <script> 25 <script>
  26 + import {
  27 + getOrganize,
  28 + getGeneralOverview,
  29 + getGeneralOverviewAttach,
  30 + getBusinessAnalyze,
  31 + getNewBuildingInfo,
  32 + getNewBuildingItem,
  33 + getDevelopmentPlan,
  34 + getTargetSuggestion
  35 + } from '@/api/organize.js'
26 import reportModule1 from "./components/reportModule1.vue" 36 import reportModule1 from "./components/reportModule1.vue"
27 import reportModule2 from "./components/reportModule2.vue" 37 import reportModule2 from "./components/reportModule2.vue"
28 import reportModule3 from "./components/reportModule3.vue" 38 import reportModule3 from "./components/reportModule3.vue"
@@ -42,6 +52,12 @@ @@ -42,6 +52,12 @@
42 data() { 52 data() {
43 return { 53 return {
44 current: 0, 54 current: 0,
  55 + reportNo:null,
  56 + reportData1:{},
  57 + reportData2:{},
  58 + reportData3:{},
  59 + reportData4:{},
  60 + reportData5:{},
45 tabList: [{ 61 tabList: [{
46 name: '组织实施落实' 62 name: '组织实施落实'
47 }, { 63 }, {
@@ -58,12 +74,38 @@ @@ -58,12 +74,38 @@
58 computed: { 74 computed: {
59 75
60 }, 76 },
61 - onLoad() {  
62 - 77 + onLoad(data) {
  78 + if(data){
  79 + this.reportNo = data.reportNo;
  80 + }
  81 + console.log(this.reportNo);
  82 + this.initData()
63 }, 83 },
64 methods: { 84 methods: {
65 modifyCur(data){ 85 modifyCur(data){
66 this.current = data.index; 86 this.current = data.index;
  87 +
  88 + },
  89 + initData(){
  90 + getOrganize(this.reportNo).then(res =>{
  91 + if(res.code === 200){
  92 + this.reportData1 = res.data;
  93 + }
  94 + console.log(this.reportData1);
  95 + })
  96 + getGeneralOverview(this.reportNo).then(res =>{
  97 + if(res.code === 200){
  98 + this.reportData2 = res.data;
  99 + }
  100 + console.log(this.reportData2);
  101 + })
  102 + // getGeneralOverview()
  103 + // getGeneralOverviewAttach
  104 + // getBusinessAnalyze
  105 + // getNewBuildingInfo
  106 + // getNewBuildingItem
  107 + // getDevelopmentPlan
  108 + // getTargetSuggestion
67 } 109 }
68 } 110 }
69 } 111 }
pages/market/userDetails.vue
1 <template> 1 <template>
2 <view class="ConCss"> 2 <view class="ConCss">
3 - <u-navbar class="navBarCss" title="居民用户详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" 3 + <u-navbar class="navBarCss" :title="title" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}"
4 leftClick="leftClick" :autoBack="true" safeAreaInsetTop placeholder /> 4 leftClick="leftClick" :autoBack="true" safeAreaInsetTop placeholder />
5 <view class="bodyCss"> 5 <view class="bodyCss">
6 <view class="basisCss"> 6 <view class="basisCss">
7 <view class="titleCss"> 7 <view class="titleCss">
8 - 标题 8 + 基本信息
9 </view> 9 </view>
10 - <view class="flexCss" v-for="(item,index) in basisData" :key="item.key">  
11 - <view class="leftCss overflow-one-lines"> {{item.name}} </view>  
12 - <view class="rightCss overflow-one-lines"> {{item.value}} </view> 10 + <!-- 居民基本信息 -->
  11 + <view class="" v-if="type == 0">
  12 + <view class="flexCss">
  13 + <view class="leftCss overflow-one-lines"> 区域 </view>
  14 + <view class="rightCss overflow-one-lines"> {{allData.area}} </view>
  15 + </view>
  16 + <view class="flexCss">
  17 + <view class="leftCss overflow-one-lines"> 预算主体 </view>
  18 + <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view>
  19 + </view>
  20 + <view class="flexCss">
  21 + <view class="leftCss overflow-one-lines"> 身份证号 </view>
  22 + <view class="rightCss overflow-one-lines"> {{allData.idNumber}} </view>
  23 + </view>
  24 + <view class="flexCss">
  25 + <view class="leftCss overflow-one-lines"> 房屋所在城市 </view>
  26 + <view class="rightCss overflow-one-lines"> {{allData.city}} </view>
  27 + </view>
  28 + <view class="flexCss">
  29 + <view class="leftCss overflow-one-lines"> 房屋所在街道 </view>
  30 + <view class="rightCss overflow-one-lines"> {{allData.street}} </view>
  31 + </view>
  32 + <view class="flexCss">
  33 + <view class="leftCss overflow-one-lines"> 房屋所在小区 </view>
  34 + <view class="rightCss overflow-one-lines"> {{allData.communityName}} </view>
  35 + </view>
  36 + <view class="flexCss">
  37 + <view class="leftCss overflow-one-lines"> 房屋所在楼层 </view>
  38 + <view class="rightCss overflow-one-lines"> {{allData.floor}} </view>
  39 + </view>
  40 + <view class="flexCss">
  41 + <view class="leftCss overflow-one-lines"> 房屋门牌号 </view>
  42 + <view class="rightCss overflow-one-lines"> {{allData.houseNumber}} </view>
  43 + </view>
  44 + <view class="flexCss">
  45 + <view class="leftCss overflow-one-lines"> 房主姓名 </view>
  46 + <view class="rightCss overflow-one-lines"> {{allData.householdName}} </view>
  47 + </view>
  48 + <view class="flexCss">
  49 + <view class="leftCss overflow-one-lines"> 房主年龄 </view>
  50 + <view class="rightCss overflow-one-lines"> {{allData.householdAge}} </view>
  51 + </view>
  52 + <view class="flexCss">
  53 + <view class="leftCss overflow-one-lines"> 联系电话 </view>
  54 + <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view>
  55 + </view>
  56 + </view>
  57 + <!-- 商业基本信息 -->
  58 + <view class="" v-if="type == 1">
  59 + <view class="flexCss">
  60 + <view class="leftCss overflow-one-lines"> 区域 </view>
  61 + <view class="rightCss overflow-one-lines"> {{allData.area}} </view>
  62 + </view>
  63 + <view class="flexCss">
  64 + <view class="leftCss overflow-one-lines"> 预算主体 </view>
  65 + <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view>
  66 + </view>
  67 + <view class="flexCss">
  68 + <view class="leftCss overflow-one-lines"> 纳税人识别号 </view>
  69 + <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber}} </view>
  70 + </view>
  71 + <view class="flexCss">
  72 + <view class="leftCss overflow-one-lines"> 房屋所在城市 </view>
  73 + <view class="rightCss overflow-one-lines"> {{allData.city}} </view>
  74 + </view>
  75 + <view class="flexCss">
  76 + <view class="leftCss overflow-one-lines"> 房屋所在街道 </view>
  77 + <view class="rightCss overflow-one-lines"> {{allData.street}} </view>
  78 + </view>
  79 + <view class="flexCss">
  80 + <view class="leftCss overflow-one-lines"> 所在场所门牌号 </view>
  81 + <view class="rightCss overflow-one-lines"> {{allData.houseNumber}} </view>
  82 + </view>
  83 + <view class="flexCss">
  84 + <view class="leftCss overflow-one-lines"> 所在场所经营者姓名 </view>
  85 + <view class="rightCss overflow-one-lines"> {{allData.householdName}} </view>
  86 + </view>
  87 + <view class="flexCss">
  88 + <view class="leftCss overflow-one-lines"> 经营业主年龄 </view>
  89 + <view class="rightCss overflow-one-lines"> {{allData.householdAge}} </view>
  90 + </view>
  91 + <view class="flexCss">
  92 + <view class="leftCss overflow-one-lines"> 联系电话 </view>
  93 + <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view>
  94 + </view>
  95 + </view>
  96 + <!-- 工业基本信息 -->
  97 + <view class="" v-if="type == 2">
  98 + <view class="flexCss">
  99 + <view class="leftCss overflow-one-lines"> 区域 </view>
  100 + <view class="rightCss overflow-one-lines"> {{allData.area}} </view>
  101 + </view>
  102 + <view class="flexCss">
  103 + <view class="leftCss overflow-one-lines"> 预算主体 </view>
  104 + <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view>
  105 + </view>
  106 + <view class="flexCss">
  107 + <view class="leftCss overflow-one-lines"> 统一社会信息代码 </view>
  108 + <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber}} </view>
  109 + </view>
  110 + <view class="flexCss">
  111 + <view class="leftCss overflow-one-lines"> 地址 </view>
  112 + <view class="rightCss overflow-one-lines"> {{allData.address}} </view>
  113 + </view>
  114 + <view class="flexCss">
  115 + <view class="leftCss overflow-one-lines"> 客户联系人 </view>
  116 + <view class="rightCss overflow-one-lines"> {{allData.contactPerson}} </view>
  117 + </view>
  118 + <view class="flexCss">
  119 + <view class="leftCss overflow-one-lines"> 职务 </view>
  120 + <view class="rightCss overflow-one-lines"> {{allData.duties}} </view>
  121 + </view>
  122 + <view class="flexCss">
  123 + <view class="leftCss overflow-one-lines"> 电话 </view>
  124 + <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view>
  125 + </view>
13 </view> 126 </view>
14 </view> 127 </view>
15 <view class="housesCss"> 128 <view class="housesCss">
16 - <view class="titleCss"> 129 + <view class="titleCss" v-if="type == 0">
17 房屋信息 130 房屋信息
18 </view> 131 </view>
19 - <view class="flexCss" v-for="(item,index) in housesData" :key="item.key">  
20 - <view class="leftCss overflow-one-lines"> {{item.name}} </view>  
21 - <view class="rightCss overflow-one-lines"> {{item.value}} </view> 132 + <view class="titleCss" v-else-if="type == 1">
  133 + 场所信息
  134 + </view>
  135 + <view class="titleCss" v-else-if="type == 2">
  136 + 房屋信息
  137 + </view>
  138 + <view class="" v-if="type == 0">
  139 + <view class="flexCss">
  140 + <view class="leftCss overflow-one-lines"> 居住人口 </view>
  141 + <view class="rightCss overflow-one-lines"> {{allData.resideNumber}} </view>
  142 + </view>
  143 + <view class="flexCss">
  144 + <view class="leftCss overflow-one-lines"> 房屋户型 </view>
  145 + <view class="rightCss overflow-one-lines"> {{allData.houseType}} </view>
  146 + </view>
  147 + <view class="flexCss">
  148 + <view class="leftCss overflow-one-lines"> 房屋面积 </view>
  149 + <view class="rightCss overflow-one-lines"> {{allData.houseArea}} </view>
  150 + </view>
  151 + <view class="flexCss">
  152 + <view class="leftCss overflow-one-lines"> 房屋建设年限 </view>
  153 + <view class="rightCss overflow-one-lines"> {{allData.houseYear}} </view>
  154 + </view>
  155 + <view class="flexCss">
  156 + <view class="leftCss overflow-one-lines"> 房屋居住性质 </view>
  157 + <view class="rightCss overflow-one-lines"> {{allData.houseNature}} </view>
  158 + </view>
  159 + <view class="flexCss">
  160 + <view class="leftCss overflow-one-lines"> 居住属性 </view>
  161 + <view class="rightCss overflow-one-lines"> {{allData.resideAttribute}} </view>
  162 + </view>
  163 + <view class="flexCss">
  164 + <view class="leftCss overflow-one-lines"> 房屋性质 </view>
  165 + <view class="rightCss overflow-one-lines"> {{allData.houseAttribute}} </view>
  166 + </view>
  167 + <view class="flexCss">
  168 + <view class="leftCss overflow-one-lines"> 房屋结构类型 </view>
  169 + <view class="rightCss overflow-one-lines"> {{allData.houseStructure}} </view>
  170 + </view>
  171 + <view class="flexCss">
  172 + <view class="leftCss overflow-one-lines"> 所在房屋距离中压管道 </view>
  173 + <view class="rightCss overflow-one-lines"> {{allData.distance}} </view>
  174 + </view>
  175 + <view class="flexCss">
  176 + <view class="leftCss overflow-one-lines"> 所在房屋是否有物业 </view>
  177 + <view class="rightCss overflow-one-lines"> {{allData.isExist}} </view>
  178 + </view>
  179 + <view class="flexCss">
  180 + <view class="leftCss overflow-one-lines"> 房屋是否列入拆迁规划 </view>
  181 + <view class="rightCss overflow-one-lines"> {{allData.isPlan}} </view>
  182 + </view>
  183 + <view class="flexCss">
  184 + <view class="leftCss overflow-one-lines"> 水/电表是否一户一表 </view>
  185 + <view class="rightCss overflow-one-lines"> {{allData.isSingleMeter}} </view>
  186 + </view>
  187 + <view class="flexCss">
  188 + <view class="leftCss overflow-one-lines"> 是否独立厨房 </view>
  189 + <view class="rightCss overflow-one-lines"> {{allData.isSingleKitchen}} </view>
  190 + </view>
  191 + <view class="flexCss">
  192 + <view class="leftCss overflow-one-lines"> 是否集中供暖 </view>
  193 + <view class="rightCss overflow-one-lines"> {{allData.isHeating}} </view>
  194 + </view>
  195 + <view class="flexCss">
  196 + <view class="leftCss overflow-one-lines"> 楼前立管是否安装 </view>
  197 + <view class="rightCss overflow-one-lines"> {{allData.isInstall}} </view>
  198 + </view>
  199 + <view class="flexCss">
  200 + <view class="leftCss overflow-one-lines"> 现使用能源 </view>
  201 + <view class="rightCss overflow-one-lines"> {{allData.currentEnergy}} </view>
  202 + </view>
  203 + <view class="flexCss">
  204 + <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view>
  205 + <view class="rightCss overflow-one-lines"> {{allData.currentPrice}} </view>
  206 + </view>
  207 + <view class="flexCss">
  208 + <view class="leftCss overflow-one-lines"> 用户报装意愿 </view>
  209 + <view class="rightCss overflow-one-lines"> {{allData.inclinate}} </view>
  210 + </view>
  211 + <view class="flexCss">
  212 + <view class="leftCss overflow-one-lines"> 不报装原因 </view>
  213 + <view class="rightCss overflow-one-lines"> {{allData.reason}} </view>
  214 + </view>
  215 + <view class="flexCss">
  216 + <view class="leftCss overflow-one-lines"> 创建时间 </view>
  217 + <!-- {{$u.timeFormat(timestamp, 'yyyy年mm月dd日')}} -->
  218 + <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view>
  219 + </view>
  220 + </view>
  221 + <view class="" v-if="type == 1">
  222 + <view class="flexCss">
  223 + <view class="leftCss overflow-one-lines"> 场所面积 </view>
  224 + <view class="rightCss overflow-one-lines"> {{allData.houseArea}} </view>
  225 + </view>
  226 + <view class="flexCss">
  227 + <view class="leftCss overflow-one-lines"> 经营范围 </view>
  228 + <view class="rightCss overflow-one-lines"> {{allData.businessScope}} </view>
  229 + </view>
  230 + <view class="flexCss">
  231 + <view class="leftCss overflow-one-lines"> 所在场所房屋性质 </view>
  232 + <view class="rightCss overflow-one-lines"> {{allData.houseNature}} </view>
  233 + </view>
  234 + <view class="flexCss">
  235 + <view class="leftCss overflow-one-lines"> 所在场所房屋类型 </view>
  236 + <view class="rightCss overflow-one-lines"> {{allData.houseAttribute}} </view>
  237 + </view>
  238 + <view class="flexCss">
  239 + <view class="leftCss overflow-one-lines"> 所在场所房屋结构类型 </view>
  240 + <view class="rightCss overflow-one-lines"> {{allData.houseStructure}} </view>
  241 + </view>
  242 + <view class="flexCss">
  243 + <view class="leftCss overflow-one-lines"> 所在场所房屋建设年限 </view>
  244 + <view class="rightCss overflow-one-lines"> {{allData.houseYear}} </view>
  245 + </view>
  246 + <view class="flexCss">
  247 + <view class="leftCss overflow-one-lines"> 所在房屋是否列入拆迁规划 </view>
  248 + <view class="rightCss overflow-one-lines"> {{allData.isPlan}} </view>
  249 + </view>
  250 + <view class="flexCss">
  251 + <view class="leftCss overflow-one-lines"> 水/电表是否一户一表 </view>
  252 + <view class="rightCss overflow-one-lines"> {{allData.isSingleMeter}} </view>
  253 + </view>
  254 + <view class="flexCss">
  255 + <view class="leftCss overflow-one-lines"> 是否有供暖需求 </view>
  256 + <view class="rightCss overflow-one-lines"> {{allData.isHeating}} </view>
  257 + </view>
  258 + <view class="flexCss">
  259 + <view class="leftCss overflow-one-lines"> 所在房屋距离中压管道 </view>
  260 + <view class="rightCss overflow-one-lines"> {{allData.distance}} </view>
  261 + </view>
  262 + <view class="flexCss">
  263 + <view class="leftCss overflow-one-lines"> 现使用能源 </view>
  264 + <view class="rightCss overflow-one-lines"> {{allData.currentEnergy}} </view>
  265 + </view>
  266 + <view class="flexCss">
  267 + <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view>
  268 + <view class="rightCss overflow-one-lines"> {{allData.currentPrice}} </view>
  269 + </view>
  270 + <view class="flexCss">
  271 + <view class="leftCss overflow-one-lines"> 预计最大开口气量(最大日用气量) </view>
  272 + <view class="rightCss overflow-one-lines"> {{allData.predictMax}} </view>
  273 + </view>
  274 + <view class="flexCss">
  275 + <view class="leftCss overflow-one-lines"> 预计签约日期 </view>
  276 + <view class="rightCss overflow-one-lines"> {{allData.predictSign}} </view>
  277 + </view>
  278 + <view class="flexCss">
  279 + <view class="leftCss overflow-one-lines"> 预计安装日期 </view>
  280 + <view class="rightCss overflow-one-lines"> {{allData.predictInstall}} </view>
  281 + </view>
  282 + <view class="flexCss">
  283 + <view class="leftCss overflow-one-lines"> 预计日用气量 </view>
  284 + <view class="rightCss overflow-one-lines"> {{allData.predictUse}} </view>
  285 + </view>
  286 + <view class="flexCss">
  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>
  290 + </view>
22 </view> 291 </view>
  292 + <view class="" v-if="type == 2">
  293 + <view class="flexCss">
  294 + <view class="leftCss overflow-one-lines"> 是否已供气 </view>
  295 + <view class="rightCss overflow-one-lines"> {{allData.isProvide}} </view>
  296 + </view>
  297 + <view class="flexCss">
  298 + <view class="leftCss overflow-one-lines"> 商业状态 </view>
  299 + <view class="rightCss overflow-one-lines"> {{allData.commercialStatus}} </view>
  300 + </view>
  301 + <view class="flexCss">
  302 + <view class="leftCss overflow-one-lines"> 项目类别 </view>
  303 + <view class="rightCss overflow-one-lines"> {{allData.projectType}} </view>
  304 + </view>
  305 + <view class="flexCss">
  306 + <view class="leftCss overflow-one-lines"> 行业分类 </view>
  307 + <view class="rightCss overflow-one-lines"> {{allData.industryType}} </view>
  308 + </view>
  309 + <view class="flexCss">
  310 + <view class="leftCss overflow-one-lines"> 最近管道距离 </view>
  311 + <view class="rightCss overflow-one-lines"> {{allData.distance}} </view>
  312 + </view>
  313 + <view class="flexCss">
  314 + <view class="leftCss overflow-one-lines"> 预计最大开口气量 </view>
  315 + <view class="rightCss overflow-one-lines"> {{allData.predictMax}} </view>
  316 + </view>
  317 + <view class="flexCss">
  318 + <view class="leftCss overflow-one-lines"> 预计签约日期 </view>
  319 + <view class="rightCss overflow-one-lines"> {{allData.predictSign}} </view>
  320 + </view>
  321 + <view class="flexCss">
  322 + <view class="leftCss overflow-one-lines"> 预计安装日期 </view>
  323 + <view class="rightCss overflow-one-lines"> {{allData.predictInstall}} </view>
  324 + </view>
  325 + <view class="flexCss">
  326 + <view class="leftCss overflow-one-lines"> 预计日用气量 </view>
  327 + <view class="rightCss overflow-one-lines"> {{allData.predictUse}} </view>
  328 + </view>
  329 + <view class="flexCss">
  330 + <view class="leftCss overflow-one-lines"> 耗能设备名称 </view>
  331 + <view class="rightCss overflow-one-lines"> {{allData.machineName}} </view>
  332 + </view>
  333 + <view class="flexCss">
  334 + <view class="leftCss overflow-one-lines"> 耗能设备型号 </view>
  335 + <view class="rightCss overflow-one-lines"> {{allData.machineModel}} </view>
  336 + </view>
  337 + <view class="flexCss">
  338 + <view class="leftCss overflow-one-lines"> 用能类型 </view>
  339 + <view class="rightCss overflow-one-lines"> {{allData.userType}} </view>
  340 + </view>
  341 + <view class="flexCss">
  342 + <view class="leftCss overflow-one-lines"> 更新时间 </view>
  343 + <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view>
  344 + </view>
  345 + </view>
  346 +
23 </view> 347 </view>
24 </view> 348 </view>
25 349
@@ -34,143 +358,27 @@ @@ -34,143 +358,27 @@
34 }, 358 },
35 data() { 359 data() {
36 return { 360 return {
37 - basisData: [{  
38 - name: "区域",  
39 - key: "area",  
40 - value: "华北区域"  
41 - }, {  
42 - name: "预算主体",  
43 - key: "budgetEntity",  
44 - value: "天津宏洁预算组织"  
45 - }, {  
46 - name: "身份证号",  
47 - key: "idCard",  
48 - value: "145678187611078000"  
49 - }, {  
50 - name: "房屋所在城市",  
51 - key: "city",  
52 - value: "天津"  
53 - }, {  
54 - name: "房屋所在街道",  
55 - key: "street",  
56 - value: "静海区街道"  
57 - }, {  
58 - name: "房屋所在小区",  
59 - key: "community",  
60 - value: "天路小区"  
61 - }, {  
62 - name: "房屋所处楼层",  
63 - key: "floor",  
64 - value: "12"  
65 - }, {  
66 - name: "房屋门牌号",  
67 - key: "houseNumber",  
68 - value: "13号"  
69 - }, {  
70 - name: "房主姓名",  
71 - key: "name",  
72 - value: "王凯"  
73 - }, {  
74 - name: "房主年龄",  
75 - key: "age",  
76 - value: "30~50岁"  
77 - }, {  
78 - name: "联系电话",  
79 - key: "phone",  
80 - value: "18731654346"  
81 - }],  
82 - housesData: [{  
83 - name: "居住人口",  
84 - key: "residentPopulation",  
85 - value: "1"  
86 - }, {  
87 - name: "房屋户型",  
88 - key: "houseType",  
89 - value: "三室一厅"  
90 - }, {  
91 - name: "房屋面积",  
92 - key: "houseArea",  
93 - value: "130"  
94 - }, {  
95 - name: "房屋建设年限",  
96 - key: "city",  
97 - value: "5年内"  
98 - }, {  
99 - name: "房屋居住性质",  
100 - key: "street",  
101 - value: "自有居住"  
102 - }, {  
103 - name: "居住属性",  
104 - key: "community",  
105 - value: "常住"  
106 - }, {  
107 - name: "房屋性质",  
108 - key: "floor",  
109 - value: "高品房_高层"  
110 - }, {  
111 - name: "房屋结构类型",  
112 - key: "houseNumber",  
113 - value: "钢结构"  
114 - }, {  
115 - name: "所在房屋距离中压管道",  
116 - key: "name",  
117 - value: "小于500米"  
118 - }, {  
119 - name: "所在房屋是否有物业",  
120 - key: "age",  
121 - value: "有"  
122 - }, {  
123 - name: "房屋是否列入拆迁规划",  
124 - key: "phone",  
125 - value: "是"  
126 - },{  
127 - name: "水/电表是否一户一表",  
128 - key: "phone",  
129 - value: "是"  
130 - },{  
131 - name: "是否独立厨房",  
132 - key: "phone",  
133 - value: "是"  
134 - },{  
135 - name: "是否集中供暖",  
136 - key: "phone",  
137 - value: "是"  
138 - },{  
139 - name: "楼前立管是否安装",  
140 - key: "phone",  
141 - value: "是"  
142 - },{  
143 - name: "现使用能源",  
144 - key: "phone",  
145 - value: "管道天燃气"  
146 - },{  
147 - name: "现使用能源价格(元)",  
148 - key: "phone",  
149 - value: "3.13元"  
150 - },{  
151 - name: "用户报装意愿",  
152 - key: "phone",  
153 - value: "小于50%"  
154 - },{  
155 - name: "小于50%",  
156 - key: "phone",  
157 - value: "太贵"  
158 - },{  
159 - name: "更新时间",  
160 - key: "phone",  
161 - value: "2023年9月14号"  
162 - }  
163 - ] 361 + type: null,
  362 + allData: {},
  363 + title: "",
164 } 364 }
165 }, 365 },
166 computed: { 366 computed: {
167 367
168 }, 368 },
169 - onLoad() {  
170 - 369 + onLoad(data) {
  370 + if (data) {
  371 + this.type = data.type;
  372 + this.allData = JSON.parse(data.details);
  373 + }
  374 + this.initData()
  375 + console.log(this.allData);
171 }, 376 },
172 methods: { 377 methods: {
173 - 378 + initData() {
  379 + const titleArr = ['居民用户详情', '商业用户详情', '工业用户详情']
  380 + this.title = titleArr[this.type]
  381 + }
174 } 382 }
175 } 383 }
176 </script> 384 </script>
static/images/empty/logo.png 0 → 100644

28 KB

utils/dictionary.js 0 → 100644
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  1 +const dictionary = {
  2 + "0": "宏观经济",
  3 + "1": "产业政策",
  4 + "2": "行业动态",
  5 + "3": "友商动态",
  6 + "4": "用户资讯",
  7 + "5": "国际能源"
  8 +};
  9 +
  10 +function dict(key) {
  11 + return dictionary[key] || "未找到对应的值";
  12 +}
  13 +
  14 +
  15 +export default dict
  16 +
  17 +// 0:宏观经济、1:产业政策、2:行业动态、3:友商动态、4:用户资讯、5:国际能源',
  18 +
utils/state.js 0 → 100644
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
  1 +const stateList = {
  2 + "0": "待申报",
  3 + "1": "待评审",
  4 + "2": "待修改",
  5 + "3": "已通过",
  6 +};
  7 +
  8 +function state(key) {
  9 + return stateList[key] || "未找到对应的值";
  10 +}
  11 +
  12 +
  13 +export default state
  14 +
  15 +// 0待申报 1待评审 2待修改 3已通过'
  16 +