瀏覽代碼

Merge branch 'dev/v4.9.33_wmh' of qmx/jy into feature/v4.9.33

wenmenghao 1 年之前
父節點
當前提交
631ec8348d

+ 8 - 1
src/web/staticres/common-module/report-analysis/js/report_analysis.js

@@ -455,6 +455,7 @@ var vm = new Vue({
       }
       }
     },
     },
     goAlldetail(type,title){ // top3 全量列表
     goAlldetail(type,title){ // top3 全量列表
+      this.saveState()
       location.href = `/jy_mobile/reportanalysis/rankingDetail?title=${title}&type=${type}&id=${this.rid}`
       location.href = `/jy_mobile/reportanalysis/rankingDetail?title=${title}&type=${type}&id=${this.rid}`
     },
     },
     setDefaultMatchWay: function (matchWay) {
     setDefaultMatchWay: function (matchWay) {
@@ -1006,7 +1007,10 @@ var vm = new Vue({
         reportFilters: this.reportFilters,
         reportFilters: this.reportFilters,
         sections: this.sections,
         sections: this.sections,
         isSubCount: this.isSubCount,
         isSubCount: this.isSubCount,
-        projectCount:this.projectCount
+        projectCount:this.projectCount,
+        projectTotalMoney:this.projectTotalMoney, // 项目总金额
+        winnercount: this.winnercount,//中标单位数
+        buyercount:this.buyercount,//采购单位数
       }
       }
       sessionStorage.setItem(this.sessStorageKey, JSON.stringify($data))
       sessionStorage.setItem(this.sessStorageKey, JSON.stringify($data))
     },
     },
@@ -1015,6 +1019,9 @@ var vm = new Vue({
       if ($data) {
       if ($data) {
         $data = JSON.parse($data)
         $data = JSON.parse($data)
         this.projectCount = $data.projectCount
         this.projectCount = $data.projectCount
+        this.projectTotalMoney = $data.projectTotalMoney
+        this.winnercount = $data.winnercount
+        this.buyercount = $data.buyercount
         this.isSubCount = $data.isSubCount
         this.isSubCount = $data.isSubCount
         this.scrollTop = $data.scrollTop
         this.scrollTop = $data.scrollTop
         this.filtersPageShow = $data.filtersPageShow
         this.filtersPageShow = $data.filtersPageShow

+ 1 - 1
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -687,7 +687,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/index.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/index.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
-{{include "/big-member/commonjs.html"}}
+{{include "/big-member/wx/commonjs.html"}}
 <script src='{{Msg "seo" "cdn"}}/antiRes/js/mainHook.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/antiRes/js/mainHook.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/vip-dialog.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/vip-dialog.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/history-project.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/history-project.js?v={{Msg "seo" "version"}}'></script>