Merge branch 'V20231129-中建一局二公司' of 192.168.60.201:root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -31,13 +31,13 @@
         <div class="each-line" style="padding-top:16px;border-top:1px solid #EEEEEE;box-sizing:border-box">
           <el-form-item label="工程类型大类">
             <el-select v-model="form.engineeringFoundationCategory" placeholder="请选择" clearable>
-              <el-option v-for="item in engineeringCategoryOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-option v-for="item in engineeringCategoryOptions" :key="item.value" :label="item.label" :value="item.label">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="工程类别明细">
             <el-select v-model="form.engineeringCategoryDetail" placeholder="请选择" clearable>
-              <el-option v-for="item in engineeringCategoryDetailOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-option v-for="item in engineeringCategoryDetailOptions" :key="item.value" :label="item.label" :value="item.label">
               </el-option>
             </el-select>
           </el-form-item>

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -689,7 +689,7 @@
           text-align: center;
         }
         .el-input-group__append:hover{
-          background:#F5F5F5;
+          background:#F5F5F5 !important;
         }
       }
       .main-right {

dsk-operate-ui/src/views/monitoring/MonitoringDynamicsgs.vue

@@ -688,7 +688,7 @@
           text-align: center;
         }
         .el-input-group__append:hover{
-          background:#F5F5F5;
+          background:#F5F5F5 !important;
         }
       }
       .main-right {

dsk-operate-ui/src/views/monitoring/MonitoringDynamicsjy.vue

@@ -674,7 +674,7 @@
           text-align: center;
         }
         .el-input-group__append:hover{
-          background:#F5F5F5;
+          background:#F5F5F5 !important;
         }
       }
       .main-right {