Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -3,6 +3,7 @@ package com.dsk.web.controller.search.controller;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.dtos.Page;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,32 +30,48 @@ public class BusinessOpportunityRadarController {
      * 公招标讯
      */
     @RequestMapping("/jskBidPage")
-    public AjaxResult jskBidPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidPage(compose);
+    public AjaxResult jskBidPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidPage(object);
     }
 
     /*
      * 土地交易
      */
     @RequestMapping("/landMarketPage")
-    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.landMarketPage(compose);
+    public AjaxResult landMarketPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.landMarketPage(object);
     }
 
     /*
      * 拟建项目
      */
     @RequestMapping("/establishmentPage")
-    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.establishmentPage(compose);
+    public AjaxResult establishmentPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.establishmentPage(object);
     }
 
     /*
      * 开标记录
      */
     @RequestMapping("/jskBidTenderPage")
-    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidTenderPage(compose);
+    public AjaxResult jskBidTenderPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidTenderPage(object);
     }
 
 
@@ -62,8 +79,12 @@ public class BusinessOpportunityRadarController {
      * 标讯pro
      */
     @RequestMapping("/jskBidNewsPage")
-    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidNewsPage(compose);
+    public AjaxResult jskBidNewsPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidNewsPage(object);
     }
 
 
@@ -71,16 +92,24 @@ public class BusinessOpportunityRadarController {
      * 专项债查询
      */
     @RequestMapping("/bondProjectPage")
-    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.bondProjectPage(compose);
+    public AjaxResult bondProjectPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.bondProjectPage(object);
     }
 
     /*
      * 投标计划查询
      */
     @RequestMapping("/jskBidPlanPage")
-    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidPlanPage(compose);
+    public AjaxResult jskBidPlanPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidPlanPage(object);
     }
 
     /*
@@ -103,7 +132,11 @@ public class BusinessOpportunityRadarController {
      * 招标来源网站
      */
     @RequestMapping("/bidSourceList")
-    public AjaxResult bidSourceList(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.bidSourceList(compose);
+    public AjaxResult bidSourceList(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.bidSourceList(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

 package com.dsk.web.controller.search.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
@@ -25,8 +26,12 @@ public class CompanySearchController {
      * 模糊查询企业名称
      */
     @RequestMapping("/index")
-    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.enterpriseIndex(compose);
+    public AjaxResult landMarketPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.enterpriseIndex(object);
     }
 
     /*
@@ -42,6 +47,9 @@ public class CompanySearchController {
      */
     @PostMapping("/page")
     public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         compose.getPage().setPage(compose.getPageNum());
         compose.getPage().setLimit(compose.getPageSize());
         compose.getPage().setField(compose.getField());

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/PageQueryLimit.java

+package com.dsk.web.controller.search.controller;
+
+import com.dsk.common.dtos.Page;
+
+/**
+ * @author lc
+ * @date 2023/6/20 17:48
+ */
+public class PageQueryLimit {
+
+    public static boolean pageLimit(Page page){
+        if (null == page) {
+            return true;
+        }
+        if (null==page.getLimit()||null==page.getPage()){
+            return true;
+        }
+        if ( page.getPage()*page.getLimit()>10000){
+            return true;
+        }
+        return false;
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -12,29 +12,30 @@ import com.dsk.common.dtos.ComposeQueryDto;
 public interface BusinessOpportunityRadarService {
 
 
-    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
-    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+    AjaxResult jskBidNewsPage(JSONObject object);
 
-    AjaxResult jskBidPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(JSONObject object);
 
-    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult jskBidPage(JSONObject object);
 
-    AjaxResult establishmentPage(ComposeQueryDto compose);
+    AjaxResult landMarketPage( JSONObject object);
 
-    AjaxResult enterpriseIndex(ComposeQueryDto compose);
+    AjaxResult establishmentPage(JSONObject object);
+
+    AjaxResult enterpriseIndex(JSONObject object);
 
     AjaxResult enterpriseByName(String keyword);
 
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
-    AjaxResult bondProjectPage(ComposeQueryDto compose);
+    AjaxResult bondProjectPage( JSONObject object);
 
-    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+    AjaxResult jskBidPlanPage( JSONObject object);
 
     AjaxResult getCapitalSourceSelect();
 
     AjaxResult keywordList();
 
-    AjaxResult bidSourceList(ComposeQueryDto compose);
+    AjaxResult bidSourceList( JSONObject object);
 
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -26,45 +26,45 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
 
 
     @Override
-    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidNewsPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
-    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidTenderPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult establishmentPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult establishmentPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult jskBidPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult landMarketPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult landMarketPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterpriseIndex(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -78,14 +78,14 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult bondProjectPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidPlanPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -102,8 +102,8 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult bidSourceList(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult bidSourceList(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

@@ -45,9 +45,13 @@ public class JskBidPlanDto {
 	Double startPlanTenderAmount;
 	Double endPlanTenderAmount;
 	//资金来源
-	String projecetCapitalSource;
+	String projectCapitalSource;
 	//发布时间
 	String issueTime;
+	//计划发布开始时间
+	String planTenderDateStart;
+	//计划发布截止时间
+	String planTenderDateEnd;
 	//来源网站
 	String sourceName;
 

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

@@ -16,6 +16,8 @@ public class SpecialBondProjectDto {
 	String uuid;
 
 	String projectName;
+	//match精确   like模糊
+	String nameType;
 
 	String projectType;
 	//项目总投资

dsk-operate-ui/src/assets/styles/index.scss

@@ -312,7 +312,9 @@ ul, li {
       height: auto !important;
       bottom: 16px;
     }
-
+    .el-table__body tr.current-row > td.el-table__cell{
+      background: none;
+    }
     .caret-wrapper{
       width: 10px;
     }
@@ -348,6 +350,30 @@ ul, li {
         background-color: #F8FBFF;
       }
     }
+    ::-webkit-scrollbar-track-piece {
+      //滚动条凹槽的颜色，还可以设置边框属性
+      background-color: #F3F4F5;
+      height: 16px;
+      padding: 0 4px;
+    }
+    //滚动条的宽度
+    ::-webkit-scrollbar {
+      width: 8px;
+      height: 16px;
+      background-color: #F3F4F5;
+      border-radius: 6px;
+    }
+    //滚动条的滑块
+    ::-webkit-scrollbar-thumb {
+      border-radius: 8px;
+      height: 8px;
+      margin: 0 4px;
+      background: rgba(98,110,126,0.2);
+      border: 4px solid #F3F4F5;
+      &:hover{
+        background: #566380;
+      }
+    }
   }
 }
 

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

@@ -36,11 +36,11 @@
           <el-table-column label="产业类型" prop="projectType"></el-table-column>
           <el-table-column :label="oneYear">
             <el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column>
-            <el-table-column prop="rate" label="占比"> </el-table-column>
+            <el-table-column prop="rate" label="占比（%）"> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
             <el-table-column prop="lastMoney" label="金额（亿元）"> </el-table-column>
-            <el-table-column prop="lastRate" label="占比" > </el-table-column>
+            <el-table-column prop="lastRate" label="占比（%）" > </el-table-column>
           </el-table-column>
         </el-table>
       </div>
@@ -166,6 +166,7 @@ export default {
             return result
           },
         },
+        color:['#547FF7', '#63B6EA', '#93A1FF','#60C585','#FF956A','#F6BE5F','#946AFF','#36A860','#7781DD','#E372C6','#F7A396','#3BAAA9','#3F8DB1','#329857','#4A6DCD','#E75E5C','#BE59A4','#FFC094','#7B65DF','#FB8BA7','#CB9EFF'],
         series: [
           {
             type: 'treemap',

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

@@ -358,7 +358,6 @@ export default {
         },
         grid: {
           top:20,
-          // left:15,
           // right:15,
           bottom:0,
         },
@@ -608,6 +607,7 @@ export default {
         },
         grid: {
           top:20,
+          // left:5,
           bottom:0,
         },
         series: [
@@ -621,7 +621,7 @@ export default {
             },
             label: {
               show: true,
-              position: 'top'
+              position: 'top',
             },
             //设置折线颜色和粗细
             lineStyle: {
@@ -722,6 +722,7 @@ export default {
               width: 20px;
               height: 20px;
               margin-left: 22px;
+              margin-bottom: -2px;
             }
           }
           .item-text{
@@ -754,10 +755,10 @@ export default {
           width: 20%;
           line-height: 26px;
           img{
-            width: 12px;
-            height: 12px;
+            width: 16px;
+            height: 16px;
             margin-right: 4px;
-            margin-bottom: -1px;
+            margin-bottom: -4px;
           }
           label{
             font-weight: 700;

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

@@ -110,9 +110,9 @@ export default {
     }
   },
   created() {
-    location({provinceId:'500000'}).then(res => {
-      this.province=res.data.currentProvince.regionName;
-      this.provinceId=res.data.currentProvince.id;
+    location({}).then(res => {
+      this.province=res.data.province;
+      this.provinceId=res.data.provinceId;
       this.querySubmit()
     })
     this.aptitudeCode()
@@ -159,8 +159,10 @@ export default {
         params.aptitudeQueryDto.aptitudeDtoList=aptitudeType
       }
       enterprise(params).then(res => {
+        if(res.code === 200){
           this.tableData=res.data.list;
           this.tableDataTotal=res.data.total;
+        }
       })
     },
     // 重置页数
@@ -187,6 +189,7 @@ export default {
       this.querySubmit()
     },
     handleClick(){
+      console.log(this.activeName)
       this.queryParams.codeStr=[]
       this.aptitudeType='';
       this.queryParams={

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="155" />
-          <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" align="right" sortable="custom"  width="155" />
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
+          <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="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
-          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
           <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>-->
@@ -174,6 +174,7 @@ export default {
           itemWidth:12,
           pageButtonPosition: 'end',
         },
+        color:['#8A82F3', '#93A1FF', '#63B6EA','#42B393','#8ECF95','#FFDC6B','#FFC08D','#FE9C77','#E8649B','#A151F5'],
         series: [
           {
             type: 'pie',
@@ -310,11 +311,49 @@ export default {
       .box-right{
         float: right;
         ::v-deep .el-table{
+          td.el-table__cell{
+            border-bottom: 0;
+          }
+          tr{
+            &.current-row>td{
+              background-color: initial;
+            }
+            &:nth-child(2n) {
+              background: #F8FBFF;
+            }
+          }
           .el-table__cell{
             height: 40px;
             padding: 0;
             line-height: 40px;
           }
+          ::-webkit-scrollbar-track-piece {
+            //滚动条凹槽的颜色，还可以设置边框属性
+            background-color: #F3F4F5;
+            height: 16px;
+            padding: 0 4px;
+          }
+          //滚动条的宽度
+          ::-webkit-scrollbar {
+            width: 8px;
+            height: 8px;
+            background-color: #F3F4F5;
+            border-radius: 6px;
+          }
+          //滚动条的滑块
+          ::-webkit-scrollbar-thumb {
+            border-radius: 8px;
+            height: 8px;
+            margin: 0 4px;
+            background: rgba(98,110,126,0.2);
+            border: 4px solid rgba(98,110,126,0.2);;
+            &:hover{
+              background: #566380;
+            }
+          }
+          .gutter{
+            background: #f8f8f9;
+          }
         }
       }
     }

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

@@ -237,17 +237,15 @@ export default {
   },
   methods: {
     open(row) {
+      this.dialogVisible = true;
       this.$nextTick(() => {
         this.getDetail(row)
       })
     },
     // 获取明细
     async getDetail(row) {
-      console.log(row)
       getNationalDetails({id:row.id}).then(res => {
-        console.log(res.data)
         this.tableData=res.data;
-        this.dialogVisible = true;
       })
     },
     formatStatus: function(row, column, cellValue) {

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

@@ -12,7 +12,10 @@
           <el-radio label="2">本级</el-radio>
         </el-radio-group>
         <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 style="cursor: pointer;" :class="searchState ? 'color':''" @click="handleSearch">筛选
+            <i v-if="searchState" class="el-icon-caret-top" style="color:#0081FF;"></i>
+            <i v-else class="el-icon-caret-bottom" style="color:rgba(35,35,35,0.4);"></i>
+          </span>
           <div v-show="searchState" ref="showContent" class="search-main">
             <div class="item">
               <span class="wrap_label">行政等级</span>
@@ -604,6 +607,9 @@ export default {
           /*cursor: pointer;*/
           color:#232323;
           position: relative;
+          .color{
+            color:#0081FF;
+          }
           .search-main{
             background: #ffffff;
             box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
@@ -635,6 +641,11 @@ export default {
                   cursor: pointer;
                   margin-right: 8px;
                 }
+                span:hover{
+                  background: #F3F4F5;
+                  border-radius: 4px;
+                  color:#232323;
+                }
                 .color_text{
                   background: #F3F4F5;
                   border-radius: 4px;