Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/workBench/components/bottom-view.vue

@@ -79,7 +79,7 @@ export default {
         }
       ],
       tableData: [],
-      maxSize: { y: 195 },
+      maxSize: { y: 235 },
       loadingDynamic: false,
       loadingTable: false
     }
@@ -170,6 +170,7 @@ export default {
     font-size: 16px;
     color: #212121;
     text-align: center;
+        box-shadow: 2px 2px 5px #ccc;
 }
   .container {
     background: #fff;
@@ -177,6 +178,7 @@ export default {
     height: 335px;
     padding: 0px 0 0 10px;
     box-sizing: border-box;
+        box-shadow: 2px 2px 5px #ccc;
   }
 }
 
@@ -256,6 +258,10 @@ export default {
 ::v-deep .ant-table-thead {
   background-color: #f4f5f8;
 }
+::v-deep .ant-table-header{
+  margin-right: -17px;
+}
+::v-deep .ant-table-body::-webkit-scrollbar{width:0;}
 </style>
 <style lang="scss">
 .testTooltip {

back/src/views/modules/workBench/components/center-view.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-07-05 12:53:03
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-26 10:24:16
+ * @LastEditors: Light
+ * @LastEditTime: 2022-12-30 10:07:30
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -35,5 +35,9 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
+    &>div{
+
+      box-shadow: 2px 2px 5px #ccc;
+    }
 }
 </style>

back/src/views/modules/workBench/components/dept-todo-view.vue

@@ -211,6 +211,7 @@ export default {
 
 .num {
   font-size: 30px;
+  font-weight: 600;
 }
 
 .unit {

back/src/views/modules/workBench/components/trend-view.vue

@@ -69,7 +69,6 @@ export default {
         days.unshift(valueItem) // 添加至数组
       }
 
-
       return days
     },
 
@@ -88,7 +87,6 @@ export default {
           endDate: this.endDate
         },
         (res) => {
-    
           if (res.data.data && res.data.data.length > 0) {
             this.data = res.data.data[0].values
             this.data.map((item) => {
@@ -106,7 +104,7 @@ export default {
           } else {
             this.trendChartData = {
               xaxis: this.ydata,
-              ydata:this.xaxis
+              ydata: this.xaxis
             }
           }
 

back/src/views/modules/workBench/workBench.vue

@@ -73,13 +73,13 @@ export default {
       },
       // 部门申请
       resourceData: [],
-      resourceColor: ['#7b2cff', '#fd5151' , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'],
+      resourceColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'],
       // 部门申请
       applyData: [],
-      applyColor: ['#5085f2', '#e75fc3', '#f87be2', '#f2719a', '#fca4bb', '#f59a8f', '#fdb301', '#57e7ec', '#cf9ef1'],
+      applyColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'],
       // 部门需求
       requireData: [],
-      requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A'],
+      requireColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'],
       loadingToDo: false,
       loadingHasToDo: false,
       loadingResource: false,
@@ -252,12 +252,20 @@ export default {
         width: 836px;
         background: #fff;
         margin-right: 16px;
+        box-shadow: 2px 2px 5px #ccc;
     }
 
     .dept-chart-box {
         width: 780px;
         height: 100%;
         background: #fff;
+        box-shadow: 2px 2px 5px #ccc;
+        &>div{
+          border-left: 1px solid rgba($color: #d0d4de, $alpha: 0.5);
+        }
+        &>div:nth-of-type(1){
+          border: none;
+        }
     }
 }
 </style>

front/src/views/newHome/components/WorkDynamics.vue

@@ -619,7 +619,13 @@
       right: 0rem;
     }
   }
-  @media only screen and (min-width: 1921px) and (max-width: 3840px) {
+  @media only screen and (min-width: 1921px) and (max-width: 2560px) {
+    .fixedmount {
+      bottom: 1.56rem;
+      right: 0.37rem;
+    }
+  }
+  @media only screen and (min-width: 2561px) and (max-width: 3840px) {
     .fixedmount {
       bottom: 1.56rem;
       right: 9.6rem;