Merge branch 'V20230915' of 192.168.60.201:root/dsk-operate-sys into V20230915

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/bo/EnterpriseProjectImportantListDto.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -20,6 +21,6 @@ public class EnterpriseProjectImportantListDto extends BasePage {
 
     private String projectLevel;
 
-    private String projectType;
+    private List<String> projectType;
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

@@ -131,6 +131,7 @@ public class EnterpriseService {
         performance.put("specialDebt", MapUtils.getInteger(projectStatisticMapData, "specialDebt", 0));
         performance.put("bidPlan", MapUtils.getInteger(projectStatisticMapData, "bidPlan", 0));
         business.put("historySend", MapUtils.getInteger(projectStatisticMapData, "historySend", 0));
+        business.put("importantBusiness", MapUtils.getInteger(projectStatisticMapData, "importantBusiness", 0));
 
         statisticMapData.put("performance", performance);
         statisticMapData.put("business", business);

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

@@ -232,7 +232,7 @@ ul, li {
     }
   }
   .el-input__inner::placeholder{
-    color: rgba(35,35,35,0.4) !important;
+    color: rgba(35,35,35,0.8) !important;
   }
   .el-select .el-input .el-select__caret{
     color: #232323;
@@ -253,7 +253,7 @@ ul, li {
   }
   .query-params {
     .form-content-width {
-      width: 160px;
+      //width: 160px;
     }
     .el-form{
       &.el-form--inline .el-form-item{
@@ -631,7 +631,7 @@ ul, li {
     line-height: 32px;
   }
   &:hover{
-    color: #fff;
+    color: #006AD1;
     border-color: #006AD1;
   }
 }

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

@@ -393,6 +393,9 @@
       }
     }
   }
+  a:hover, a:visited, a:link, a:active{
+    color: #0081FF;
+  }
 }
 //弹出层样式
 .popups{

dsk-operate-ui/src/assets/styles/search-common.scss

@@ -10,8 +10,8 @@
     .el-cascader,
     .el-select {
       max-width: unset !important;
-      width: 64px;
-      padding: 0px 8px;
+      //width: 64px;
+      padding: 0px 16px;
       transition: width 0.3s;
       box-sizing: border-box;
 
@@ -33,19 +33,20 @@
       .el-input {
         display: flex;
         align-items: center;
-        & > input {
+        .el-input__inner {
           padding: 0px;
           border: none;
           height: 30px;
           line-height: 30px;
           box-sizing: border-box;
           &::placeholder {
-            color: rgba(35, 35, 35, 0.8);
-            font-size: 14px;
+            color: rgba(35, 35, 35, 0.8) !important;
+            font-size: 14px !important;
           }
         }
 
         & > .el-input__suffix {
+          margin-left: 8px;
           position: unset;
           .el-input__suffix-inner {
             i {
@@ -57,12 +58,35 @@
           }
         }
       }
+
+      // hover状态
+      &:hover {
+        background: #f4f6f9;
+        border-radius: 4px;
+        .el-input {
+          .el-input__inner {
+            background: #f4f6f9;
+            &::placeholder {
+              color: #232323 !important;
+            }
+          }
+          .el-input__suffix {
+            .el-input__suffix-inner {
+              i {
+                color: #232323;
+              }
+            }
+          }
+        }
+      }
     }
 
     // 自定义事件选择 金额选择
     .custom-select {
       height: 32px;
       transition: width 0.3s;
+      cursor: pointer;
+      padding: 0px 16px;
       .block {
         & > .el-input {
           display: flex;
@@ -73,12 +97,14 @@
             height: 30px;
             line-height: 30px;
             box-sizing: border-box;
+            cursor: pointer;
             &::placeholder {
-              color: rgba(35, 35, 35, 0.8);
-              font-size: 14px;
+              color: rgba(35, 35, 35, 0.8) !important;
+              font-size: 14px !important;
             }
           }
           & > .el-input__suffix {
+            margin-left: 8px;
             position: unset;
             width: auto;
             .el-input__suffix-inner {
@@ -93,6 +119,38 @@
           }
         }
       }
+
+      .options-block {
+        .option {
+          &:hover {
+            color: #0381fa;
+          }
+        }
+      }
+
+      // hover状态
+      &:hover {
+        background: #f4f6f9;
+        border-radius: 4px;
+        .block {
+          & > .el-input {
+            .el-input__inner {
+              background: #f4f6f9;
+              &::placeholder {
+                color: #232323 !important;
+              }
+            }
+            & > .el-input__suffix {
+              .el-input__suffix-inner {
+                span,
+                i {
+                  color: #232323;
+                }
+              }
+            }
+          }
+        }
+      }
     }
 
     // 时间选择器

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -88,8 +88,8 @@
           { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[], uid: this.getUid()},
           { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[],dateTo:this.formatDate(new Date()) , uid: this.getUid()},
           { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[], uid: this.getUid() },
-          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150, uid: this.getUid()},
-          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
+          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [], uid: this.getUid()},
+          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [], uid: this.getUid()},
           { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100, uid: this.getUid()},
           // { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
           { type: 3, fieldName: 'searchValue', value: '', placeholder: '输入关键词查询', uid: this.getUid()},

dsk-operate-ui/src/views/detail/groupAccount/component/qualifications.vue

@@ -12,7 +12,16 @@
       <!--certificateList-->
       <div class="item_ckquery" :style="height?'height:'+height+'':'height: 60px'">
         <template v-for="(item,index) in certificateList">
-          <span :class="{'color_text':queryParams.qualificationType === item.qualificationType}" @click="changeType(item.qualificationType)">{{item.qualificationName}}（{{item.companyCount}}）</span>
+          <el-tooltip  popper-class="certificateTips" placement="bottom" effect="light" :disabled="isShowTooltip" :key="index">
+            <span class="span" @mouseover="onMouseOver('isOverflow'+index)" :class="{'color_text':queryParams.qualificationType === item.qualificationType}">
+              <span :ref="`isOverflow`+index" @click="changeType(item.qualificationType)">
+              {{item.qualificationName}}（{{item.companyCount}}）
+            </span>
+            </span>
+            <span slot="content" :class="{'color_text':queryParams.qualificationType === item.qualificationType}">
+              {{item.qualificationName}}（{{item.companyCount}}）
+            </span>
+          </el-tooltip>
         </template>
       </div>
       <el-divider v-if="certificateList.length > 10 && !height" @click="moreClick()">更多<span></span></el-divider>
@@ -77,13 +86,21 @@
         title:'',
         rowData:'',
         certificateList:[],
-        height:''
+        height:'',
+        isShowTooltip: false
       }
     },
     created() {
+      console.log(window.location.host)
       this.getCertificateList()
     },
     methods: {
+      onMouseOver (str) { // 内容超出，显示文字提示内容
+        const tag = this.$refs[str]
+        const parentWidth = tag[0].parentNode.offsetWidth // 获取元素父级可视宽度
+        const contentWidth = tag[0].offsetWidth // 获取元素可视宽度
+        this.isShowTooltip = contentWidth <= parentWidth
+      },
       handleQuery(params){
         this.isSkeleton = true
         let data = params ? params : this.queryParams;
@@ -129,7 +146,22 @@
     }
   }
 </script>
-
+<style lang="scss">
+  .certificateTips.is-light{
+    /*padding: 12px;*/
+    /*width: 318px;*/
+    /*box-sizing: border-box;*/
+    /*font-size: 14px;*/
+    /*line-height: 20px;*/
+    color: #333333;
+    border-color: rgba(0, 0, 0, 0.08);
+    box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.08);
+    .popper__arrow {
+      border-bottom-color: rgba(0, 0, 0, 0.08) !important;
+      border-top-color: rgba(0, 0, 0, 0.08) !important;
+    }
+  }
+</style>
 <style lang="scss" scoped>
   .qualifications{
     background: #ffffff;
@@ -145,16 +177,25 @@
       position: relative;
       margin-bottom: 10px;
       overflow: hidden;
-      span{
+      .span{
         color: #232323;
-        padding: 3px 10px;
         margin-bottom: 4px;
+        height: 25px;
+        line-height: 25px;
         display: inline-block;
         font-size: 14px;
         cursor: pointer;
-        width: 20%;
+        width: 19%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        span{
+          padding: 0 10px;
+          /*display: inline-block;*/
+          /*padding-right: 20px;*/
+        }
       }
-      span:hover{
+      .span:hover{
         background: #F3F4F5;
         border-radius: 4px;
         color:#0081FF;

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue

@@ -218,7 +218,7 @@
     <div class="content">
       <head-form
         title="历史发包项目金额TOP10"
-        :form-data="formData"
+        :form-data="formData1"
         :query-params="queryParams1"
         @handle-search="handleSearch1"
         :slots="true"
@@ -283,17 +283,20 @@
       return{
         queryParams: {
           combineId: this.customerId,
-          year:'2023年'
         },
         queryParams1: {
           combineId: this.customerId,
-          year:'2023年'
         },
         formData: [
           { type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
           { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
           { type: 1, fieldName: 'year', value: '2023年', placeholder: '年份', options: [],width:100, uid: this.getUid()},
         ],
+        formData1: [
+          { type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
+          { type: 1, fieldName: 'year', value: '2023年', placeholder: '年份', options: [],width:100, uid: this.getUid()},
+        ],
         cgblList: [
           {name:'100%',value:'100%'},
           {name:'50%以上',value:'50%以上'},
@@ -321,6 +324,7 @@
     },
     created() {
       this.formData[1].options=this.cgblList;
+      this.formData1[1].options=this.cgblList;
       this.yearsData()
       //项目类型
       getDictType('project_type_new').then(result=>{
@@ -331,6 +335,10 @@
               name: data[i].dictLabel,
               value: data[i].dictValue,
             })
+            this.formData1[0].options.push({
+              name: data[i].dictLabel,
+              value: data[i].dictValue,
+            })
           }
         }
       })
@@ -356,6 +364,7 @@
         }
         this.yearOptions=Years.reverse()
         this.formData[2].options=Years
+        this.formData1[2].options=Years
       },
       handleQuery(params){
         // this.isSkeleton = true
@@ -457,6 +466,7 @@
         })
       },
       getPeojectTop(params){
+        console.log(params)
         let data = params || this.queryParams1;
         if(data.cgbl){
           if(data.cgbl === '100%'){
@@ -490,8 +500,39 @@
           }
         })
       },
+      formParams1(){
+        let condtion = {}
+        let reqData = {}
+        this.formData1&&this.formData1.forEach(item => {
+          if(item.value || (item.value && item.value.length) || item.value===0) {
+            if(item.fieldName == 'time') {
+              condtion[item.startTime] = item.value[0];
+              condtion[item.endTime] = item.value[1];
+              return
+            }
+            if(item.fieldName == 'money') {
+              condtion[item.startMoney] = item.value[0];
+              condtion[item.endMoney] = item.value[1];
+              return
+            }
+            condtion[item.fieldName] = item.value
+          }
+        })
+        Object.keys(condtion).forEach(key => {
+          if(condtion[key] || condtion[key]===0) {
+            if(Array.isArray(condtion[key]) && condtion[key].length == 0){
+              delete condtion[key]
+            }
+            reqData[key] = condtion[key]
+          }
+        })
+        if(this.queryParams1 && Object.keys(this.queryParams1)) {
+          reqData = Object.assign(reqData, this.queryParams1)
+        }
+        return reqData
+      },
       handleSearch1(){
-        let params = this.formParams()
+        let params = this.formParams1()
         this.getPeojectTop(params)
       },
       changeSelect1(){

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

@@ -226,7 +226,8 @@ export default {
 
 <style lang="scss">
   .custom-money-select {
-    width: 120px;
+    /*width: 120px;*/
+    width: auto;
     height: 34px;
     position: relative;
     .el-input__inner{

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

@@ -238,7 +238,8 @@ export default {
 
 <style lang="scss">
   .custom-time-select {
-    width: 120px;
+    /*width: 120px;*/
+    width: auto;
     height: 34px;
 
     .rote {

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

@@ -5,14 +5,6 @@
         <div class="flex-box query-params">
           <span class="common-title" v-if="title">{{ title }}</span>
         </div>
-        <template v-if="slots">
-          <slot name="slot"></slot>
-        </template>
-        <div v-else class="flex-box">
-          <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
-          <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
-          <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
-        </div>
       </div>
       <div class="flex-box query-box" v-if="formData.length > 0">
         <div class="flex-box query-params">
@@ -105,7 +97,10 @@
             </div>
           </div>
         </div>
-        <div v-if="!title" class="flex-box">
+        <template v-if="slots">
+          <slot name="slot"></slot>
+        </template>
+        <div v-else class="flex-box">
           <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
           <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
           <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>

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

 <template>
-  <div class="head-form-new" v-if="title === '集团业绩'">
-    <div class="common-title" v-if="title">{{ title }}</div>
-    <div class="flex-box query-box" style="margin-bottom: 12px;">
-      <div class="flex-box query-params">
-
-      </div>
-      <template v-if="slots">
-        <slot name="slot"></slot>
-      </template>
-      <div v-else class="flex-box">
-        <span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span>
-        <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img
-            src="@/assets/images/ability_excel.png">导出EXCEL</span>
-        <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
-      </div>
-    </div>
-    <div class="flex-box query-box">
-      <div class="flex-box query-params">
-        <div class="headForm-from">
-          <div class="from-item" :key="i" v-for="(form, i) in formData">
-            <!-- 单选 -->
-            <template v-if="form.type==1">
-              <el-select v-model="form.value" clearable class="form-content-width same-select-com" :class="[`select-adaptive-${form.uid}`]"
-                :style="form.width?'width:'+form.width+'px':'max-width: 110px'" :placeholder="form.placeholder" @change="iptAdaptive(form.uid)">
-                <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled" />
-              </el-select>
-            </template>
-            <!-- 年月日 -->
-            <template v-if="form.type==2">
-              <el-date-picker @change="changeSelect" class="fromTime" style="width: 210px" v-model="form.value" type="daterange"
-                prefix-icon="fromTime-icon" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-              </el-date-picker>
-            </template>
-            <!-- 输入框 -->
-            <template v-if="form.type==3">
-              <!-- 未点击前的输入框样式 -->
-              <div class="normal-search-container" @click="showSearchBox = true" v-if="!showSearchBox">
-                <img src="@/assets/images/enterprise/enterprise-search-icon.svg" alt="">
-                <span>搜索</span>
-              </div>
-              <!-- 输入框展开后样式 -->
-              <transition @enter="onEnter" appear mode="out-in">
-                <div class="cooperate-name enterprise-search-container" :id="'focus'+i" v-if="showSearchBox">
-                  <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value"
-                    :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
-                  <span @click="changeSelect">搜索</span>
-                </div>
-              </transition>
-            </template>
-            <!-- 多选 -->
-            <template v-if="form.type==4">
-              <el-select class="form-content-width"
-                :class="form.value.length > 1 ? ['selectTag',`select-adaptive-${form.uid}`] : [`select-adaptive-${form.uid}`]" v-model="form.value"
-                multiple collapse-tags clearable :style="form.width?'width:'+form.width+'px':'max-width: 170px'" :placeholder="form.placeholder"
-                @change="iptAdaptive(form.uid,true)">
-                <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
-              </el-select>
-            </template>
-            <!-- 时间、自定义 -->
-            <template v-else-if="form.type==5">
-              <custom-time-select :class="[`select-adaptive-${form.uid}`,'custom-select']" :timeList="form.timeList" v-model="form.value"
-                :placeholder="form.placeholder" :dateFrom="form.dateFrom ? form.dateFrom : ''" :dateTo="form.dateTo ? form.dateTo : ''"
-                @handle-search="iptAdaptive(form.uid)" />
-            </template>
-            <!-- 金额 -->
-            <template v-else-if="form.type==6">
-              <custom-money-select :class="[`select-adaptive-${form.uid}`,'custom-select']" :moneyList="form.moneyList" v-model="form.value"
-                :placeholder="form.placeholder" @handle-search="iptAdaptive(form.uid)" />
-            </template>
-            <!-- 地区选择 -->
-            <template v-else-if="form.type==7">
-              <el-cascader :class="[`select-adaptive-${form.uid}`]" ref="cascader" :options="form.options" :props="form.props" v-model="form.value"
-                @change="iptAdaptive(form.uid,true)" :placeholder="form.placeholder" collapse-tags clearable></el-cascader>
-            </template>
-            <!-- 自定义 -->
-            <template v-if="form.type==0">
-              <slot name="slot"></slot>
-            </template>
-
-          </div>
-
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="head-form-new" v-else>
+  <div class="head-form-new">
     <div class="common-title" v-if="title">{{ title }}</div>
     <div class="flex-box query-box">
       <div class="flex-box query-params">
@@ -158,8 +73,8 @@
       </template>
       <div v-else class="flex-box">
         <span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span>
-        <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img
-            src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" v-if="isExcel && title ==='集团业绩'"
+          @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
@@ -230,11 +145,11 @@ export default {
             textContainer.style.setProperty("display", "inline-block");
             textContainer.style.setProperty("font-size", "14px");
             const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
-            hasPadding ? textContainer.style.setProperty("padding", "0px 8px") : null;
+            hasPadding ? textContainer.style.setProperty("padding", realStyles.paddingRight) : null;
             textContainer.style.setProperty("box-sizing", "border-box");
             textContainer.textContent = text;
             document.body.append(textContainer);
-            // 加上按钮宽度 以及间距
+            // 加上按钮宽度 以及按钮左外边距
             let containerWidth = textContainer.offsetWidth + 12 + 8;
             textContainer.remove();
             dom.style.setProperty("width", `${containerWidth}px`);
@@ -295,7 +210,7 @@ export default {
           textContainer.style.setProperty("visibility", "hidden");
           textContainer.style.setProperty("display", "inline-block");
           textContainer.style.setProperty("font-size", "14px");
-          textContainer.style.setProperty("padding", "0px 8px");
+          textContainer.style.setProperty("padding", "0px 16px");
           textContainer.style.setProperty("box-sizing", "border-box");
           textContainer.textContent = iptChild.getAttribute("placeholder");
           document.body.append(textContainer);
@@ -324,7 +239,7 @@ export default {
           textContainer.style.setProperty("display", "inline-block");
           textContainer.style.setProperty("font-size", "14px");
           const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
-          hasPadding ? textContainer.style.setProperty("padding", "0px 8px") : null;
+          hasPadding ? textContainer.style.setProperty("padding", realStyles.padding) : null;
           textContainer.style.setProperty("box-sizing", "border-box");
           textContainer.textContent = iptChild.value ? iptChild.value : iptChild.getAttribute("placeholder");
           document.body.append(textContainer);
@@ -391,7 +306,8 @@ export default {
   ::v-deep .el-cascader {
     height: 34px;
     line-height: 34px;
-    width: 190px;
+    /*width: 190px;*/
+    width: auto;
     .el-input {
       input {
         height: 34px !important;
@@ -492,8 +408,7 @@ export default {
         }
 
         & > span {
-          color: #232323;
-          color: rgba(35, 35, 35, 0.4);
+          color: rgba(35, 35, 35, 0.8);
           font-weight: 400;
           margin-left: 8px;
           line-height: 22px;
@@ -502,7 +417,8 @@ export default {
       }
     }
     ::v-deep .form-content-width {
-      width: 170px;
+      /*width: 170px;*/
+      /*width: auto;*/
     }
     ::v-deep .selectTag {
       .el-select__tags {

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

@@ -237,40 +237,45 @@ export default {
                   this.sideRoute[0].children[5].disabled = true;
                 }
                 break;
-              case 'landInfo':
+              case 'importantBusiness':
                 if (arr[i][j] < 1) {
                   this.sideRoute[2].children[0].disabled = true;
+                }
+                break;
+              case 'landInfo':
+                if (arr[i][j] < 1) {
+                  this.sideRoute[2].children[1].disabled = true;
                   this.sideRoute[4].children[1].disabled = true;
                 }
                 break;
               case 'busProposedProjectV1':
                 if (arr[i][j] < 1) {
-                  this.sideRoute[2].children[1].disabled = true;
+                  this.sideRoute[2].children[2].disabled = true;
                 }
                 break;
               case 'specialDebt':
                 if (arr[i][j] < 1) {
-                  this.sideRoute[2].children[2].disabled = true;
+                  this.sideRoute[2].children[3].disabled = true;
                 }
                 break;
               case 'bidPlan':
                 if (arr[i][j] < 1) {
-                  this.sideRoute[2].children[3].disabled = true;
+                  this.sideRoute[2].children[4].disabled = true;
                 }
                 break;
               case 'biddingAnnouncement':
                 if (arr[i][j] < 1) {
-                  this.sideRoute[2].children[4].disabled = true;
+                  this.sideRoute[2].children[5].disabled = true;
                 }
                 break;
               case 'proBiddingAnnouncement':
                 if (arr[i][j] < 1) {
-                  this.sideRoute[2].children[5].disabled = true;
+                  this.sideRoute[2].children[6].disabled = true;
                 }
                 break;
               case 'adminLicensing':
                 if (arr[i][j] < 1) {
-                  this.sideRoute[2].children[6].disabled = true;
+                  this.sideRoute[2].children[7].disabled = true;
                 }
                 break;
               case 'customer':
@@ -336,6 +341,7 @@ export default {
                   this.sideRoute[5].children[6].disabled = true;
                 }
                 break;
+
               default:
                 break;
             }

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

@@ -367,7 +367,8 @@ export default {
       } else {
         this.$nextTick(() => {
           this.isCompany = true;
-          this.currentPath.pathName = 'overview';
+          // this.currentPath.pathName = 'overview';
+          this.currentPath.pathName = this.$routes.query.path;
         });
       }
     },

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

@@ -6,7 +6,7 @@
     <tables v-else :tableLoading="tableLoading" :tableData="tableData" :forData="forData" :tableDataTotal="tableDataTotal" :queryParams="queryParams"
       @handle-current-change="handleCurrentChange" @sort-change="sortChange">
       <template slot="projectName" slot-scope="scope">
-        <router-link :to="`/radar/Land/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName "
+        <router-link :to="`/radar/MajorProject/details/${scope.row.md5Id}`" tag="a" class="a-link" v-if="scope.row.md5Id&&scope.row.projectName "
           v-html="scope.row.projectName"></router-link>
         <div v-else v-html="scope.row.projectName  || '--'"></div>
       </template>
@@ -16,6 +16,10 @@
           {{scope.row.totalInvestment ? `${scope.row.totalInvestment}万元` : "--"}}
         </div>
       </template>
+      <!-- 项目年度 -->
+      <template slot="year" slot-scope="scope">
+        {{scope.row.year ? `${scope.row.year}年` : "--"}}
+      </template>
     </tables>
 
   </div>
@@ -42,11 +46,11 @@ export default {
       },
       forData: [
         { label: '项目名称', prop: 'projectName', minWidth: '450', slot: true },
-        { label: '项目地区', prop: 'projectAddress', width: '127' },
-        { label: '项目等级', prop: 'projectLevel', width: '90' },
-        { label: '项目投资金额', prop: 'totalInvestment', width: '120', slot: true },
-        { label: '项目类型', prop: 'projectType', width: '120' },
-        { label: '项目年度', prop: 'year', width: '90' },
+        { label: '项目地区', prop: 'projectAddress', minWidth: '127' },
+        { label: '项目等级', prop: 'projectLevel', minWidth: '90' },
+        { label: '项目投资金额', prop: 'totalInvestment', minWidth: '120', slot: true },
+        { label: '项目类型', prop: 'projectType', minWidth: '120' },
+        { label: '项目年度', prop: 'year', minWidth: '90', slot: true },
       ],
       formData: [
         { type: 1, fieldName: 'projectLevel', value: '', placeholder: '项目级别', options: [], uid: this.getUid() },

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

@@ -21,7 +21,8 @@
       iframeHight: window.innerHeight, // iframe高度-当前页控制
       navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68},  // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
       src: '',  //iframe嵌套页面地址
-      domain: 'https://plug.jiansheku.com', // 插件地址
+      domain: 'https://plug.jiansheku.com', // 线上-插件地址
+      // domain: 'https://pre-plug.jiansheku.com', // 测试-插件地址
       // domain: 'http://192.168.60.104:3400',
       // domain: 'http://192.168.60.30:3300',
       ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912', // 需要携带的sdkId
@@ -31,6 +32,7 @@
     }
   },
   created() {
+    // http://szh.jiansheku.com
     this.gettokens()
   },
   mounted() {

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -1193,6 +1193,8 @@ export default {
         display: flex;
         align-items: center;
         cursor: pointer;
+        opacity: 0;
+        transition: opacity 0.3s;
         .renling-img-true {
           width: 16px;
           height: 16px;
@@ -1228,6 +1230,23 @@ export default {
         }
       }
     }
+
+    .el-table {
+      th,
+      td {
+        .cell {
+          font-size: 12px;
+        }
+      }
+
+      .hover-row {
+        .cell {
+          .renling-btn {
+            opacity: 1;
+          }
+        }
+      }
+    }
   }
   .table-item1 {
     ::v-deep .el-table__body-wrapper {

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

@@ -2,7 +2,7 @@
   <div class="regionalEconomy">
     <div class="flex-box query-box">
       <div class="flex-box query-params">
-        <span class="common-title">指标</span>
+        <!--<span class="common-title">指标</span>-->
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
           <el-form-item prop="year">
             <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择">
@@ -649,16 +649,21 @@ export default {
     margin-top: 12px;
     border-radius: 4px;
     .el-form{
-      margin-left: 20px;
+      /*margin-left: 20px;*/
       .el-form-item{
         margin: 0 !important;
         .form-content-width{
           width: 110px;
         }
+        ::v-deep .el-input{
+          .el-input__inner{
+            border: 0;
+          }
+        }
       }
     }
     .table-item{
-      margin-top: 22px;
+      margin-top: 16px;
       position: relative;
       ::v-deep .el-table{
         .el-table__body{

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

@@ -2,10 +2,10 @@
   <div class="regionalEconomy">
     <div class="flex-box query-box">
       <div class="flex-box query-params">
-        <span class="common-title">主要指标</span>
+        <!--<span class="common-title">主要指标</span>-->
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
           <el-form-item prop="year">
-            <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="getGroupCount">
+            <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getGroupCount">
               <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
             </el-select>
           </el-form-item>
@@ -344,16 +344,21 @@ export default {
     margin-top: 12px;
     border-radius: 4px;
     .el-form{
-      margin-left: 24px;
+      /*margin-left: 24px;*/
       .el-form-item{
         margin: 0 !important;
         .form-content-width{
           width: 100px;
         }
+        ::v-deep .el-input{
+          .el-input__inner{
+            border: 0;
+          }
+        }
       }
     }
     .content{
-      margin-top: 22px;
+      margin-top: 16px;
       display: flex;
       justify-content: space-between;
       .content-left{

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

@@ -193,12 +193,17 @@ export default {
 <style lang="scss" scoped>
   .regionalEconomy{
     .el-form{
-      margin-left: 24px;
+      /*margin-left: 24px;*/
       .el-form-item{
         margin: 0 !important;
         .form-content-width{
           width: 100px;
         }
+        ::v-deep .el-input{
+          .el-input__inner{
+            border: 0;
+          }
+        }
       }
     }
     .content{
@@ -209,7 +214,7 @@ export default {
       border-radius: 4px;
     }
     .table-item{
-      margin-top: 22px;
+      margin-top: 16px;
       ::v-deep .el-table{
         overflow:visible;
         .el-table__header-wrapper{

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

@@ -3,7 +3,7 @@
     <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <div v-if="state && !isSkeleton">
       <div class="content content1">
-        <div class="common-title">经济数据</div>
+        <!--<div class="common-title">经济数据</div>-->
         <div class="content-box">
           <div class="item">
             <div class="item-title"><i style="background: #4E8EFF;"></i>{{recentlyYear.year}}年GDP</div>

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

@@ -613,7 +613,7 @@ export default {
 
           & > span {
             color: #232323;
-            color: rgba(35, 35, 35, 0.4);
+            color: rgba(35, 35, 35, 0.8);
             font-weight: 400;
             margin-left: 8px;
             line-height: 22px;

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

@@ -36,10 +36,11 @@
       </div>
     </div>
     <div v-if="!isSkeleton" class="content">
-      <div class="common-title flex-box">
-        <div class="flex-box">项目明细</div>
+      <div class="flex-box query-box">
+        <div class="flex-box query-ability">
+          <span class="total">共 {{tableDataTotal}} 条</span>
+        </div>
         <div class="flex-box query-ability">
-          <span class="flex-box">共 {{tableDataTotal}} 条</span>
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
@@ -433,6 +434,14 @@ export default {
         color: #3D3D3D;
         font-size: 12px;
       }
+      /*.total:before {*/
+        /*content: "";*/
+        /*display: inline-block;*/
+        /*width: 2px;*/
+        /*height: 2px;*/
+        /*background: rgba(35, 35, 35, 0.4);*/
+        /*margin-right: 4px;*/
+      /*}*/
     }
     .content{
       background: #ffffff;

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

@@ -3,7 +3,7 @@
     <div class="content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
-          <span class="common-title">全国经济大全</span>
+          <!--<span class="common-title">全国经济大全</span>-->
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item prop="year">
               <el-select v-model="queryParams.year" filterable class="form-content-width  same-select-com" placeholder="请选择" :class="[`select-adaptive-${inputID1}`]" @change="handleSearch" :popper-append-to-body='false'>
@@ -455,7 +455,7 @@
       }
       .query-params{
         .el-form{
-          margin-left: 24px;
+          /*margin-left: 24px;*/
         }
         ::v-deep .el-form{
           .el-form-item--small.el-form-item{

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

@@ -772,11 +772,22 @@ export default {
         margin-right: 24px;
       }
       ::v-deep .form-content-width{
-        width: 150px;
+        width: 135px;
         .el-select__input{
           width: 10px !important;
           max-width: 10px !important;
           margin-left:0;
+          border: 0;
+        }
+        .el-input{
+          .el-input__inner{
+            border: 0;
+          }
+        }
+        .is-focus{
+          .el-input__inner{
+            background: #F4F6F9;
+          }
         }
       }
       ::v-deep .el-cascader{

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

@@ -659,19 +659,29 @@
         margin-right: 24px;
       }
       ::v-deep .form-content-width{
-        width: 150px;
+        width: 145px;
         .el-select__input{
           width: 10px !important;
           max-width: 10px !important;
           margin-left:0;
         }
+        .el-input{
+          .el-input__inner{
+            border: 0;
+          }
+        }
+        .is-focus{
+          .el-input__inner{
+            background: #F4F6F9;
+          }
+        }
       }
       ::v-deep .el-cascader{
         width: 220px;
         .el-cascader__tags{
           flex-wrap: inherit;
           .el-tag{
-            max-width: 130px;
+            max-width: 70px;
           }
         }
       }

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

@@ -1193,19 +1193,29 @@
         margin-right: 24px;
       }
       ::v-deep .form-content-width{
-        width: 150px;
+        width: 145px;
         .el-select__input{
           width: 10px !important;
           max-width: 10px !important;
           margin-left:0;
         }
+        .el-input{
+          .el-input__inner{
+            border: 0;
+          }
+        }
+        .is-focus{
+          .el-input__inner{
+            background: #F4F6F9;
+          }
+        }
       }
       ::v-deep .el-cascader{
         width: 220px;
         .el-cascader__tags{
           flex-wrap: inherit;
           .el-tag{
-            max-width: 130px;
+            max-width: 70px;
           }
         }
       }

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

@@ -136,11 +136,12 @@
     </div>
     <div class="content" id="content">
       <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 class="common-title">城投平台列表</span>-->
           <span class="total">共{{tableDataTotal}}条</span>
+        </div>
+        <div class="flex-box query-ability">
+          <!--<span class="total">共{{tableDataTotal}}条</span>-->
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>

dsk-operate-ui/src/views/radar/components/MajorProject/index.vue

@@ -148,7 +148,7 @@
             <router-link :to="'/radar/MajorProject/details/'+ item.md5" tag="a" class="list-titel-a">
               <div class="project-name-of-level">
                 <span v-if="item.projectLevel" class="project-of-level" :class="[getBackGround(item.projectLevel)]">{{item.projectLevel}}</span>
-                <span class="project-of-name">{{item.projectName}}</span>
+                <span class="project-of-name" v-html="item.projectName"></span>
               </div>
             </router-link>
           </p>