计划大屏修改

src/views/index.vue

@@ -21,11 +21,17 @@
           {{item.time}}
         </div>
         <div :class="actionTime==index?item.data.class+' timeBox_b_action':item.data.class" v-if="item.data!=null" @click="changePlanAction(index,item.data)">
-          <div>{{item.data.title}}</div>
+          <div v-if="item.data.typeId==35">计划停机</div>
+          <div v-if="item.data.typeId==36">调试</div>
+          <div v-if="item.data.typeId==37">生产</div>
+          <div v-if="item.data.typeId==38">休息</div>
           <div>{{item.data.productNo}}</div>
         </div>
       </div>
-      <div class="boxBg0" style="margin-right:1vw;">
+      <div :class="nextPlan.typeId==35||nextPlan.typeId==38?'boxBg0_b':'boxBg0'" style="margin-right:1vw;">
+        <i v-if="nextPlan.typeId==35||nextPlan.typeId==38">
+            下一产品
+        </i>
         <div class="titleBox">下一产品</div>
         <div class="trBox0">
             <span>{{nextPlan.productName}}</span>
@@ -49,15 +55,15 @@
             </span>
             <span>
               <div>原材料</div>
-              <div v-if="nextPlan.mouldType==1" class="pei_type1 pei1"></div>
-              <div v-if="nextPlan.mouldType==2" class="pei_type2 pei1"></div>
-              <div v-if="nextPlan.mouldType==3" class="pei_type3 pei1"></div>
+              <div v-if="nextPlan.material==1" class="pei_type1 pei1"></div>
+              <div v-if="nextPlan.material==2" class="pei_type2 pei1"></div>
+              <div v-if="nextPlan.material==3" class="pei_type3 pei1"></div>
             </span>
             <span>
-              <div>包装</div>
-              <div v-if="nextPlan.mouldType==1" class="pei_type1 pei2"></div>
-              <div v-if="nextPlan.mouldType==2" class="pei_type2 pei2"></div>
-              <div v-if="nextPlan.mouldType==3" class="pei_type3 pei2"></div>
+              <div>料箱</div>
+              <div v-if="nextPlan.materialbox==1" class="pei_type1 pei2"></div>
+              <div v-if="nextPlan.materialbox==2" class="pei_type2 pei2"></div>
+              <div v-if="nextPlan.materialbox==3" class="pei_type3 pei2"></div>
             </span>
             <span>
               <p>{{nextPlan.produceNum}}</p>
@@ -67,7 +73,10 @@
             </span>
         </div>
       </div>
-      <div class="boxBg0" style="margin-left:0.6vw;">
+      <div :class="nowPlan.typeId==35||nowPlan.typeId==38?'boxBg0_b':'boxBg0'" style="margin-left:0.6vw;">
+        <i v-if="nowPlan.typeId==35||nowPlan.typeId==38">
+            当前产品
+        </i>
         <div class="titleBox">当前产品</div>
         <div class="trBox0">
             <span>{{nowPlan.productName}}</span>
@@ -84,22 +93,22 @@
         </div>
         <div class="trBox2">
             <span>
-              <div>{{mjArr[nowPlan.mouldType]}}</div>
+              <div>模具</div>
               <div v-if="nowPlan.mouldType==1" class="pei_type1 pei0"></div>
               <div v-if="nowPlan.mouldType==2" class="pei_type2 pei0"></div>
               <div v-if="nowPlan.mouldType==3" class="pei_type3 pei0"></div>
             </span>
             <span>
-              <div>{{nowPlan.material}}</div>
-              <div v-if="nowPlan.mouldType==1" class="pei_type1 pei1"></div>
-              <div v-if="nowPlan.mouldType==2" class="pei_type2 pei1"></div>
-              <div v-if="nowPlan.mouldType==3" class="pei_type3 pei1"></div>
+              <div>原材料</div>
+              <div v-if="nowPlan.material==1" class="pei_type1 pei1"></div>
+              <div v-if="nowPlan.material==2" class="pei_type2 pei1"></div>
+              <div v-if="nowPlan.material==3" class="pei_type3 pei1"></div>
             </span>
             <span>
-              <div>{{nowPlan.materialbox}}</div>
-              <div v-if="nowPlan.mouldType==1" class="pei_type1 pei2"></div>
-              <div v-if="nowPlan.mouldType==2" class="pei_type2 pei2"></div>
-              <div v-if="nowPlan.mouldType==3" class="pei_type3 pei2"></div>
+              <div>料箱</div>
+              <div v-if="nowPlan.materialbox==1" class="pei_type1 pei2"></div>
+              <div v-if="nowPlan.materialbox==2" class="pei_type2 pei2"></div>
+              <div v-if="nowPlan.materialbox==3" class="pei_type3 pei2"></div>
             </span>
             <span>
               <p>{{nowPlan.produceNum}}</p>
@@ -119,41 +128,44 @@
       <div class="boxBg1All">
         
         <div class="boxBg1Box" v-for="(item0,index0) in showDataNew" :key="index0">
-          <div class="boxBg1" v-for="(item,index) in item0.child" :key="index">
+          <div :class="item.typeId==35||item.typeId==38?'boxBg1_b':'boxBg1'" v-for="(item,index) in item0.child" :key="index">
             <i v-if="item.type==0">
             {{item.weekData}}
             </i>
-            <div class="trBox0" v-if="item.type==1" style="border-top:none">
+            <i v-if="item.type==1&&(item.typeId==35||item.typeId==38)">
+              
+            </i>
+            <div class="trBox0" v-if="item.type==1&&(item.typeId==36||item.typeId==37)" style="border-top:none">
                 <span>{{item.productName}}</span>
                 <span>
                   <p>件/箱</p>
                   <p>{{item.pieces}}</p>
                 </span>
             </div>
-            <div class="trBox1" v-if="item.type==1">
+            <div class="trBox1" v-if="item.type==1&&(item.typeId==36||item.typeId==37)">
                 <span>标识</span>
                 <span>
                   批次生产数量
                 </span>
             </div>
-            <div class="trBox2" v-if="item.type==1">
+            <div class="trBox2" v-if="item.type==1&&(item.typeId==36||item.typeId==37)">
                 <span>
-                  <div>{{mjArr[item.mouldType]}}</div>
+                  <div>模具</div>
                   <div v-if="item.mouldType==1" class="pei_type1 pei0"></div>
                   <div v-if="item.mouldType==2" class="pei_type2 pei0"></div>
                   <div v-if="item.mouldType==3" class="pei_type3 pei0"></div>
                 </span>
                 <span>
-                  <div>{{item.material}}</div>
-                  <div v-if="item.mouldType==1" class="pei_type1 pei1"></div>
-                  <div v-if="item.mouldType==2" class="pei_type2 pei1"></div>
-                  <div v-if="item.mouldType==3" class="pei_type3 pei1"></div>
+                  <div>原材料</div>
+                  <div v-if="item.material==1" class="pei_type1 pei1"></div>
+                  <div v-if="item.material==2" class="pei_type2 pei1"></div>
+                  <div v-if="item.material==3" class="pei_type3 pei1"></div>
                 </span>
                 <span>
-                  <div>{{item.materialbox}}</div>
-                  <div v-if="item.mouldType==1" class="pei_type1 pei2"></div>
-                  <div v-if="item.mouldType==2" class="pei_type2 pei2"></div>
-                  <div v-if="item.mouldType==3" class="pei_type3 pei2"></div>
+                  <div>料箱</div>
+                  <div v-if="item.materialbox==1" class="pei_type1 pei2"></div>
+                  <div v-if="item.materialbox==2" class="pei_type2 pei2"></div>
+                  <div v-if="item.materialbox==3" class="pei_type3 pei2"></div>
                 </span>
                 <span>
                   <p>{{item.produceNum}}</p>
@@ -282,8 +294,8 @@
           Message.error('请选择要修改的计划')
           return false;
         }
-        this.timeArrNew[num].data=this.actionTimeData
         this.timeArrNew[this.actionTime].data=null
+        this.timeArrNew[num].data=this.actionTimeData
         this.actionTime=num;
         var time=this.timeArr[num]
         var planFinishTime=this.actionTimeData.planFinishTime.split(" ")[0]+" "+time+":00"
@@ -732,8 +744,8 @@
   .timeBox_b div:first-child{
     color:#02AEFF;
     font-size: 0.6vw;
-    height: 1.7vw;
-    line-height: 2.6vw;
+    height: 1.5vw;
+    line-height: 2.2vw;
   }
   .timeBox_b div:last-child{
     color:#02AEFF;
@@ -753,6 +765,26 @@
     margin-top: 0.6vw;
     overflow: hidden;
   }
+  .boxBg0_b{
+    float: right;
+    background-image: url("../assets/img/boxBg1_b.png");
+    background-size:100% 100%; 
+    text-align: center;
+    font-size: 0.5vw;
+    color: #fff;
+    width: 14.7vw;
+    height: 9.5vw;
+    margin-right: 0.8vw;
+    margin-top: 0.6vw;
+    overflow: hidden;
+  }
+  .boxBg0_b i{
+    width: 100%;
+    text-align: center;
+    line-height: 10vw;
+    font-size: 2.4vw;
+    font-style: inherit;
+  }
   .titleBox{
     width: 100%;
     text-align: center;
@@ -896,6 +928,18 @@
     background-size: 100% 100%;
     overflow: hidden;
   }
+  .boxBg1_b{
+    float: left;
+    background-image: url("../assets/img/boxBg1_b.png");
+    text-align: center;
+    font-size: 0.5vw;
+    color: #fff;
+    width: 14.7vw;
+    height: 8.4vw;
+    margin-right: 0.8vw;
+    background-size: 100% 100%;
+    overflow: hidden;
+  }
   .boxBg1 i{
     width: 100%;
     text-align: center;