Browse Source

看板调整增加线别

xiaost 2 năm trước cách đây
mục cha
commit
5828647d35
32 tập tin đã thay đổi với 361 bổ sung71 xóa
  1. 5 2
      src/components/assemblyechart/bottom/bottomRightChart/index.vue
  2. 6 2
      src/components/assemblyechart/centerLeft/centerLeft1Chart/index.vue
  3. 6 2
      src/components/assemblyechart/centerRight/centerRightChart/index.vue
  4. 5 2
      src/components/packageechart/bottom/bottomLeft2Chart/chart.vue
  5. 5 2
      src/components/packageechart/bottom/bottomRightChart/index.vue
  6. 6 2
      src/components/packageechart/centerLeft/centerLeft1Chart/index.vue
  7. 5 2
      src/components/packageechart/centerRight/centerRightChart/index.vue
  8. 5 2
      src/components/smtechart/bottom/bottom1Chart/index.vue
  9. 5 2
      src/components/smtechart/up/up1Chart/chart.vue
  10. 5 2
      src/components/smtechart/up/up2Chart/index.vue
  11. 6 2
      src/components/smtechart/up/up2ChartOld/chart.vue
  12. 6 2
      src/components/smtechart/up/up3Chart/index.vue
  13. 5 0
      src/main.js
  14. 10 0
      src/store/index.js
  15. 5 2
      src/views/assembly/bottomRight2.vue
  16. 5 2
      src/views/assembly/center.vue
  17. 5 2
      src/views/assembly/centerLeft_two.vue
  18. 5 2
      src/views/assembly/centerRight1.vue
  19. 10 4
      src/views/assembly/centerRight2.vue
  20. 54 4
      src/views/assembly/index.vue
  21. 14 1
      src/views/login.vue
  22. 10 4
      src/views/package/center.vue
  23. 5 2
      src/views/package/centerLeft_two.vue
  24. 5 2
      src/views/package/centerRight1.vue
  25. 10 4
      src/views/package/centerRight2.vue
  26. 54 5
      src/views/package/index.vue
  27. 5 1
      src/views/smt/bottom1.vue
  28. 5 2
      src/views/smt/bottom1Old.vue
  29. 5 2
      src/views/smt/bottom2.vue
  30. 74 4
      src/views/smt/index.vue
  31. 5 2
      src/views/smt/up2.vue
  32. 5 2
      src/views/smt/up2old.vue

+ 5 - 2
src/components/assemblyechart/bottom/bottomRightChart/index.vue

@@ -59,8 +59,11 @@ export default {
               +"/"
               +(dateBase.getDate() + 1 < 10 ? "0" + (dateBase.getDate() + 1) : dateBase.getDate() + 1);
       //良率直通图
-      await this.$http.get("kanban/datalist.action?caller=DAYTURNOUT!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DAYTURNOUT!ZZ&_noc=1&page=1&pageSize=100",{
+          params: {
+            condition: "1=1",
+          }
+        }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let weekCategory = new Array();
                         let weekLineData = new Array();

+ 6 - 2
src/components/assemblyechart/centerLeft/centerLeft1Chart/index.vue

@@ -44,8 +44,12 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      await this.$http.get("kanban/datalist.action?caller=NGREASONF!ZZ&_noc=1&page=1&pageSize=100&condition=mb_ymd="+formatDate(new Date()))
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=NGREASONF!ZZ&_noc=1&page=1&pageSize=100",
+              {
+                params: {
+                  condition: "mb_ymd="+formatDate(new Date()),
+                }
+              }) .then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let xData0 = new Array();
                         let seriesData0 = new Array();

+ 6 - 2
src/components/assemblyechart/centerRight/centerRightChart/index.vue

@@ -69,8 +69,12 @@ export default {
       let dateBase = new Date();
       this.cdata.year = dateBase.getFullYear();
       //  //雷达图:
-      await this.$http.get("kanban/datalist.action?caller=STEPOKRATE!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=STEPOKRATE!ZZ&_noc=1&page=1&pageSize=100",{
+              params: {
+                condition: "1=1",
+              }
+            })
+          .then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let indicatorData = new Array();
                         let radiusData = new Array();

+ 5 - 2
src/components/packageechart/bottom/bottomLeft2Chart/chart.vue

@@ -138,8 +138,11 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      await this.$http.get("kanban/datalist.action?caller=WCDAYTURNOUT&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=WCDAYTURNOUT&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let xAxis0 = new Array();
                         let series0 = new Array();

+ 5 - 2
src/components/packageechart/bottom/bottomRightChart/index.vue

@@ -60,8 +60,11 @@ export default {
               +(dateBase.getDate() + 1 < 10 ? "0" + (dateBase.getDate() + 1) : dateBase.getDate() + 1);
 
       //良率直通图
-      await this.$http.get("kanban/datalist.action?caller=DAYTURNOUT&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DAYTURNOUT&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let weekCategory = new Array();
                         let weekLineData = new Array();

+ 6 - 2
src/components/packageechart/centerLeft/centerLeft1Chart/index.vue

@@ -44,8 +44,12 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      await this.$http.get("kanban/datalist.action?caller=NGREASONF&_noc=1&page=1&pageSize=100&condition=mb_ymd="+formatDate(new Date()))
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=NGREASONF&_noc=1&page=1&pageSize=100",
+              {
+                params: {
+                  condition: "mb_ymd="+formatDate(new Date())
+                }
+              }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let xData0 = new Array();
                         let seriesData0 = new Array();

+ 5 - 2
src/components/packageechart/centerRight/centerRightChart/index.vue

@@ -69,8 +69,11 @@ export default {
       let dateBase = new Date();
       this.cdata.year = dateBase.getFullYear();
       //  //雷达图:
-      await this.$http.get("kanban/datalist.action?caller=STEPOKRATE&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=STEPOKRATE&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let indicatorData = new Array();
                         let radiusData = new Array();

+ 5 - 2
src/components/smtechart/bottom/bottom1Chart/index.vue

@@ -84,8 +84,11 @@
                         }
                     );*/
                 //良率直通图
-                await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!DAYTURNOUT&_noc=1&page=1&pageSize=100&condition=1=1")
-                    .then((result)=>{
+                await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!DAYTURNOUT&_noc=1&page=1&pageSize=100",{
+                    params: {
+                        condition: "1=1",
+                    }
+                }).then((result)=>{
                             let dataList = JSON.parse(result.data.data);
                             let weekCategory = new Array();
                             let weekLineData = new Array();

+ 5 - 2
src/components/smtechart/up/up1Chart/chart.vue

@@ -127,8 +127,11 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP1&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP1&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let xAxis0 = new Array();
                         let series0 = new Array();

+ 5 - 2
src/components/smtechart/up/up2Chart/index.vue

@@ -36,8 +36,11 @@ export default {
       let dateBase = new Date();
       this.cdata.year = dateBase.getFullYear();
       //雷达图:
-      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!STEPOKRATE&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!STEPOKRATE&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let indicatorData = new Array();
                         let radiusData = new Array();

+ 6 - 2
src/components/smtechart/up/up2ChartOld/chart.vue

@@ -226,8 +226,12 @@ export default {
     },
     async getdata() {
       //仪表仪盘  达成率 总抛料率   稼动率
-      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!2&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!2&_noc=1&page=1&pageSize=100",
+              {
+                params: {
+                  condition: "1=1",
+                }
+              }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let series1 = new Array();
                         let series2 = new Array();

+ 6 - 2
src/components/smtechart/up/up3Chart/index.vue

@@ -38,8 +38,12 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP3!NGREASONF&_noc=1&page=1&pageSize=100&condition=mb_ymd="+formatDate(new Date()))
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP3!NGREASONF&_noc=1&page=1&pageSize=100",
+              {
+                params: {
+                  condition: "mb_ymd="+formatDate(new Date()),
+                }
+              }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let xData0 = new Array();
                         let seriesData0 = new Array();

+ 5 - 0
src/main.js

@@ -18,6 +18,7 @@ import 'vue-awesome/icons/align-left.js';
 import echarts from 'echarts'
 import ElementUI from 'element-ui';
 
+
 //5.x 引用方式为按需引用
 //希望使用5.x版本的话,需要在package.json中更新版本号,并切换引用方式
 //import * as echarts from 'echarts'
@@ -69,6 +70,10 @@ Vue.prototype.$http.interceptors.request.use(config => {
   if(sessionStorage.getItem('x-access-token')) {
     config.headers['x-access-token'] = sessionStorage.getItem('x-access-token');
   }
+  if(config.params && config.params['condition']) {
+    console.log(sessionStorage.getItem('li_code'));
+    config.params['condition'] = config.params['condition'] + " and V_LICODE='"+sessionStorage.getItem('li_code')+"'";
+  }
   return config;
 });
 

+ 10 - 0
src/store/index.js

@@ -5,8 +5,18 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
+    user:''
   },
   mutations: {
+    setUser(state,user){
+      state.user = { ... user};
+      sessionStorage.setItem('user',JSON.stringify(user));
+    }
+  },
+  getters : {
+    user(state) {
+      return state.user || JSON.parse(sessionStorage.getItem("user"))
+    }
   },
   actions: {
   },

+ 5 - 2
src/views/assembly/bottomRight2.vue

@@ -48,8 +48,11 @@ export default {
       }, 30000);
     },
     async getdata() {
-      await this.$http.get("kanban/datalist.action?caller=ATERATE!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-          .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=ATERATE!ZZ&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                     let dataList = JSON.parse(result.data.data);
                     let resultList = new Array();
                     for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/assembly/center.vue

@@ -141,8 +141,11 @@ export default {
                       }
               );
       //关键工序直通率
-      await this.$http.get("kanban/datalist.action?caller=KeyStepRate!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KeyStepRate!ZZ&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let datas = new Array();
                         for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/assembly/centerLeft_two.vue

@@ -40,8 +40,11 @@ export default {
     },
     async settestdata(){
       //完成工单数统计
-      await this.$http.get("kanban/datalist.action?caller=MAKEQTY!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=MAKEQTY!ZZ&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let makeData = new Array();
                         for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/assembly/centerRight1.vue

@@ -60,8 +60,11 @@ export default {
     },
     async getdata() {
     //  const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
-      await this.$http.get("kanban/datalist.action?caller=DPLANTOUTPUT!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-          .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DPLANTOUTPUT!ZZ&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                     let dataList = JSON.parse(result.data.data);
                     let resultList = new Array();
                     for (let index = 0; index < dataList.length; index++) {

+ 10 - 4
src/views/assembly/centerRight2.vue

@@ -62,8 +62,11 @@ export default {
     },
     async setData () {
       // 设备类别维保执行情况
-      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainData!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainData!ZZ&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let datas = new Array();
                         for (let index = 0; index < dataList.length; index++) {
@@ -81,8 +84,11 @@ export default {
               );
 
       //饼图pie,设备保养执行率
-      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainRate!ZZ&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainRate!ZZ&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         this.rate[0].tips = dataList[0].rate
                       },(result)=>{

+ 54 - 4
src/views/assembly/index.vue

@@ -41,15 +41,23 @@
             </div>
             <div class="react-right mr-4 react-l-s">
               <span class="react-after"></span>
-              <el-dropdown class="dropdown">
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur">
+                <el-option
+                        v-for="item in linedata"
+                        :key="item.LI_CODE"
+                        :label="item.LI_CODE"
+                        :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--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                组装车间<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-dropdown>-->
               <span class="text"
                 >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
               >
@@ -138,6 +146,10 @@ export default {
     bottomRight,
     bottomRight2
   },
+  created() {
+    this.linedata = this.$store.getters.user.linedata;
+    this.linecode = sessionStorage.getItem("li_code");
+  },
   mounted() {
     this.timeFn()
     this.cancelLoading()
@@ -158,7 +170,11 @@ export default {
       setTimeout(() => {
         this.loading = false
       }, 5000)
-    }
+    },
+    handleBlur (val){
+      sessionStorage.setItem('li_code',val);
+      location.reload();
+    },
   }
 }
 </script>
@@ -169,5 +185,39 @@ export default {
   font-size: 18px;
   color: #568aea;
   transform: skewX(45deg);
+  ::v-deep .el-select-dropdown {
+    /* // 若不将下拉框的背景颜色设置为:transparent,那么做不出来半透明的效果;
+    // 因为其最终的显示为:下拉框有一个背景颜色且下拉框的字体有一个背景颜色,重叠后的效果展示; */
+    border: 1px solid #0f1325;
+    background: #04308D !important;
+  }
+
+  ::v-deep .el-input__inner {
+    background-color: #0f1325;
+    color: #fff;
+    border: 1px solid #0f1325;
+  }
+
+  .el-select-dropdown__item {
+    color: #fff;
+    background-color: #0f1325;
+  }
+  ::v-deep .el-select-dropdown {
+    background-color: transparent;
+    border: 1px solid #0f1325;
+  }
+  ::v-deep.el-select-dropdown__list {
+    padding: 0;
+  }
+  ::v-deep.el-popper[x-placement^="bottom"] {
+    margin-top: 0px;
+  }
+  ::v-deep.el-popper .popper__arrow,
+  ::v-deep.el-popper .popper__arrow::after {
+    display: none;
+  }
+  .el-select-dropdown__item:hover {
+    background-color: rgba(0, 225, 219, 0.690196078431373);
+  }
 }
 </style>

+ 14 - 1
src/views/login.vue

@@ -91,13 +91,26 @@
                     if (valid) {
                        // console.log('登录',this.loginForm);
                         //?username=zhongyl&password=asd&sob=N_MES_TEST
-                        this.$http.get("kanban/login.action",{params:{username:this.loginForm.username,password:this.loginForm.password,sob:this.loginForm.sob}}).then(
+                        this.$http.get("kanban/login.action",{
+                                params:{
+                                    username:this.loginForm.username,
+                                    password:this.loginForm.password,
+                                    sob:this.loginForm.sob,
+                                    wccode:this.loginForm.workshop
+                                }}).then(
                             (result)=>{
                                 console.info(result.data);
                                 var res = result.data;
                                 if(res.success || "检测到您已登录本系统,请不要重复登录、打开空白页!" == res.reason) {
                                     //登录成功返回session
                                     sessionStorage.setItem('x-access-token', res.token);
+                                    sessionStorage.setItem('user',res);
+                                    if(res.linedata) {
+                                        sessionStorage.setItem('li_code',res.linedata[0].LI_CODE);
+                                    }else{
+                                        sessionStorage.setItem('li_code','');
+                                    }
+                                    this.$store.commit('setUser',res);
                                     if(this.loginForm.workshop =='SMT'){
                                         this.$router.push({path: this.redirect || '/smt'});
                                     }else if(this.loginForm.workshop =='包装'){

+ 10 - 4
src/views/package/center.vue

@@ -116,8 +116,11 @@ export default {
     },
     async setData () {
       // 首检任务数,完成数,合格数,巡检任务数,完成数,巡检合格数  name value
-      await this.$http.get("kanban/datalist.action?caller=CheckData&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=CheckData&_noc=1&page=1&pageSize=100",{
+      params: {
+        condition: "1=1",
+      }
+    }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let titleitems = new Array();
                         for (let index = 0; index < dataList.length; index++) {
@@ -141,8 +144,11 @@ export default {
                       }
               );
       //关键工序直通率
-      await this.$http.get("kanban/datalist.action?caller=KeyStepRate&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KeyStepRate&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let datas = new Array();
                         for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/package/centerLeft_two.vue

@@ -52,8 +52,11 @@ export default {
     },
     async settestdata(){
       //完成工单数统计
-      await this.$http.get("kanban/datalist.action?caller=MAKEQTY&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=MAKEQTY&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                       let dataList = JSON.parse(result.data.data);
                       let titleitems = new Array();
                       for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/package/centerRight1.vue

@@ -56,8 +56,11 @@ export default {
     },
     async getdata() {
     //  const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
-      await this.$http.get("kanban/datalist.action?caller=DPLANTOUTPUT&_noc=1&page=1&pageSize=100&condition=1=1")
-          .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DPLANTOUTPUT&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                     let dataList = JSON.parse(result.data.data);
                     let resultList = new Array();
                     for (let index = 0; index < dataList.length; index++) {

+ 10 - 4
src/views/package/centerRight2.vue

@@ -62,8 +62,11 @@ export default {
     },
     async setData () {
       // 设备类别维保执行情况
-      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainData&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainData&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let datas = new Array();
                         for (let index = 0; index < dataList.length; index++) {
@@ -81,8 +84,11 @@ export default {
               );
 
       //饼图pie,设备保养执行率
-      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainRate&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=DeviceMaintainRate&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         this.rate[0].tips = dataList[0].rate
                       },(result)=>{

+ 54 - 5
src/views/package/index.vue

@@ -41,15 +41,23 @@
             </div>
             <div class="react-right mr-4 react-l-s">
               <span class="react-after"></span>
-              <el-dropdown class="dropdown">
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur">
+                <el-option
+                        v-for="item in linedata"
+                        :key="item.LI_CODE"
+                        :label="item.LI_CODE"
+                        :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--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                包装车间<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-dropdown>-->
               <span class="text"
                 >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
               >
@@ -138,6 +146,10 @@ export default {
     bottomLeft2,
     bottomRight
   },
+  created() {
+    this.linedata = this.$store.getters.user.linedata;
+    this.linecode = sessionStorage.getItem("li_code");
+  },
   mounted() {
     this.timeFn()
     this.cancelLoading()
@@ -159,12 +171,16 @@ export default {
         this.loading = false
       }, 5000)
     },
+    handleBlur (val){
+      sessionStorage.setItem('li_code',val);
+      location.reload();
+    },
     goSMT(){
       this.$router.push('/smt');
     },
     goAssembly(){
       this.$router.push('/assembly');
-    }
+    },
   },
 }
 
@@ -178,6 +194,39 @@ export default {
   font-size: 18px;
   color: #568aea;
   transform: skewX(45deg);
-}
+  ::v-deep .el-select-dropdown {
+    /* // 若不将下拉框的背景颜色设置为:transparent,那么做不出来半透明的效果;
+    // 因为其最终的显示为:下拉框有一个背景颜色且下拉框的字体有一个背景颜色,重叠后的效果展示; */
+    border: 1px solid #0f1325;
+    background: #04308D !important;
+  }
+
+  ::v-deep .el-input__inner {
+    background-color: #0f1325;
+    color: #fff;
+    border: 1px solid #0f1325;
+  }
 
+  .el-select-dropdown__item {
+    color: #fff;
+    background-color: #0f1325;
+  }
+  ::v-deep .el-select-dropdown {
+    background-color: transparent;
+    border: 1px solid #0f1325;
+  }
+  ::v-deep.el-select-dropdown__list {
+    padding: 0;
+  }
+  ::v-deep.el-popper[x-placement^="bottom"] {
+    margin-top: 0px;
+  }
+  ::v-deep.el-popper .popper__arrow,
+  ::v-deep.el-popper .popper__arrow::after {
+    display: none;
+  }
+  .el-select-dropdown__item:hover {
+    background-color: rgba(0, 225, 219, 0.690196078431373);
+  }
+}
 </style>

+ 5 - 1
src/views/smt/bottom1.vue

@@ -72,7 +72,11 @@
                 }, 10000);
             },
             async getdata() {
-                await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!DPLANTOUTPUT&_noc=1&page=1&pageSize=100&condition=1=1")
+                await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!DPLANTOUTPUT&_noc=1&page=1&pageSize=100", {
+                        params: {
+                            condition: "1=1",
+                        }
+                    })
                     .then((result)=>{
                             let dataList = JSON.parse(result.data.data);
                             let resultList = new Array();

+ 5 - 2
src/views/smt/bottom1Old.vue

@@ -56,8 +56,11 @@ export default {
       }, 30000);
     },
     async getdata() {
-      await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1&_noc=1&page=1&pageSize=100&condition=1=1")
-          .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      }).then((result)=>{
                     let dataList = JSON.parse(result.data.data);
                     let resultList = new Array();
                     for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/smt/bottom2.vue

@@ -46,8 +46,11 @@
       async getdata() {
         //先清空数据
         //大于等于98%
-        await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!ZWDATA&_noc=1&page=1&pageSize=100&condition=1=1")
-                .then((result)=>{
+        await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!ZWDATA&_noc=1&page=1&pageSize=100",{
+          params: {
+            condition: "1=1",
+          }
+        }).then((result)=>{
                           let dataList = JSON.parse(result.data.data);
                           let resultList = new Array();
                           for (let index = 0; index < dataList.length; index++) {

+ 74 - 4
src/views/smt/index.vue

@@ -41,7 +41,29 @@
             </div>
             <div class="react-right mr-4 react-l-s">
               <span class="react-after"></span>
-              <el-dropdown class="dropdown">
+
+             <!-- <el-dropdown class="dropdown">
+                <span class="el-dropdown-link" ref="echarType">
+                   {{linecode.LI_CODE}} <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 class="dropdownitem"
+                                    v-for="item in linedata"
+                                    :key="item.LI_CODE"
+                  >{{item.LI_CODE}}</el-dropdown-item>
+                 </el-dropdown-menu>
+              </el-dropdown>*/-->
+
+             <el-select v-model="linecode" class="dropdown" @change ="handleBlur">
+                <el-option
+                        v-for="item in linedata"
+                        :key="item.LI_CODE"
+                        :label="item.LI_CODE"
+                        :value="item.LI_CODE"
+                   ></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>
@@ -49,7 +71,7 @@
                   <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-dropdown>-->
 
               <span class="text"
               >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
@@ -100,9 +122,12 @@ import up2 from './up2'
 import up3 from './up3'
 import bottom1 from './bottom1'
 import bottom2 from './bottom2'
-
+import { mapState } from "vuex"
 export default {
   mixins: [ drawMixin ],
+  computed: {
+    ...mapState('user', ['user'])
+  },
   data() {
     return {
       timing: null,
@@ -111,7 +136,9 @@ export default {
       dateYear: null,
       dateWeek: null,
       weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-      decorationColor: ['#568aea', '#000000']
+      decorationColor: ['#568aea', '#000000'],
+      linecode:null,
+      linedata:[]
     }
   },
   components: {
@@ -121,6 +148,10 @@ export default {
     bottom1,
     bottom2
   },
+  created() {
+    this.linedata = this.$store.getters.user.linedata;
+    this.linecode = sessionStorage.getItem("li_code");
+  },
   mounted() {
     this.timeFn()
     this.cancelLoading()
@@ -141,6 +172,10 @@ export default {
       setTimeout(() => {
         this.loading = false
       }, 5000)
+    },
+    handleBlur (val){
+      sessionStorage.setItem('li_code',val);
+      location.reload();
     }
   }
 }
@@ -152,5 +187,40 @@ export default {
   font-size: 18px;
   color: #568aea;
   transform: skewX(45deg);
+  ::v-deep .el-select-dropdown {
+    /* // 若不将下拉框的背景颜色设置为:transparent,那么做不出来半透明的效果;
+    // 因为其最终的显示为:下拉框有一个背景颜色且下拉框的字体有一个背景颜色,重叠后的效果展示; */
+    border: 1px solid #0f1325;
+    background: #04308D !important;
+  }
+
+  ::v-deep .el-input__inner {
+    background-color: #0f1325;
+    color: #fff;
+    border: 1px solid #0f1325;
+  }
+
+  .el-select-dropdown__item {
+    color: #fff;
+    background-color: #0f1325;
+  }
+  ::v-deep .el-select-dropdown {
+    background-color: transparent;
+    border: 1px solid #0f1325;
+  }
+  ::v-deep.el-select-dropdown__list {
+    padding: 0;
+  }
+  ::v-deep.el-popper[x-placement^="bottom"] {
+    margin-top: 0px;
+  }
+  ::v-deep.el-popper .popper__arrow,
+  ::v-deep.el-popper .popper__arrow::after {
+    display: none;
+  }
+  .el-select-dropdown__item:hover {
+    background-color: rgba(0, 225, 219, 0.690196078431373);
+  }
 }
+
 </style>

+ 5 - 2
src/views/smt/up2.vue

@@ -57,8 +57,11 @@
       },
       async settestdata(){
         //今日成品生产情况统计
-        await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!MAKEQTY&_noc=1&page=1&pageSize=100&condition=1=1")
-                .then((result)=>{
+        await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!MAKEQTY&_noc=1&page=1&pageSize=100",{
+          params: {
+            condition: "1=1",
+          }
+        }).then((result)=>{
                           let dataList = JSON.parse(result.data.data);
                           let titleitems = new Array();
                           for (let index = 0; index < dataList.length; index++) {

+ 5 - 2
src/views/smt/up2old.vue

@@ -47,8 +47,11 @@
             },
             async setData () {
                 // 基板总数 ,总实装点数 name value
-                await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!1&_noc=1&page=1&pageSize=100&condition=1=1")
-                    .then((result)=>{
+                await this.$http.get("kanban/datalist.action?caller=KB!SMT!UP2!1&_noc=1&page=1&pageSize=100",{
+                    params: {
+                        condition: "1=1",
+                    }
+                }).then((result)=>{
                             let dataList = JSON.parse(result.data.data);
                             let titleitems = new Array();
                             for (let index = 0; index < dataList.length; index++) {