修改

dsk-operate-ui/src/api/macro/macro.js

@@ -100,7 +100,16 @@ export function countNewsBidByMonth(param) {
     data: param
   })
 }
-//全国商机项目分析-全国土地交易项目年份统计
+
+//全国中标市场分析-全国中标项目统计
+export function countBidByType(param) {
+  return request({
+    url: '/marketAnalysis/countBidByType',
+    method: 'POST',
+    data: param
+  })
+}
+//全国中标市场分析-全国各地区中标统计TOP10
 export function countBidGroupByProvince(param) {
   return request({
     url: '/marketAnalysis/countBidGroupByProvince',
@@ -108,6 +117,37 @@ export function countBidGroupByProvince(param) {
     data: param
   })
 }
+//全国中标市场分析-全国中标金额分析
+export function rangeBidMoney(param) {
+  return request({
+    url: '/marketAnalysis/rangeBidMoney',
+    method: 'POST',
+    data: param
+  })
+}
+//全国中标市场分析-全国中标趋势分析
+export function rangeBidFiveYears() {
+  return request({
+    url: '/marketAnalysis/rangeBidFiveYears',
+    method: 'POST',
+  })
+}
+//全国中标市场分析-全国中标下浮率分析
+export function lowerRateByYear(param) {
+  return request({
+    url: '/marketAnalysis/lowerRateByYear',
+    method: 'POST',
+    data: param
+  })
+}
+//全国中标市场分析-全国中标业绩项目类型下浮率
+export function lowerRangeTenderType(param) {
+  return request({
+    url: '/marketAnalysis/lowerRangeTenderType',
+    method: 'POST',
+    data: param
+  })
+}
 
 
 

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -36,7 +36,7 @@
 
           </el-table-column>
           <el-table-column prop="gdp" label="GDP（亿元）" sortable width="120" :formatter="formatStatus"/>
-          <el-table-column prop="gdpGrowth" label="GDP增速（%）" sortable width="100" :formatter="formatStatus"/>
+          <el-table-column prop="gdpGrowth" label="GDP增速（%）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="gdpPerCapita" label="人均GDP（元）" sortable width="130" :formatter="formatStatus"/>
           <el-table-column prop="population" label="人口（万人）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="fixedInvestment" label="固定资产投资 （亿元） " sortable width="200" :formatter="formatStatus"/>
@@ -100,7 +100,6 @@ export default {
   },
   methods: {
     getData(){
-      this.isSkeleton = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:2 }
       if(this.queryParams.field){
         params.field=this.queryParams.field
@@ -118,6 +117,7 @@ export default {
         params.areaId=[this.provinceId[2]]
       }
       // params.provinceIds=[this.dataQuery.provinceId]
+      // this.isSkeleton = true
       nationalPage(params).then(res => {
         this.isSkeleton = false
         this.tableData = res.data.list

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -220,7 +220,7 @@
       },
       // 查询提交
       async querySubmit() {
-        this.isSkeleton = true
+        // this.isSkeleton = true
         const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:1 }
         if(this.queryParams.address){
           let arr = this.$refs.address.getCheckedNodes();

dsk-operate-ui/src/views/macro/nationalEconomies/index.vue

@@ -4,14 +4,14 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
         <el-tab-pane label="全国商机项目分析" name="second"></el-tab-pane>
-        <!--<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>-->
-        <el-tab-pane label="全国中标市场分析" name="fourth"></el-tab-pane>
+        <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
+        <el-tab-pane label="全国建筑企业分析" name="fourth"></el-tab-pane>
       </el-tabs>
     </div>
 
     <Economic v-if="activeName === 'first'"></Economic>
     <Sjxmfx v-if="activeName === 'second'"></Sjxmfx>
-    <!--<Zhongbiao v-if="activeName === 'third'"></Zhongbiao>-->
+    <Zhongbiao v-if="activeName === 'third'"></Zhongbiao>
     <Jzqyfx v-if="activeName === 'fourth'"></Jzqyfx>
   </div>
 </template>
@@ -28,7 +28,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'first'
+      activeName: 'third'
     }
   },
   created() {

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -130,9 +130,9 @@
           state:2,
         }
         getGZDB(params).then(result=>{
-          this.datalist = result.code == 200?result:[]
-          if(this.datalist){
-            this.yqnum = `已逾期 ${this.datalist.rows.length} 条`;
+          let datalist = result.code == 200?result:[]
+          if(datalist){
+            this.yqnum = `已逾期 ${datalist.rows.length} 条`;
           }
         })
       },