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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java

@@ -39,8 +39,9 @@ public class BusinessInfoController extends BaseController
      * 项目批量导入
      */
     @PostMapping("/upload")
-    public AjaxResult batchUpload(@RequestParam(value="file",required = false) MultipartFile file, HttpServletRequest request, HttpServletResponse response){
-         return businessInfoService.batchUpload(file,response);
+//    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response){
+    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file){
+         return businessInfoService.batchUpload(file);
     }
 
     /**

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

@@ -105,4 +105,16 @@ public class EnterpriseController {
         return enterpriseService.financial(vo);
     }
 
+    @ApiOperation(value = "城投平台企业查询（openApi）")
+    @PostMapping(value = "uipSerach")
+    public TableDataInfo uipSerach(@RequestBody @Valid EnterpriseUipSearchBody vo) throws Exception {
+        return enterpriseService.uipSerach(vo);
+    }
+
+    @ApiOperation(value = "城投平台企业查询选项（openApi）")
+    @PostMapping(value = "uipGroupData")
+    public R financial() throws Exception {
+        return enterpriseService.uipGroupData();
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.dsk.web.controller.search.macroMarket;
 
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@ public class RegionalEconomicDataController {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/national/nationalPage")
-    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1PageDto dto) {
         return economicService.nationalPage(dto);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

@@ -118,6 +118,78 @@ public class BusinessInfo extends BaseEntity
     @Excel(name = "项目状态")
     private Integer status;
 
+    /** 评标办法 */
+    @Excel(name = "评标办法")
+    private String evaluationBidWay;
+
+    /** 开标时间 */
+    @Excel(name = "开标时间")
+    private String bidOpenTime;
+
+    /** 开标地点 */
+    @Excel(name = "开标地点")
+    private String bidOpenPlace;
+
+    /** 保证金缴纳 */
+    @Excel(name = "保证金缴纳")
+    private String earnestMoneyPay;
+
+    /** 保证金金额 */
+    @Excel(name = "保证金金额")
+    private String earnestMoney;
+
+    /** 评标委员会 */
+    @Excel(name = "评标委员会")
+    private String evaluationBidCouncil;
+
+    public String getEvaluationBidWay() {
+        return evaluationBidWay;
+    }
+
+    public void setEvaluationBidWay(String evaluationBidWay) {
+        this.evaluationBidWay = evaluationBidWay;
+    }
+
+    public String getBidOpenTime() {
+        return bidOpenTime;
+    }
+
+    public void setBidOpenTime(String bidOpenTime) {
+        this.bidOpenTime = bidOpenTime;
+    }
+
+    public String getBidOpenPlace() {
+        return bidOpenPlace;
+    }
+
+    public void setBidOpenPlace(String bidOpenPlace) {
+        this.bidOpenPlace = bidOpenPlace;
+    }
+
+    public String getEarnestMoneyPay() {
+        return earnestMoneyPay;
+    }
+
+    public void setEarnestMoneyPay(String earnestMoneyPay) {
+        this.earnestMoneyPay = earnestMoneyPay;
+    }
+
+    public String getEarnestMoney() {
+        return earnestMoney;
+    }
+
+    public void setEarnestMoney(String earnestMoney) {
+        this.earnestMoney = earnestMoney;
+    }
+
+    public String getEvaluationBidCouncil() {
+        return evaluationBidCouncil;
+    }
+
+    public void setEvaluationBidCouncil(String evaluationBidCouncil) {
+        this.evaluationBidCouncil = evaluationBidCouncil;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -359,7 +431,12 @@ public class BusinessInfo extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
             .append("customerId", getCustomerId())
-            .append("status", getStatus())
+            .append("evaluationBidWay", getEvaluationBidWay())
+            .append("bidOpenTime", getBidOpenTime())
+            .append("bidOpenPlace", getBidOpenPlace())
+            .append("earnestMoneyPay", getEarnestMoneyPay())
+            .append("earnestMoney", getEarnestMoney())
+            .append("evaluationBidCouncil", getEvaluationBidCouncil())
             .toString();
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseUipSearchBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseUipSearchBody extends BasePage {
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 1金额倒序，2金额正序，3时间倒序，4时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+    /**
+     * 省份
+     */
+    private List<Integer> provinceIds;
+
+    /**
+     * 市份
+     */
+    private List<Integer> cityIds;
+
+    /**
+     * 县
+     */
+    private List<Integer> areaIds;
+
+    /**
+     * 城投业务类型
+     */
+    private List<String> uipBusinessType;
+
+    /**
+     * 主体信用等级
+     */
+    private List<String> bratingSubjectLevel;
+
+    /**
+     * 股东背景
+     */
+    private List<String> shareholderBg;
+
+    /**
+     * 股权关系
+     */
+    private List<String> equityRelationship;
+
+}

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

 package com.dsk.common.dtos;
 
-import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
 /**
@@ -11,27 +10,40 @@ import lombok.Data;
  * @Version
  */
 @Data
-public class OpRegionalEconomicDataV1Dto extends BasePage {
+public class OpRegionalEconomicDataV1Dto {
+
+    /**
+     * id
+     */
+    private Integer id;
 
     /**
      * 年份
      */
     private Integer year;
+
     /**
-     * 省
+     * 省Id
      */
-    private String provinceId;
+    private Integer provinceId;
+
     /**
-     * 市
+     * 市Id
      */
-    private String cityId;
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+
     /**
-     * 区
+     * 城市类型 1：直辖市
      */
-    private String areaId;
+    private Integer cityType;
 
     /**
-     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     * 城市类型 1：直辖市
      */
-    private Integer type;
+    private Integer provinceType;
 }

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

+package com.dsk.common.dtos;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1PageDto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataV1PageDto extends BasePage {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+    /**
+     * 省
+     */
+    private List<String> provinceIds;
+    /**
+     * 市
+     */
+    private List<String> cityIds;
+    /**
+     * 区
+     */
+    private List<String> areaIds;
+
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private Integer type;
+
+    /**
+     * 排序字段 默认gdp
+     */
+    private String field = "gdp";
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order = "desc";
+}

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

+import request from "@/utils/request";
+
+// 获取查询下拉选项
+export function getOption() {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}
+
+// 获取列表数据
+export function getList(data) {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}

dsk-operate-ui/src/router/index.js

@@ -125,7 +125,7 @@ export const constantRoutes = [
         path: '/macro/financing/details/:id(\\d+)',
         component: () => import('@/views/macro/financing/details'),
         name: 'financingDetails',
-        meta: { title: '区域专项债详情', icon: 'user' }
+        meta: { title: '区域专项债详情'}
       }
     ]
   },

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

@@ -35,7 +35,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input v-model="form.value" placeholder="请输入关键词"></el-input>
+                <el-input v-model="form.value" :placeholder="form.placeholder"></el-input>
                 <span @click="changeSelect">搜索</span>
               </div>
             </template>

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

@@ -15,9 +15,9 @@
           <template slot="title">
             <span>{{item.title}}</span>
           </template>
-          <el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)">{{it.title}}</el-menu-item>
+          <el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)" :disabled="it.disabled">{{it.title}}</el-menu-item>
         </el-submenu>
-        <el-menu-item :index="index.toString()" @click="handleItem(item)" v-else>{{item.title}}</el-menu-item>
+        <el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="item.disabled" v-else>{{item.title}}</el-menu-item>
       </template>
     </el-menu>
   </div>
@@ -50,13 +50,13 @@ export default {
         ]},
         {title: '财务简析', pathName: 'financial'},
         {title: '项目商机', pathName: '', children: [
-          {title: '土地交易', pathName: ''},
-          {title: '拟建项目', pathName: ''},
-          {title: '专项债项目', pathName: ''},
-          {title: '招标计划', pathName: ''},
-          {title: '招标公告', pathName: ''},
-          {title: '标讯Pro', pathName: ''},
-          {title: '行政许可', pathName: ''}
+          {title: '土地交易', pathName: 'landtransaction'},
+          {title: '拟建项目', pathName: 'proposed'},
+          {title: '专项债项目', pathName: 'bond'},
+          {title: '招标计划', pathName: 'biddingplan'},
+          {title: '招标公告', pathName: 'announcement'},
+          {title: '标讯Pro', pathName: 'tencent'},
+          {title: '行政许可', pathName: 'administrative'}
         ]},
         {title: '业务往来', pathName: '', children: [
           {title: '客户', pathName: ''},
@@ -80,7 +80,7 @@ export default {
           {title: '开庭公告', pathName: 'openacourtsessionNotice'},
           {title: '信用中国', pathName: ''}
         ]},
-        {title: '商务信息', pathName: 'business'},
+        // {title: '商务信息', pathName: 'business'},
         {title: '招标偏好', pathName: 'preference'},
         {title: '合作情况', pathName: 'cooperate'},
         {title: '决策链条', pathName: 'decisionMaking'},

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

@@ -24,6 +24,7 @@
             :label="item.label"
             :prop="item.prop"
             :width="item.width"
+            :min-width="item.minWidth"
             align="left"
             :fixed="item.fixed"
             :sortable="item.sortable"

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

+<!-- 表格组件 -->
+<template>
+  <div class="infoTable-container">
+    <el-form v-if="Object.keys(obj).length > 0" class="infoTable-form" label-position="left">
+      <template v-for="(item, index) in list">
+        <el-form-item :style="item.span?{width: `${100/(24/item.span)}%`}:{}" :label="item.name" :label-width="labelWidth?labelWidth+'px':'130px'" :key="index" :class="[
+            { 'infoTable-form-view': item.style },
+            { 'infoTable-form-item': !item.style },
+            { 'infoTable-form-row': item.rowstyle }
+          ]">
+          <div>
+            <template v-if="item.slot === true">
+              <slot :name="item.prop" :data="obj"></slot>
+            </template>
+            <span v-else> {{  obj[item.prop] ?obj[item.prop] !==""?item.formatter?item.formatter(obj[item.prop]):obj[item.prop]:'--' :'--' }}</span>
+          </div>
+        </el-form-item>
+      </template>
+    </el-form>
+    <div v-else class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂时没有找到相关数据" />
+        <span>暂时没有找到相关数据</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "InfoTable",
+  components: {
+
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => [],
+    },
+    obj: {
+      type: Object,
+      default: () => { }
+    },
+    labelWidth: {
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      show:false,
+      // 当前移入单元格内容
+      noData: require("@/assets/images/detail/noData.png")
+    };
+  },
+  created() {
+  },
+  mounted(){
+    this.show = true;
+  },
+  methods: {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.infoTable-container {
+  .infoTable-form {
+    display: flex;
+    flex-wrap: wrap;
+    border-left: 1px solid #e5e9f5;
+    border-top: 1px solid #e5e9f5;
+    border-collapse: collapse;
+    .infoTable-form-item {
+      width: 50%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 12px;
+    }
+    .infoTable-form-view {
+      width: 100%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 12px;
+    }
+    .infoTable-form-row {
+      width: 33%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 12px;
+    }
+    ::v-deep .el-form-item__label {
+      height: 100%;
+      background-color: #F0F3FA;
+      padding: 8px 12px 8px 12px;
+      font-size: 12px;
+      font-weight: normal;
+      color: rgba(35,35,35,0.8);
+      display: flex;
+      align-items: center;
+      line-height: normal;
+    }
+    ::v-deep .el-form-item__content {
+      padding-left: 12px;
+      font-size: 12px;
+      color: #232323;
+    }
+    ::v-deep .el-form-item__content {
+      border-left: 1px solid #e5e9f5;
+      height: 100%;
+      display: flex;
+      align-items: center;
+    }
+    ::v-deep .el-col {
+      border-bottom: 1px solid #e5e9f5;
+    }
+  }
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    max-width: 1200px;
+    height: 328px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+  ::v-deep .el-form-item__content {
+    line-height: 22px;
+    padding: 6px 4px;
+  }
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/financial/index.vue

@@ -193,6 +193,7 @@ export default {
     .financial-header{
       background: #FFFFFF;
       padding: 24px 16px;
+      border-radius: 4px;
       .header-box {
         justify-content: space-between;
         flex-wrap: wrap;
@@ -269,6 +270,7 @@ export default {
       background: #FFFFFF;
       padding: 24px 16px;
       margin-top: 12px;
+      border-radius: 4px;
       .zcqk-list{
         margin-top: 4px;
         overflow: hidden;
@@ -335,6 +337,7 @@ export default {
       background: #FFFFFF;
       padding: 24px 16px;
       margin-top: 12px;
+      border-radius: 4px;
       .zwqk-box{
         padding-top: 20px;
         justify-content: normal;

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

@@ -7,14 +7,23 @@
       </div>
       <div class="part-right">
         <div id="partBox" v-if="companyId">
-          <Overview v-if="currentPath.pathName=='overview'" />
+          <!-- 企业概览 -->
+          <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" />
           <Businfo v-if="currentPath.pathName=='businfo'" :company-id="companyId" />
           <Holderinfo v-if="currentPath.pathName=='holderinfo'" :company-id="companyId" />
           <Execuinfo v-if="currentPath.pathName=='execuinfo'" :company-id="companyId" />
           <Overseas v-if="currentPath.pathName=='overseas'" :company-id="companyId" />
           <Branch v-if="currentPath.pathName=='branch'" :company-id="companyId" />
           <Financial v-if="currentPath.pathName=='financial'" :company-id="companyId" />
-          <Business v-if="currentPath.pathName=='business'" />
+<!--          <Business v-if="currentPath.pathName=='business'" /> 商务信息 -->
+          <!-- 项目商机 -->
+          <Landtransaction v-if="currentPath.pathName=='landtransaction'" :company-id="companyId" />
+          <Proposed v-if="currentPath.pathName=='proposed'" :company-id="companyId" />
+          <Bond v-if="currentPath.pathName=='bond'" :company-id="companyId" />
+          <Biddingplan v-if="currentPath.pathName=='biddingplan'" :company-id="companyId" />
+          <Announcement v-if="currentPath.pathName=='announcement'" :company-id="companyId" />
+          <Tencent v-if="currentPath.pathName=='tencent'" :company-id="companyId" />
+          <Administrative v-if="currentPath.pathName=='administrative'" :company-id="companyId" />
           <!-- 投诚分析 -->
           <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" />
           <RegionalEconomies v-if="currentPath.pathName=='regionalEconomies'" />
@@ -53,7 +62,14 @@ import Execuinfo from "./overview/execuinfo"   //企业概览-高管信息
 import Overseas from "./overview/overseas"   //企业概览-对外投资
 import Branch from "./overview/branch"   //企业概览-分支机构
 import Financial from "./financial" //财务简析
-import Business from "./business" //商务信息
+//import Business from "./business" //商务信息
+import Landtransaction from "./opport/landtransaction"  //项目商机-土地交易
+import Proposed from "./opport/proposed"  //项目商机-拟建项目
+import Bond from "./opport/bond"  //项目商机-专项债项目
+import Biddingplan from "./opport/biddingplan"  //项目商机-招标计划
+import Announcement from "./opport/announcement"  //项目商机-招标公告
+import Tencent from "./opport/tencent"  //项目商机-标讯Pro
+import Administrative from "./opport/administrative"  //项目商机-行政许可
 import LandAcquisition from "./urbanLnvestment/landAcquisition" //投诚分析-城投拿地
 import RegionalEconomies from "./urbanLnvestment/regionalEconomies" //投诚分析-区域经济
 import SameRegion from "./urbanLnvestment/sameRegion" //投诚分析-同地区城投
@@ -80,7 +96,14 @@ export default {
     Overseas,
     Branch,
     Financial,
-    Business,
+    // Business,
+    Landtransaction,
+    Proposed,
+    Bond,
+    Biddingplan,
+    Announcement,
+    Tencent,
+    Administrative,
     LandAcquisition,
     RegionalEconomies,
     SameRegion,

dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js

@@ -14,6 +14,12 @@ export default {
 
   },
   methods: {
+    // 设置下拉选项数据源
+    setFormData(fieldName, list) {
+      this.formData.forEach(item => {
+        item.fieldName == fieldName ? item.options =  list : ''
+      })
+    },
     formParams(){
       let condtion = {}
       let reqData = {}

dsk-operate-ui/src/views/detail/party-a/opport/administrative.vue

+<template>
+  <div class="detail-container">
+    <head-form
+      title="行政许可"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.porjectName)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
+          {{ scope.row.porjectName }}
+          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.porjectName)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">展开</span></span>
+        </span>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Administrative',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '许可决定日期', prop: 'use', width: '100'},
+        {label: '决定文书号', prop: 'type', width: '200'},
+        {label: '许可编号', prop: 'type', width: '80'},
+        {label: '决定文书名称', prop: 'type', width: '190'},
+        {label: '许可内容', prop: 'porjectName', width: '300', slot: true},
+        {label: '有效期自', prop: 'type', width: '100'},
+        {label: '有效期至', prop: 'type', width: '100'},
+        {label: '行政许可类别', prop: 'type', width: '100'},
+        {label: '许可机关', prop: 'type', width: '180'},
+        {label: '行政许可机关统一社会信用代码', prop: 'type', width: '200'},
+        {label: '数据来源单位', prop: 'type', width: '110'},
+        {label: '数据来源单位统一社会信用代码', prop: 'type', width: '200'},
+        {label: '来源', prop: 'type', width: '80'}
+      ],
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[]
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装2',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    },
+    changeShowAll(row, column) {
+      this.showList.push({
+        row: row,
+        column: column
+      })
+    },
+    isOverHiddenFlag(data, showList, row, column, value) {
+      if(value && String(value).length > this.getLenth(data)) {
+        return !showList.some(item => item.row==row&&item.column==column)
+      }else {
+        return false
+      }
+    },
+    getLenth(data) {
+      return Math.floor(data / 12) * 5
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .cell-span {
+    display: inline-block;
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    cursor: pointer;
+
+    >span {
+      display: inline-block;
+      width: 37px;
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      background-color: #fff;
+      z-index: 1;
+    }
+  }
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue

+<template>
+  <div class="detail-container">
+    <head-form
+      title="招标公告"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import {getList, getOption} from '@/api/detail/party-a/opport'
+export default {
+  name: 'Announcement',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '发布日期', prop: 'use', sortable: true, width: '120'},
+        {label: '预算金额（万元）', prop: 'type', sortable: true, width: '140'},
+        {label: '项目地区', prop: 'way', width: '120'},
+        {label: '项目类别', prop: 'state', width: '90'},
+        {label: '招采单位联系人', prop: 'money', width: '110'},
+        {label: '招采单位联系方式', prop: 'money', width: '130'},
+        {label: '代理单位', prop: 'money', width: '170'},
+        {label: '代理单位联系人', prop: 'money', width: '110'},
+        {label: '代理单位联系方式', prop: 'money', width: '130'},
+        {label: '报名截止日期', prop: 'money', width: '100'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目地区', options: []},
+        { type: 1, fieldName: 'projectType', value: '', placeholder: '项目类型', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleOption()
+    this.handleQuery()
+  },
+  methods: {
+    handleOption(){
+      getOption().then((res) => {
+        this.setFormData('projectStage', [
+          { name: '类别1', value: '1' },
+          { name: '类别2', value: '2' },
+          { name: '类别3', value: '3' },
+          { name: '类别4', value: '4' }
+        ])
+        this.setFormData('projectType', [
+          { name: '类别1', value: '1' },
+          { name: '类别2', value: '2' },
+          { name: '类别3', value: '3' },
+          { name: '类别4', value: '4' }
+        ])
+      })
+    },
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/biddingplan.vue

+<template>
+  <div class="app-container detail-container">
+    biddingplan
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'Biddingplan',
+  props: ['companyId'],
+  mixins: [mixin],
+  data() {
+    return {
+
+    }
+  },
+  created() {
+
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/bond.vue

+<template>
+  <div class="detail-container">
+    <head-form
+      title="专项债项目"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Bond',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '项目总投资（亿元）', prop: 'use', sortable: true, width: '150'},
+        {label: '项目资本金（亿元）', prop: 'type', sortable: true, width: '150'},
+        {label: '项目收益倍数（倍）', prop: 'way', sortable: true, width: '150'},
+        {label: '专项债金额（亿元）', prop: 'state', sortable: true, width: '150'},
+        {label: '专项债用作资本金（亿元）', prop: 'money', sortable: true, width: '200'}
+      ],
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/landtransaction.vue

+<template>
+  <div class="detail-container">
+    <head-form
+      title="土地交易"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getOption, getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Landtransaction',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '土地用途', prop: 'use', width: '130'},
+        {label: '行业分类', prop: 'type', width: '100'},
+        {label: '供地方式', prop: 'way', width: '100'},
+        {label: '土地坐落', prop: 'state', width: '130'},
+        {label: '成交金额（万元）', prop: 'money', sortable: true, width: '140'},
+        {label: '总面积（㎡）', prop: 'scale', sortable: true, width: '130'},
+        {label: '批准单位', prop: 'unit', width: '130'},
+        {label: '签订日期', prop: 'date', width: '130'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '土地用途', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleOption()
+    this.handleQuery()
+  },
+  methods: {
+    handleOption(){
+      getOption().then((res) => {
+        this.setFormData('penalizeReasonType', [
+          { name: '类别1', value: '1' },
+          { name: '类别2', value: '2' },
+          { name: '类别3', value: '3' },
+          { name: '类别4', value: '4' }
+        ])
+      })
+    },
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/proposed.vue

+<template>
+  <div class="detail-container">
+    <head-form
+      title="拟建项目"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Proposed',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '成交金额（万元）', prop: 'use', sortable: true, width: '150'},
+        {label: '项目类别', prop: 'type', width: '100'},
+        {label: '计划开工日期', prop: 'way', sortable: true, width: '130'},
+        {label: '计划完工日期', prop: 'state', sortable: true, width: '130'},
+        {label: '审批结果', prop: 'money', width: '100'},
+        {label: '是否为民间推介项目', prop: 'scale', width: '150'}
+      ],
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/tencent.vue

+<template>
+  <div class="app-container detail-container">
+    tencent
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'Tencent',
+  props: ['companyId'],
+  mixins: [mixin],
+  data() {
+    return {
+
+    }
+  },
+  created() {
+
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/branch.vue

@@ -18,7 +18,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="inReason" slot-scope="scope">
-        <div>{{scope.row.inReason}}</div>
+        <router-link to="" tag="a" class="a-link">{{scope.row.inReason}}</router-link>
         <div class="tags" v-if="scope.row.tag">
           <span class="tag style1">{{scope.row.tag}}</span>
           <span class="tag style1">{{scope.row.tag}}</span>
@@ -87,6 +87,7 @@ export default {
     margin: 0;
     padding: 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .tags{
       .tag{
         display: inline-block;

dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue

@@ -5,66 +5,10 @@
       <el-tab-pane label="工商变更" name="second"></el-tab-pane>
     </el-tabs>
 
-    <div class="businfo-box" v-if="activeName=='first'">
-      <p>
-        <label class="label">企业名称</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">社会信用代码</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">法定代表人</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">登记状态</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">成立日期</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">注册资本</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">实缴资本</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">核准日期</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">组织机构代码</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">工商注册号</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">纳税人识别号</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">企业类型</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">营业期限</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">纳税人资质</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">所属地区</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">登记机关</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">人员规模</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-        <label class="label">参保人数</label>
-        <span>{{forInfo.companyName || '--'}}</span>
-      </p>
-      <p>
-        <label class="label">经营范围</label>
-        <span class="span-one">{{forInfo.companyName || '--'}}</span>
-      </p>
-    </div>
+
+    <info-table class="info-tab" :list="defaultList" :obj="forInfo" :labelWidth="labelWidth" v-if="activeName=='first'">
+
+    </info-table>
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
@@ -78,9 +22,13 @@
 
 <script>
 import mixin from '../mixins/mixin'
+import InfoTable from '../component/infoTable'
 export default {
   name: 'Businfo',
   props: ['companyId'],
+  components: {
+    InfoTable
+  },
   mixins: [mixin],
   data() {
     return {
@@ -90,7 +38,29 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
-      forInfo: {},
+      labelWidth: 250,
+      forInfo: {projectType: 'aaa', projectPurposes: '222', projectInvestmentAmounts: '222'},
+      defaultList: [
+        { name: '企业名称', prop: 'projectTypes' },
+        { name: '社会信用代码', prop: 'projectPurposes' },
+        { name: '法定代表人', prop: 'projectInvestmentAmounts' },
+        { name: '登记状态', prop: 'projectInvestmentAmounts' },
+        { name: '成立日期', prop: 'projectInvestmentAmounts' },
+        { name: '注册资本', prop: 'projectInvestmentAmounts' },
+        { name: '实缴资本', prop: 'projectInvestmentAmounts' },
+        { name: '核准日期', prop: 'projectInvestmentAmounts' },
+        { name: '组织机构代码', prop: 'projectInvestmentAmounts' },
+        { name: '工商注册号', prop: 'projectInvestmentAmounts' },
+        { name: '纳税人识别号', prop: 'projectInvestmentAmounts' },
+        { name: '企业类型', prop: 'projectInvestmentAmounts' },
+        { name: '营业期限', prop: 'projectInvestmentAmounts' },
+        { name: '纳税人资质', prop: 'projectInvestmentAmounts' },
+        { name: '所属地区', prop: 'projectInvestmentAmounts' },
+        { name: '登记机关', prop: 'projectInvestmentAmounts' },
+        { name: '人员规模', prop: 'projectInvestmentAmounts' },
+        { name: '参保人数', prop: 'projectInvestmentAmounts' },
+        { name: '经营范围', prop: 'projectInvestmentAmounts', style: true }
+      ],
       forData: [
         {label: '变更日期', prop: 'inReason', width: '90', slot: true},
         {label: '变更事项', prop: 'inDate'},
@@ -129,6 +99,7 @@ export default {
   margin: 0;
   padding: 16px;
   background: #FFFFFF;
+  border-radius: 4px;
   .detail-tab{
     margin: 0 0 0 -16px;
     ::v-deep .el-tabs__nav-wrap::after{
@@ -144,35 +115,5 @@ export default {
       }
     }
   }
-  .businfo-box {
-    border-top: 1px solid #E6E9F0;
-    p {
-      display: flex;
-      align-items: center;
-      margin: 0;
-      border-left: 1px solid #E6E9F0;
-      border-bottom: 1px solid #E6E9F0;
-      .label {
-        width: 10%;
-        font-weight: 400;
-        line-height: 40px;
-        font-size: 12px;
-        height: 40px;
-        background: #F0F3FA;
-        padding-left: 12px;
-      }
-      span {
-        width: 40%;
-        color: #000;
-        height: 40px;
-        line-height: 40px;
-        padding-left: 12px;
-        font-size: 12px;
-      }
-      .span-one {
-        width: 90%;
-      }
-    }
-  }
 }
 </style>

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

@@ -231,6 +231,7 @@ export default {
       padding: 24px 16px;
       background: #FFFFFF;
       overflow: hidden;
+      border-radius: 4px;
       .zbph-item{
         justify-content: space-around;
         padding-top: 26px;
@@ -296,6 +297,7 @@ export default {
       width: calc(50% - 8px);
       padding: 24px 16px;
       background: #FFFFFF;
+      border-radius: 4px;
       .table-item{
         margin-top:15px;
         .ywwl-ico{

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

@@ -178,6 +178,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .selfTab{
       margin: 24px 0 0 -12px;
       ::v-deep .el-tabs__nav-wrap::after{

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

@@ -540,6 +540,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .company-swiper{
       position: relative;
       .swiper-info{

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

@@ -74,6 +74,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .part-swiper{
       position: relative;
       margin-top: 16px;

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

@@ -92,6 +92,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .selfTab{
       margin: 24px 0 0 -12px;
       ::v-deep .el-tabs__nav-wrap::after{

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

@@ -151,6 +151,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .clue-box{
       width: 100%;
       justify-content: space-between;

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

@@ -49,6 +49,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .table-item{
       margin-top: 16px;
       ::v-deep .el-table--border .el-table__cell{

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

@@ -60,6 +60,7 @@ export default {
       padding: 24px 16px;
       background: #FFFFFF;
       overflow: hidden;
+      border-radius: 4px;
       .common-title{
         margin-bottom: 10px;
       }

dsk-operate-ui/src/views/detail/party-a/overview/execuinfo.vue

@@ -65,5 +65,6 @@ export default {
   margin: 0;
   padding: 16px;
   background: #FFFFFF;
+  border-radius: 4px;
 }
 </style>

dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue

@@ -20,7 +20,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="inReason" slot-scope="scope">
-        <div>{{scope.row.inReason}}</div>
+        <router-link to="" tag="a" class="a-link">{{scope.row.inReason}}</router-link>
         <div class="tags" v-if="scope.row.tag">
           <span class="tag style1">{{scope.row.tag}}</span>
           <span class="tag style1">{{scope.row.tag}}</span>
@@ -88,6 +88,7 @@ export default {
   margin: 0;
   padding: 16px;
   background: #FFFFFF;
+  border-radius: 4px;
   .detail-tab{
     margin: -34px 0 0 -16px;
     ::v-deep .el-tabs__nav-wrap::after{

dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue

@@ -30,7 +30,7 @@
           </el-popover></div>
       </template>
       <template slot="inReason" slot-scope="scope">
-        <div>{{scope.row.inReason}}</div>
+        <router-link to="" tag="a" class="a-link">{{scope.row.inReason}}</router-link>
         <div class="tags" v-if="scope.row.tag">
           <span class="tag style1">{{scope.row.tag}}</span>
           <span class="tag style1">{{scope.row.tag}}</span>
@@ -111,6 +111,7 @@ export default {
   margin: 0;
   padding: 16px;
   background: #FFFFFF;
+  border-radius: 4px;
   .tab-header{
     img{
       margin-bottom: -3px;

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

 <template>
   <div class="app-container home">
     <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          领取阿里云通用云产品1888优惠券
-          <br />
-          <el-link
-            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
-            type="primary"
-            target="_blank"
-            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
-          >
-          <br />
-          领取腾讯云通用云产品2860优惠券
-          <br />
-          <el-link
-            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
-            type="primary"
-            target="_blank"
-            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
-          >
-          <br />
-          阿里云服务器折扣区
-          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          >
-          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
-          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          ><br />
-          <h4 class="text-danger">
-            云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
-          </h4>
-        </blockquote>
-
-        <hr />
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>央企后台经营管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了央企经营系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
+      <el-col :span="18">
+        <div class="content-left">
+          <div class="task-wrap">
+            <div class="item">
+              <img class="left" src="@/assets/images/index/icon1.png"/>
+              <div class="right">
+                <p class="title">即将开标项目</p>
+                <p class="number">36</p>
+                <p class="compare">较上月 <span class="up">+3<img src="@/assets/images/index/up.png"/></span></p>
+              </div>
+            </div>
+            <div class="item">
+              <img class="left" src="@/assets/images/index/icon2.png"/>
+              <div class="right">
+                <p class="title">重点关注项目</p>
+                <p class="number">36</p>
+                <p class="compare">较上月 <span class="up">+3<img src="@/assets/images/index/up.png"/></span></p>
+              </div>
+            </div>
+            <div class="item">
+              <img class="left" src="@/assets/images/index/icon3.png"/>
+              <div class="right">
+                <p class="title">重点关注客户</p>
+                <p class="number">36</p>
+                <p class="compare">较上月 <span class="down">-3<img src="@/assets/images/index/down.png"/></span></p>
+              </div>
+            </div>
+            <div class="item">
+              <img class="left" src="@/assets/images/index/icon4.png"/>
+              <div class="right">
+                <p class="title">储备合作客户</p>
+                <p class="number">36</p>
+                <p class="compare">较上月 <span class="up">+3<img src="@/assets/images/index/up.png"/></span></p>
+              </div>
+            </div>
+            <div class="item add">
+              <span class="yd"><i></i><i></i><i></i><i></i><i></i><i></i></span>
+              <div class="btn"><i class="el-icon-plus"></i>新建待办任务</div>
+            </div>
+          </div>
+          <!--经理视角-->
+          <div v-if="user === 1" class="content-wrap">
+            <el-col :span="12">
+              <div class="record">
+                <div class="flex-box query-box">
+                  <div class="flex-box query-params">
+                    <span class="common-title">跟进记录</span>
+                  </div>
+                  <div class="flex-box query-ability">
+                    <div class="area">西南地区<i class="el-icon-caret-bottom"></i></div>
+                    <div class="month">不限<i class="el-icon-caret-bottom"></i></div>
+                  </div>
+                </div>
+                <div class="list">
+                  <div class="item" v-for="(item,index) in gjjlData" :key="index">
+                    <h3>{{item.title}}</h3>
                     <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
+                      <span>跟进人：{{item.user}}</span>
+                      <span>关联企业：{{item.name}}</span>
                     </p>
+                  </div>
+                </div>
+                <p class="more">更多跟进记录 ></p>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="ranking">
+                <div class="flex-box query-box">
+                  <div class="flex-box query-params">
+                    <span class="common-title">业绩排名</span>
+                  </div>
+                  <div class="flex-box query-ability">
+                    <div class="area">西南地区<i class="el-icon-caret-bottom"></i></div>
+                    <div class="month">不限<i class="el-icon-caret-bottom"></i></div>
+                  </div>
+                </div>
+                <div class="main">
+                  <div class="amount">
                     <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
+                      <span>产值目标（万元）</span>
+                      <span>实际已完成(万元)</span>
                     </p>
                     <p>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-s-home"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
+                      <span class="money">359,800.00</span>
+                      <span class="money">359,800.00</span>
                     </p>
+                    <el-progress :text-inside="true" :stroke-width="10" :percentage="70"></el-progress>
+                  </div>
+                  <div style="background: #ffffff;margin: 0 12px 12px 12px;">
+                    <div id="pm-echarts" style="height: 288px;"></div>
+                  </div>
+                </div>
+              </div>
             </el-col>
+          </div>
+          <div v-if="user === 1" class="analysis">
+            <div class="flex-box query-box">
+              <div class="flex-box query-params">
+                <span class="common-title">经营分析</span>
+              </div>
+              <div class="flex-box query-ability">
+                <div class="tabs">
+                  <div class="label" v-for="(item,index) in typeList" :class="typeIndex === index ? 'color':''" @click="handleClick(index)">{{item.name}}</div>
+                </div>
+                <div class="area">西南地区<i class="el-icon-caret-bottom"></i></div>
+              </div>
+            </div>
+            <div>
+              <div id="fx-echarts" style="height: 200px;"></div>
+            </div>
+          </div>
 
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
+          <!--员工视角-->
+          <div v-if="user === 2" class="content-db">
+            <div class="flex-box query-box">
+              <div class="flex-box query-params">
+                <span class="common-title">待办</span>
+              </div>
+              <div class="flex-box query-ability"><span>9</span>全部待办 ></div>
+            </div>
+            <div class="list">
+              <div class="item" v-for="(item,index) in gjjlData" :key="index">
+                <h3>{{item.title}}</h3>
+                <p>
+                  <span>拜访时间：{{item.time}}</span>
+                  <span>关联企业：{{item.name}}</span>
+                </p>
+                <div class="btn">写跟进<i class="el-icon-edit"></i></div>
+              </div>
+            </div>
+          </div>
+          <div v-if="user === 2" class="trends">
+            <el-tabs v-model="activeName" @tab-click="handleClickTab">
+              <el-tab-pane label="甲方舆情" name="first">
+                <el-timeline>
+                  <el-timeline-item
+                    v-for="(item, index) in trendsList"
+                    :key="index"
+                    icon="el-icon-time">
+                    {{item.main}}
+                  </el-timeline-item>
+                </el-timeline>
+              </el-tab-pane>
+              <el-tab-pane label="监控动态" name="second">监控动态</el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
       </el-col>
       <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
+        <div class="content-right">
+          <div class="user">
+            <h3>刘毅<span>总经理</span></h3>
+            <p>您好，祝您工作顺利每一天</p>
+          </div>
+          <div class="search">
+            <span class="common-title">快捷搜索</span>
+            <el-input placeholder="找客户/找项目/找甲方">
+              <i slot="prefix" class="el-icon-search"></i>
+            </el-input>
+            <span class="common-title" style="margin-bottom: 10px;">储备项目类</span>
+            <div class="list">
+              <div class="item">
+                <img src="@/assets/images/index/cb_icon1.png"/>
+                <p>EPC项目</p>
+              </div>
+              <div class="item">
+                <img src="@/assets/images/index/cb_icon2.png"/>
+                <p>投资项目</p>
               </div>
-          <div class="body">
+              <div class="item">
+                <img src="@/assets/images/index/cb_icon3.png"/>
+                <p>房建项目</p>
+              </div>
+            </div>
+            <div class="list">
+              <div class="item">
+                <img src="@/assets/images/index/cb_icon4.png"/>
+                <p>电力项目</p>
+              </div>
+              <div class="item">
+                <img src="@/assets/images/index/cb_icon5.png"/>
+                <p>市政项目</p>
+              </div>
+              <div class="item">
+                <img src="@/assets/images/index/cb_icon6.png"/>
+                <p>水利项目</p>
+              </div>
+            </div>
+          </div>
+          <div class="zbgg">
+            <span class="common-title">招标公告</span>
+            <div class="list">
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
                 <p>
-              <i class="el-icon-s-promotion"></i> 官网：<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
                 </p>
+              </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
                 <p>
-              <i class="el-icon-user-solid"></i> QQ群：<s> 满937441 </s> <s> 满887144332 </s>
-              <s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
-              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s>
-              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s>
-              <s> 满101046199 </s> <a href="https://jq.qq.com/?_wv=1027&k=tKEt51dz" target="_blank">136919097</a>
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
                 </p>
+              </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
                 <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-                >/ *若依</a
-              >
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
                 </p>
+              </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
                 <p>
-              <i class="el-icon-money"></i> 支付宝：<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
                 </p>
               </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.8.5 - 2023-01-01">
-              <ol>
-                <li>定时任务违规的字符</li>
-                <li>重置时取消部门选中</li>
-                <li>新增返回警告消息提示</li>
-                <li>忽略不必要的属性数据返回</li>
-                <li>修改参数键名时移除前缓存配置</li>
-                <li>导入更新用户数据前校验数据权限</li>
-                <li>兼容Excel下拉框内容过多无法显示的问题</li>
-                <li>升级echarts到最新版本5.4.0</li>
-                <li>升级core-js到最新版本3.25.3</li>
-                <li>升级oshi到最新版本6.4.0</li>
-                <li>升级kaptcha到最新版2.3.3</li>
-                <li>升级druid到最新版本1.2.15</li>
-                <li>升级fastjson到最新版2.0.20</li>
-                <li>升级pagehelper到最新版1.4.6</li>
-                <li>优化弹窗内容过多展示不全问题</li>
-                <li>优化swagger-ui静态资源使用缓存</li>
-                <li>开启TopNav没有子菜单隐藏侧边栏</li>
-                <li>删除fuse无效选项maxPatternLength</li>
-                <li>优化导出对象的子列表为空会出现[]问题</li>
-                <li>优化编辑头像时透明部分会变成黑色问题</li>
-                <li>优化小屏幕上修改头像界面布局错位的问题</li>
-                <li>修复代码生成勾选属性无效问题</li>
-                <li>修复文件上传组件格式验证问题</li>
-                <li>修复回显数据字典数组异常问题</li>
-                <li>修复sheet超出最大行数异常问题</li>
-                <li>修复Log注解GET请求记录不到参数问题</li>
-                <li>修复调度日志点击多次数据不变化的问题</li>
-                <li>修复主题颜色在Drawer组件不会加载问题</li>
-                <li>修复文件名包含特殊字符的文件无法下载问题</li>
-                <li>修复table中更多按钮切换主题色未生效修复问题</li>
-                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
-                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
-                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.4 - 2022-09-26">
-              <ol>
-                <li>数据逻辑删除不进行唯一验证</li>
-                <li>Excel注解支持导出对象的子列表方法</li>
-                <li>Excel注解支持自定义隐藏属性列</li>
-                <li>Excel注解支持backgroundColor属性设置背景色</li>
-                <li>支持配置密码最大错误次数/锁定时间</li>
-                <li>登录日志新增解锁账户功能</li>
-                <li>通用下载方法新增config配置选项</li>
-                <li>支持多权限字符匹配角色数据权限</li>
-                <li>页面内嵌iframe切换tab不刷新数据</li>
-                <li>操作日志记录支持排除敏感属性字段</li>
-                <li>修复多文件上传报错出现的异常问题</li>
-                <li>修复图片预览组件src属性为null值控制台报错问题</li>
-                <li>升级oshi到最新版本6.2.2</li>
-                <li>升级fastjson到最新版2.0.14</li>
-                <li>升级pagehelper到最新版1.4.3</li>
-                <li>升级core-js到最新版本3.25.2</li>
-                <li>升级element-ui到最新版本2.15.10</li>
-                <li>优化任务过期不执行调度</li>
-                <li>优化字典数据使用store存取</li>
-                <li>优化修改资料头像被覆盖的问题</li>
-                <li>优化修改用户登录账号重复验证</li>
-                <li>优化代码生成同步后值NULL问题</li>
-                <li>优化定时任务支持执行父类方法</li>
-                <li>优化用户个人信息接口防止修改部门</li>
-                <li>优化布局设置使用el-drawer抽屉显示</li>
-                <li>优化没有权限的用户编辑部门缺少数据</li>
-                <li>优化日志注解记录限制请求地址的长度</li>
-                <li>优化excel/scale属性导出单元格数值类型</li>
-                <li>优化日志操作中重置按钮时重复查询的问题</li>
-                <li>优化多个相同角色数据导致权限SQL重复问题</li>
-                <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.3 - 2022-06-27">
-              <ol>
-                <li>新增缓存列表菜单功能</li>
-                <li>代码生成树表新增(展开/折叠)</li>
-                <li>Excel注解支持color字体颜色</li>
-                <li>新增Anonymous匿名访问不鉴权注解</li>
-                <li>用户头像上传限制只能为图片格式</li>
-                <li>接口使用泛型使其看到响应属性字段</li>
-                <li>检查定时任务bean所在包名是否为白名单配置</li>
-                <li>添加页签openPage支持传递参数</li>
-                <li>用户缓存信息添加部门ancestors祖级列表</li>
-                <li>升级element-ui到最新版本2.15.8</li>
-                <li>升级oshi到最新版本6.1.6</li>
-                <li>升级druid到最新版本1.2.11</li>
-                <li>升级fastjson到最新版2.0.8</li>
-                <li>升级spring-boot到最新版本2.5.14</li>
-                <li>降级jsencrypt版本兼容IE浏览器</li>
-                <li>删除多余的salt字段</li>
-                <li>新增获取不带后缀文件名称方法</li>
-                <li>新增获取配置文件中的属性值方法</li>
-                <li>新增内容编码/解码方便插件集成使用</li>
-                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-                <li>优化设置分页参数默认值</li>
-                <li>优化对空字符串参数处理的过滤</li>
-                <li>优化显示顺序orderNum类型为整型</li>
-                <li>优化表单构建按钮不显示正则校验</li>
-                <li>优化字典数据回显样式下拉框显示值</li>
-                <li>优化R响应成功状态码与全局保持一致</li>
-                <li>优化druid开启wall过滤器出现的异常问题</li>
-                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
-                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
-                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
-                <li>修复字典数据显示不全问题</li>
-                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img
-              src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
-              alt="donate"
-              width="100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
+                <p>
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
+  import * as echarts from 'echarts';
 export default {
   name: "Index",
   data() {
     return {
       // 版本号
-      version: "3.8.5"
+      version: "3.8.5",
+      typeList:[
+        {name:'待成交项目数'},
+        {name:'待成交总金额'},
+        {name:'成交项目金额'},
+        {name:'成交项目总数'},
+        {name:'储备项目总数'},
+        {name:'储备项目总金额'},
+      ],
+      typeIndex:0,
+      jyfxData:['1月','2月','3月','4月','5月','6月'],
+      jyfxData1:[103,256,132,186,210,95],
+      gjjlData:[
+        {
+          title:'今天拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'今天拜访了重庆机场集团董事长，下个月招标项目预计1.2个亿。争取能拿到项目。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'5月27日早上劳动局去杨局长说希望我们把项目预算清单做出来看一下。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'5月27日早上劳动局去杨局长说希望我们把项目预算清单做出来看一下。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+      ],
+      pmData:[
+        {
+          name:'朱博',
+          value:334,
+          value1:164,
+        },
+        {
+          name:'陈伟',
+          value:230,
+          value1:130,
+        },
+        {
+          name:'张天翼',
+          value:156,
+          value1:150,
+        },
+        {
+          name:'李晨旭',
+          value:112,
+          value1:130,
+        },
+        {
+          name:'徐阳',
+          value:110,
+          value1:90,
+        },
+      ],
+      rankIconsSize:'24',
+      rankIcons:[// 排序图标
+        require('@/assets/images/index/1.png'),
+        require('@/assets/images/index/2.png'),
+        require('@/assets/images/index/3.png'),
+        require('@/assets/images/index/4.png'),
+        require('@/assets/images/index/5.png'),
+      ],
+      user:1,
+      activeName:'first',
+      trendsList:[
+        {
+          time:'2018-04-03 10:20',
+          name:'重庆轨道交通集团有限公司',
+          main:'发布招标公告 重庆轨道交通环线鹅公岩轨道专用桥增设防船撞设施项目，项目地区是重庆市-江北区，项目类型为工程建设。'
+        },
+        {
+          time:'2018-04-03 10:20',
+          name:'重庆轨道交通集团有限公司',
+          main:'发布招标公告 重庆轨道交通环线鹅公岩轨道专用桥增设防船撞设施项目，项目地区是重庆市-江北区，项目类型为工程建设。'
+        },
+        {
+          time:'2018-04-03 10:20',
+          name:'重庆轨道交通集团有限公司',
+          main:'发布招标公告 重庆轨道交通环线鹅公岩轨道专用桥增设防船撞设施项目，项目地区是重庆市-江北区，项目类型为工程建设。'
+        },
+        {
+          time:'2018-04-03 10:20',
+          name:'重庆轨道交通集团有限公司',
+          main:'发布招标公告 重庆轨道交通环线鹅公岩轨道专用桥增设防船撞设施项目，项目地区是重庆市-江北区，项目类型为工程建设。'
+        },
+      ]
   };
+  },
+  created() {
+    if(this.user === 1){
+      this.$nextTick(()=>{
+        this.initChart()
+        this.initChart1()
+      })
+    }
+
   },
   methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
+    handleClick(index){
+      this.typeIndex=index;
+    },
+    initChart() {
+      let myChart = echarts.init(document.getElementById("fx-echarts"))
+      let option ={
+        tooltip: {
+          show:false
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: this.jyfxData,
+        },
+        yAxis: {
+          type: 'value',
+        },
+        grid: {
+          top:20,
+          left:30,
+          right:10,
+          bottom:20,
+        },
+        series: [
+          {
+            data: this.jyfxData1,
+            type: 'line',
+            smooth: true,
+            emphasis: {
+              disabled: true,
+              focus: 'none'
+            },
+            //设置折线颜色和粗细
+            lineStyle: {
+              width: 1,
+              color: "#0081FF",
+            },
+            itemStyle:{
+              color: "#4E8EFF",
+            },
+            //设置面积区域为渐变效果
+            areaStyle: {
+              color: echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                {
+                  offset: 0.2,
+                  color: "#DFEAFF",
+                },
+                {
+                  offset: 1,
+                  color: "#5895FF",
+                },
+              ]),
+            },
+          }
+        ]
+      }
+      myChart.setOption(option);
+    },
+    initChart1(){
+      let myChart = echarts.init(document.getElementById("pm-echarts"))
+      let option ={
+        legend: {
+          show: true,
+          x:'center',
+          y:'bottom',
+          padding:[0,0,10,0],
+        },
+        yAxis: {
+          type: 'category',
+          inverse: true, // 反向坐标
+          data: this.pmData.map(item => item.name),
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            label: {
+              show: true,
+              margin: 30
+            }
+          },
+          axisLabel: {
+            color: '#232323',
+            margin: 50,
+            // formatter必须，配合rich使用
+            textStyle: {
+              align:'left',
+            },
+            rich: {
+              a1: {
+                backgroundColor: {image: this.rankIcons[0]},
+                width: this.rankIconsSize,
+                height: this.rankIconsSize,
+                align: "left",
+                // padding: [0, 0, 50, 100]
+              },
+              a2: {
+                backgroundColor: { image: this.rankIcons[1] },
+                width: this.rankIconsSize,
+                height: this.rankIconsSize,
+                align: "center",
+              },
+              a3: {
+                backgroundColor: { image: this.rankIcons[2] },
+                width: this.rankIconsSize,
+                height: this.rankIconsSize,
+                align: "center",
+              },
+              a4: {
+                backgroundColor: { image: this.rankIcons[3] },
+                width: this.rankIconsSize,
+                height: this.rankIconsSize,
+                align: "center",
+              },
+              a5: {
+                backgroundColor: { image: this.rankIcons[4] },
+                width: this.rankIconsSize,
+                height: this.rankIconsSize,
+                align: "center",
+              },
+            },
+            formatter: (params, index) => {
+              return [`{a${index + 1}|}  ${params}`].join('\n')
+            },
+
+          },
+        },
+        xAxis: {
+          type: 'value',
+        },
+        grid: {
+          left: '22%',
+          top: 20,
+          right: 20,
+          bottom: 60,
+        },
+        tooltip: {
+          show: true,
+          backgroundColor: 'rgba(0,0,0,.7)',
+          borderWidth: 0,
+          textStyle: {
+            color: '#fff',
+          },
+        },
+        series: [
+          {
+            // realtimeSort: true,
+            name:'目标产值',
+            data: this.pmData.map(item => item.value),
+            type: 'bar',
+            stack: 'total',
+            emphasis: {
+              focus: 'series'
+            },
+            itemStyle:{
+              color: '#14C9C9',
+            },
+            barWidth: 16,
+          },
+          {
+            // realtimeSort: true,
+            name:'已完成产值',
+            data: this.pmData.map(item => item.value1),
+            type: 'bar',
+            stack: 'total',
+            emphasis: {
+              focus: 'series'
+            },
+            itemStyle:{
+              color: '#C3F6F6',
+            },
+            barWidth: 16,
+          },
+        ],
+      }
+      myChart.setOption(option);
+    },
+    handleClickTab(){
+
     }
   }
 };
 </script>
 
 <style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
+  .app-container{
+    padding: 0;
   }
-
-  ul {
+  p{
     padding: 0;
     margin: 0;
   }
-
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
+  .home {
+    ::v-deep .el-row{
+      .el-col:nth-child(1){
+        padding-left: 0 !important;
+        padding-right: 0 !important;
       }
-
-  h4 {
-    margin-top: 0px;
+      .el-col:nth-child(2){
+        padding-left: 16px !important;
+        padding-right: 0 !important;
       }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
     }
-
-  p {
+    .content-left{
+      .task-wrap{
+        height: 88px;
+        background: #FFFFFF;
+        border-radius: 4px;
+        margin-bottom: 12px;
+        display: flex;
+        justify-content: space-between;
+        .item{
+          width: 20%;
+          display: flex;
+          padding-left: 16px;
+          margin-right: 9px;
+          margin-top: 14px;
+          margin-bottom: 14px;
+          border-right: 1px solid #EFEFEF;
+          .left{
+            width: 48px;
+            height: 48px;
+            margin-right: 8px;
+          }
+          .right{
+            .title{
+              font-size: 12px;
+              color: #3D3D3D;
+            }
+            .number{
+              font-weight: bold;
+              color: #3D3D3D;
+              font-size: 18px;
+              padding: 4px 0;
+            }
+            .compare{
+              color: rgba(35,35,35,0.4);
+              font-size: 12px;
+              img{
+                width: 8px;
+                height: 10px;
+                margin-left: 4px;
+                margin-bottom: -1px;
+              }
+              .down{
+                color:#FF3C3C;
+              }
+              .up{
+                color:#0CBC6D;
+              }
+            }
+          }
+        }
+        .item:nth-child(4){
+          border-right: 0;
+        }
+        .item:last-child{
+          border-right: 0;
+        }
+        .add{
+          padding-left: 0;
+          .yd{
+            display: inline-block;
+            width: 5px;
+            margin-right: 10%;
+            i{
+              width: 5px;
+              height: 5px;
+              border-radius: 2px;
+              background: #E6E6E9;
+              margin-bottom: 6px;
+              display: block;
+            }
+          }
+          .btn{
+            width: 80%;
+            height: 64px;
+            background: #FFFFFF;
+            border-radius: 4px;
+            border: 1px solid #E6E6E9;
+            color:#0081FF;
+            line-height: 64px;
+            font-size: 14px;
+            margin-left: 0;
+            i{
+              margin-right: 4px;
+            }
+          }
+        }
+      }
+      .content-wrap{
+        margin-bottom: 12px;
+        height: 460px;
+        .record{
+          height: 460px;
+          background: #FFFFFF;
+          border-radius: 4px;
+          padding: 16px;
+          position: relative;
+          .list{
+            height: 375px;
+            overflow: hidden;
+            .item{
+              border-bottom: 1px solid #EEEEEE;
+              padding: 16px 0;
+              h3{
+                color: #232323;
+                font-size: 14px;
+                font-weight: 400;
+                margin: 0;
+              }
+              p{
+                color: rgba(35,35,35,0.4);
+                font-size: 14px;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                margin-top: 8px;
+                span{
+                  margin-right: 15px;
+                }
+              }
+            }
+            .item:last-child{
+              border-bottom: 0;
+            }
+          }
+          .more{
+            text-align: center;
+            color: #0081FF;
+            font-size: 14px;
+            margin-top: 4px;
+            cursor: pointer;
+            position: absolute;
+            bottom:16px;
+            left: 50%;
+            margin-left: -48px;
+          }
+        }
+        .ranking{
+          height: 460px;
+          background: #FFFFFF;
+          border-radius: 4px;
+          padding: 16px;
+          .main{
+            background: url("../assets/images/index/yjpm_bg.png");
+            background-size: 100% 100%;
+            height: 399px;
             margin-top: 10px;
-
-    b {
+          }
+          .amount{
+            padding: 16px 24px;
+            p{
+              display: flex;
+              justify-content: space-between;
+            }
+            span{
+              font-weight: 400;
+              color: #184280;
+              font-size: 14px;
+            }
+            .money{
               font-weight: 700;
+              color: #184280;
+              font-size: 18px;
+              margin-top: 8px;
+            }
+            ::v-deep .el-progress-bar__outer{
+              border: 1px solid #A2E8E8;
+              background-color:#ffffff !important;
+              border-radius: 2px;
+              .el-progress-bar__inner{
+                background: linear-gradient(-270deg, #C3F6F6 0%, #14C9C9 100%);
+                border-radius:0;
+                .el-progress-bar__innerText{
+                  color: #ffffff;
+                  opacity: 0;
+                }
               }
             }
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
           }
         }
-}
+        .area{
+          font-size: 14px;
+          color: #232323;
+          cursor: pointer;
+          i{
+            color:#A7A7A7;
+          }
+        }
+        .month{
+          font-size: 14px;
+          color: #232323;
+          margin-left: 16px;
+          cursor: pointer;
+          i{
+            color:#A7A7A7;
+          }
+        }
+      }
+      .content-db{
+        height: 263px;
+        background: #FFFFFF;
+        border-radius: 4px;
+        margin-bottom: 12px;
+        padding: 16px;
+        overflow: hidden;
+        .query-ability{
+          color: #0081FF;
+          font-size: 14px;
+          cursor: pointer;
+          span{
+            width: 16px;
+            height: 16px;
+            background: #FF3C3C;
+            display: inline-block;
+            color:#ffffff;
+            font-size: 12px;
+            border-radius: 50%;
+            line-height: 16px;
+            text-align: center;
+            margin-right: 4px;
+          }
+        }
+        .list{
+          margin-top: 16px;
+        }
+        .item{
+          min-height: 62px;
+          background: #F6F9FD;
+          border-radius: 6px;
+          margin-bottom: 8px;
+          position: relative;
+          padding: 10px 16px;
+          h3{
+            font-weight: 400;
+            color: #232323;
+            font-size: 14px;
+            margin: 0;
+            padding-bottom: 6px;
+            width: 85%;
+          }
+          p{
+            color: rgba(35,35,35,0.4);
+            font-size: 14px;
+            span{
+              margin-right: 24px;
+            }
+          }
+          .btn{
+            position: absolute;
+            right: 50px;
+            top:22px;
+            color: #0CBC6D;
+            font-size: 12px;
+          }
+        }
+      }
+      .analysis{
+        height: 242px;
+        background: #FFFFFF;
+        border-radius: 4px;
+        padding: 16px;
+        .tabs{
+          .label{
+            display: inline-block;
+            padding: 0 14px;
+            height: 22px;
+            color: rgba(35,35,35,0.8);
+            font-size: 12px;
+            line-height: 22px;
+            border-top: 1px solid #EFEFEF;
+            border-bottom: 1px solid #EFEFEF;
+            border-left: 1px solid #EFEFEF;
+            cursor: pointer;
+          }
+          .label:first-child{
+            border-radius: 2px 0px 0px 2px;
+          }
+          .label:last-child{
+            border-radius: 0px 2px 2px 0px;
+            border-right: 1px solid #EFEFEF;
+          }
+          .color{
+            background: #0081FF;
+            color: #FFFFFF;
+          }
+        }
+        .area{
+          font-size: 14px;
+          color: #232323;
+          margin-left: 16px;
+          cursor: pointer;
+          i{
+            color:#A7A7A7;
+          }
+        }
+      }
+      .trends{
+        background: #FFFFFF;
+        border-radius: 4px;
+        padding: 16px;
+        height: 440px;
+      }
+    }
+    .content-right{
+      .user{
+        height: 88px;
+        border-radius: 4px;
+        margin-bottom: 12px;
+        background-image: url("../assets/images/index/user_bg.png");
+        background-size: cover;
+        padding-left: 24px;
+        h3{
+          font-weight: 700;
+          color: #1C1C28;
+          font-size: 18px;
+          padding-top: 16px;
+          padding-bottom: 8px;
+          margin: 0px;
+          span{
+            height: 20px;
+            background: #FFF2E2;
+            display: inline-block;
+            border-radius: 11px;
+            border: 1px solid #FFB010;
+            color: #FFB010;
+            font-size: 12px;
+            line-height: 20px;
+            padding: 0 10px;
+            margin-left: 12px;
+            font-weight: 400;
+          }
+        }
+        p{
+          color: #666666;
+          font-size: 16px;
+        }
+      }
+      .search{
+        height: 322px;
+        background: #FFFFFF;
+        border-radius: 4px;
+        margin-bottom: 12px;
+        padding: 16px;
+        ::v-deep .el-input{
+          height: 32px;
+          border-radius: 2px;
+          margin-bottom: 22px;
+          margin-top: 16px;
+          .el-input__inner{
+            height: 32px;
+            line-height: 32px;
+            background: #F3F3F4;
+            padding-left: 37px;
+          }
+          .el-icon-search{
+            font-size: 16px;
+            line-height: 32px;
+            color:#0081FF;
+            margin-left: 10px;
+            margin-right: 10px;
+          }
+        }
+        .list{
+          display: flex;
+          justify-content: space-between;
+          .item{
+            margin: 0 auto;
+            height: 94px;
+            text-align: center;
+            img{
+              width: 40px;
+              height: 40px;
+              margin-top: 16px;
+            }
+            p{
+              color: #3D3D3D;
+              font-size: 12px;
+            }
+          }
+        }
+      }
+      .zbgg{
+        height: 382px;
+        background: #FFFFFF;
+        border-radius: 4px;
+        padding: 16px;
+        .list{
+          margin-top: 16px;
+        }
+        .item{
+          border-bottom: 1px solid #EEEEEE;
+          padding: 10px 0;
+          h3{
+            font-weight: 400;
+            color: rgba(35,35,35,0.8);
+            font-size: 14px;
+            padding-bottom: 8px;
+            margin: 0;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+          p{
+            color: rgba(35,35,35,0.4);
+            font-size: 14px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            span{
+              margin-right: 15px;
+            }
+          }
+        }
+        .item:last-child{
+          border-bottom: 0;
+        }
+      }
+    }
+  }
 </style>
 

dsk-operate-ui/src/views/login.vue

 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title"><img src="../assets/images/title_icon.png"/>欢迎登录系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
           type="text"
           auto-complete="off"
-          placeholder="账号"
+          placeholder="请输入登录账号"
         >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <img class="img" slot="prefix" src="../assets/images/user.png"/>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -17,33 +17,33 @@
           v-model="loginForm.password"
           type="password"
           auto-complete="off"
-          placeholder="密码"
+          placeholder="请输入账号密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <img class="img" slot="prefix" src="../assets/images/password.png"/>
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
+          placeholder="请输入验证码"
+          style="width: 56%;float: left;"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 48px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width:100%;height: 48px;border-radius: 4px;font-size: 16px;"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
@@ -54,10 +54,6 @@
         </div>
       </el-form-item>
     </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
   </div>
 </template>
 
@@ -161,30 +157,53 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login_background.jpg");
+  background-image: url("../assets/images/login_bg.png");
   background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+  padding: 46px 0 32px 48px;
+  border-bottom: 1px solid #F0F0F0;
+  font-size: 22px;
+  color: #232323;
+  margin: 0 0 32px 0;
+  img{
+    width: 17px;
+    height: 17px;
+    margin-bottom: 3px;
+  }
 }
 
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  width: 420px;
+  /*padding: 25px 25px 5px 25px;*/
+  .el-form-item{
+    padding: 0 48px;
+    margin-bottom:24px;
+  }
   .el-input {
-    height: 38px;
+    width: 324px;
+    height: 48px;
+    background: #F2F4F9;
     input {
-      height: 38px;
+      height: 48px;
+      background: #F2F4F9;
+      font-size: 14px;
+    }
+    .el-input__inner{
+      padding-left: 73px;
     }
   }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
+  .el-input__prefix{
+    border-right: 1px solid #D8D8D8;
+    height: 24px;
+    margin: 12px 0;
+  }
+  .img {
+    height: 24px;
+    width: 24px;
+    margin: 0 14px 0 12px;
   }
 }
 .login-tip {
@@ -195,7 +214,8 @@ export default {
 .login-code {
   width: 33%;
   height: 38px;
-  float: right;
+  float: left;
+  margin-left: 16px;
   img {
     cursor: pointer;
     vertical-align: middle;
@@ -214,6 +234,6 @@ export default {
   letter-spacing: 1px;
 }
 .login-code-img {
-  height: 38px;
+  height: 48px;
 }
 </style>

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

@@ -164,16 +164,30 @@ export default {
       padding: 16px;
       .search{
         ::v-deep .el-cascader{
-          width: 130px;
+          width: 180px;
           margin-right: 12px;
           height: 32px;
           .el-input{
             width: 100%;
+            height: 32px;
+            .el-input__inner{
+              height: 32px !important;
+            }
+          }
+          .el-cascader__tags{
+            flex-wrap: inherit;
+            .el-tag{
+              max-width: 100px;
+              margin: 5px 0 2px 6px;
+            }
           }
         }
         ::v-deep .el-input{
           width: 250px;
           height: 32px;
+          .el-input__inner{
+            height: 32px;
+          }
           .el-input-group__append{
             width: 59px;
             background: #F5F5F5;

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

@@ -268,6 +268,14 @@
         .el-form{
           margin-left: 24px;
         }
+        ::v-deep .el-cascader{
+          .el-cascader__tags{
+            flex-wrap: inherit;
+            .el-tag{
+              max-width: 130px;
+            }
+          }
+        }
       }
     }
     .content{

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

@@ -139,7 +139,7 @@ export default {
         },
       ],
       glData:['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
-      glData1:[103,156,132,186,203,143,189,301,211,195,132,176],
+      glData1:[503,156,132,186,203,143,189,301,211,195,132,176],
       tableData1:[
         {
           area:'1月',
@@ -263,6 +263,7 @@ export default {
     },
     initChart1() {
       let myChart = echarts.init(document.getElementById("gl-echarts"))
+      let dataList=this.glData1;
       let option = {
         tooltip: {
           trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
@@ -287,17 +288,41 @@ export default {
         series: [
           {
             data: this.glData1,
-            markPoint:{
-              data:[
-                {type:'max',name:'最大值'},
-              ]
-            },
+            // markPoint:{
+            //   data:[
+            //     {type:'max',name:'最大值'},
+            //     {type:'min',name:'最小值'},
+            //   ]
+            // },
             type: 'bar',
             barWidth: 20,
             itemStyle: {
               normal: {
                 barBorderRadius: [4, 4, 0, 0],
-                color: '#2ECFCF',
+                // color: '#2ECFCF',
+                color: function (params) {
+                  var colorList = []  //定义一个存储颜色的数组
+                  //更改前二位柱形颜色
+                  //定义一个变量 保存柱形图数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
+                  let companyValue1 = JSON.parse(JSON.stringify(dataList))
+                  let arr = dataList.sort((a, b) => {
+                    return b - a
+                  })
+                  //将原数组数据赋值回去  保持数据不变
+                  dataList = JSON.parse(JSON.stringify(companyValue1))
+                  //遍历数据 将原数组和排序后的数组比较
+                  dataList.map(i => {
+                    if (i == arr[0]) {
+                      colorList.push('#F39F35')
+                    } else if (i == arr[1]) {
+                      colorList.push('#6675A5')
+                    }else{
+                      colorList.push('#2ECFCF')
+                    }
+                  })
+                  //返回一个存储着颜色的数组根据数据index顺序渲染到页面
+                  return colorList[params.dataIndex]
+                }
               },
             }
           }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -107,13 +107,13 @@ public class EnterpriseProjectService {
 
 
     public TableDataInfo bidPlanPage(Object body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R bidPlanDetail(Object body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
         Map data = MapUtils.getMap(map, "data", null);
         String contentId = MapUtils.getString(data, "contentId");
         if (ObjectUtil.isEmpty(contentId)) {

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -2,16 +2,24 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.json.JSONUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
+import com.dsk.system.service.ICustomerService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,6 +37,9 @@ public class EnterpriseService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
+    @Autowired
+    ICustomerService iCustomerService;
+
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
@@ -136,4 +147,45 @@ public class EnterpriseService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/getUipId", params);
         return BeanUtil.toBean(map, R.class);
     }
+
+    public TableDataInfo uipSerach(EnterpriseUipSearchBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipSerach", BeanUtil.beanToMap(body, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) throw new RuntimeException();
+
+        Map data = MapUtils.getMap(map, "data", null);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        ArrayList<String> uipIds = new ArrayList<>();
+        for (Object dataMap : list) {
+            uipIds.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "uipId"));
+        }
+
+        List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
+
+        //按照城投企业id合并两个list
+        for (Object companyObj : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+            String uipId = MapUtils.getString(companyMap, "uipId");
+            if (CollectionUtils.isEmpty(claimStatusList)) {
+                companyMap.put("claimStatus", 0);
+            }
+            for (CustomerStatusListVo vo : claimStatusList) {
+                if (uipId.equals(vo.getUipId())) {
+                    companyMap.put("claimStatus", 1);
+                }
+            }
+        }
+
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
+    }
+
+    public R uipGroupData() throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", null);
+        return BeanUtil.toBean(map, R.class);
+    }
 }

dsk-system/src/main/java/com/dsk/system/mapper/BusinessInfoMapper.java

@@ -90,7 +90,13 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
      */
     BusinessBrowseVo selectTotal(Integer business);
 
-
+    /**
+     * 查询项目名称是否存在
+     * @param projectName
+     * @param userId
+     * @return
+     */
+    int isRepetitionProjectName(@Param("projectName") String projectName,@Param("userId") Integer userId);
 
     int selectCountByStatusAndCustomerId(@Param("status") Integer status,@Param("customerId") String customerId);
 

dsk-system/src/main/java/com/dsk/system/service/EconomicService.java

@@ -2,6 +2,7 @@ package com.dsk.system.service;
 
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 
 /**
  * @ClassName EconomicService
@@ -19,7 +20,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto);
 
     /***
      *@Description: 全国经济大全详情

dsk-system/src/main/java/com/dsk/system/service/IBusinessInfoService.java

@@ -61,7 +61,7 @@ public interface IBusinessInfoService
     /**
      * 项目批量导入
      */
-    AjaxResult batchUpload(MultipartFile file, HttpServletResponse response);
+    AjaxResult batchUpload(MultipartFile file);
 
     /**
      * 新增项目详情

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
@@ -13,6 +14,7 @@ import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.common.core.domain.entity.BusinessLabel;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.core.domain.entity.BusinessUser;
+import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.BusinessExcelDto;
@@ -28,6 +30,7 @@ import com.dsk.system.mapper.BusinessRelateCompanyMapper;
 import com.dsk.system.mapper.BusinessUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -79,6 +82,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
+        if (dto.getUserId() == null) {
+            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+            if (deptId == null) throw new BaseException("请登录");
+            dto.setDeptId(deptId.intValue());
+        }
         return businessInfoMapper.selectBusinessInfoList(dto);
     }
 
@@ -87,7 +95,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         BusinessBrowseVo businessBrowseVo = new BusinessBrowseVo();
         //查询项目基本信息
         BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
-        BeanUtil.copyProperties(businessInfo,businessBrowseVo);
+        BeanUtil.copyProperties(businessInfo, businessBrowseVo);
         //查询项目标签
         businessBrowseVo.setLabelList(businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId)).stream().map(p -> p.getLabel()).collect(Collectors.toList()));
         //查询关键企业
@@ -106,34 +114,37 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     }
 
     @Override
-    public AjaxResult batchUpload(MultipartFile file, HttpServletResponse response) {
-        int row=3;//起始行数
-        int rowSuccess=0;//成功条数
-        Integer errorCount=0;//失败条数
+    public AjaxResult batchUpload(MultipartFile file) {
+        //获取当前登录用户id
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+//        Long userId = 103L;
+        if (userId == null) return AjaxResult.error("请登录");
+        int row = 3;//起始行数
+        int rowSuccess = 0;//成功条数
+        Integer errorCount = 0;//失败条数
         List<String> result = new LinkedList();//导入结果汇总
         List<BusinessExcelDto> businessInfoList = readBusinessInfoExcel.getExcelInfo(file);
         for (BusinessExcelDto businessInfo : businessInfoList) {
             //查询已有的项目名称
-            Integer count = businessInfoMapper.selectCount(Wrappers.<BusinessInfo>lambdaQuery().eq(BusinessInfo::getProjectName, businessInfo.getProjectName()));
+            Integer count = businessInfoMapper.isRepetitionProjectName(businessInfo.getProjectName(), userId.intValue());
             row++;
-            if(count > 0){
+            if (count > 0) {
                 //如果存在，跳过该项目，不保存
-                result.add("第"+row+"行的"+businessInfo.getProjectName()+"的项目已存在,跳过该项目，保存下一条");
+                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
                 errorCount++;
-            }else {
+            } else {
                 //保存到数据库
                 BusinessAddDto businessAddDto = new BusinessAddDto();
-                BeanUtil.copyProperties(businessInfo,businessAddDto);
-                //获取当前登录用户id
-                businessAddDto.setUserId(SecurityUtils.getLoginUser().getUserId().intValue());
+                BeanUtil.copyProperties(businessInfo, businessAddDto);
+                businessAddDto.setUserId(userId.intValue());
                 businessAddDto.setCompanyId(0);
                 AjaxResult add = insertBusinessInfo(businessAddDto);
-                if(add.get("code").equals(HttpStatus.SUCCESS))rowSuccess++;
+                if (add.get("code").equals(HttpStatus.SUCCESS)) rowSuccess++;
             }
         }
-        result.add("导入项目成功条数"+rowSuccess);
-        result.add("导入项目失败条件"+errorCount);
-        return errorCount == businessInfoList.size() ? AjaxResult.error(String.join("\n",result),response) : AjaxResult.success(String.join("\n",result),response);
+        result.add("导入项目成功条数" + rowSuccess);
+        result.add("导入项目失败条数" + errorCount);
+        return errorCount == businessInfoList.size() ? AjaxResult.error(String.join(",", result)) : AjaxResult.success(String.join(",", result));
     }
 
     /**
@@ -146,8 +157,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Transactional
     public AjaxResult insertBusinessInfo(BusinessAddDto dto) {
         //新增前查询是否已存在
-        BusinessInfo selectOne = businessInfoMapper.selectOne(Wrappers.<BusinessInfo>lambdaQuery().eq(BusinessInfo::getProjectName, dto.getProjectName()));
-        if(ObjectUtil.isNotEmpty(selectOne)) return AjaxResult.error("项目名称已存在");
+        int count = businessInfoMapper.isRepetitionProjectName(dto.getProjectName(), dto.getUserId());
+        if (count > 0) return AjaxResult.error("项目名称已存在");
         //新增项目主信息
         BusinessInfo businessInfo = new BusinessInfo();
         BeanUtil.copyProperties(dto, businessInfo);
@@ -174,8 +185,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     @Transactional
-    public int updateBusinessInfo(BusinessInfo businessInfo)
-    {
+    public int updateBusinessInfo(BusinessInfo businessInfo) {
         businessInfo.setUpdateTime(DateUtils.getNowDate());
         return businessInfoMapper.updateBusinessInfo(businessInfo);
     }

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -3,6 +3,7 @@ package com.dsk.system.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +26,8 @@ public class EconomicServiceImpl implements EconomicService {
     private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
-    public AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
+    public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -34,25 +35,25 @@ public class EconomicServiceImpl implements EconomicService {
     public AjaxResult details(Integer id) {
         Map<String, Object> bodyMap = new HashMap<>(1);
         bodyMap.put("id", id);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/details", bodyMap);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/details", bodyMap);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult regionalList(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/regional/list",  BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/list",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/xx",  BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/xx",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/ReadBusinessInfoExcel.java

@@ -108,7 +108,8 @@ public class ReadBusinessInfoExcel {
 //        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
         ArrayList<BusinessExcelDto> list = new ArrayList<>();
         //循环Excel行数
-        for (int r = 1; r < totalRows; r++) {
+        //
+        for (int r = 3; r < totalRows; r++) {
             Row row = sheet.getRow(r);
             if (row == null) {
                 continue;
@@ -116,7 +117,7 @@ public class ReadBusinessInfoExcel {
             //循环Excel的列
 //            Map<String, Object> map = new HashMap<String, Object>();
             BusinessExcelDto businessExcelDto = new BusinessExcelDto();
-            for (int c = 3; c < this.totalCells; c++) {
+            for (int c = 0; c < this.totalCells; c++) {
                 Cell cell = row.getCell(c);
                 if (null != cell) {
                     if (c == 0) {
@@ -147,6 +148,7 @@ public class ReadBusinessInfoExcel {
             //添加到list
             list.add(businessExcelDto);
         }
+        log.info("项目批量导入Excel数据,{}",list);
         return list;
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/RegionalEnterprisesServiceImpl.java

@@ -5,7 +5,6 @@ import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.service.RegionalEnterprisesService;
-import com.dsk.system.service.SpecialPurposeBondsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +25,7 @@ public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesServic
 
     @Override
     public AjaxResult page(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/search/enterprisePage", 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);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java

@@ -28,7 +28,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
 
     @Override
     public AjaxResult page(SpecialPurposeBondsPageDto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -36,19 +36,19 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
     public AjaxResult details(String id) {
         Map<String, Object> bodyMap = new HashMap<>(1);
         bodyMap.put("id", id);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/details", bodyMap);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/details", bodyMap);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult bondPage(SpecialBondInformationPageDto pageDto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/specialPurposeBonds/bond/page", BeanUtil.beanToMap(pageDto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/page", BeanUtil.beanToMap(pageDto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java

@@ -26,7 +26,7 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
 
     @Override
     public AjaxResult page(UrbanInvestmentPlatformDto pageDto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -34,13 +34,13 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
     public AjaxResult details(String id) {
         Map<String, Object> bodyMap = new HashMap<>(1);
         bodyMap.put("id", id);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/details", bodyMap);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/details", bodyMap);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult statistics(UrbanInvestmentPlatformDto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/urbanInvestment/statistics", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/statistics", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -29,7 +29,12 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
-        <result property="customerId" column="customer_id"/>
+        <result property="evaluationBidWay" column="evaluation_bid_way"/>
+        <result property="bidOpenTime" column="bid_open_time"/>
+        <result property="bidOpenPlace" column="bid_open_place"/>
+        <result property="earnestMoneyPay" column="earnest_money_pay"/>
+        <result property="earnestMoney" column="earnest_money"/>
+        <result property="evaluationBidCouncil" column="evaluation_bid_council"/>
     </resultMap>
 
     <sql id="selectBusinessInfoVo">
@@ -57,7 +62,13 @@
                create_time,
                update_time,
                status,
-               customer_id
+               customer_id,
+               evaluation_bid_way,
+               bid_open_time,
+               bid_open_place,
+               earnest_money_pay,
+               earnest_money,
+               evaluation_bid_council
         from business_info
     </sql>
 
@@ -240,7 +251,12 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
-            <if test="customerId != null">customer_id,</if>
+            <if test="evaluationBidWay != null">evaluation_bid_way,</if>
+            <if test="bidOpenTime != null">bid_open_time,</if>
+            <if test="bidOpenPlace != null">bid_open_place,</if>
+            <if test="earnestMoneyPay != null">earnest_money_pay,</if>
+            <if test="earnestMoney != null">earnest_money,</if>
+            <if test="evaluationBidCouncil != null">evaluation_bid_council,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectName != null">#{projectName},</if>
@@ -267,6 +283,12 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="status != null">#{status},</if>
             <if test="customerId != null">#{customerId},</if>
+            <if test="evaluationBidWay != null">#{evaluationBidWay},</if>
+            <if test="bidOpenTime != null">#{bidOpenTime},</if>
+            <if test="bidOpenPlace != null">#{bidOpenPlace},</if>
+            <if test="earnestMoneyPay != null">#{earnestMoneyPay},</if>
+            <if test="earnestMoney != null">#{earnestMoney},</if>
+            <if test="evaluationBidCouncil != null">#{evaluationBidCouncil},</if>
         </trim>
     </insert>
 
@@ -297,6 +319,12 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="status != null">status = #{status},</if>
             <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="evaluationBidWay != null">evaluation_bid_way = #{evaluationBidWay},</if>
+            <if test="bidOpenTime != null">bid_open_time = #{bidOpenTime},</if>
+            <if test="bidOpenPlace != null">bid_open_place = #{bidOpenPlace},</if>
+            <if test="earnestMoneyPay != null">earnest_money_pay = #{earnestMoneyPay},</if>
+            <if test="earnestMoney != null">earnest_money = #{earnestMoney},</if>
+            <if test="evaluationBidCouncil != null">evaluation_bid_council = #{evaluationBidCouncil},</if>
         </trim>
         where id = #{id}
     </update>
@@ -340,8 +368,21 @@
             plan_start_time,
             plan_complete_time,
             build_property,
-            project_details
+            project_details,
+            evaluation_bid_way,
+            bid_open_time,
+            bid_open_place,
+            earnest_money_pay,
+            earnest_money,
+            evaluation_bid_council
         from business_info
         where id = #{id}
     </select>
+    <select id="isRepetitionProjectName" resultType="java.lang.Integer">
+        select count(i.id)
+        from business_info i
+        inner join business_user u on u.business_id = i.id
+        where  i.project_name = #{projectName}
+        and u.user_id = #{userId}
+    </select>
 </mapper>

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -43,7 +43,7 @@
         from customer ct
         join customer_user ctu on ct.customer_id = ctu.customer_id
         where ctu.user_id = #{userId} and ct.uip_id in
-        <foreach collection="uipIds" item="uipId" open="(" separator="," close=",">
+        <foreach collection="uipIds" item="uipId" open="(" separator="," close=")">
             #{uipId}
         </foreach>
     </select>