百岗看板调整：项目阶段和项目整合成类似线别一样切换，同一个入口。调整项目阶段列表颜色

src/views/DIP/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="SMT">SMT</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="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/FQC/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</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="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/IQC/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</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="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/LAB/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</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="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/PRJ/index.vue

@@ -52,9 +52,17 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</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="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
+              <el-select v-model="licode" class="dropdown" @change ="handleBlur" style="width: 150px">
+                <el-option
+                    v-for="item in linedata"
+                    :key="item.LI_NAME"
+                    :label="item.LI_NAME"
+                    :value="item.LI_NAME"
+                ></el-option>
+              </el-select>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
             </div>
@@ -148,6 +156,8 @@ export default {
       dateWeek: null,
       weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
       decorationColor: ['#568aea', '#000000'],
+      licode:'总看板',
+      linedata:[{"LI_NAME":"总看板"},{"LI_NAME":"项目阶段"}],
     }
   },
   components: {
@@ -201,6 +211,14 @@ export default {
         }, 3000)
       }
     },
+    handleBlur (val){
+      console.log(val);
+      if(val == "项目阶段"){
+        this.$router.push("/PRJPHASE");
+      }else{
+        location.reload();
+      }
+    },
   }
 }
 </script>

src/views/PRJPHASE/index.vue

@@ -42,12 +42,11 @@
               <span class="react-after"></span>
               <el-dropdown class="dropdown">
                 <span class="el-dropdown-link" ref="echarType">
-                  项目阶段<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                  项目<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item class="dropdownitem"><router-link to="IQC">IQC</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="FQC">FQC</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJ">项目</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="LAB">实验室</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="SMT">SMT</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</router-link></el-dropdown-item>
@@ -55,6 +54,14 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="WIRE">制线</router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
+              <el-select v-model="licode" class="dropdown" @change ="handleBlur" style="width: 150px">
+                <el-option
+                    v-for="item in linedata"
+                    :key="item.LI_NAME"
+                    :label="item.LI_NAME"
+                    :value="item.LI_NAME"
+                ></el-option>
+              </el-select>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
             </div>
@@ -97,6 +104,8 @@ export default {
       dateWeek: null,
       weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
       decorationColor: ['#568aea', '#000000'],
+      licode:'项目阶段',
+      linedata:[{"LI_NAME":"总看板"},{"LI_NAME":"项目阶段"}],
     }
   },
   components: {
@@ -143,6 +152,13 @@ export default {
         }, 3000)
       }
     },
+    handleBlur (val){
+      if(val == "总看板"){
+        this.$router.push("/PRJ");
+      }else{
+        location.reload();
+      }
+    },
   }
 }
 </script>

src/views/PRJPHASE/up.vue

@@ -151,10 +151,10 @@ $box-width: 100%;
         .row-item {
           font-size: 20px !important;
         }
-        /* 第1行和第2行 - 浅黄色 */
+        /* 第1行和第2行 - 浅蓝色 */
         .row-item:nth-child(4n+1),
         .row-item:nth-child(4n+2) {
-          background-color: #f5df97 !important;
+          background-color: #7cd0ef !important;
         }
 
         /* 第3行和第4行 - 浅绿色  */

src/views/SMT/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</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="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <el-select v-model="licode" class="dropdown" @change ="handleBlur" style="width: 150px">

src/views/WIRE/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="SMT">SMT</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">DIP</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="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/ZZ/index.vue

@@ -52,7 +52,7 @@
                   <el-dropdown-item class="dropdownitem"><router-link to="SMT">SMT</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="DIP">插件</router-link></el-dropdown-item>
                   <el-dropdown-item class="dropdownitem"><router-link to="WIRE">制线</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>
+<!--                  <el-dropdown-item class="dropdownitem"><router-link to="PRJPHASE">项目阶段</router-link></el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/views/login.vue

@@ -69,7 +69,7 @@
                     {label: '插件', value: 'DIP'},
                     {label: '组装', value: 'ZZ'},
                     {label: '制线', value: 'WIRE'},
-                    {label: '项目阶段', value: 'PRJPHASE'},
+                 /*   {label: '项目阶段', value: 'PRJPHASE'},*/
                 ],
             }
         },