看板页面切换调整

src/router/index.js

@@ -48,7 +48,7 @@ const routes = [{
     name: 'makeprocess',
     component: () => import('../views/makeprocess/index.vue'),
     meta: {
-      title: "生产进度",
+      title: "生产进度看板",
       requireAuth: true // 标识该路由是否需要登录
     }
   },{
@@ -71,5 +71,19 @@ const routes = [{
 const router = new VueRouter({
   routes
 })
-
+router.beforeEach((to, from, next) => {
+  // 清除之前的定时器
+  if (router.timer) {
+    clearTimeout(router.timer);
+  }
+  // 设置新的定时器，例如每60秒切换到下一个页面
+  router.timer = setTimeout(() => {
+    if (to.path === '/prodline') {
+      next('/makeprocess');
+    } else if(to.path === '/makeprocess') {
+      next('/prodline');
+    }
+  }, 60000);
+  next();
+});
 export default router

src/views/login.vue

@@ -65,7 +65,8 @@
                     {label: '品质看板', value: '品质看板'},
                     {label: '车间看板', value: '车间看板'},
                     {label: '仓库看板', value: '仓库看板'},
-                    {label: '组装看板', value: '组装看板'}
+                    {label: '组装看板', value: '组装看板'},
+                    {label: '生产进度看板', value: '生产进度看板'}
                 ],
             }
         },
@@ -127,7 +128,9 @@
                                         this.$router.push({path: this.redirect || '/quality'});
                                     }else if(this.loginForm.type =='仓库看板'){
                                       this.$router.push({path: this.redirect || '/warehouse'});
-                                    }
+                                    }else if(this.loginForm.type =='生产进度看板'){
+                                     this.$router.push({path: this.redirect || '/makeprocess'});
+                                   }
                                   //总看板，品质看板，车间看板，仓库看板
                                 }else{
                                     this.$message.error(res.reason);

src/views/makeprocess/bottom1.vue

@@ -23,12 +23,12 @@ export default {
       config: {
         header: ['单号','业务员','产品编号','产品名称', '订单数','裁切','打点','SMT','无尘1','无尘2','组装1','组装2','样品','丝印','包装' ],
         data: [],
-        rowNum: 15, //表格行数
+        rowNum: 14, //表格行数
         headerHeight: 35,
-        headerBGC: 'rgba(15,19,37,0.1)', //表头
-        oddRowBGC: 'rgb(33,56,117)', //奇数行
-        evenRowBGC: 'rgb(33,56,117)', //偶数行
-        columnWidth: [150,110,200,150, 110, 120, 120, 120, 120, 120,120, 120,120],
+        headerBGC: 'rgba(15,19,37,0.27)', //表头
+        oddRowBGC: 'rgba(15,19,37,0.6)', //奇数行
+        evenRowBGC: 'rgba(23,28,51,0.51)', //偶数行
+        columnWidth: [150,110,220,170, 110, 110, 110, 110, 110, 110,110, 110,110],
         align: ['center','center','center','center','center','center','center','center','center','center','center','center','center','center','center']
       },
       timing: null,
@@ -65,55 +65,96 @@ export default {
                   item.push("<span  class='colorY fs-xxl'>" + element.v_prodcode + "</span>");
                   item.push("<span  class='colorY fs-xxl'>" + element.v_prdetail + "</span>");
                   item.push("<span  class='colorY fs-xxl'>" + element.v_qty + "</span>");
-                  if(element.v_qty==element.裁切 ){
+                  if(element.v_qty==element.裁切 )
+                  {
                     item.push("<span  class='colorGrass fs-xxl'>" + element.裁切 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.裁切 + "</span>");
+                    if(element.v_qty>element.裁切&&element.裁切>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.裁切 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.裁切 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.打点 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.打点 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.打点 + "</span>");
+                    if(element.v_qty>element.打点&&element.打点>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.打点 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.打点 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.smt ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.smt + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.smt + "</span>");
+                    if(element.v_qty>element.smt&&element.smt>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.smt + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.smt + "</span>");
+                    }
                   }
                   if(element.v_qty==element.无尘01 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.无尘01 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.无尘01 + "</span>");
+                    if(element.v_qty>element.无尘01&&element.无尘01>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.无尘01 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.无尘01 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.无尘02 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.无尘02 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.无尘02 + "</span>");
+                    if(element.v_qty>element.无尘02&&element.无尘02>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.无尘02 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.无尘02 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.组装01 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.组装01 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.组装01 + "</span>");
+                    if(element.v_qty>element.组装01&&element.组装01>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.组装01 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.组装01 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.组装02 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.组装02 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.组装02 + "</span>");
+                    if(element.v_qty>element.组装02&&element.组装02>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.组装02 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.组装02 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.样品 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.样品 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.样品 + "</span>");
+                    if(element.v_qty>element.样品&&element.样品>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.样品 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.样品 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.丝印 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.丝印 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.丝印 + "</span>");
+                    if(element.v_qty>element.丝印&&element.丝印>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.丝印 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.丝印 + "</span>");
+                    }
                   }
                   if(element.v_qty==element.包装 ){
                     item.push("<span  class='colorGrass fs-xxl'>" + element.包装 + "</span>");
                   }else {
-                    item.push("<span  class='colorY fs-xxl'>" + element.包装 + "</span>");
+                    if(element.v_qty>element.包装&&element.包装>0 ){
+                      item.push("<span  class='colorRemind fs-xxl'>" + element.包装 + "</span>");
+                    }else{
+                      item.push("<span  class='colorY fs-xxl'>" + element.包装 + "</span>");
+                    }
                   }
                   resultList.push(item);
                 }

src/views/makeprocess/index.vue

@@ -49,6 +49,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="prodline">车间看板</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="quality">品质看板</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="warehouse">仓库看板</router-link></el-dropdown-item>
+                  <el-dropdown-item class="dropdownitem"><router-link to="zz">组装看板</router-link></el-dropdown-item>
                  </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/prodline/index.vue

@@ -49,6 +49,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="quality">品质看板</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="warehouse">仓库看板</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="zz">组装看板</router-link></el-dropdown-item>
+                  <el-dropdown-item class="dropdownitem"><router-link to="makeprocess">生产进度看板</router-link></el-dropdown-item>
                  </el-dropdown-menu>
               </el-dropdown>