From cd70fe15fc16fddf626c3dbe25e1b0003a4bf7b2 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Tue, 24 Oct 2023 18:04:58 +0800
Subject: [PATCH] feat: 联调接口

---
 api/organize.js                           |  45 +++++++++++++++++++++++++++++++++++++++++++++
 components/news-list/news-list.vue        |   5 +++--
 main.js                                   |   8 ++++++++
 pages.json                                |   1 +
 pages/market/components/reportModule1.vue |  18 ++++++++++--------
 pages/market/index.vue                    |  93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
 pages/market/insight.vue                  | 353 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
 pages/market/newsDetails.vue              |   4 ++--
 pages/market/reportDetails.vue            |  50 ++++++++++++++++++++++++++++++++++++++++++++++----
 pages/market/userDetails.vue              | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------
 static/images/empty/logo.png              | Bin 0 -> 28696 bytes
 utils/dictionary.js                       |  18 ++++++++++++++++++
 utils/state.js                            |  16 ++++++++++++++++
 13 files changed, 860 insertions(+), 237 deletions(-)
 create mode 100644 api/organize.js
 create mode 100644 static/images/empty/logo.png
 create mode 100644 utils/dictionary.js
 create mode 100644 utils/state.js

diff --git a/api/organize.js b/api/organize.js
new file mode 100644
index 0000000..38c6ecd
--- /dev/null
+++ b/api/organize.js
@@ -0,0 +1,45 @@
+const { http } = uni.$u
+// 列表和条件筛选
+export const getOrganizelist = params => http.get('/organize/list', { params })
+
+//居民用户
+export const getPoolResidentlist = params => http.get('/poolResident/list', { params })
+
+//商业用户
+export const getPoolCommercelist = params => http.get('/poolCommerce/list', { params })
+
+//工业用户
+export const getPoolIndustrylist = params => http.get('/poolIndustry/list', { params })
+
+/*报告详情*/
+
+//报告详情-组织实施落实 1
+export const getOrganize = params => http.get('/organize/' + params )
+
+//报告详情-天然气市场总体概况主表 2
+export const getGeneralOverview = params => http.get('/generalOverview/'+ params)
+
+//报告详情-天然气市场总体概况附表 3
+export const getGeneralOverviewAttach = params => http.get('/generalOverviewAttach/'+ params)
+
+//报告详情-告详情-重点市场业务分析 4
+export const getBusinessAnalyze = params => http.get('/businessAnalyze/'+ params)
+
+
+//报告详情-预计2021财年-2022财年已签约且在2023财年安装确认项目 5
+export const getNewBuildingInfo = params => http.get('/newBuildingInfo/'+ params)
+
+
+//报告详情-预计2023-2025财年安装确认项目 6
+export const getNewBuildingItem = params => http.get('/newBuildingItem/'+ params)
+
+//报告详情-未来发展规划,所需资源配置 7
+export const getDevelopmentPlan = params => http.get('/developmentPlan/'+ params)
+
+//报告详情-目标思路建议 8
+export const getTargetSuggestion = params => http.get('/targetSuggestion/'+ params)
+
+
+
+
+
diff --git a/components/news-list/news-list.vue b/components/news-list/news-list.vue
index 49fa762..a4a7864 100644
--- a/components/news-list/news-list.vue
+++ b/components/news-list/news-list.vue
@@ -6,7 +6,7 @@
           {{newItem.title}}
         </view>
         <view class="bomCss overflow-one-lines">
-          <view class="overflow-one-lines"> {{ newItem.plate_name }} </view>
+          <view class="overflow-one-lines"> {{ $dict(newItem.plateName) }} </view>
           <view class="">｜</view>
           <view class="overflow-one-lines"> {{newItem.organizeName}} </view>
         </view>
@@ -19,6 +19,7 @@
 </template>
 
 <script>
+  import logoImg from '@/static/images/empty/logo.png'
   export default {
     name: "news-list",
     props: {
@@ -28,7 +29,7 @@
     },
     data() {
       return {
-        src: 'https://cdn.uviewui.com/uview/album/1.jpg'
+        src: logoImg
       };
     },
     methods:{
diff --git a/main.js b/main.js
index eda4fc6..66d34d1 100644
--- a/main.js
+++ b/main.js
@@ -8,8 +8,16 @@ import echarts from '@/components/echarts-uniapp/echarts-uniapp.vue';
 // vuex
 import store from './store'
 
+import dict from '@/utils/dictionary.js'
+import state from '@/utils/dictionary.js'
+
+
+// 将 dict 方法挂载到全局对象上
+
 Vue.config.productionTip = false
 Vue.prototype.$store = store
+Vue.prototype.$state = state
+Vue.prototype.$dict = dict
 
 Vue.component('echarts',echarts)
 
diff --git a/pages.json b/pages.json
index 1a23d3c..1e8b76f 100644
--- a/pages.json
+++ b/pages.json
@@ -19,6 +19,7 @@
     }, {
       "path": "pages/market/insight",
       "style": {
+        "enablePullDownRefresh": true,
         "navigationBarTitleText": "市场洞察"
       }
     }, {
diff --git a/pages/market/components/reportModule1.vue b/pages/market/components/reportModule1.vue
index 6852db3..43acd59 100644
--- a/pages/market/components/reportModule1.vue
+++ b/pages/market/components/reportModule1.vue
@@ -8,25 +8,25 @@
             <view class="u-demo-block">
               <text class="u-demo-block__title">组长</text>
               <view class="u-demo-block__content" style="margin-top: 15px;">
-                <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
+                <u--input :value="reportData.leader" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
               </view>
             </view>
             <view class="u-demo-block">
               <text class="u-demo-block__title">副组长</text>
               <view class="u-demo-block__content" style="margin-top: 15px;">
-                <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
+                <u--input :value="reportData.deputyLeader" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
               </view>
             </view>
             <view class="u-demo-block">
               <text class="u-demo-block__title">成员</text>
               <view class="u-demo-block__content" style="margin-top: 15px;">
-                <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
+                <u--input :value="reportData.member" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
               </view>
             </view>
             <view class="u-demo-block">
               <text class="u-demo-block__title">填报人</text>
               <view class="u-demo-block__content" style="margin-top: 15px;">
-                <u--input v-model="list" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
+                <u--input :value="reportData.createBy" disabled suffixIcon="arrow-down" suffixIconStyle="color: #909399"></u--input>
               </view>
             </view>
           </view>
@@ -37,8 +37,8 @@
       <u-collapse :border="false" :value="['2']">
         <u-collapse-item name="2">
           <text slot="title" class="slot-title">实施情况</text>
-          <view class="largeAmountOfTextCss">
-            为了精准掌握玉林中燃经营区域及周边市场发展态势，预测2023财年市场开发计划和未来市场发展方向，按照集团三年发展规划及高质量发展的要求，玉林中燃积极开展了一次全面、系统、深入的全方面市场调研工作。
+          <view class="largeAmountOfTextCss" v-if="reportData.implementationSituation != '' && reportData.implementationSituation != null">
+            {{reportData.implementationSituation}}
           </view>
         </u-collapse-item>
       </u-collapse>
@@ -81,7 +81,9 @@
   export default {
     components: {},
     props: {
-
+      reportData:{
+        type:Object
+      }
     },
     data() {
       return {
@@ -179,7 +181,7 @@
     text-align: left;
     line-height: 46rpx;
   }
-  
+
   /deep/.uni-input-input {
     color: #999db0;
   }
diff --git a/pages/market/index.vue b/pages/market/index.vue
index e65caef..032d4eb 100644
--- a/pages/market/index.vue
+++ b/pages/market/index.vue
@@ -8,6 +8,7 @@
     </u-sticky>
     <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="NewsList.length <= 0"></u-empty>
     <newsList v-for="(item,index) in NewsList" :key="index" :newItem="item" v-else></newsList>
+    <u-loadmore :status="status" v-if="NewsList.length > 0" />
   </view>
 </template>
 
@@ -19,7 +20,6 @@
   import {
     listSimpleDictDatas
   } from '@/api/dict.js'
-  import keyboard from '../../uni_modules/uview-ui/libs/config/props/keyboard'
   export default {
     components: {
       newsList
@@ -31,6 +31,12 @@
       return {
         keyword: "",
         current: 0,
+        status:"loadmore",
+        total: null,
+        queryParameter: {
+          pageNum: 1,
+          pageSize: 10
+        },
         tabList: [{
           name: "全部",
         }, {
@@ -47,10 +53,6 @@
           name: "国际能源",
         }],
         NewsList: [],
-        queryParameter: {
-          keyword: "",
-          plate_name: ""
-        }
       }
     },
     computed: {
@@ -59,50 +61,87 @@
     onLoad() {
       this.initData()
     },
+    onReachBottom() {
+      let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
+      if (allTotal < this.total) {
+        //当前条数小于总条数 则增加请求页数
+        this.queryParameter.pageNum++;
+        this.status = 'loading';
+        this.updateList() //调用加载数据方法
+      } else {
+        this.status = "nomore"
+        // console.log('已加载全部数据')
+      }
+    },
     onPullDownRefresh() {
-      this.keyword = ""
+      this.resetQuery();
+      this.keyword = "";
       this.current = 0;
-      this.initData()
-      uni.stopPullDownRefresh()
+      this.initData();
+      setTimeout(() => {
+        //结束下拉刷新
+        uni.stopPullDownRefresh();
+      }, 500);
     },
     methods: {
       initData() {
-        // this.updateList()
-        getInfoMarketInformationlist().then(res => {
-          console.log(res);
-          if (res.code === 200) {
-            this.NewsList = res.rows
-            console.log(this.NewsList);
-          }
-        })
+        this.updateList()
+      },
+      resetQuery(){
+        this.NewsList = [];
+        this.queryParameter = {
+          pageNum: 1,
+          pageSize: 10
+        }
       },
       search() {
-        console.log("搜索");
-        // if (this.keyword) {
-          this.updateList({
-            keyword: this.keyword
-          })
-        // }
+        this.resetQuery();
+        this.updateList()
+      },
+      checkTotal(){
+        let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
+        if(this.total < allTotal){
+          this.status = "nomore"
+        }
       },
       updateList() {
         let Params
         if (this.keyword && this.current !== -1) {
-          Params = {keyword: this.keyword,plateName: this.current}
+          Params = {
+            title: this.keyword,
+            plateName: this.current
+          }
         } else if (this.keyword !== "") {
-          Params = {keyword: this.keyword,}
+          Params = {
+            title: this.keyword,
+          }
         } else if (this.current !== 0) {
-          Params = {plateName: this.current - 1}
+          Params = {
+            plateName: this.current - 1
+          }
         }
+        Params = {
+          ...this.queryParameter,
+          ...Params
+        };
+        // console.log(111111, Params);
         getInfoMarketInformationlist(Params).then(res => {
           // console.log(res);
           if (res.code === 200) {
-            this.NewsList = res.rows
-            // console.log(this.NewsList);
+            if(this.queryParameter.pageSize > 1){
+              this.NewsList = [...this.NewsList,...res.rows]
+            }else{
+              this.NewsList = res.rows
+            }
+            this.total = res.total;
+            console.log(this.NewsList);
           }
         })
+        this.checkTotal();
       },
       tabChange(e) {
         console.log(e);
+        this.resetQuery()
         this.current = e.index
         console.log(this.current);
         this.updateList()
diff --git a/pages/market/insight.vue b/pages/market/insight.vue
index a74f88c..8b7978c 100644
--- a/pages/market/insight.vue
+++ b/pages/market/insight.vue
@@ -1,75 +1,98 @@
 <template>
   <view class="ConCss">
-    <view class="topFCss">
-      <view class="tabsCss" :class="!current?'isActiveCss':''" @click="current = 0">
-        市场摸底
-
-      </view>
-      <view class="tabsCss" :class="current?'isActiveCss':''" @click="current = 1">
-        待开发用户池
+    <u-sticky bgColor="#fff" customNavHeight="0" offsetTop="0">
+      <view class="topFCss">
+        <view class="tabsCss" :class="!current?'isActiveCss':''" @click="typeChange(0)">
+          市场摸底
+        </view>
+        <view class="tabsCss" :class="current?'isActiveCss':''" @click="typeChange(1)">
+          待开发用户池
+        </view>
       </view>
-    </view>
-    <u-divider style="margin:0;"></u-divider>
-    <view class="topSCss" v-if="!current">
-      <u-tabs :list="tabList1" :current="current1" lineHeight="0" lineColor="#f56c6c" :activeStyle="{
+      <u-divider style="margin:0;"></u-divider>
+      <view class="topSCss" v-if="!current">
+        <u-tabs :list="tabList1" :current="current1" lineHeight="0" lineColor="#f56c6c" :activeStyle="{
                  color: '#cf000d',
                  fontWeight: 'bold',
                  transform: 'scale(1.1)'
-             }" itemStyle="height: 78rpx;">
-        <view slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="openFiscalYearChoice">
-          <view style="display:flex;"><u-icon name="clock" size="18" bold></u-icon>
-            <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">财年</text>
+             }" itemStyle="height: 78rpx;" @click="tabChange1">
+          <view slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="openFiscalYearChoice">
+            <view style="display:flex;"><u-icon name="clock" size="18" bold></u-icon>
+              <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">财年</text>
+            </view>
           </view>
-        </view>
-      </u-tabs>
-    </view>
-    <view class="topSCss" v-else>
-      <u-tabs :list="tabList2" :current="current2" lineHeight="0" lineColor="#f56c6c" :activeStyle="{
+        </u-tabs>
+      </view>
+      <view class="topSCss" v-else>
+        <u-tabs :list="tabList2" :current="current2" lineHeight="0" lineColor="#f56c6c" :activeStyle="{
                  color: '#cf000d',
                  fontWeight: 'bold',
                  transform: 'scale(1.1)'
-             }" itemStyle="display:flex;justify-content: space-between;height: 78rpx;">
-        <!-- <view v-show="!current" slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="$u.toast('插槽被点击')">
+             }" itemStyle="display:flex;justify-content: space-between;height: 78rpx;" @click="tabChange2">
+          <!-- <view v-show="!current" slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="$u.toast('插槽被点击')">
           <view style="display: flex;">
             <u-icon name="clock" size="21" bold></u-icon>
             <text>财年</text>
           </view>
         </view> -->
-      </u-tabs>
-    </view>
-    <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)"
-      height="74rpx" bgColor="#F5F6FA" @search="search"></u-search>
+        </u-tabs>
+      </view>
+      <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)"
+        height="74rpx" bgColor="#F5F6FA" @search="search"></u-search>
+    </u-sticky>
     <view class="listBodyCss">
-      <view class="reportCss" v-if="!current" v-for="i in 5">
-        <view class="topTitleCss">
-          <view class="top1 overflow-one-lines"> 2023财年玉林中燃天然气市场调研报告 </view>
-          <view class="top2 overflow-one-lines"> 预算主体: </view>
-          <view class="top2 overflow-one-lines"> 填报人: </view>
-          <view class="top2 overflow-one-lines"> 状态有效时间: </view>
-        </view>
-        <view class="topStateCss">
-          <view class="textCss"> 状态 </view>
-          <view class="btnCss">
-            <u-button color="#CF000D" style="width: 160rpx;height: 60rpx;" shape="circle" text="查看详情" @click="jumpReportDetails"></u-button>
+      <view class="" v-if="!current">
+        <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="newList1.length <= 0"></u-empty>
+        <view class="reportCss" v-for="(item,index) in newList1" :key="index">
+          <view class="topTitleCss">
+            <view class="top1 overflow-one-lines"> {{item.reportName || ""}} </view>
+            <view class="top2 overflow-one-lines"> 预算主体:{{item.budgetSubject || ""}} </view>
+            <view class="top2 overflow-one-lines"> 填报人: {{item.createBy || ""}}</view>
+            <view class="top2 overflow-one-lines"> 状态有效时间:
+              {{$u.timeFormat(item.validityTimeEnd, 'yyyy年mm月dd日 hh:MM:ss') || ""}}
+            </view>
+          </view>
+          <view class="topStateCss">
+            <view class="textCss" :style="{'color':statusCss(item.statusCode)}"> {{item.statusName}} </view>
+            <view class="btnCss">
+              <u-button color="#CF000D" style="width: 160rpx;height: 60rpx;" shape="circle" text="查看详情"
+                @click="jumpReportDetails(item.reportNo)"></u-button>
+            </view>
           </view>
         </view>
+        <u-loadmore :status="status1" v-if="newList1.length > 0" />
       </view>
-      <view class="reportCss" @click="jumpUserDetails" :style="'height:auto'" v-else v-for="i in 5">
-        <view class="topTitleCss">
-          <view class="top1 overflow-one-lines"> 张三 </view>
-          <view class="top2 overflow-one-lines"> 预算主体: </view>
-          <view class="top2 overflow-one-lines"> 联系方式: </view>
-          <view class="top2 overflow-one-lines"> 详情地址: </view>
+      <view v-else>
+        <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="newList2.length <= 0"></u-empty>
+        <view class="reportCss" @click="jumpUserDetails(item)" :style="'height:auto'" v-else v-for="(item,index) in newList2"
+          :key="index">
+          <view class="topTitleCss">
+            <view class="top1 overflow-one-lines" v-if="current2 === 0"> {{item.householdName || ""}} </view>
+            <view class="top1 overflow-one-lines" v-else-if="current2 === 1" > {{item.householdName || ""}} </view>
+            <view class="top1 overflow-one-lines" v-else-if="current2 === 2"> {{item.contactPerson || ""}} </view>
+            <view class="top2 overflow-one-lines"> 预算主体: {{item.budgetSubject || ""}}</view>
+            <view class="top2 overflow-one-lines"> 联系方式: {{item.phoneNumber || ""}}</view>
+            <view class="top2 overflow-one-lines"> 详情地址: {{item.address || ""}}</view>
+          </view>
         </view>
+        <u-loadmore :status="status2" v-if="newList2.length > 0" />
       </view>
     </view>
-    <u-datetime-picker :show="fiscalYearShow"  v-model="fiscalYear" cancelText="重置"  @confirm="fiscalYearShow = false"
-     @cancel="reset" @close="fiscalYearShow = false" closeOnClickOverlay mode="year" ></u-datetime-picker>
+    <u-datetime-picker :show="fiscalYearShow" v-model="fiscalYear" cancelText="重置" @confirm="fiscalYearShow = false"
+      @cancel="resetDate" @close="fiscalYearShow = false" closeOnClickOverlay mode="year"></u-datetime-picker>
   </view>
 </template>
 
 <script>
-  import { $moment } from '@/uni_modules/uview-ui';
+  import {
+    getOrganizelist,
+    getPoolResidentlist,
+    getPoolCommercelist,
+    getPoolIndustrylist
+  } from '@/api/organize.js'
+  import {
+    $moment
+  } from '@/uni_modules/uview-ui';
   export default {
     components: {},
     props: {
@@ -81,8 +104,18 @@
         keyword: "",
         current1: 0,
         current2: 0,
-        fiscalYearShow:false,
-        fiscalYear:"",
+        newList1: [],
+        newList2: [],
+        fiscalYearShow: false,
+        fiscalYear: "",
+        status1: "loadmore",
+        status2: "loadmore",
+        total1: null,
+        total2: null,
+        queryParameter: {
+          pageNum: 1,
+          pageSize: 10
+        },
         tabList1: [{
           name: '全部'
         }, {
@@ -107,26 +140,232 @@
 
     },
     onLoad() {
-
+      this.initData()
+    },
+    onReachBottom() {
+      let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
+      //待开发用户池
+      if (this.current) {
+        console.log(222);
+        if (allTotal < this.total2) {
+          this.queryParameter.pageNum++;
+          this.status2 = 'loading';
+          this.updateList2()
+        } else {
+          this.status2 = 'nomore';
+        }
+      } else {
+        console.log(111);
+        //市场摸底
+        if (allTotal < this.total1) {
+          this.queryParameter.pageNum++;
+          this.status1 = 'loading';
+          this.updateList1()
+        } else {
+          this.status1 = 'nomore';
+        }
+      }
+    },
+    onPullDownRefresh() {
+      this.resetQuery();
+      this.keyword = "";
+      if (this.current) {
+        this.current2 = 0;
+        this.updateList2()
+      } else {
+        this.current1 = 0;
+        this.updateList1()
+      }
+      setTimeout(() => {
+        //结束下拉刷新
+        uni.stopPullDownRefresh();
+      }, 500);
     },
     methods: {
-      openFiscalYearChoice(){
+      statusCss(code) {
+        const colors = ['#5875eb', '#ffa500', '#e74c3c', '#666666'];
+        return colors[code];
+      },
+      initData() {
+        getOrganizelist().then(res => {
+          console.log("市场摸底列表", res);
+          if (res.code === 200) {
+            this.newList1 = res.rows;
+            this.total1 = res.total;
+          }
+        })
+      },
+      typeChange(i) {
+        this.keyword = "";
+        this.resetQuery();
+        this.current = i;
+        this.current ? this.updateList2() : this.updateList1();
+      },
+      updateList1() {
+        let Params
+        if (this.keyword && this.current1 !== -1) {
+          Params = {
+            reportName: this.keyword,
+            statusCode: this.current1
+          }
+        } else if (this.keyword !== "") {
+          Params = {
+            reportName: this.keyword,
+          }
+        } else if (this.current1 !== 0) {
+          Params = {
+            statusCode: this.current1 - 1
+          }
+        }
+        Params = {
+          ...this.queryParameter,
+          ...Params
+        };
+        getOrganizelist(Params).then(res => {
+          // console.log(res);
+          if (res.code === 200) {
+            if (this.queryParameter.pageSize > 1) {
+              this.newList1 = [...this.newList1, ...res.rows];
+            } else {
+              this.newList1 = res.rows
+            }
+            this.total1 = res.total;
+            console.log(this.newList1);
+          }
+        })
+      },
+      updateList2() {
+        let Params
+        // if (this.keyword && this.current2 !== -1) {
+        //   Params = {
+        //     reportName: this.keyword,
+        //     statusCode: this.current2
+        //   }
+        // } else if (this.keyword !== "") {
+        //   Params = {
+        //     reportName: this.keyword,
+        //   }
+        // } else if (this.current2 !== 0) {
+        //   Params = {
+        //     statusCode: this.current2 - 1
+        //   }
+        // }
+        // Params = {
+        //   ...this.queryParameter,
+        //   ...Params
+        // };
+        if (this.current2 === 0) {
+          if(this.keyword){
+            Params = {
+              householdName: this.keyword,
+            }
+          }
+          getPoolResidentlist(Params).then(res => {
+            // console.log(res);
+            if (res.code === 200) {
+              if (this.queryParameter.pageSize > 1) {
+                this.newList2 = [...this.newList2, ...res.rows];
+              } else {
+                this.newList2 = res.rows
+              }
+              this.total2 = res.total;
+            }
+          })
+        } else if (this.current2 === 1) {
+          if(this.keyword){
+            Params = {
+              householdName: this.keyword,
+            }
+          }
+          getPoolCommercelist(Params).then(res => {
+            // console.log(res);
+            if (res.code === 200) {
+              if (this.queryParameter.pageSize > 1) {
+                this.newList2 = [...this.newList2, ...res.rows];
+              } else {
+                this.newList2 = res.rows
+              }
+              this.total2 = res.total;
+            }
+          })
+        } else if (this.current2 === 2) {
+          if(this.keyword){
+            Params = {
+              contactPerson: this.keyword,
+            }
+          }
+          getPoolIndustrylist(Params).then(res => {
+            // console.log(res);
+            if (res.code === 200) {
+              if (this.queryParameter.pageSize > 1) {
+                this.newList2 = [...this.newList2, ...res.rows];
+              } else {
+                this.newList2 = res.rows
+              }
+              this.total2 = res.total;
+            }
+          })
+        }else{
+
+        }
+        this.checkTotal()
+        console.log("待开发", this.newList2);
+      },
+      checkTotal(){
+        let allTotal = this.queryParameter.pageNum * this.queryParameter.pageSize
+        if(this.total1 < allTotal){
+          this.status1 = "nomore"
+        }
+        if(this.total2 < allTotal){
+          this.status2 = "nomore"
+        }
+      },
+      resetQuery() {
+        this.newList1 = [];
+        this.newList2 = [];
+        this.queryParameter = {
+          pageNum: 1,
+          pageSize: 10
+        }
+      },
+      tabChange1(e) {
+        console.log(e);
+        this.resetQuery()
+        this.current1 = e.index;
+        this.updateList1();
+      },
+      tabChange2(e) {
+        console.log(e);
+        this.current2 = e.index
+        this.resetQuery();
+        this.updateList2();
+      },
+      openFiscalYearChoice() {
         this.fiscalYearShow = true;
         // this.fiscalYear = Number(new Date());
       },
-      reset(){
+      resetDate() {
         console.log("重置");
         this.fiscalYear = "";
         this.fiscalYearShow = false;
       },
-      jumpUserDetails(){
+      search() {
+        console.log("搜索");
+        this.resetQuery();
+        if (this.current) {
+          this.updateList2()
+        } else {
+          this.updateList1()
+        }
+      },
+      jumpUserDetails(item) {
         uni.navigateTo({
-          url:"/pages/market/userDetails"
+          url: `/pages/market/userDetails?type=${this.current2}&details=${JSON.stringify(item)}`
         })
       },
-      jumpReportDetails(){
+      jumpReportDetails(id) {
         uni.navigateTo({
-          url:"/pages/market/reportDetails"
+          url: "/pages/market/reportDetails?reportNo=" + id
         })
       }
     }
@@ -258,4 +497,8 @@
     background-color: #ffffff;
     box-sizing: border-box;
   }
+
+  .u-empty {
+    background: #fff !important;
+  }
 </style>
diff --git a/pages/market/newsDetails.vue b/pages/market/newsDetails.vue
index 1fb1748..58faa03 100644
--- a/pages/market/newsDetails.vue
+++ b/pages/market/newsDetails.vue
@@ -6,7 +6,7 @@
       {{ detailsContent.title }}
     </view>
     <view class="releaseTimeCss">
-      {{ detailsContent.publishTime}}
+      发布时间：{{ $u.timeFormat(detailsContent.publishTime, 'yyyy年mm月dd日 hh:MM:ss')}}
     </view>
     <rich-text :nodes="detailsContent.details">
     </rich-text>
@@ -29,8 +29,8 @@
 
     },
     onLoad(data) {
-      console.log(data);
       let resData = JSON.parse(data.detailsContent)
+      console.log(resData);
       if(data){
         this.detailsContent = resData;
       }
diff --git a/pages/market/reportDetails.vue b/pages/market/reportDetails.vue
index 2b5aba6..babdfc0 100644
--- a/pages/market/reportDetails.vue
+++ b/pages/market/reportDetails.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="ComCss">
-    <u-navbar class="navBarCss" title="2023财年玉林中燃天然气市场调研报告"
+    <u-navbar class="navBarCss" :title="reportData1.reportName"
       :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}" leftClick="leftClick" :autoBack="true"
       safeAreaInsetTop placeholder />
     <view class="topCss">
@@ -13,7 +13,7 @@
       </u-tabs>
     </view>
     <view class="bodyCss">
-      <reportModule1 v-if="current == 0"></reportModule1>
+      <reportModule1 v-if="current == 0" :reportData="reportData1"></reportModule1>
       <reportModule2 v-if="current == 1"></reportModule2>
       <reportModule3 v-if="current == 2"></reportModule3>
       <reportModule4 v-if="current == 3"></reportModule4>
@@ -23,6 +23,16 @@
 </template>
 
 <script>
+  import {
+    getOrganize,
+    getGeneralOverview,
+    getGeneralOverviewAttach,
+    getBusinessAnalyze,
+    getNewBuildingInfo,
+    getNewBuildingItem,
+    getDevelopmentPlan,
+    getTargetSuggestion
+  } from '@/api/organize.js'
   import reportModule1 from "./components/reportModule1.vue"
   import reportModule2 from "./components/reportModule2.vue"
   import reportModule3 from "./components/reportModule3.vue"
@@ -42,6 +52,12 @@
     data() {
       return {
         current: 0,
+        reportNo:null,
+        reportData1:{},
+        reportData2:{},
+        reportData3:{},
+        reportData4:{},
+        reportData5:{},
         tabList: [{
           name: '组织实施落实'
         }, {
@@ -58,12 +74,38 @@
     computed: {
 
     },
-    onLoad() {
-
+    onLoad(data) {
+      if(data){
+        this.reportNo = data.reportNo;
+      }
+      console.log(this.reportNo);
+      this.initData()
     },
     methods: {
       modifyCur(data){
         this.current = data.index;
+
+      },
+      initData(){
+        getOrganize(this.reportNo).then(res =>{
+          if(res.code === 200){
+            this.reportData1 = res.data;
+          }
+          console.log(this.reportData1);
+        })
+        getGeneralOverview(this.reportNo).then(res =>{
+          if(res.code === 200){
+            this.reportData2 = res.data;
+          }
+          console.log(this.reportData2);
+        })
+        // getGeneralOverview()
+        // getGeneralOverviewAttach
+        // getBusinessAnalyze
+        // getNewBuildingInfo
+        // getNewBuildingItem
+        // getDevelopmentPlan
+        // getTargetSuggestion
       }
     }
   }
diff --git a/pages/market/userDetails.vue b/pages/market/userDetails.vue
index be86495..8b8d072 100644
--- a/pages/market/userDetails.vue
+++ b/pages/market/userDetails.vue
@@ -1,25 +1,349 @@
 <template>
   <view class="ConCss">
-    <u-navbar class="navBarCss" title="居民用户详情" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}"
+    <u-navbar class="navBarCss" :title="title" :titleStyle="{'fontSize':'36rpx','color':'#333333','fontWeight':'700'}"
       leftClick="leftClick" :autoBack="true" safeAreaInsetTop placeholder />
     <view class="bodyCss">
       <view class="basisCss">
         <view class="titleCss">
-          标题
+          基本信息
         </view>
-        <view class="flexCss" v-for="(item,index) in basisData" :key="item.key">
-          <view class="leftCss overflow-one-lines"> {{item.name}} </view>
-          <view class="rightCss overflow-one-lines"> {{item.value}} </view>
+        <!-- 居民基本信息 -->
+        <view class="" v-if="type == 0">
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 区域 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.area}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预算主体 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 身份证号 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.idNumber}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋所在城市 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.city}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋所在街道 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.street}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋所在小区 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.communityName}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋所在楼层 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.floor}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋门牌号 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseNumber}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房主姓名 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.householdName}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房主年龄 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.householdAge}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 联系电话 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view>
+          </view>
+        </view>
+        <!-- 商业基本信息 -->
+        <view class="" v-if="type == 1">
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 区域 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.area}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预算主体 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 纳税人识别号 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋所在城市 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.city}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋所在街道 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.street}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在场所门牌号 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseNumber}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在场所经营者姓名 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.householdName}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 经营业主年龄 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.householdAge}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 联系电话 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view>
+          </view>
+        </view>
+        <!-- 工业基本信息 -->
+        <view class="" v-if="type == 2">
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 区域 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.area}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预算主体 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.budgetSubject}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 统一社会信息代码 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.taxpayerNumber}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 地址 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.address}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 客户联系人 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.contactPerson}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 职务 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.duties}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 电话 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.phoneNumber}} </view>
+          </view>
         </view>
       </view>
       <view class="housesCss">
-        <view class="titleCss">
+        <view class="titleCss" v-if="type == 0">
           房屋信息
         </view>
-        <view class="flexCss" v-for="(item,index) in housesData" :key="item.key">
-          <view class="leftCss overflow-one-lines"> {{item.name}} </view>
-          <view class="rightCss overflow-one-lines"> {{item.value}} </view>
+        <view class="titleCss" v-else-if="type == 1">
+          场所信息
+        </view>
+        <view class="titleCss" v-else-if="type == 2">
+          房屋信息
+        </view>
+        <view class="" v-if="type == 0">
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 居住人口 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.resideNumber}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋户型 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseType}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋面积 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseArea}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋建设年限 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseYear}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋居住性质 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseNature}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 居住属性 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.resideAttribute}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋性质 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseAttribute}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋结构类型 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseStructure}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在房屋距离中压管道 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.distance}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在房屋是否有物业 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isExist}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 房屋是否列入拆迁规划 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isPlan}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 水/电表是否一户一表 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isSingleMeter}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 是否独立厨房 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isSingleKitchen}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 是否集中供暖 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isHeating}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 楼前立管是否安装 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isInstall}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 现使用能源 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.currentEnergy}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view>
+            <view class="rightCss overflow-one-lines"> {{allData.currentPrice}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 用户报装意愿 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.inclinate}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 不报装原因 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.reason}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 创建时间 </view>
+            <!-- {{$u.timeFormat(timestamp, 'yyyy年mm月dd日')}} -->
+            <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view>
+          </view>
+        </view>
+        <view class="" v-if="type == 1">
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 场所面积 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseArea}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 经营范围 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.businessScope}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在场所房屋性质 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseNature}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在场所房屋类型 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseAttribute}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在场所房屋结构类型 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseStructure}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在场所房屋建设年限 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.houseYear}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在房屋是否列入拆迁规划 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isPlan}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 水/电表是否一户一表 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isSingleMeter}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 是否有供暖需求 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.isHeating}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 所在房屋距离中压管道 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.distance}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 现使用能源 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.currentEnergy}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 现使用能源价格(元) </view>
+            <view class="rightCss overflow-one-lines"> {{allData.currentPrice}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预计最大开口气量（最大日用气量） </view>
+            <view class="rightCss overflow-one-lines"> {{allData.predictMax}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预计签约日期 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.predictSign}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预计安装日期 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.predictInstall}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 预计日用气量 </view>
+            <view class="rightCss overflow-one-lines"> {{allData.predictUse}} </view>
+          </view>
+          <view class="flexCss">
+            <view class="leftCss overflow-one-lines"> 更新时间 </view>
+            <!-- {{$u.timeFormat(timestamp, 'yyyy年mm月dd日')}} -->
+            <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view>
+          </view>
         </view>
+        <view class="" v-if="type == 2">
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 是否已供气 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.isProvide}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 商业状态 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.commercialStatus}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 项目类别 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.projectType}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 行业分类 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.industryType}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 最近管道距离 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.distance}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 预计最大开口气量 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.predictMax}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 预计签约日期 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.predictSign}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 预计安装日期 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.predictInstall}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 预计日用气量 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.predictUse}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 耗能设备名称 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.machineName}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 耗能设备型号 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.machineModel}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 用能类型 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.userType}} </view>
+            </view>
+            <view class="flexCss">
+              <view class="leftCss overflow-one-lines"> 更新时间 </view>
+              <view class="rightCss overflow-one-lines"> {{allData.sysCtime}} </view>
+            </view>
+        </view>
+
       </view>
     </view>
 
@@ -34,143 +358,27 @@
     },
     data() {
       return {
-        basisData: [{
-          name: "区域",
-          key: "area",
-          value: "华北区域"
-        }, {
-          name: "预算主体",
-          key: "budgetEntity",
-          value: "天津宏洁预算组织"
-        }, {
-          name: "身份证号",
-          key: "idCard",
-          value: "145678187611078000"
-        }, {
-          name: "房屋所在城市",
-          key: "city",
-          value: "天津"
-        }, {
-          name: "房屋所在街道",
-          key: "street",
-          value: "静海区街道"
-        }, {
-          name: "房屋所在小区",
-          key: "community",
-          value: "天路小区"
-        }, {
-          name: "房屋所处楼层",
-          key: "floor",
-          value: "12"
-        }, {
-          name: "房屋门牌号",
-          key: "houseNumber",
-          value: "13号"
-        }, {
-          name: "房主姓名",
-          key: "name",
-          value: "王凯"
-        }, {
-          name: "房主年龄",
-          key: "age",
-          value: "30~50岁"
-        }, {
-          name: "联系电话",
-          key: "phone",
-          value: "18731654346"
-        }],
-        housesData: [{
-          name: "居住人口",
-          key: "residentPopulation",
-          value: "1"
-        }, {
-          name: "房屋户型",
-          key: "houseType",
-          value: "三室一厅"
-        }, {
-          name: "房屋面积",
-          key: "houseArea",
-          value: "130"
-        }, {
-          name: "房屋建设年限",
-          key: "city",
-          value: "5年内"
-        }, {
-          name: "房屋居住性质",
-          key: "street",
-          value: "自有居住"
-        }, {
-          name: "居住属性",
-          key: "community",
-          value: "常住"
-        }, {
-          name: "房屋性质",
-          key: "floor",
-          value: "高品房_高层"
-        }, {
-          name: "房屋结构类型",
-          key: "houseNumber",
-          value: "钢结构"
-        }, {
-          name: "所在房屋距离中压管道",
-          key: "name",
-          value: "小于500米"
-        }, {
-          name: "所在房屋是否有物业",
-          key: "age",
-          value: "有"
-        }, {
-          name: "房屋是否列入拆迁规划",
-          key: "phone",
-          value: "是"
-        },{
-          name: "水/电表是否一户一表",
-          key: "phone",
-          value: "是"
-        },{
-          name: "是否独立厨房",
-          key: "phone",
-          value: "是"
-        },{
-          name: "是否集中供暖",
-          key: "phone",
-          value: "是"
-        },{
-          name: "楼前立管是否安装",
-          key: "phone",
-          value: "是"
-        },{
-          name: "现使用能源",
-          key: "phone",
-          value: "管道天燃气"
-        },{
-          name: "现使用能源价格(元)",
-          key: "phone",
-          value: "3.13元"
-        },{
-          name: "用户报装意愿",
-          key: "phone",
-          value: "小于50%"
-        },{
-          name: "小于50%",
-          key: "phone",
-          value: "太贵"
-        },{
-          name: "更新时间",
-          key: "phone",
-          value: "2023年9月14号"
-        }
-        ]
+        type: null,
+        allData: {},
+        title: "",
       }
     },
     computed: {
 
     },
-    onLoad() {
-
+    onLoad(data) {
+      if (data) {
+        this.type = data.type;
+        this.allData = JSON.parse(data.details);
+      }
+      this.initData()
+      console.log(this.allData);
     },
     methods: {
-
+      initData() {
+        const titleArr = ['居民用户详情', '商业用户详情', '工业用户详情']
+        this.title = titleArr[this.type]
+      }
     }
   }
 </script>
diff --git a/static/images/empty/logo.png b/static/images/empty/logo.png
new file mode 100644
index 0000000..63e5804
Binary files /dev/null and b/static/images/empty/logo.png differ
diff --git a/utils/dictionary.js b/utils/dictionary.js
new file mode 100644
index 0000000..af240c4
--- /dev/null
+++ b/utils/dictionary.js
@@ -0,0 +1,18 @@
+const dictionary = {
+  "0": "宏观经济",
+  "1": "产业政策",
+  "2": "行业动态",
+  "3": "友商动态",
+  "4": "用户资讯",
+  "5": "国际能源"
+};
+
+function dict(key) {
+  return dictionary[key] || "未找到对应的值";
+}
+
+
+export default dict
+
+// 0:宏观经济、1:产业政策、2:行业动态、3:友商动态、4:用户资讯、5:国际能源',
+
diff --git a/utils/state.js b/utils/state.js
new file mode 100644
index 0000000..a8685d8
--- /dev/null
+++ b/utils/state.js
@@ -0,0 +1,16 @@
+const stateList = {
+  "0": "待申报",
+  "1": "待评审",
+  "2": "待修改",
+  "3": "已通过",
+};
+
+function state(key) {
+  return stateList[key] || "未找到对应的值";
+}
+
+
+export default state
+
+// 0待申报 1待评审 2待修改 3已通过'
+
--
libgit2 0.21.2