修改

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

@@ -168,7 +168,7 @@ export function bondPage(param) {
 //区域企业
 export function enterprise(param) {
   return request({
-    url: '/enterprise/page',
+    url: '/enterprises/regional/page',
     method: 'POST',
     data: param
   })

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

@@ -227,7 +227,6 @@ export default {
         //   return;
         // }
       });
-      console.log(sums)
       return sums;
     },
 

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

@@ -29,7 +29,7 @@
               <!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
             <!--</template>-->
             <template slot-scope="scope">
-              <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
+              <span @click="childMethod(scope.row)" class="a-link" style="cursor: pointer;">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</span>
             </template>
 
           </el-table-column>
@@ -37,14 +37,14 @@
           <el-table-column prop="gdpGrowth" label="GDP增速" sortable width="100" :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="170" :formatter="formatStatus"/>
-          <el-table-column prop="gbr" label="一般公共预算收入（亿元）" sortable  width="180" :formatter="formatStatus"/>
-          <el-table-column prop="gbe" label="一般公共预算支出（亿 元）" sortable width="190" :formatter="formatStatus"/>
-          <el-table-column prop="govFundIncome" label="政府性基金收入（亿元）" sortable width="180" :formatter="formatStatus"/>
-          <el-table-column prop="govDebtBalance" label="地方政府债务余额（亿元）" sortable width="180" :formatter="formatStatus"/>
-          <el-table-column prop="uipInterestBearingDebt" label="城投平台有息债务（亿元）" sortable width="180" :formatter="formatStatus"/>
-          <el-table-column prop="fiscalSelfSufficiencyRate" label="财政自给率（%）" sortable width="120":formatter="formatStatus"/>
-          <el-table-column prop="govDebtRateWild" label="债务率-宽口径（%）" sortable :formatter="formatStatus"/>
+          <el-table-column prop="fixedInvestment" label="固定资产投资 （亿元） " sortable width="200" :formatter="formatStatus"/>
+          <el-table-column prop="gbr" label="一般公共预算收入（亿元）" sortable  width="200" :formatter="formatStatus"/>
+          <el-table-column prop="gbe" label="一般公共预算支出（亿 元）" sortable width="200" :formatter="formatStatus"/>
+          <el-table-column prop="govFundIncome" label="政府性基金收入（亿元）" sortable width="200" :formatter="formatStatus"/>
+          <el-table-column prop="govDebtBalance" label="地方政府债务余额（亿元）" sortable width="200" :formatter="formatStatus"/>
+          <el-table-column prop="uipInterestBearingDebt" label="城投平台有息债务（亿元）" sortable width="200" :formatter="formatStatus"/>
+          <el-table-column prop="fiscalSelfSufficiencyRate" label="财政自给率（%）" sortable width="150" :formatter="formatStatus"/>
+          <el-table-column prop="govDebtRateWild" label="债务率-宽口径（%）" sortable width="170" :formatter="formatStatus"/>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -147,6 +147,18 @@ export default {
         message: '功能正在开发中',
         type: 'warning'
       });
+    },
+    childMethod(item) {
+      let data={}
+      data.provinceId=item.provinceId;
+      data.cityId=item.cityId;
+      data.areaId=item.areaId;
+      if(item.area){
+        data.province=item.area;
+      }else {
+        data.province=item.province;
+      }
+      this.$parent.handleClick('first',data);
     }
   }
 }

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

@@ -96,6 +96,24 @@ export default {
       if(key === 'four'){
         this.activeName='four'
       }
+      if(key === 'first'){
+        this.activeName='first'
+      }
+      if(item.cityId){
+        if(this.provinceId.length >= 2){
+          this.provinceId.splice(1, 1, item.cityId);
+        }else {
+          this.provinceId.push(item.cityId)
+        }
+        if(item.areaId){
+          if(this.provinceId.length >= 3){
+            this.provinceId.splice(2, 1, item.areaId);
+          }else {
+            this.provinceId.push(item.areaId)
+          }
+        }
+        this.province=item.province;
+      }
       // sessionStorage.setItem('currentTab', this.activeName)
     },
     //地区

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

@@ -34,10 +34,10 @@
           highlight-current-row
           v-if="tableDataTotal > 0"
         >
-          <el-table-column label="序号" width="50" align="left" fixed>
+          <el-table-column label="序号" width="60" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="公司名称" align="left" fixed>
+          <el-table-column label="公司名称" align="left" fixed width="300">
             <template slot-scope="scope">
               <router-link v-if="scope.row.jskEid"  :to="`/company/${encodeStr(scope.row.jskEid)}`" tag="a" class="a-link" v-html="scope.row.name" ></router-link>
               <span v-else v-html="scope.row.name" ></span>
@@ -47,15 +47,15 @@
           <el-table-column label="资质资格" prop="aptitudeCountNew" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="专业人员" prop="persionCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="中标业绩" prop="recentlyCount" sortable="custom" width="120" :formatter="formatStatus"/>
-          <!--<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
+          <el-table-column label="最大中标金额（万元）" prop="bidMaxAmount" sortable="custom" width="170" :formatter="formatStatus"/>
+          <el-table-column label="中标总金额（万元）" prop="bidSumAmount" sortable="custom" width="170" :formatter="formatStatus"/>
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
-          <el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
+          <el-table-column label="公路业绩" prop="roadConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="水利业绩" prop="waterConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus"/>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
-          <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
-          <!--<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>-->
+          <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" :formatter="formatStatus"/>
+          <el-table-column label="常合作供应商" prop="topSupplier" width="150" :formatter="formatStatus"/>
         </el-table>
         <div class="empty" v-if="tableDataTotal === 0">
           <img class="img" src="@/assets/images/project/empty.png">

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -11,28 +11,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '万' : ''}}</span></h4>
+              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '亿' : ''}}</span></h4>
               <p>项目总投资额</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon1.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '万' : ''}}</span></h4>
+              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '亿' : ''}}</span></h4>
               <p>项目资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon2.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '万' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '亿' : ''}}</span></h4>
               <p>专项债融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon3.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '万' : ''}}</span></h4>
+              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '亿' : ''}}</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -41,28 +41,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '万' : ''}}</span></h4>
+              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '亿' : ''}}</span></h4>
               <p>其他资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon5.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '万' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '亿' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
               <p>专项债融资额/专项债只数</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon6.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '万' : ''}}</span></h4>
+              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '亿' : ''}}</span></h4>
               <p>其他融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon7.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '万' : ''}}</span></h4>
+              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '亿' : ''}}</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -95,7 +95,7 @@
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '万' : ''}}</span>
+          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '亿' : ''}}</span>
         </p>
       </div>
     </div>
@@ -130,8 +130,8 @@
               {{formatDate(scope.row.tenderDate)}}
             </template>
           </el-table-column>
-          <el-table-column prop="actualBondIssueScale" label="专项债规模（万）"  width="260" />
-          <el-table-column prop="isUsedProjectScale" label="用于项目规模(万)" width="260" />
+          <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）"  width="260" />
+          <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
           <el-table-column prop="isUsedCapital" label="是否资本金" width="200" />
         </el-table>
       </div>

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

@@ -52,11 +52,11 @@
               <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
             </template>
           </el-table-column>
-          <el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="165" />
-          <el-table-column prop="projectCapital" label="项目资本金（万元）" :formatter="formatStatus" align="right" sortable="custom"  width="155" />
-          <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="150" />
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" :formatter="formatStatus" align="right" sortable="custom" width="165" />
+          <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" align="right" sortable="custom"  width="160" />
+          <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="160" />
           <!--<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
-          <el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="180" />
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" align="right" sortable="custom" :formatter="formatStatus" width="180" />
           <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
             <!--<template slot-scope="scope">-->
               <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->

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

@@ -104,7 +104,7 @@
             </el-table-column>
             <el-table-column prop="label" label="月份"/>
             <el-table-column prop="count" sortable label="招标数量" align="right"/>
-            <el-table-column prop="rate" sortable label="占比" align="right"/>
+            <el-table-column prop="rate" sortable label="占比（%）" align="right"/>
           </el-table>
         </div>
       </div>

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

@@ -10,7 +10,7 @@
       <div class="main1">
         <div style="height: 300px;">
           <div class="left">
-            <div class="item" v-for="(item,index) in glData" :class="typeIndex === index ? 'color':''" @click="handleClick(1,index)">{{item.major}}<i></i></div>
+            <div class="item" v-for="(item,index) in glData" :class="typeIndex === index ? 'color':''" @click="handleClick(1,index)">{{item.major}}企业<i></i></div>
           </div>
           <div class="right">
             <div id="gl-echarts" style="height: 260px;background: #ffffff;"></div>
@@ -232,7 +232,7 @@ export default {
         for (let i=0; i<res.data.length; i++){
           res.data[i].levelList=res.data[i].levelList.reverse();
           let item={};
-          item.major=res.data[i].major;
+          item.major=res.data[i].major+'施工总承包';
           for (let j=0; j<res.data[i].levelList.length; j++){
             if(res.data[i].levelList[j].levelValue === '特级'){
               item.tjCount=res.data[i].levelList[j].count;

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

@@ -244,7 +244,11 @@
     <el-dialog :visible.sync="claimVisible" width="244" :show-close="false">
       <div>认领成功，是否完善客户信息？</div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="innerVisible = true">立即完善</el-button>
+        <el-button @click="innerVisible = true">
+          <router-link :to="`/enterprise/${encodeStr(companyId)}?customerId=${customerId}`" tag="a" >
+            立即完善
+          </router-link>
+        </el-button>
         <el-button @click="claimVisible = false">稍后</el-button>
       </div>
     </el-dialog>
@@ -288,6 +292,8 @@ export default {
       typeList:[],
       statistics:{},
       claimVisible:false,
+      customerId:'',
+      companyId:'',
     }
   },
   watch:{
@@ -386,7 +392,7 @@ export default {
         this.tableData = res.data.list;
         this.tableDataTotal = res.data.totalCount
       })
-      urbanInvestmentStatistics(param).then(res => {
+      urbanInvestmentStatistics(params).then(res => {
         this.statistics=res.data;
       })
     },
@@ -581,9 +587,11 @@ export default {
       });
     },
     handleClick(item){
+      this.companyId=item.companyId
       claim({uipId:item.uipId,companyName:item.companyName}).then(res => {
         if(res.code === 200){
           this.claimVisible=true;
+          this.customerId=res.data.customerId;
         }
       })
     },