修改产线看板

src/views/login.vue

@@ -39,7 +39,6 @@
 </template>
 
 <script>
-    import CryptoJS from "crypto-js";
 
     export default {
         name: "Login",
@@ -62,10 +61,7 @@
                 options: [],
                 typeoptions:[
                     //车间看板、产线看板、品质看板、设备看板
-                    {label: '车间看板', value: '车间看板'},
                     {label: '产线看板', value: '产线看板'},
-                    {label: '品质看板', value: '品质看板'},
-                    {label: '仓库看板', value: '仓库看板'},
                    /* {label: '设备看板', value: '设备看板'}*/
                 ],
             }
@@ -109,7 +105,7 @@
                         this.$http.get("kanban/login.action",{
                                 params:{
                                     username:this.loginForm.username,
-                                    password:CryptoJS.AES.encrypt(this.loginForm.password, "123456"), //密码加密传递
+                                    password:this.loginForm.password,
                                     sob:this.loginForm.sob,
                                     type:this.loginForm.type
                                 }}).then(
@@ -157,7 +153,7 @@
              //登录成功返回session
              sessionStorage.setItem('x-access-token', res.token);
              sessionStorage.setItem('username',this.loginForm.username);
-             sessionStorage.setItem('password',CryptoJS.AES.encrypt(this.loginForm.password, "123456"));
+             sessionStorage.setItem('password',this.loginForm.password);
              sessionStorage.setItem('sob',this.loginForm.sob);
              this.$store.commit('setUser',this.loginForm);
            },
@@ -165,7 +161,7 @@
                 if (this.checked) {
                     this.$cookie.set(
                         "password",
-                        CryptoJS.AES.encrypt(this.loginForm.password, "123456"),
+                        this.loginForm.password,
                         {
                             expires: 30
                         }
@@ -192,10 +188,7 @@
                 }
                 this.loginForm.username = this.$cookie.get("username");
                 if (this.$cookie.get("password")) {
-                    this.loginForm.password = CryptoJS.AES.decrypt(
-                        this.$cookie.get("password"),
-                        "123456"
-                    ).toString(CryptoJS.enc.Utf8);
+                    this.loginForm.password = this.$cookie.get("password");
                 }
                 if(this.$cookie.get("type")) {
                     this.loginForm.type = this.$cookie.get("type");

src/views/prodline/bottom1.vue

@@ -36,14 +36,14 @@ export default {
   data() {
     return {
       config: {
-        header: ['线别','生产工单', '机型', '订单数', '备料状态', '计划投入', '计划完成', '计划工时', '加班工时', '提醒事项'],
+        header: ['线别','生产工单', '产品名称', '订单数', '备料状态', '计划完成数量', '提醒事项'],
         data: [],
         rowNum: 9, //表格行数
         headerHeight: 35,
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
-        columnWidth: [130,190, 180, 100, 100, 100, 100, 100, 100, 160],
+        columnWidth: [130,190, 180, 100, 120, 150,  260],
         align: ['center','left','left','left','left','center','center','center','center']
       },
       timing: null,
@@ -68,6 +68,7 @@ export default {
       await this.$http.get("kanban/datalist.action?caller=" + caller + "&_noc=1&page=1&pageSize=100", {
         params: {
           condition: "V_OUTLINE='"+sessionStorage.getItem('li_code')+"'" ,
+         // condition: "1=1" ,
         }
       })
           .then((result) => {
@@ -85,10 +86,7 @@ export default {
                   } else {
                     item.push("<span  class='colorGrass fs-lg'>" + element.v_blstatus + "</span>");
                   }
-                  item.push("<span  class='colorGrass fs-lg'>" + element.v_planinqty + "</span>");
                   item.push("<span  class='colorGrass fs-lg'>" + element.v_planoutqty + "</span>");
-                  item.push("<span  class='colorGrass fs-lg'>" + element.v_plantime + "</span>");
-                  item.push("<span  class='colorGrass fs-lg'>" + element.v_overtime + "</span>");
                   item.push("<span  class='colorRemind fs-lg'>" + element.v_remark + "</span>");
                   resultList.push(item);
                 }

src/views/prodline/bottom2.vue

@@ -39,14 +39,14 @@ export default {
   data() {
     return {
       config: {
-        header: ['工段', '生产数','产出数', '不良数','直通率%'],
+        header: ['工段', '产出数', '不良数','直通率%'],
         data: [],
          rowNum: 5, //表格行数
         headerHeight: 35,
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
-        columnWidth: [110,100,100,100,100],
+        columnWidth: [110,100,100,100],
         align: ['center']
       },
       timing:null,
@@ -73,7 +73,7 @@ export default {
       var caller = 'KB!LongLinePLANTOUTPUT';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100", {
         params: {
-          condition:"V_OUTLINE='"+sessionStorage.getItem('ul_code')+"'"
+          condition:"V_OUTLINE='"+sessionStorage.getItem('li_code')+"'"
         }
       })
           .then((result)=>{
@@ -83,7 +83,6 @@ export default {
                   const element = dataList[index];
                   let item = new Array();
                   item.push("<span  class='fs-md'>"+ element.v_wccode +"</span>");
-                  item.push("<span  class='colorGrass fs-md'>"+element.allqty+"</span>");
                   item.push("<span  class='colorGrass fs-md'>"+element.value+"</span>");
                   item.push("<span  class='colorGrass fs-md'>"+element.ngqty+"</span>");
                   if(element.okrate<98) {  //98%

src/views/prodline/index.vue

@@ -37,8 +37,9 @@
           </div>
           <div class="d-flex aside-width">
             <div class="react-right bg-color-r mr-3">
-              <span class="text" @click="fullScreen" ref="fullScreen">全屏</span>
-              <span class="text" @click="exitFullScreen" ref="exitFullScreen"  style="display: none">退出全屏</span>
+              <el-button type="text" class="text" style="width:50% ;font-size: 21px;" @click="fullScreen" ref="fullScreen"
+                         v-show=!isFullScreen >全屏</el-button>
+              <el-button type="text" class="text" style="width:50% ;font-size: 21px;" @click="exitFullScreen" ref="exitFullScreen" v-show=isFullScreen>退出全屏</el-button>
             </div>
             <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
@@ -46,15 +47,7 @@
                 <span class="el-dropdown-link" ref="echarType">
                   产线看板<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="shop">车间看板</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="device">设备看板</router-link></el-dropdown-item>-->
-                  </el-dropdown-menu>
               </el-dropdown>
-
-
               <el-select v-model="licode" class="dropdown" @change ="handleBlur" style="width: 230px">
                 <el-option
                     v-for="item in linedata"
@@ -151,10 +144,12 @@ export default {
   },
   created() {
      this.getlinedata();
+     this.isFullScreen = document.fullscreenElement;
   },
   mounted() {
-    this.timeFn()
-    this.cancelLoading()
+    this.timeFn();
+    this.cancelLoading();
+    this.autoFullScreen();
   },
   beforeDestroy () {
     clearInterval(this.timing);
@@ -185,6 +180,21 @@ export default {
       });
       location.reload();
     },
+    autoFullScreen(){
+      if (!this.isFullScreen) {
+        setTimeout(() => {
+          this.$showMsgBox({
+            caption: "提示",
+            msg: '是否全屏展示？',
+            callback: (data) => {
+              if (data == "yes") {
+                this.fullScreen();
+              }
+            }
+          })
+        }, 3000)
+      }
+    },
     getlinedata (){
       this.$http.get("kanban/getLinesByWorkCenter.action",{
       }).then( (res)=>{

src/views/prodline/up2.vue

@@ -52,7 +52,8 @@ export default {
       var caller = 'KB!LongLineLinePlan';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+sessionStorage.getItem('ul_code')+"'" ,
+         // condition: "V_OUTLINE='"+sessionStorage.getItem('li_code')+"'" ,
+          condition: "1=1" ,
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

src/views/prodline/up3.vue

@@ -52,7 +52,8 @@ export default {
       var caller = 'KB!LongLineLineMonthPlan';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+sessionStorage.getItem('ul_code')+"'"
+          //condition: "V_OUTLINE='"+sessionStorage.getItem('li_code')+"'"
+          condition: "1=1"
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

src/views/prodline/up4.vue

@@ -78,7 +78,7 @@ export default {
       var caller = 'KB!UpLineManInfo';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "V_OUTLINE='"+sessionStorage.getItem('ul_code')+"'" ,
+          condition: "V_OUTLINE='"+sessionStorage.getItem('li_code')+"'" ,
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);