修改

dsk-operate-ui/src/api/detail/party-a/urbanLnvestment.js

@@ -32,3 +32,11 @@ export function urbanInvestmentPage(data) {
     data
   })
 }
+// 同地区城投-查询选项
+export function uipGroupData(data) {
+  return request({
+    url: '/enterprise/uipGroupData',
+    method: 'post',
+    data
+  })
+}

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -28,7 +28,7 @@
             :min-width="item.minWidth"
             :align="item.align?item.align:'left'"
             :fixed="item.fixed"
-            :sortable="item.sortable"
+            :sortable="item.sortable ? 'custom' : false"
             :resizable="false">
               <template v-if="item.slotHeader" slot="header">
                 <slot :name="item.slotName"></slot>

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -60,8 +60,6 @@ export default {
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },

dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue

@@ -75,8 +75,6 @@ export default {
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -4,6 +4,7 @@
       <div class="flex-box query-params">
         <span class="common-title">区域经济</span>
       </div>
+      <div class="params-dw"><img src="@/assets/images/addree.png" />广东省-广州市</div>
     </div>
     <div class="table-item">
       <el-table
@@ -253,6 +254,16 @@ export default {
   }
   .query-box{
     margin: 10px 0 20px;
+    .params-dw{
+      font-size: 14px;
+      font-weight: 400;
+      color: #0081FF;
+      img{
+        width: 14px;
+        height: 14px;
+        margin-right: 5px;
+      }
+    }
   }
 }
 

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -10,79 +10,79 @@
     >
       <template slot="slot">
         <div class="search-box">
-          <span style="cursor: pointer;" @click="handleSearch">筛选<i class="el-icon-caret-bottom" style="color:rgba(35,35,35,0.4);margin-left: 5px"></i></span>
+          <span class="search-box-t"
+                :class="queryParams.uipExecutiveLevel ||
+                queryParams.uipBusinessType.length > 0 ||
+                queryParams.bratingSubjectLevel.length > 0 ||
+                queryParams.shareholderBg.length > 0 ||
+                queryParams.equityRelationship.length > 0 ||
+                queryParams.platformImportance.length > 0 ||
+                queryParams.developmentZone.length > 0 ? 'search-box-ta' : ''"
+                @click="handleSearch1">筛选<i :class="searchState ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"></i></span>
           <div v-show="searchState" ref="showContent" class="search-main">
             <div class="item">
               <span class="wrap_label">行政等级</span>
               <div class="item_ckquery">
-                <span :class="{color_text:xzdjCalss == ''}" @click="changeXZDJ('')">全部</span>
+                <span :class="{color_text:queryParams.uipExecutiveLevel == ''}" @click="changeXZDJ('')">全部</span>
                 <template v-for="(item,index) in xzdj">
-                  <span :class="{color_text:index+1 === xzdjCalss}" @click="changeXZDJ(index+1)">{{item.name}}</span>
+                  <span :class="{color_text:item == queryParams.uipExecutiveLevel}" @click="changeXZDJ(item)">{{item}}</span>
                 </template>
               </div>
             </div>
             <div class="item">
               <span class="wrap_label">城投业务类型</span>
               <div class="item_ckquery">
-                <span>全部</span>
-                <template v-for="(item,index) in typeList">
-                  <span>{{item}}</span>
+                <span :class="{color_text:queryParams.uipBusinessType.length == 0}" @click="changeBeCurrent('','uipBusinessType')">全部</span>
+                <template v-for="(item,index) in uipGroupDatalist.uipBusinessType">
+                  <span :class="{color_text:queryParams.uipBusinessType.includes(item)}" @click="changeBeCurrent(item,'uipBusinessType')">{{item}}</span>
                 </template>
               </div>
             </div>
             <div class="item">
               <span class="wrap_label">主体评级</span>
               <div class="item_ckquery">
-                <span>全部</span>
-                <template v-for="(item,index) in ztpj">
-                  <span>{{item}}</span>
+                <span :class="{color_text:queryParams.bratingSubjectLevel.length == 0}" @click="changeBeCurrent('','bratingSubjectLevel')">全部</span>
+                <template v-for="(item,index) in uipGroupDatalist.bratingSubjectLevel">
+                  <span  :class="{color_text:queryParams.bratingSubjectLevel.includes(item)}" @click="changeBeCurrent(item,'bratingSubjectLevel')">{{item}}</span>
                 </template>
               </div>
             </div>
             <div class="item">
               <span class="wrap_label">股东背景</span>
               <div class="item_ckquery">
-                <span>全部</span>
-                <template v-for="(item,index) in gdbj">
-                  <span>{{item}}</span>
+                <span :class="{color_text:queryParams.shareholderBg.length == 0}" @click="changeBeCurrent('','shareholderBg')">全部</span>
+                <template v-for="(item,index) in uipGroupDatalist.shareholderBg">
+                  <span :class="{color_text:queryParams.shareholderBg.includes(item)}" @click="changeBeCurrent(item,'shareholderBg')">{{item}}</span>
                 </template>
               </div>
             </div>
             <div class="item">
               <span class="wrap_label">股权关系</span>
               <div class="item_ckquery">
-                <span>全部</span>
-                <template v-for="(item,index) in gqgx">
-                  <span>{{item}}</span>
+                <span :class="{color_text:queryParams.equityRelationship.length == 0}" @click="changeBeCurrent('','equityRelationship')">全部</span>
+                <template v-for="(item,index) in uipGroupDatalist.equityRelationship">
+                  <span :class="{color_text:queryParams.equityRelationship.includes(item)}" @click="changeBeCurrent(item,'equityRelationship')">{{item}}</span>
                 </template>
               </div>
             </div>
             <div class="item">
               <span class="wrap_label">平台重要性</span>
               <div class="item_ckquery">
-                <span>全部</span>
-                <template v-for="(item,index) in pt">
-                  <span>{{item}}</span>
+                <span :class="{color_text:queryParams.platformImportance.length == 0}" @click="changeBeCurrent('','platformImportance')">全部</span>
+                <template v-for="(item,index) in uipGroupDatalist.platformImportance">
+                  <span :class="{color_text:queryParams.platformImportance.includes(item)}" @click="changeBeCurrent(item,'platformImportance')">{{item}}</span>
                 </template>
               </div>
             </div>
             <div class="item">
-              <span class="wrap_label" style="width: 78px;">开发区类别</span>
+              <span class="wrap_label">开发区类别</span>
               <div class="item_ckquery">
-                <span>全部</span>
+                <span :class="{color_text:queryParams.developmentZone.length == 0}" @click="changeBeCurrent('','developmentZone')">全部</span>
                 <template v-for="(item,index) in lfqType">
-                  <span>{{item}}</span>
+                  <span :class="{color_text:queryParams.developmentZone.includes(item)}" @click="changeBeCurrent(item,'developmentZone')">{{item}}</span>
                 </template>
               </div>
             </div>
-            <div class="item">
-              <span class="wrap_label">更多筛选</span>
-              <div class="item_ckquery">
-                <span :class="addresslength>0?'select-active':''">注册地区{{addresslength>0?(addresslength+'项'):''}}</span>
-                <el-cascader ref="address" class="cascader-region" popper-class='cascader-region-addd'
-                             @input="addressListbtn"  v-model="addressType" :options="addressList" :props="props" collapse-tags></el-cascader>
-              </div>
-            </div>
           </div>
         </div>
       </template>
@@ -109,7 +109,8 @@
 import mixin from '../mixins/mixin'
 import dataRegion from '@/assets/json/dataRegion'
 import {
-  urbanInvestmentPage
+  urbanInvestmentPage,
+  uipGroupData
 } from '@/api/detail/party-a/urbanLnvestment'
 export default {
   name: 'SameRegion',
@@ -122,12 +123,22 @@ export default {
       queryParams: {
         provinceId: 500000,
         cityId: 500100,
+        uipExecutiveLevel: '',
+        uipBusinessType: [],
+        bratingSubjectLevel: [],
+        shareholderBg: [],
+        equityRelationship: [],
+        platformImportance: [],
+        developmentZone: [],
         pageNum: 1,
         pageSize: 15
       },
       forData: [
         {label: '企业名称', prop: 'companyName', width: '369', slot: true},
         {label: '区域', prop: 'area', width: '100'},
+        {label: '招标数量', prop: 'biddingCount', width: '100', sortable: true},
+        {label: '城投拿地', prop: 'landInfoCount', width: '100', sortable: true},
+        {label: '供应商', prop: 'supplierCount', width: '100', sortable: true},
         {label: '主体评级', prop: 'bratingSubjectLevel', width: '110'},
         {label: '债劵余额（亿元）', prop: 'bondBalance', width: '130'},
         {label: '行政级别', prop: 'uipExecutiveLevel', width: '120'},
@@ -153,22 +164,9 @@ export default {
       ],
       formData: [
         { type: 0, fieldName: 'penalizeReasonType', value: '', placeholder: '筛选', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
-      ],
-      xzdj:[
-        {
-          name:'省级',
-          key:1,
-        },
-        {
-          name:'地级市',
-          key:2,
-        },
-        {
-          name:'区县级',
-          key:3,
-        }
+        { type: 3, fieldName: 'keyword', value: '', placeholder: '请输入关键词', options: []},
       ],
+      xzdj:['省级','地级市','区县级'],
       selected:[],
       xzdjCalss:'',
       typeList:['土地开发整理','基础设施建设','棚改保障房建设','公用事业','文化旅游','交通建设运营','产投平台'],
@@ -185,6 +183,7 @@ export default {
       addressType: [],
       addresslength: 0,
       searchState:false,
+      uipGroupDatalist:[],
       //列表
       tableLoading:false,
       tableData:[],
@@ -193,6 +192,7 @@ export default {
   },
   created() {
     this.handleQuery()
+    this.getScreen()
   },
   computed: {
 
@@ -250,8 +250,8 @@ export default {
       }
       this.addressList = str;
     },
-
-    handleSearch(event){
+    // 筛选
+    handleSearch1(event){
       // this.searchState=!this.searchState;
       let dom = this.$refs.showContent;
       if (!dom.contains(event.target)) {
@@ -259,8 +259,43 @@ export default {
         document.removeEventListener('click', this.handleSearch);
       }
     },
+    // 请求筛选条件
+    getScreen(){
+      uipGroupData().then(res => {
+        this.uipGroupDatalist = res.data
+      })
+    },
+
     changeXZDJ(index) {
-      this.xzdjCalss = index;
+      this.queryParams.uipExecutiveLevel = index;
+      this.changes()
+    },
+    changeBeCurrent(index,name) {
+      if(index){
+        let i = this.queryParams[name].indexOf(index)
+        if(i == -1){
+          this.queryParams[name].push(index);
+        }else{
+          this.queryParams[name].splice(i,1);
+        }
+      }else{
+        this.queryParams[name] = []
+      }
+      this.changes()
+      this.$forceUpdate();
+    },
+    changes(){
+      let params = this.formParams()
+      params.pageNum = 1
+      this.queryParams.pageNum = 1
+      params.uipExecutiveLevel = this.queryParams.uipExecutiveLevel
+      params.uipBusinessType = this.queryParams.uipBusinessType
+      params.bratingSubjectLevel = this.queryParams.bratingSubjectLevel
+      params.shareholderBg = this.queryParams.shareholderBg
+      params.equityRelationship = this.queryParams.equityRelationship
+      params.platformImportance = this.queryParams.platformImportance
+      params.developmentZone = this.queryParams.developmentZone
+      this.handleQuery(params)
     },
     addressListbtn() {
       let arr = this.$refs.address.getCheckedNodes();
@@ -290,7 +325,50 @@ export default {
           this.tableDataTotal = res.data.totalCount
         this.tableLoading = false
       })
+    },
+    //排序
+    sortChange(e){
+      if(e.order=='ascending'){
+        this.queryParams.field = e.prop
+        this.queryParams.order = 'asc'
+      }else if(e.order=='descending'){
+        this.queryParams.field = e.prop
+        this.queryParams.order = 'desc'
+      }else{
+        delete this.queryParams.field
+        delete this.queryParams.order
+      }
+      this.handleSearch();
+    },
+    // attr 参数表示当前点击的是哪一列，传进来的是点击列的标识
+    // rev 参数表示的是点击当前列表头之后是升序降序或者null，三种值分别是['ascending', 'descending', null]
+    sortFun(attr, rev){
+      if(rev === 'ascending') {
+        rev = 1
+      } else if (rev === 'descending') {
+        rev = -1
+      } else {
+        rev = 0
+      }
+      return function (x, y) {
+        let a = x[attr]
+        let b = y[attr]
+        if (!a) {
+          a = ""
+        }
+        if (!b) {
+          b = ""
+        }
+        if (a < b) {
+          return rev * -1
+        }
+        if (a > b) {
+          return rev * 1
+        }
+        return 0
+      }
     }
+
   }
 }
 </script>
@@ -304,10 +382,26 @@ export default {
   }
   .search-box{
     display: inline-block;
-    margin-right: 32px;
     /*cursor: pointer;*/
-    color:#232323;
     position: relative;
+    .search-box-t{
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 32px;
+      color:#232323;
+      margin-right: 8px;
+      cursor: pointer;
+      i{
+        color:rgba(35,35,35,0.4);
+        margin-left: 5px
+      }
+    }
+    .search-box-ta{
+      color: #0081FF;
+      i{
+        color: #0081FF;
+      }
+    }
     .search-main{
       background: #ffffff;
       box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
@@ -331,11 +425,13 @@ export default {
         }
         .item_ckquery{
           position: relative;
+          flex: 1;
           span{
             color: #232323;
-            padding: 5px 12px;
+            padding: 5px 6px;
             display: inline-block;
             cursor: pointer;
+            margin-right: 8px;
           }
           .color_text{
             background: #F3F4F5;

dsk-operate-ui/vue.config.js

@@ -35,6 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://122.9.160.122:9011`,
+        // target: `http://192.168.60.126:9011`,
+        // target: `http://192.168.60.27:8766`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''