Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/components/Gantt/components/dashLeftMenu.vue

@@ -8,9 +8,9 @@
     <el-table
       ref="tableMenu"
       :data="tableData"
-      border
+      size="mini"
       fit
-      style="width: 100%"
+      style="width: 100%;border-top: 1px solid #f5f5f5"
       row-key="id"
       height="100%"
       default-expand-all
@@ -89,6 +89,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .el-table__header>.has-gutter>tr>th{
+    height: 41px!important;
+  }
 .tableMneu {
   width: 100%;
   position: relative;

hb_client/src/components/Gantt/dashGantt.vue

@@ -442,13 +442,13 @@
           item.widthMe = item.widthChild = this.computedTimeWidth(item.startTime, item.endTime);
           item.isShow = true;
           if (index - 1 < 0) {
-            item.top = 15;
+            item.top = 7;
             if (item.type == 3) {
               item.isexpand = true;
               if (item.children.length > 0) {
                 item.children.forEach((k, i) => {
                   k.planTime = [k.startTime, k.endTime];
-                  k.top = item.top + i * 40 + 40;
+                  k.top = item.top + i * 34 + 35;
                   k.isShow = true;
                   k.left = this.computedTimeWidth(k.startTime);
                   k.widthMe = k.widthChild = this.computedTimeWidth(k.startTime, k.endTime, k);
@@ -458,13 +458,13 @@
           } else {
             if (list[index - 1].type == 3) {
               item.top =
-                list[index - 1].top + list[index - 1].children.length * 40 + 40;
+                list[index - 1].top + list[index - 1].children.length * 34 + 35;
               if (item.type == 3) {
                 item.isexpand = true;
                 if (item.children.length > 0) {
                   item.children.forEach((z, o) => {
                     z.planTime = [z.startTime, z.endTime];
-                    z.top = item.top + o * 40 + 40;
+                    z.top = item.top + o * 34 + 35;
                     z.isShow = true;
                     z.left = this.computedTimeWidth(z.startTime);
                     z.widthMe = z.widthChild = this.computedTimeWidth(z.startTime, z.endTime, z);
@@ -472,7 +472,7 @@
                 }
               }
             } else {
-              item.top = list[index - 1].top + 40;
+              item.top = list[index - 1].top + 35;
             }
           }
         });
@@ -484,11 +484,19 @@
         });
         this.list = list;
         this.setStoneLine(list);
-        window.scrollTo({
-          top: 0,
-          left: 400,
-          behavior: "smooth"
-        });
+        // window.scrollTo({
+        //   top: 0,
+        //   left: 400,
+        //   behavior: "smooth"
+        // });
+        this.$nextTick(()=>{
+          this.$refs.leftMenu.handlerSelect(list[0]);
+          this.$refs.chart.scrollTo({
+            top: 0,
+            left: list[0].left - 30,
+            behavior: "smooth"
+          });
+        })
       },
       //设置左侧leftmenu高亮
       handlerSelect(row) {
@@ -624,7 +632,7 @@
         this.currentRow = row;
         this.$refs.chart.scrollTo({
           top: 0,
-          left: row.left - 100,
+          left: row.left - 30,
           behavior: "smooth"
         });
       },
@@ -1349,9 +1357,9 @@
 
         .dateNum {
           font-size: 12px;
-          line-height: 19px;
+          line-height: 15px;
           display: block;
-          height: 19px;
+          height: 15px;
           // border-left: 1px solid #d7d7d7;
           border-bottom: 1px solid #d7d7d7;
           box-sizing: border-box;
@@ -1364,8 +1372,8 @@
 
         .dateBG {
           position: absolute;
-          top: 20px;
-          left: 0px;
+          top: 15px;
+          left: 0;
           display: block;
           // height: 100%;
         }

hb_client/src/views/dashboard/index.vue

@@ -84,11 +84,12 @@
     </div>
     <div id="dashboardMiddle" class="dashboardMiddle">
       <el-row>
-        <el-col :span="16">
+        <el-col :span="15">
           <div class="CardTitleWrap">
             <span class="verticalLine"></span><span class="dashboardCardTitle">任务进度</span>
           </div>
         </el-col>
+        <el-col :span="1" style="height: 1px"></el-col>
         <el-col :span="8">
           <div class="CardTitleWrap">
             <span class="verticalLine"></span><span class="dashboardCardTitle">成品率</span>
@@ -135,13 +136,12 @@
     </div>
     <el-row class="dashboardSubRow" :gutter="5">
       <el-col :span="12">
-        <el-card style="border-radius: 10px;">
+        <el-card style="border-radius: 5px;">
           <div class="dashboardCardHand">
             <div class="CardTitleWrap">
               <span class="verticalLine"></span><span class="dashboardCardTitle">库存列表</span>
               <span class="stockMore" @click="stockMore">更多>></span>
             </div>
-            <!--<div class="dashboardCardTitle">库存列表 </div>-->
             <div class="block">
               <el-pagination
                 :current-page.sync="stockPage"
@@ -157,7 +157,8 @@
           <el-table
             v-loading="listLoadingStock"
             :data="stockList"
-            border fit stripe
+            fit stripe
+            size="mini"
             :height="cardTabelHeight"
           >
             <el-table-column label="物料编号" prop="material_">
@@ -184,7 +185,7 @@
         </el-card>
       </el-col>
       <el-col :span="12">
-        <el-card style="height: 350px;border-radius: 10px;">
+        <el-card style="height: 350px;border-radius: 5px;">
           <div class="dashboardCardHand">
             <div class="CardTitleWrap">
               <span class="verticalLine"></span><span class="dashboardCardTitle">提醒</span>
@@ -903,6 +904,7 @@ export default {
     line-height:34px;
     font-size: 14px;
     font-weight: bold;
+    width: 50px;
     vertical-align: middle;
     margin-right: 7px;
   }