Merge branch 'V20230915' of http://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

@@ -631,7 +631,7 @@ ul, li {
     line-height: 32px;
   }
   &:hover{
-    color: #fff;
+    color: #006AD1;
     border-color: #006AD1;
   }
 }

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

@@ -11,7 +11,7 @@
     .el-select {
       max-width: unset !important;
       //width: 64px;
-      padding: 0px 8px;
+      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/party-a/component/HeadFormNew.vue

@@ -73,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','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-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>
@@ -145,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`);
@@ -210,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);
@@ -239,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);
@@ -408,7 +408,6 @@ export default {
         }
 
         & > span {
-          color: #232323;
           color: rgba(35, 35, 35, 0.8);
           font-weight: 400;
           margin-left: 8px;

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/opport/MajorProject.vue

@@ -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/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/enterpriseData/components/searchTheOwner/index.vue

@@ -37,9 +37,9 @@
           <div class="content_right">
             <div class="checkbox">
               <div class="checkbox-content">
-                <!-- <div class="checkbox-content-qx">
-                <el-checkbox v-model="checkOwnerLabel" @change="allOwnerLabelBtn">全部</el-checkbox>
-              </div> -->
+                <div class="checkbox-content-qx">
+                  <el-checkbox v-model="checkOwnerLabel" @change="allOwnerLabelBtn">不限</el-checkbox>
+                </div>
                 <el-checkbox-group v-model="currentOwnerLabels" @change="OwnerLabelChange">
                   <el-checkbox v-for="item of ownerLabels" :label="item.dictValue" :key="item.dictCode">{{item.dictLabel}}</el-checkbox>
                 </el-checkbox-group>
@@ -114,7 +114,7 @@
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
           class="table-item1 fixed-table" border highlight-current-row :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass"
-          :header-cell-class-name="setCellClass" @sort-change="sortChange">
+          :row-class-name="setRowClass" :header-cell-class-name="setCellClass" @sort-change="sortChange">
 
           <el-table-column type="index" label="序号" fixed width="60" :resizable="false">
             <template slot-scope="scope">
@@ -310,7 +310,7 @@ export default {
       // 当前选中的业主标签
       currentOwnerLabels: [],
       // 业主全选状态
-      checkOwnerLabel: false,
+      checkOwnerLabel: true,
       // 选中两个及两个以上业主标签 添加选中条件 or任意均可 and同时具备
       tagCodeQueryType: "or",
       pageFlag: true,
@@ -332,11 +332,11 @@ export default {
       //   value: "按土地交易签订日期从近到远",
       //   status: false,
       // },
-      {
-        key: "approval_project_count",
-        value: "按拟建项目审批时间从近到远",
-        status: false,
-      },
+      // {
+      //   key: "approval_project_count",
+      //   value: "按拟建项目审批时间从近到远",
+      //   status: false,
+      // },
       {
         key: "important_project_count",
         value: "按重点项目清单从多到少",
@@ -356,10 +356,18 @@ export default {
       dialogVisible1: false,
       tableData: [],
       total: 0,
+      oldPageNum: 1,
       pageNum: 1,
       pageSize: 20
     };
   },
+  watch: {
+    "pageNum": {
+      handler(newValue, oldValue) {
+        this.oldPageNum = oldValue;
+      }
+    }
+  },
   computed: {
     // 仅搜索企业名
     onlySearchEname() {
@@ -500,6 +508,9 @@ export default {
         return "enterprise-name-column";
       }
     },
+    setRowClass({ row, rowIndex }) {
+      return "enterprise-name-row";
+    },
     addColumnClass(row, column, cell, event) {
       const { target } = event;
       if (column.label == "公司名称") return this.showClaim = true;
@@ -630,8 +641,9 @@ export default {
     },
     handleCurrentChange(pageNum) {
       if (pageNum > 500) {
-        pageNum = 1;
+        this.pageNum = this.oldPageNum;
         this.$message.warning("对不起最多只能访问500页");
+        return;
       }
       this.pageNum = pageNum;
       this.search(this.pageNum, this.pageSize);
@@ -1099,14 +1111,6 @@ export default {
         font-size: 14px;
       }
     }
-    .el-table {
-      th,
-      td {
-        .cell {
-          font-size: 12px;
-        }
-      }
-    }
     padding: 0px 16px;
     .list-titel-a {
       color: #0081ff;
@@ -1195,10 +1199,21 @@ export default {
       }
     }
 
-    .enterprise-name-column {
-      &:hover {
-        .renling-btn {
-          opacity: 1;
+    .el-table {
+      th,
+      td {
+        .cell {
+          font-size: 12px;
+        }
+      }
+
+      .enterprise-name-row {
+        &.hover-row {
+          .cell {
+            .renling-btn {
+              opacity: 1;
+            }
+          }
         }
       }
     }

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>