Browse Source

修改看板页面切换

callm 6 months ago
parent
commit
0d3ba88e3b

+ 8 - 1
src/components/assemblyechart/center/top5Chart/index.vue

@@ -49,10 +49,17 @@ export default {
       if (sessionStorage.getItem('li_code') == '所有'){
         caller = 'ZZ!NGREASONF!ALL';
       }
+      var csline='';
+      if(sessionStorage.getItem('li_code') =='ZZB'){
+        csline='CSB';
+      }
+      if(sessionStorage.getItem('li_code') =='ZZC'){
+        csline='CSC';
+      }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",
               {
                 params: {
-                  condition: "mb_ymd="+formatDate(new Date()) +" and V_LICODE in ('CSC','CSB')"
+                  condition: "mb_ymd="+formatDate(new Date()) +" and V_LICODE ='"+csline+"'"
                 }
               }) .then((result)=>{
                         let dataList = JSON.parse(result.data.data);

+ 61 - 19
src/views/assembly/index.vue

@@ -10,15 +10,15 @@
             <div class="title">
               <span class="title-text">UAS-MES可视化平台</span>
               <dv-decoration-6
-                class="dv-dec-6"
-                :reverse="true"
-                :color="['#50e3c2', '#67a1e5']"
+                  class="dv-dec-6"
+                  :reverse="true"
+                  :color="['#50e3c2', '#67a1e5']"
               />
             </div>
             <dv-decoration-8
-              class="dv-dec-8"
-              :reverse="true"
-              :color="decorationColor"
+                class="dv-dec-8"
+                :reverse="true"
+                :color="decorationColor"
             />
           </div>
           <dv-decoration-10 class="dv-dec-10-s" />
@@ -37,10 +37,12 @@
           </div>
           <div class="d-flex aside-width">
             <div class="react-right bg-color-r mr-3">
-             <!-- <span class="text ">设备运行分析</span>-->
+              <!-- <span class="text ">设备运行分析</span>-->
               <el-button type="text" class="text" style="width:50% ;font-size: 21px;" @click="fullScreen" ref="fullScreenDom"
-                         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>
+                         v-show=!isFullScreen v-if=false>全屏</el-button>
+              <el-button type="text" class="text" style="width:50% ;font-size: 21px;" @click="exitFullScreen" ref="exitFullScreen" v-show=isFullScreen v-if=false>退出全屏</el-button>
+
+              <el-switch class="but" v-model="isChange" active-text="是否跳转"></el-switch>
             </div>
             <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
@@ -48,22 +50,22 @@
                <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-menu>
-             </el-dropdown>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item ><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"
-                        :label="item.LI_CODE"
-                        :value="item.LI_CODE"
+                    v-for="item in linedata"
+                    :key="item.LI_CODE"
+                    :label="item.LI_CODE"
+                    :value="item.LI_CODE"
                 ></el-option>
               </el-select>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text"
-                >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
+              >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
               >
             </div>
           </div>
@@ -140,7 +142,9 @@ export default {
       weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
       decorationColor: ['#568aea', '#000000'],
       isFullScreen: false, // 添加全屏状态标志
-      intervalId: null // 添加定时器ID
+      intervalId: null, // 添加定时器ID
+      isChange: false,
+      currentLine:""
     }
   },
   components: {
@@ -172,6 +176,8 @@ export default {
       message: `当前屏幕分辨率,宽:${window.innerWidth},高:${window.innerHeight}`,
       type:'warning'
     });
+    this.currentLine = this.$cookie.get("AS_LI_CODE")
+    this.isChange = sessionStorage.getItem('isChange') == '1' ? true : false
     // 添加全屏状态变化监听
     document.addEventListener('fullscreenchange', this.handleFullScreenChange);
   },
@@ -181,6 +187,39 @@ export default {
     // 移除事件监听
     document.removeEventListener('fullscreenchange', this.handleFullScreenChange);
   },
+  watch:{
+    currentLine:{
+      handler(newVal){
+        if(this.isChange && (newVal == "ZZB" || newVal == "ZZC")){
+          setTimeout(() => {
+            sessionStorage.setItem('li_code', newVal == "ZZB" ? "ZZC" :"ZZB");
+            this.$cookie.set("AS_LI_CODE", newVal == "ZZB" ? "ZZC" :"ZZB", {
+              expires: 30,
+            });
+            location.reload();
+            this.autoFullScreen()
+          }, 60000)
+        }
+      },
+      immediate:true
+    },
+    isChange:{
+      handler(newVal){
+        if(newVal && (this.currentLine == "ZZB" || this.currentLine == "ZZC")){
+          setTimeout(() => {
+            sessionStorage.setItem('li_code', this.currentLine == "ZZB" ? "ZZC" :"ZZB");
+            this.$cookie.set("AS_LI_CODE", this.currentLine == "ZZB" ? "ZZC" :"ZZB", {
+              expires: 30,
+            });
+            location.reload();
+            this.autoFullScreen()
+          }, 60000)
+        }
+        sessionStorage.setItem('isChange', newVal ? '1' : '0')
+      },
+      immediate:false
+    }
+  },
   methods: {
     timeFn() {
       this.timing = setInterval(() => {
@@ -262,6 +301,9 @@ export default {
 
 <style lang="scss" scoped>
 @import '../../assets/scss/indexassembly.scss';
+.but{
+  transform: skewX(45deg);
+}
 .dropdown {
   font-size: 18px;
   color: #568aea;