修改

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

@@ -215,6 +215,14 @@ export function claim(param) {
     data: param
   })
 }
+//批量获取城投企业id
+export function getUipIdByCid(param) {
+  return request({
+    url: '/enterprise/getUipIdByCid',
+    method: 'POST',
+    data: param
+  })
+}
 
 
 

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

@@ -16,9 +16,9 @@
         <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
-    <div class="table-item" ref="regionalStyle">
-      <!--<div class="table-title" :class="fixed == true ? 'fixed' : ''" :style="'width:' + StyWidth">-->
-      <div class="table-title">
+    <div class="table-item" ref="regionalStyle" id="regionalStyle">
+      <div class="table-title" :class="fixed == true ? 'fixed' : ''" :style="'width:' + StyWidth">
+      <!--<div class="table-title">-->
         <span class="span-tit">指标</span>
         <span class="span-tit">
           <span class="address" v-if="value1Flag">{{addressValue1}}<i class="el-icon-circle-close" @click="handleDelete(1)"></i></span>
@@ -103,6 +103,7 @@
 
 <script>
   import dataRegion from '@/assets/json/dataRegion'
+  import elementResizeDetectorMaker from "element-resize-detector"
   import { regionalCompare,getYears,multipleCompare } from '@/api/macro/macro'
 export default {
   name: 'comparison',
@@ -300,10 +301,16 @@ export default {
     }
   },
   mounted(){
-    // window.addEventListener('scroll', this.handleScroll);
+    window.addEventListener('scroll', this.handleScroll);
+    const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("regionalStyle")
+    erd.listenTo(partBox, element => {
+      _this.$nextTick(() => {
+        this.StyWidth = partBox.offsetWidth + 'px';
+      })
+    })
   },
   destroyed () {
-    // window.removeEventListener('scroll', this.handleScroll)
+    window.removeEventListener('scroll', this.handleScroll)
   },
   created() {
     this.dataRegion();
@@ -340,10 +347,6 @@ export default {
         this.getData(params)
       }
     })
-
-    this.$nextTick(function () {
-      this.StyWidth = this.$refs.regionalStyle.offsetWidth + 'px';
-    })
   },
   computed: {
     getHeaders() {

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

@@ -25,7 +25,7 @@
           @sort-change="sortChange"
           :default-sort = "{prop: 'gdp', order: 'descending'}"
         >
-          <el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus" fixed>
+          <el-table-column prop="province" label="下辖区" width="100" :formatter="formatStatus" fixed>
             <!--<template slot-scope="scope">-->
               <!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
             <!--</template>-->

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

@@ -64,10 +64,10 @@
     <div class="content content2">
       <div class="common-title">经济信息</div>
       <div class="content-box">
-        <span><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
-        <span><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
+        <span @click="childMethod(1)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
+        <span @click="childMethod(2)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
         <span><img src="@/assets/images/economies/icon_3.png">城投平台授信余额 <label>{{recentlyYear.creditBalance}}<i>亿</i></label></span>
-        <span><img src="@/assets/images/economies/icon_4.png">城投平台营收账款 <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
+        <span><img src="@/assets/images/economies/icon_4.png">城投平台应收账款 <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
         <span><img src="@/assets/images/economies/icon_5.png">城投平台有息债务 <label>{{recentlyYear.uipInterestBearingDebt}}<i>亿</i></label></span>
       </div>
     </div>
@@ -77,7 +77,7 @@
           <span class="common-title">主要指标</span>
         </div>
         <div class="flex-box query-ability">
-          <span class="flex-box" @click="childMethod"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
+          <span class="flex-box" @click="childMethod(4)"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
@@ -674,12 +674,27 @@ export default {
         type: 'warning'
       });
     },
-    childMethod() {
+    childMethod(key) {
       let data=this.dataQuery
-      console.log(this.dataQuery,"||||||||")
       data.pId=this.dataQuery.provinceId
-      this.$parent.handleClick('four',data);
+      switch (key) {
+        case 1:
+          this.$parent.handleClick('second', data);
+          break;
+        case 2:
+          this.$router.push({
+            path: '/macro/urban',
+            query:{
+              provinceId:this.dataQuery.provinceId
             }
+          })
+          break;
+        case 4:
+          this.$parent.handleClick('four', data);
+          break;
+      }
+
+    },
   }
 }
 </script>

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

@@ -95,11 +95,15 @@ export default {
   },
   methods: {
     handleClick(key,item) {
+      console.log(key)
       if(key === 'four'){
-        this.activeName='four'
+        this.activeName=key
       }
       if(key === 'first'){
-        this.activeName='first'
+        this.activeName=key
+      }
+      if(key === 'second'){
+        this.activeName=key
       }
       if(item.cityId){
         if(this.provinceId.length >= 2){

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

@@ -38,7 +38,7 @@
           <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 width="350">
+          <el-table-column label="公司名称" align="left" fixed width="290">
             <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>
@@ -53,18 +53,18 @@
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :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="topCustomer" width="290" :formatter="formatStatus">
             <template slot-scope="scope">
-              <router-link v-if="scope.row.topCustomerId"  :to="`/company/${encodeStr(scope.row.topCustomerId)}`" tag="a" class="a-link" v-html="scope.row.topCustomer" ></router-link>
-              <span v-else v-html="scope.row.topCustomer" ></span>
+              <span style="cursor: pointer;" v-if="scope.row.topCustomerId"  @click="getUipIdByCid(scope.row.topCustomerId)" class="a-link" v-html="scope.row.topCustomer" ></span>
+              <span v-else>{{scope.row.topCustomer ? scope.row.topCustomer :'-'}}</span>
             </template>
           </el-table-column>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="150" :formatter="formatStatus"/>
-          <el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus">
+          <el-table-column label="常合作供应商" prop="topSupplier" width="290" :formatter="formatStatus">
             <template slot-scope="scope">
               <router-link v-if="scope.row.topSupplierId"  :to="`/company/${encodeStr(scope.row.topSupplierId)}`" tag="a" class="a-link" v-html="scope.row.topSupplier" ></router-link>
-              <span v-else v-html="scope.row.topSupplier" ></span>
+              <span v-else>{{scope.row.topSupplier ? scope.row.topSupplier :'-'}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -89,7 +89,7 @@
   // import Offsite from './component/offsite'
   import {encodeStr} from "@/assets/js/common.js"
   import aptitudeCode from '@/assets/json/aptitudeCode'
-  import { enterprise,location } from '@/api/macro/macro'
+  import { enterprise,location,getUipIdByCid } from '@/api/macro/macro'
 export default {
   name: 'Enterprises',
   // components: {LocalEnterprises,Offsite},
@@ -132,7 +132,7 @@ export default {
 
   },
   methods: {
-//资质Json
+  //资质Json
     async aptitudeCode() {
       // await axios.post("https://files.jiansheku.com/file/json/common/aptitudeCode.json", {}, {
       //   headers: {
@@ -245,6 +245,21 @@ export default {
       this.pageIndex = 1;
       this.querySubmit()
     },
+    getUipIdByCid(companyId){
+      var params=[companyId]
+      getUipIdByCid(params).then(res=>{
+        if (res.code==200) {
+          if(res.data&&res.data.length>0&&res.data[0].uipId){
+            this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
+          }else{
+            this.$router.push({path: '/company/'+this.encodeStr(companyId)})
+          }
+
+        }
+      }).catch(error=>{
+
+      });
+    },
   }
 }
 </script>
@@ -315,11 +330,12 @@ export default {
             }
           }
         }
-        ::v-deep .el-input{
+        ::v-deep .el-input.el-input-group{
           width: 250px;
           height: 32px;
           .el-input__inner{
             height: 32px;
+            border-right: 0;
           }
           .el-input-group__append{
             width: 59px;

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

@@ -139,6 +139,7 @@
           <span class="common-title">城投平台列表</span>
         </div>
         <div class="flex-box query-ability">
+          <span class="total">共{{tableDataTotal}}条</span>
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>