Merge branch 'dev-yjl' into 'shenzhen-dev'

中间四局（资源管理、进度管理）页面调整

See merge request !79

src/views/projectAdmin/common/jChart/bar/JBarChart.vue

@@ -93,7 +93,7 @@ export default {
           left: 20,
           itemWidth: 8,
           textStyle: { color: '#fff' },
-          data: [{ name: '过磅次数' }, { name: '过磅重量' }]
+          data: [{ name: '计划用量' }, { name: '实际用量' }]
         },
         tooltip,
         grid: {

src/views/projectAdmin/fourEngin/progress/index.vue

@@ -196,8 +196,9 @@ export default {
   width: 100%;
   height: 100%;
   margin-top: 20px;
-  position: relative;
+  // position: relative;
   overflow: hidden;
+  margin-top: 2%;
 
   // background: url(../assets/temp/4.png) no-repeat;
   // background-size: 100% 100%;
@@ -209,7 +210,7 @@ export default {
   }
   .changeTab0 {
     position: absolute;
-    top: 5%;
+    margin-top:-38px;
     left: 30%;
     width: 212px;
     height: 38px;
@@ -219,7 +220,7 @@ export default {
   }
   .changeTab1 {
     position: absolute;
-    top: 5%;
+    margin-top:-38px;
     left: 40%;
     width: 212px;
     height: 38px;
@@ -229,7 +230,7 @@ export default {
   }
   .changeTab2 {
     position: absolute;
-    top: 5%;
+    margin-top:-38px;
     left: 50%;
     width: 212px;
     height: 38px;
@@ -239,7 +240,7 @@ export default {
   }
   .show0 {
     position: absolute;
-    top: 5%;
+      margin-top:-38px;
     left: 30%;
     width: 212px;
     height: 38px;
@@ -250,7 +251,7 @@ export default {
   }
   .show1 {
     position: absolute;
-    top: 5%;
+    margin-top:-38px;
     left: 40%;
     width: 212px;
     z-index: 98;
@@ -261,7 +262,7 @@ export default {
   }
   .show2 {
     position: absolute;
-    top: 5%;
+    margin-top:-38px;
     left: 50%;
     width: 212px;
     z-index: 98;
@@ -318,11 +319,12 @@ export default {
   // }
   .right {
     width: 100%;
-    height: 98%;
+    height: 96%;
     // background-image: url(../assets/temp/tab3.png);
     background-repeat: no-repeat;
     background-size: 100%;
     color: #fafbfa;
+    margin-bottom: 36px;
     iframe {
       width: 100%;
       height: 100%;

src/views/projectAdmin/fourEngin/sourse/leftBottom.vue

@@ -12,15 +12,15 @@
           </div>
         </div>
         <div class="tbody">
-          <vue-scroll>
+          <vue-scroll style="height:280px">
             <div class="row" v-for="(item, index) in carList" :key="index">
               <div>{{ item.materialName }}</div>
               <div class="datetime">
                 {{ item.netWeight }}<a>{{ "(吨)" }}</a>
               </div>
-              <div>{{ item.poundType }}</div>
+              <div>{{ item.poundType==1?'收料':item.poundType==2?'发料':item.poundType==3?'直入直出':'无' }}</div>
               <div>{{ item.warehouseName }}</div>
-              <div>{{ item.createTime }}</div>
+              <div>{{ item.weighingGrossTime }}</div>
             </div>
           </vue-scroll>
         </div>
@@ -112,6 +112,7 @@ export default {
       this.sn = this.$store.state.projectSn
       getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => {
         this.carList = res.result
+        console.log('this.carList ',this.carList);
       })
     }
   }
@@ -139,7 +140,7 @@ export default {
       // justify-content: center;
       font-size: 14px;
       &:not(:last-child) {
-        margin-bottom: 12px;
+        // margin-bottom: 12px;
       }
       div {
         box-sizing: border-box;
@@ -150,6 +151,7 @@ export default {
         }
         &:not(:last-child) {
           width: 84px;
+          margin-left: -6px
         }
         &:last-child {
           flex: 1;

src/views/projectAdmin/fourEngin/sourse/leftTop.vue

@@ -1,10 +1,10 @@
 <template>
   <Card title="实时过磅">
     <div class="car-count">
-      计划进场量<span>{{messageList.count}}</span>吨
+      计划进场量<span>{{messageList.ton}}</span>吨
     </div>
-    <div class="car-count">
+    <div class="car-count" style="margin-left:30px">
-      实际进场量<span>{{messageList.ton}}</span>吨
+      过磅量<span style="margin-left:45px">{{messageList.ton}}</span>吨
     </div>
   </Card>
 </template>
@@ -12,7 +12,6 @@
 <script>
 import Card from '../components/Card.vue'
 import { getRealTimeWeigh } from '@/assets/js/api/markingRoom'
-
 export default {
   components: { Card },
   data(){

src/views/projectAdmin/fourEngin/sourse/rightTop.vue

@@ -69,7 +69,7 @@ export default {
       xData: new Array(12).fill('破产倒闭').map((v, i) => i + 1 + '月'),
       series: [
         {
-          name: '过磅次数',
+          name: '计划用量',
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           itemStyle: {
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -79,7 +79,7 @@ export default {
           }
         },
         {
-          name: '过磅重量',
+          name: '实际用量',
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           itemStyle: {
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -128,7 +128,7 @@ export default {
             for (let i = 0; i < 12; i++) {
               let rest = dataAll.find(item => item.date == i + 1)
               if (rest) {
-                frequency[i] = rest.count
+                frequency[i] = rest.ton
                 weight[i] = rest.ton
               }
             }

src/views/projectFront/scheduleManage/ganttwo.vue

@@ -110,7 +110,8 @@ export default {
         confirm_closing: "请确认是否撤销修改!", //Your changes will be lost, are your sure?
         confirm_deleting: "是否删除计划?",
         section_description: "备注:",
-        section_time: "时间范围:",
+        section_time: "计划时间:",
+        section_time2: "开始时间:",
         section_type: "类型",
         section_text: "任务名称:",
         section_color: "颜色:",
@@ -242,6 +243,14 @@ export default {
           { key: 3, label: "已完成" ,color:'#F2D026F'},
         ],
       },
+      //时间范围
+      {
+        name: "time2",
+        height: 30,
+        map_to: "auto",
+        type: "time",
+        time_format: ["%Y", "%m", "%d"],
+      },
 
       //任务模式
       {