Browse Source

修改包装看板

callm 6 months ago
parent
commit
1b7dd45cca

+ 1 - 1
package-lock.json

@@ -16129,7 +16129,7 @@
     },
     },
     "node_modules/vue-moment": {
     "node_modules/vue-moment": {
       "version": "4.1.0",
       "version": "4.1.0",
-      "resolved": "https://registry.npmmirror.com/vue-moment/-/vue-moment-4.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/vue-moment/-/vue-moment-4.1.0.tgz",
       "integrity": "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==",
       "integrity": "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==",
       "dependencies": {
       "dependencies": {
         "moment": "^2.19.2"
         "moment": "^2.19.2"

+ 0 - 17
src/components/assemblyechart/bottom/bottomLeft2Chart/chart.vue

@@ -147,23 +147,6 @@ export default {
             emphasis: {
             emphasis: {
               focus: 'series'
               focus: 'series'
             }
             }
-          }, {
-            name: 'UPH',
-            type: 'line',
-            barWidth: 20,
-            data:[],
-            //data: [12, 22, 32, 12, 32, 12, 32],
-            emphasis: {
-              focus: 'series'
-            },lineStyle: {
-              width: 4
-            },
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold"
-            }
           }
           }
         ]
         ]
       },
       },

+ 1 - 1
src/components/assemblyechart/centerRight/centerRight1Chart/chart.vue

@@ -52,7 +52,7 @@ export default {
         yAxis: [
         yAxis: [
           {
           {
             type: 'value',
             type: 'value',
-            interval: 50,
+            interval: 150,
             axisLabel: {
             axisLabel: {
               fontSize: 16
               fontSize: 16
             }
             }

+ 1 - 1
src/components/assemblyechart/centerRight/centerRight2Chart/chart.vue

@@ -53,7 +53,7 @@ export default {
         yAxis: [
         yAxis: [
           {
           {
             type: 'value',
             type: 'value',
-            interval: 50,
+            interval: 150,
             axisLabel: {
             axisLabel: {
               fontSize: 14
               fontSize: 14
             }
             }

+ 1 - 20
src/components/packageechart/bottom/bottomLeft2Chart/chart.vue

@@ -150,25 +150,6 @@ export default {
             emphasis: {
             emphasis: {
               focus: 'series'
               focus: 'series'
             }
             }
-          }, {
-            name: 'UPH',
-            type: 'line',
-            symbolSize: 8,
-            barWidth: 15,
-            data:[],
-            //data: [12, 22, 32, 12, 32, 12, 32],
-            emphasis: {
-              focus: 'series'
-            },
-            lineStyle: {
-              width: 4
-            },
-            label: {
-              show: true,
-              position: 'top',
-              fontSize:14,
-              fontWeight: "bold"
-            }
           }
           }
         ]
         ]
       },
       },
@@ -345,7 +326,7 @@ export default {
       }
       }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
         params: {
-          condition: "1=1",
+          condition:  "V_LICODE='" + sessionStorage.getItem('li_code') + "'"
         }
         }
       }).then((result)=>{
       }).then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let dataList = JSON.parse(result.data.data);

+ 1 - 1
src/components/packageechart/bottom/bottomRightChart/index.vue

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

+ 2 - 2
src/views/assembly/bottomRight.vue

@@ -64,7 +64,7 @@ export default {
             //获取总共有多少个线别
             //获取总共有多少个线别
             const groupByLonglineMap = dataList.reduce((result, currentItem) => {
             const groupByLonglineMap = dataList.reduce((result, currentItem) => {
               // 使用 key 函数提取分组键
               // 使用 key 函数提取分组键
-              const groupKey = currentItem["v_licode"];
+              const groupKey = currentItem["v_liname"];
               // 初始化分组数组(如果尚未创建)
               // 初始化分组数组(如果尚未创建)
               if (!result[groupKey]) {
               if (!result[groupKey]) {
                 result[groupKey] = [];
                 result[groupKey] = [];
@@ -74,7 +74,7 @@ export default {
               return result;
               return result;
             }, {});
             }, {});
 
 
-            const longlines = Array.from(new Set(dataList.map(item => item['v_licode']))).join().split(",");
+            const longlines = Array.from(new Set(dataList.map(item => item['v_liname']))).join().split(",");
             let seriesdata = new Array();
             let seriesdata = new Array();
             for (let value of longlines) {
             for (let value of longlines) {
               let se = new Object();
               let se = new Object();

+ 0 - 6
src/views/package/index.vue

@@ -48,13 +48,7 @@
                   包装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                   包装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 </span>
                   <el-dropdown-menu slot="dropdown">
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item ><router-link to="dj"> 点胶车间 </router-link></el-dropdown-item>
-                    <el-dropdown-item ><router-link to="dip"> DIP车间 </router-link></el-dropdown-item>
-                    <el-dropdown-item ><router-link to="dpl"> 多品类车间 </router-link></el-dropdown-item>
                     <el-dropdown-item ><router-link to="assembly"> 组装车间 </router-link></el-dropdown-item>
                     <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-item ><router-link to="smttest">SMT测试车间</router-link></el-dropdown-item>
-                    <el-dropdown-item class="dropdownitem"><router-link to="total"> 各车间总看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>
                   </el-dropdown-menu>
             </el-dropdown>
             </el-dropdown>
               <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
               <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">

+ 1 - 1
yarn.lock

@@ -8823,7 +8823,7 @@
 
 
 "vue-moment@^4.1.0":
 "vue-moment@^4.1.0":
   "integrity" "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw=="
   "integrity" "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw=="
-  "resolved" "https://registry.npmmirror.com/vue-moment/-/vue-moment-4.1.0.tgz"
+  "resolved" "https://registry.npmjs.org/vue-moment/-/vue-moment-4.1.0.tgz"
   "version" "4.1.0"
   "version" "4.1.0"
   dependencies:
   dependencies:
     "moment" "^2.19.2"
     "moment" "^2.19.2"