From 26ea3e40c5188112533546d68b3e43bb18044f23 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Wed, 20 Dec 2023 13:42:11 +0800
Subject: [PATCH] feat:修改bug、增加文件查询接口

---
 api/organize.js                           |  4 ++++
 pages/market/components/reportModule1.vue | 24 +++++++++++++++---------
 pages/market/insight.vue                  | 64 ++++++++++++++++++++++++++++++++++++++++------------------------
 pages/market/reportDetails.vue            |  3 ++-
 pages/market/total.vue                    |  2 +-
 pages/market/userDetails.vue              |  2 +-
 6 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/api/organize.js b/api/organize.js
index c1b424c..ef57168 100644
--- a/api/organize.js
+++ b/api/organize.js
@@ -49,6 +49,10 @@ export const getDevelopmentPlan = params => http.get('/insight/developmentPlan/'
 export const getTargetSuggestion = params => http.get('/insight/targetSuggestion/'+ params)
 
 
+//根据uuid查询文件
+export const getInsightFileList = uuid => http.get('/insight/insightFile/list?uuid='+ uuid)
+
+
 
 
 
diff --git a/pages/market/components/reportModule1.vue b/pages/market/components/reportModule1.vue
index c5414ec..851368d 100644
--- a/pages/market/components/reportModule1.vue
+++ b/pages/market/components/reportModule1.vue
@@ -54,7 +54,7 @@
         <!-- <u-collapse-item name="3"> -->
           <text  class="slot-title">预算主体附件</text>
           <view class="attachmentCss" v-if="this.isShowUrl">
-            <view class="flexCss" v-for="(item,index) in reportData.attachmentsUrl" :key="index">
+            <view class="flexCss" v-for="(item,index) in fileList" :key="index">
               <view class="leftCss overflow-one-lines">
                 <u-icon size="18" :name="calcIcon(item.extension)"></u-icon>
                 <view class="textCss overflow-one-lines">{{item.fileName}}</view>
@@ -71,6 +71,9 @@
 </template>
 
 <script>
+  import {
+    getInsightFileList
+  } from '@/api/organize.js'
   export default {
     components: {},
     props: {
@@ -81,6 +84,7 @@
     data() {
       return {
         isShowUrl: false,
+        fileList:[],
       }
     },
     computed: {
@@ -102,18 +106,20 @@
         }
       },
       init() {
-        if (Array.isArray(this.reportData.attachmentsUrl)) {
-          this.isShowUrl = true
+        if (this.reportData.attachmentsUrl == "") {
+          this.isShowUrl = false
         }else{
-          this.reportData.attachmentsUrl = JSON.parse(this.reportData.attachmentsUrl);
-          if(this.reportData.attachmentsUrl.length && this.reportData.attachmentsUrl != '[]'){
-            this.isShowUrl = true
-          }else{
-            this.isShowUrl = false
-          }
+          this.isShowUrl = true
         }
+        let uuid = this.reportData.attachmentsUrl;
+        getInsightFileList(uuid).then(res=>{
+          if(res.code === 200){
+            this.fileList = res.rows
+          }
+        })
         console.log('附件', JSON.parse(JSON.stringify(this.reportData.attachmentsUrl)));
       },
+
       viewAttachments(urls) {
         uni.getSystemInfo({
           success: function(res) {
diff --git a/pages/market/insight.vue b/pages/market/insight.vue
index ca2d62b..6f3d493 100644
--- a/pages/market/insight.vue
+++ b/pages/market/insight.vue
@@ -18,7 +18,8 @@
              }" itemStyle="height:78rpx;" @click="tabChange1">
           <view slot="right" style="padding-left: 4px;padding-right: 10rpx;" @click="openFiscalYearChoice">
             <view style="display:flex;"><u-icon name="/static/images/icon/time.png" size="18" bold></u-icon>
-              <text style="padding-left:10rpx;" :style="fiscalYear!=''?'color:#339af0':''">{{fiscalYear?fiscalYear:'财年'}}</text>
+              <text style="padding-left:10rpx;"
+                :style="fiscalYear!=''?'color:#339af0':''">{{fiscalYear?fiscalYear:'财年'}}</text>
             </view>
           </view>
         </u-tabs>
@@ -40,9 +41,10 @@
       <u-search placeholder="搜索感兴趣的内容" v-model="keyword" :show-action="false" borderColor="rgb(230, 230, 230)"
         height="74rpx" bgColor="#F5F6FA" @search="search" @clear="clearInit"></u-search>
     </u-sticky>
-    <view class="listBodyCss" :style="newList1.length || newList2.length ?{'background':'#f2f4f3'}:{'background':'#fff'}">
+    <view class="listBodyCss"
+      :style="newList1.length || newList2.length ?{'background':'#f2f4f3'}:{'background':'#fff'}">
       <view class="" v-if="!current">
-        <u-empty  text="暂无报告" icon="/static/images/icon/nodata.png" v-if="newList1.length <= 0"></u-empty>
+        <u-empty text="暂无报告" icon="/static/images/icon/nodata.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>
@@ -72,7 +74,13 @@
             <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 class="top2 overflow-one-lines" v-if="current2 === 0">
+              详情地址:{{ item.city + item.street + item.communityName + item.floor+ '楼' + item.houseNumber + '号'}}
+            </view>
+            <view class="top2 overflow-one-lines" v-else-if="current2 === 1">
+              详情地址: {{ item.city + item.street + item.houseNumber + '号'}}
+            </view>
+            <view class="top2 overflow-one-lines" v-else-if="current2 === 2"> 详情地址: {{item.address}}</view>
           </view>
         </view>
         <u-loadmore marginTop="50rpx" :status="status2" v-if="newList2.length > 0" />
@@ -104,7 +112,7 @@
         newList1: [],
         newList2: [],
         fiscalYearShow: false,
-        yaerModal:"",
+        yaerModal: "",
         fiscalYear: "",
         status1: "loadmore",
         status2: "loadmore",
@@ -113,8 +121,8 @@
         queryParameter: {
           pageNum: 1,
           pageSize: 10,
-          roleId:this.$store.state.user.roleId,
-          entity:this.$store.state.user.entity,
+          roleId: this.$store.state.user.roleId,
+          entity: this.$store.state.user.entity,
         },
         tabList1: [{
           name: '全部'
@@ -197,17 +205,16 @@
       },
       updateList1() {
         let Params = {};
-        if(this.keyword){
+        if (this.keyword) {
           Params.reportName = this.keyword
         }
-        if(this.current1 !== -1 && this.current1 !== 0)
-        {
-           Params.statusCode = this.current1 - 1;
+        if (this.current1 !== -1 && this.current1 !== 0) {
+          Params.statusCode = this.current1 - 1;
         }
-        if(this.fiscalYear !== ""){
+        if (this.fiscalYear !== "") {
           Params.fiscalYear = this.fiscalYear
         }
-        console.log("市场摸底查询参数",Params);
+        console.log("市场摸底查询参数", Params);
         Params = {
           ...this.queryParameter,
           ...Params
@@ -232,7 +239,10 @@
           if (this.keyword) {
             Params.householdName = this.keyword
           }
-          getPoolResidentlist({...Params,...this.queryParameter}).then(res => {
+          getPoolResidentlist({
+            ...Params,
+            ...this.queryParameter
+          }).then(res => {
             // console.log(res);
             if (res.code === 200) {
               if (this.queryParameter.pageSize > 1) {
@@ -247,7 +257,10 @@
           if (this.keyword) {
             Params.householdName = this.keyword
           }
-          getPoolCommercelist({...Params,...this.queryParameter}).then(res => {
+          getPoolCommercelist({
+            ...Params,
+            ...this.queryParameter
+          }).then(res => {
             // console.log(res);
             if (res.code === 200) {
               if (this.queryParameter.pageSize > 1) {
@@ -262,7 +275,10 @@
           if (this.keyword) {
             Params.contactPerson = this.keyword
           }
-          getPoolIndustrylist({...Params,...this.queryParameter}).then(res => {
+          getPoolIndustrylist({
+            ...Params,
+            ...this.queryParameter
+          }).then(res => {
             // console.log(res);
             if (res.code === 200) {
               if (this.queryParameter.pageSize > 1) {
@@ -293,7 +309,7 @@
         this.queryParameter.pageNum = 1;
         this.queryParameter.pageSize = 10;
       },
-      clearInit(){
+      clearInit() {
         this.keyword = ""
         this.search()
       },
@@ -314,14 +330,14 @@
         // this.fiscalYear = Number(new Date());
       },
       confirmYear() {
-        setTimeout(()=>{
+        setTimeout(() => {
           let year = this.$u.timeFormat(this.yaerModal, 'yyyy');
           this.fiscalYear = year;
           this.fiscalYearShow = false;
           console.log(this.fiscalYear);
           this.resetQuery();
           this.updateList1();
-        },0)
+        }, 0)
         // this.$nextTick(()=>{
 
         // })
@@ -347,7 +363,7 @@
           url: `/pages/market/userDetails?type=${this.current2}&id=${item.id}`
         })
       },
-      jumpReportDetails(id,fiscalYear) {
+      jumpReportDetails(id, fiscalYear) {
         uni.navigateTo({
           url: `/pages/market/reportDetails?reportNo=${id}&fiscalYear=${fiscalYear}`
         })
@@ -401,7 +417,7 @@
     bottom: 2px;
     left: 50%;
     transform: translateX(-50%);
-    width:100%;
+    width: 100%;
     /* 图片宽度 */
     height: 14rpx;
     /* 图片高度 */
@@ -417,7 +433,7 @@
     background: #fff;
   }
 
-  /deep/.u-tabs__wrapper__nav__item{
+  /deep/.u-tabs__wrapper__nav__item {
     padding: 0 5rpx;
   }
 
@@ -435,7 +451,7 @@
     min-height: 65vh;
   }
 
-  .u-empty{
+  .u-empty {
     min-height: 50vh;
   }
 
@@ -499,4 +515,4 @@
   .u-empty {
     background: #fff !important;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/market/reportDetails.vue b/pages/market/reportDetails.vue
index e5cff35..51ce400 100644
--- a/pages/market/reportDetails.vue
+++ b/pages/market/reportDetails.vue
@@ -36,7 +36,8 @@
     getNewBuildingInfo,
     getNewBuildingItem,
     getDevelopmentPlan,
-    getTargetSuggestion
+    getTargetSuggestion,
+    getInsightFileList
   } from '@/api/organize.js'
   import reportModule1 from "./components/reportModule1.vue"
   import reportModule2 from "./components/reportModule2.vue"
diff --git a/pages/market/total.vue b/pages/market/total.vue
index d7a6a32..a5bd680 100644
--- a/pages/market/total.vue
+++ b/pages/market/total.vue
@@ -99,7 +99,7 @@
     computed: {
 
     },
-    onLoad() {
+    onShow() {
       this.initData()
     },
     methods: {
diff --git a/pages/market/userDetails.vue b/pages/market/userDetails.vue
index a6382fc..409340c 100644
--- a/pages/market/userDetails.vue
+++ b/pages/market/userDetails.vue
@@ -268,7 +268,7 @@
             <view class="rightCss overflow-one-lines"> {{allData.currentPrice || ""}} </view>
           </view>
           <view class="flexCss">
-            <view class="leftCss overflow-one-lines"> 预计最大开口气量（最大日用气量） </view>
+            <view class="leftCss"> 预计最大开口气量（最大日用气量） </view>
             <view class="rightCss overflow-one-lines"> {{allData.predictMax || ""}} </view>
           </view>
           <view class="flexCss">
--
libgit2 0.21.2