看板- 看板调整增加工作中心切换

src/assets/scss/indexassembly.scss

@@ -135,7 +135,6 @@
 
       // 底部数据
       .bottom-box {
-        margin-top: 10px;
         display: grid;
         grid-template-columns: 3fr 3fr;
       }

src/assets/scss/indexpackage.scss

@@ -135,7 +135,6 @@
 
       // 底部数据
       .bottom-box {
-        margin-top: 10px;
         display: grid;
         grid-template-columns: 3fr 3fr;
       }

src/components/packageechart/centerRight/centerRightChart/chart.vue

@@ -3,7 +3,7 @@
     <Echart
       :options="options"
       id="centreRight2Chart1"
-      height="200px"
+      height="180px"
       width="260px"
     ></Echart>
   </div>

src/views/assembly/center.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="center">
-    <div class="up">
+   <!-- <div class="up">
       <div
         class="bg-color-black item"
         v-for="item in titleItem"
@@ -14,7 +14,7 @@
           />
         </div>
       </div>
-    </div>
+    </div>-->
     <div class="down">
       <div class="ranking bg-color-black">
         <span>
@@ -197,6 +197,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  $box-height: 420px;
 #center {
   display: flex;
   flex-direction: column;
@@ -222,16 +223,17 @@ export default {
     padding-bottom: 0;
     width: 100%;
     display: flex;
-    height: 255px;
+    height: $box-height;
     justify-content: space-between;
     .bg-color-black {
       border-radius: 5px;
+      height: $box-height - 15px;
     }
     .ranking {
       padding: 10px;
       width: 100%;
       .dv-scr-rank-board {
-        height: 225px;
+          height: 370px;
       }
     }
     .percent {

src/views/assembly/centerLeft1.vue

@@ -121,9 +121,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$box-height: 410px;
+$box-height: 420px;
 $box-width: 350px;
-
 #centerLeft1 {
   padding: 5px;
   height: $box-height;

src/views/assembly/centerLeft_two.vue

@@ -15,11 +15,11 @@
                   :key="item.title"
           >
             <p class="ml-3 colorBlue fw-b fs-xl">{{ item.title }}</p>
-            <div>
-              <dv-digital-flop
+            <div class="dv-dig-flop ml-1 mt-2 pl-3"> {{ item.number }}
+             <!-- <dv-digital-flop
                       class="dv-dig-flop ml-1 mt-2 pl-3"
                       :config="item.number"
-              />
+              />-->
             </div>
           </div>
         </div>
@@ -64,7 +64,7 @@ export default {
                         if(element.name =='工单达成率'){
                           titleitems.push({
                             title: element.name,
-                            number: {
+                            number: element.value +'%'/*{
                               number: [element.value],
                               textAlign: 'left',
                               toFixed: 2,
@@ -72,19 +72,19 @@ export default {
                               style: {
                                 fontSize: 26
                               }
-                            }
+                            }*/
                           });
                         }else {
                           titleitems.push({
                             title: element.name,
-                            number: {
+                            number:element.value /*{
                               number: [element.value],
                               textAlign: 'left',
                               content: '{nt}',
                               style: {
                                 fontSize: 26
                               }
-                            }
+                            }*/
                           });
                         }
                       }
@@ -99,9 +99,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-#centerLeft1 {
   $box-width: 300px;
-  $box-height: 410px;
+  $box-height: 420px;
+#centerLeft1 {
   padding: 5px;
   height: $box-height;
   width: $box-width;
@@ -128,17 +128,19 @@ export default {
       display: flex;
       flex-wrap: wrap;
       //justify-content: space-around;
-      height: 140px;
-      margin-bottom: 7px;
+      height: 180px;
+      //margin-bottom: 7px;
       .item {
         border-radius: 6px;
-        padding-top: 8px;
+        padding-top: 2px;
         margin-top: 8px;
         width: 50%;
-        height: 60px;
+        height: 52px;
         .dv-dig-flop {
-          width: 100px;
+          width: 100%;
           height: 30px;
+          font-size: 20px;
+          color: #3de7c9;
         }
       }
     }

src/views/assembly/centerRight1.vue

@@ -88,7 +88,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$box-height: 410px;
+$box-height: 420px;
 $box-width: 640px;
 #centerRight1 {
   padding: 16px;

src/views/assembly/centerRight2.vue

@@ -104,7 +104,7 @@ export default {
 
 <style lang="scss" scoped>
 #centerRight2 {
-  $box-height: 410px;
+  $box-height: 420px;
   $box-width: 340px;
   padding: 5px;
   height: $box-height;

src/views/assembly/index.vue

@@ -41,9 +41,19 @@
               <span class="text" @click="fullScreen" ref="fullScreen">全屏</span>
               <span class="text" @click="exitFullScreen" ref="exitFullScreen"  style="display: none">退出全屏</span>
             </div>
-            <div class="react-right mr-4 react-l-s">
+            <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
-              <el-select v-model="linecode" class="dropdown" @change ="handleBlur">
+              <el-dropdown class="dropdown">
+               <span class="el-dropdown-link" ref="echarType">
+                 组装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+               </span>
+               <el-dropdown-menu slot="dropdown">
+                 <el-dropdown-item ><router-link to="package"> 包装车间 </router-link></el-dropdown-item>
+                 <el-dropdown-item ><router-link to="smt">SMT车间</router-link></el-dropdown-item>
+               </el-dropdown-menu>
+             </el-dropdown>
+
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
                 <el-option
                         v-for="item in linedata"
                         :key="item.LI_CODE"
@@ -51,15 +61,7 @@
                         :value="item.LI_CODE"
                 ></el-option>
               </el-select>
-              <!--<el-dropdown class="dropdown">
-              <span class="el-dropdown-link" ref="echarType">
-                组装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
-              </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item ><router-link to="package"> 包装车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item ><router-link to="smt">SMT车间</router-link></el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>-->
+              <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text"
                 >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
               >
@@ -144,8 +146,7 @@ export default {
     bottomRight,
   },
   created() {
-    this.linedata = this.$store.getters.user.linedata;
-    this.linecode = sessionStorage.getItem("li_code");
+    this.getLines();
   },
   mounted() {
     this.timeFn()
@@ -175,6 +176,27 @@ export default {
       });
       location.reload();
     },
+    getLines (){
+      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=组装").then(
+              (res)=>{
+                if(res.data.linedata) {
+                  if(this.$cookie.get("AS_LI_CODE") && res.data.linedata.some(item => item.LI_CODE === this.$cookie.get("AS_LI_CODE")) ){
+                    sessionStorage.setItem('li_code', this.$cookie.get("AS_LI_CODE"));
+                  }else {
+                    sessionStorage.setItem('li_code', res.data.linedata[0].LI_CODE);
+                    this.$cookie.set("AS_LI_CODE", res.data.linedata[0].LI_CODE, {
+                      expires: 30,
+                    });
+                  }
+                }else{
+                  sessionStorage.setItem('li_code','');
+                }
+                this.linedata = res.data.linedata;
+                this.linecode = sessionStorage.getItem("li_code");
+              },(result)=>{
+                console.error(result)
+              });
+    }
   }
 }
 </script>

src/views/login.vue

@@ -68,13 +68,17 @@
 
             }
         },
-        mounted() {
+        created() {
             //默认数据
             this.getCookies();
-            //监听enter键
-            this.$refs.loginForm.$el.addEventListener('keydown',this.handleEnter);
             //获取账套信息
             this.getMasters();
+            //获取工作中心数据
+            // this.getWorkCenter();
+        },
+        mounted() {
+            //监听enter键
+            this.$refs.loginForm.$el.addEventListener('keydown',this.handleEnter);
         },
         beforeDestroy(){
             this.$refs.loginForm.$el.removeEventListener('keydown',this.handleEnter);
@@ -89,7 +93,25 @@
                             this.options.push({label: res[i].ma_function, value: res[i].ma_user});
                         }
                         //设置默认值
-                        this.loginForm.sob = res[0].ma_user;
+                        if("" == this.loginForm.sob || !result.data.masters.some(item => item.ma_function === this.loginForm.sob) ){
+                            this.loginForm.sob = res[0].ma_user;
+                        }
+                    },(result)=>{
+                        console.error(result)
+                    });
+            },
+            //获取工作中心
+            getWorkCenter(){
+                this.$http.get("kanban/getAllWorkCenter.action").then(
+                    (result)=>{
+                        var res = JSON.parse(JSON.stringify(result.data.workCenter));
+                        for (let i = 0; i < res.length; i++) {
+                            this.workshopoptions.push({label: res[i].wc_code, value: res[i].wc_name});
+                        }
+                        //设置默认值
+                        if("" == this.loginForm.workshop || !result.data.workCenter.some(item => item.ma_function === this.loginForm.workshop) ){
+                            this.loginForm.workshop = res[0].ma_user;
+                        }
                     },(result)=>{
                         console.error(result)
                     });
@@ -116,46 +138,10 @@
                                     this.$store.commit('setUser',res);
                                     this.setCookieData();
                                     if(this.loginForm.workshop =='SMT'){
-                                        if(res.linedata) {
-                                            if(this.$cookie.get("SMT_LI_CODE") && res.linedata.some(item => item.LI_CODE === this.$cookie.get("SMT_LI_CODE")) ){
-                                                sessionStorage.setItem('li_code', this.$cookie.get("SMT_LI_CODE"));
-                                            }else {
-                                                sessionStorage.setItem('li_code', res.linedata[0].LI_CODE);
-                                                this.$cookie.set("SMT_LI_CODE", res.linedata[0].LI_CODE, {
-                                                    expires: 30,
-                                                });
-                                            }
-                                        }else{
-                                            sessionStorage.setItem('li_code','');
-                                        }
                                         this.$router.push({path: this.redirect || '/smt'});
                                     }else if(this.loginForm.workshop =='包装'){
-                                        if(res.linedata) {
-                                            if(this.$cookie.get("PC_LI_CODE") && res.linedata.some(item => item.LI_CODE === this.$cookie.get("PC_LI_CODE")) ){
-                                                sessionStorage.setItem('li_code', this.$cookie.get("PC_LI_CODE"));
-                                            }else {
-                                                sessionStorage.setItem('li_code', res.linedata[0].LI_CODE);
-                                                this.$cookie.set("PC_LI_CODE", res.linedata[0].LI_CODE, {
-                                                    expires: 30,
-                                                });
-                                            }
-                                        }else{
-                                            sessionStorage.setItem('li_code','');
-                                        }
                                         this.$router.push({path: this.redirect || '/package'});
                                     }else if(this.loginForm.workshop =='组装'){
-                                        if(res.linedata) {
-                                            if(this.$cookie.get("AS_LI_CODE") && res.linedata.some(item => item.LI_CODE === this.$cookie.get("AS_LI_CODE")) ){
-                                                sessionStorage.setItem('li_code', this.$cookie.get("AS_LI_CODE"));
-                                            }else {
-                                                sessionStorage.setItem('li_code', res.linedata[0].LI_CODE);
-                                                this.$cookie.set("AS_LI_CODE", res.linedata[0].LI_CODE, {
-                                                    expires: 30,
-                                                });
-                                            }
-                                        }else{
-                                            sessionStorage.setItem('li_code','');
-                                        }
                                         this.$router.push({path: this.redirect || '/assembly'});
                                     }
                                 }else{
@@ -210,6 +196,9 @@
                 });
             },
             getCookies(){
+                if(this.$cookie.get("sob")) {
+                    this.loginForm.sob = this.$cookie.get("sob");
+                }
                 this.loginForm.username = this.$cookie.get("username");
                 if (this.$cookie.get("password")) {
                     this.loginForm.password = CryptoJS.AES.decrypt(

src/views/package/center.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="center">
-    <div class="up">
+  <!--  <div class="up">
       <div
         class="bg-color-black item"
         v-for="item in titleItem"
@@ -14,7 +14,7 @@
           />
         </div>
       </div>
-    </div>
+    </div>-->
     <div class="down">
       <div class="ranking bg-color-black">
         <span>
@@ -116,7 +116,7 @@ export default {
     },
     async setData () {
       // 首检任务数，完成数，合格数，巡检任务数，完成数，巡检合格数  name value
-      await this.$http.get("kanban/datalist.action?caller=CheckData&_noc=1&page=1&pageSize=100",{
+    /*  await this.$http.get("kanban/datalist.action?caller=CheckData&_noc=1&page=1&pageSize=100",{
       params: {
         condition: "1=1",
       }
@@ -142,7 +142,7 @@ export default {
                       },(result)=>{
                         console.error(result)
                       }
-              );
+              );*/
       //关键工序直通率
       await this.$http.get("kanban/datalist.action?caller=KeyStepRate&_noc=1&page=1&pageSize=100",{
         params: {
@@ -197,6 +197,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  $box-height: 420px;
 #center {
   display: flex;
   flex-direction: column;
@@ -222,16 +223,17 @@ export default {
     padding-bottom: 0;
     width: 100%;
     display: flex;
-    height: 255px;
+    height: $box-height;
     justify-content: space-between;
     .bg-color-black {
       border-radius: 5px;
+      height: $box-height - 15px;
     }
     .ranking {
       padding: 10px;
       width: 100%;
       .dv-scr-rank-board {
-        height: 225px;
+        height: 370px;
       }
     }
     .percent {

src/views/package/centerLeft1.vue

@@ -121,9 +121,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$box-height: 410px;
+$box-height: 420px;
 $box-width: 350px;
-
 #centerLeft1 {
   padding: 5px;
   height: $box-height;

src/views/package/centerLeft_two.vue

@@ -15,11 +15,11 @@
                   :key="item.title"
           >
             <p class="ml-3 colorBlue fw-b fs-xl">{{ item.title }}</p>
-            <div>
-              <dv-digital-flop
+            <div class="dv-dig-flop ml-1 mt-2 pl-3"> {{ item.number }}
+             <!-- <dv-digital-flop
                       class="dv-dig-flop ml-1 mt-2 pl-3"
                       :config="item.number"
-              />
+              />-->
             </div>
           </div>
         </div>
@@ -64,7 +64,7 @@ export default {
                         if(element.name =='工单达成率'){
                           titleitems.push({
                             title: element.name,
-                            number: {
+                            number: element.value +'%'/*{
                               number: [element.value],
                               textAlign: 'left',
                               toFixed: 2,
@@ -72,19 +72,19 @@ export default {
                               style: {
                                 fontSize: 26
                               }
-                            }
+                            }*/
                           });
                         }else {
                           titleitems.push({
                             title: element.name,
-                            number: {
+                            number:element.value /*{
                               number: [element.value],
                               textAlign: 'left',
                               content: '{nt}',
                               style: {
                                 fontSize: 26
                               }
-                            }
+                            }*/
                           });
                         }
                       }
@@ -99,9 +99,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-#centerLeft1 {
   $box-width: 300px;
-  $box-height: 410px;
+  $box-height: 420px;
+#centerLeft1 {
   padding: 5px;
   height: $box-height;
   width: $box-width;
@@ -128,17 +128,19 @@ export default {
       display: flex;
       flex-wrap: wrap;
       //justify-content: space-around;
-      height: 140px;
-      margin-bottom: 7px;
+      height: 180px;
+      //margin-bottom: 7px;
       .item {
         border-radius: 6px;
-        padding-top: 8px;
+        padding-top: 2px;
         margin-top: 8px;
         width: 50%;
-        height: 60px;
+        height: 52px;
         .dv-dig-flop {
-          width: 100px;
+          width: 100%;
           height: 30px;
+          font-size: 20px;
+          color: #3de7c9;
         }
       }
     }

src/views/package/centerRight1.vue

@@ -88,7 +88,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$box-height: 410px;
+$box-height: 420px;
 $box-width: 640px;
 #centerRight1 {
   padding: 16px;

src/views/package/index.vue

@@ -41,9 +41,18 @@
               <span class="text" @click="fullScreen" ref="fullScreen">全屏</span>
               <span class="text" @click="exitFullScreen" ref="exitFullScreen"  style="display: none">退出全屏</span>
             </div>
-            <div class="react-right mr-4 react-l-s">
+            <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
-              <el-select v-model="linecode" class="dropdown" @change ="handleBlur">
+               <el-dropdown class="dropdown">
+                <span class="el-dropdown-link" ref="echarType">
+                  包装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item ><router-link to="assembly"> 组装车间 </router-link></el-dropdown-item>
+                    <el-dropdown-item ><router-link to="smt">SMT车间</router-link></el-dropdown-item>
+                  </el-dropdown-menu>
+            </el-dropdown>
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
                 <el-option
                         v-for="item in linedata"
                         :key="item.LI_CODE"
@@ -51,18 +60,8 @@
                         :value="item.LI_CODE"
                 ></el-option>
               </el-select>
-             <!-- <el-dropdown class="dropdown">
-              <span class="el-dropdown-link" ref="echarType">
-                包装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
-              </span>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item ><router-link to="assembly"> 组装车间 </router-link></el-dropdown-item>
-                      <el-dropdown-item ><router-link to="smt">SMT车间</router-link></el-dropdown-item>
-                    </el-dropdown-menu>
-              </el-dropdown>-->
-              <span class="text"
-                >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
-              >
+              <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+              <span class="text">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
             </div>
           </div>
         </div>
@@ -149,8 +148,7 @@ export default {
     bottomRight
   },
   created() {
-    this.linedata = this.$store.getters.user.linedata;
-    this.linecode = sessionStorage.getItem("li_code");
+    this.getLines();
   },
   mounted() {
     this.timeFn()
@@ -186,6 +184,27 @@ export default {
     goAssembly(){
       this.$router.push('/assembly');
     },
+    getLines (){
+      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=包装").then(
+              (res)=>{
+                if(res.data.linedata) {
+                  if(this.$cookie.get("PC_LI_CODE") && res.data.linedata.some(item => item.LI_CODE === this.$cookie.get("PC_LI_CODE")) ){
+                    sessionStorage.setItem('li_code', this.$cookie.get("PC_LI_CODE"));
+                  }else {
+                    sessionStorage.setItem('li_code', res.data.linedata[0].LI_CODE);
+                    this.$cookie.set("PC_LI_CODE", res.data.linedata[0].LI_CODE, {
+                      expires: 30,
+                    });
+                  }
+                }else{
+                  sessionStorage.setItem('li_code','');
+                }
+                this.linedata = res.data.linedata;
+                this.linecode = sessionStorage.getItem("li_code");
+              },(result)=>{
+                console.error(result)
+              });
+    }
   },
 }
 

src/views/smt/index.vue

@@ -40,7 +40,7 @@
               <span class="text" @click="fullScreen" ref="fullScreen">全屏</span>
               <span class="text" @click="exitFullScreen" ref="exitFullScreen"  style="display: none">退出全屏</span>
             </div>
-            <div class="react-right mr-4 react-l-s">
+            <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
 
              <!-- <el-dropdown class="dropdown">
@@ -55,7 +55,17 @@
                  </el-dropdown-menu>
               </el-dropdown>*/-->
 
-             <el-select v-model="linecode" class="dropdown" @change ="handleBlur">
+              <el-dropdown class="dropdown">
+                <span class="el-dropdown-link" ref="echarType">
+                  SMT车间<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="assembly">组装车间</router-link></el-dropdown-item>
+                    <el-dropdown-item class="dropdownitem"><router-link to="package"> 包装车间</router-link></el-dropdown-item>
+                  </el-dropdown-menu>
+              </el-dropdown>
+
+             <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
                 <el-option
                         v-for="item in linedata"
                         :key="item.LI_CODE"
@@ -64,19 +74,8 @@
                    ></el-option>
               </el-select>
 
-              <!--<el-dropdown class="dropdown">
-              <span class="el-dropdown-link" ref="echarType">
-                SMT车间<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="assembly"> 组装车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="package"> 包装车间</router-link></el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>-->
-
-              <span class="text"
-              >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
-              >
+              <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+              <span class="text">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
             </div>
           </div>
         </div>
@@ -150,8 +149,7 @@ export default {
     bottom2
   },
   created() {
-    this.linedata = this.$store.getters.user.linedata;
-    this.linecode = sessionStorage.getItem("li_code");
+    this.getLines();
   },
   mounted() {
     this.timeFn()
@@ -181,6 +179,28 @@ export default {
       });
       location.reload();
     },
+    getLines (){
+      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=SMT").then(
+              (res)=>{
+                if(res.data.linedata) {
+                  if(this.$cookie.get("SMT_LI_CODE") && res.data.linedata.some(item => item.LI_CODE === this.$cookie.get("SMT_LI_CODE")) ){
+                    sessionStorage.setItem('li_code', this.$cookie.get("SMT_LI_CODE"));
+                  }else {
+                    sessionStorage.setItem('li_code', res.data.linedata[0].LI_CODE);
+                    this.$cookie.set("SMT_LI_CODE", res.data.linedata[0].LI_CODE, {
+                      expires: 30,
+                    });
+                  }
+                }else{
+                  sessionStorage.setItem('li_code','');
+                }
+                console.log('23');
+                this.linedata = res.data.linedata;
+                this.linecode = sessionStorage.getItem("li_code");
+              },(result)=>{
+                console.error(result)
+              });
+    }
   }
 }
 </script>