Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java

@@ -374,6 +374,7 @@ public class MonitorServiceImpl implements MonitorService {
         }
         log.info("中建一局用户添加默认监控企业！");
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
+        log.info("----------------------------------"+map.toString());
         return BeanUtil.toBean(map, R.class);
     }
 }

dsk-operate-ui/src/views/component/CustomTimeSelect.vue

@@ -175,7 +175,7 @@ export default {
         switch (value) {
           case '昨日':
             startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 1)
-            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            timeStr = [this.formatDate(startTime), this.formatDate(startTime)]
             break;
           case '今日':
             startTime = new Date(endTime.getTime())

dsk-operate-ui/src/views/supplier/aptitude/historySearch.vue

@@ -40,6 +40,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+  .enterprise_contatiner{
+    .title_wrap{
+      padding: 20px;
+      background-color: #FFFFFF;
+      border-bottom: 1px solid #e0e0e0;
+    }
+  }
+
+
     .header{
       justify-content: space-between;
       background: #FFFFFF;

dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue

@@ -312,7 +312,8 @@ export default {
         },
         toResult(){
             this.successDialog = false;
-            this.$emit("changeActiveName")
+          this.$router.push({path: '/supplier/aptitude/historySearch'})
+            // this.$emit("changeActiveName")
         },
         loadingFn(flag){
             this.loading = !this.loading

dsk-operate-ui/src/views/supplier/components/SearchResult.vue

@@ -95,6 +95,34 @@ export default {
         color: #0081FF;
         cursor: pointer;
     }
+
+  .table-item-jf1 {
+    padding: 0px 16px;
+  }
+  .table-item-jf1{
+    .item-jf-img {
+      display: block;
+      margin: 24px auto;
+      width: 108px;
+
+    }
+    .item-jf-text {
+      font-size: 14px;
+      font-weight: 400;
+      color: #999999;
+      line-height: 18px;
+      padding-bottom: 48px;
+      text-align: center;
+    }
+    .item-jf-titel {
+      font-size: 16px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 21px;
+      margin-bottom: 8px;
+      text-align: center;
+    }
+  }
 }
 
 </style>

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

@@ -308,7 +308,7 @@
       <div class="cont-left">
         <div class="title_wrap">
           <div class="cont_title">
-            供应商行业分布
+            供应商主营业务
           </div>
         </div>
         <div class="charts-div">
@@ -325,7 +325,7 @@
                   <span>{{scope.$index + 1}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="行业" prop="name"></el-table-column>
+              <el-table-column label="主营业务" prop="name"></el-table-column>
               <el-table-column label="供应商数量" width="130" prop="number"></el-table-column>
               <el-table-column label="履约金额（亿）" width="130" prop="money"></el-table-column>
             </el-table>
@@ -719,52 +719,52 @@
 
         hyfbList:[
           {
-            name:'批发和零售业',
+            name:'工业分析仪',
             number:'832',
             money:'102'
           },
           {
-            name:'房屋建筑业',
+            name:'检查井',
             number:'772',
             money:'118'
           },
           {
-            name:'制造业',
+            name:'人脸识别',
             number:'345',
             money:'114'
           },
           {
-            name:'交通运输',
+            name:'装载机',
             number:'342',
             money:'92'
           },
           {
-            name:'农、林、牧、渔',
+            name:'电线电缆',
             number:'232',
             money:'82'
           },
           {
-            name:'供应商行业名称六',
+            name:'空调器',
             number:'132',
             money:'78'
           },
           {
-            name:'供应商行业名称七',
+            name:'智能照明系统',
             number:'132',
             money:'72'
           },
           {
-            name:'供应商行业名称八',
+            name:'其余周转材料',
             number:'132',
             money:'62'
           },
           {
-            name:'供应商行业名称九',
+            name:'荷兰砖',
             number:'83',
             money:'11'
           },
           {
-            name:'供应商行业名称十',
+            name:'车载电动地泵',
             number:'84',
             money:'25'
           },
@@ -1053,26 +1053,61 @@
           tooltip: {
             trigger: 'axis',
             axisPointer: {
-              type: 'line',
-              label: {
-                backgroundColor: '#FFFFFF'
-              }
+              type: 'shadow',
+              // label: {
+              //   backgroundColor: '#FFFFFF'
+              // }
             }
           },
-          // legend: {
-          //   data: ['供应商数量', '风险数量'],
-          //   itemGap: 5,
-          //   padding:[10,0,0,0]
-          // },
+          legend: {
+            data: ['供应商数量', '风险数量'],
+            itemGap: 5,
+            padding:[10,0,0,0]
+          },
+          dataZoom: [
+            {
+              type: "slider",
+              show: true,  // x轴是否启用
+              start: 0,  // 从哪里开始显示
+              end: 20,   // 到哪里结束显示
+              bottom:10,
+              height:15,
+              // backgroundColor:'#ccc',
+              // handleStyle:{
+              //   color:'#eee',
+              // },
+              handleSize: '30%',
+            },
+            {
+              type: "inside",
+              start: 70,
+              end: 100,
+            },
+            {
+              type: "slider",
+              show: false,   // y轴是否启用
+              yAxisIndex: 0,
+              filterMode: "empty",
+              width: '5%',
+              height: "70%",
+              handleSize: '30%',
+              showDataShadow: false,
+              right:'93%'
+            },
+          ],
           xAxis: {
             type: 'category',
             data: data.map(item => item.riskType),
+            axisLabel: {
+              show: true,
+              interval: 0
+            },
           },
           yAxis: {
             type: 'value',
           },
           grid: {
-            top:30,
+            top:40,
             left:50,
             right:40,
             bottom:50,

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -222,7 +222,7 @@
           </el-table-column>
           <el-table-column label="施工队长" min-width="155" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.leaderName||'--'}}
+              <span v-html="scope.row.leaderName||'--'"></span>
               <span v-if="scope.$index + 1 === 1 || scope.$index + 1 === 3" style="width: 64px;height: 22px;background: #FFECE8;border-radius: 2px;line-height: 22px;display: inline-block;text-align: center;color: #FF3C3C;margin-left: 8px;">经营风险</span>
             </template>
           </el-table-column>