修改组装看板

package.json

@@ -3,8 +3,8 @@
   "version": "1.5.1",
   "private": true,
   "scripts": {
-    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

src/components/assemblyechart/bottom/bottomLeft2Chart/chart.vue

@@ -75,7 +75,7 @@ export default {
           {
             name: '投入',
             type: 'bar',
-            barWidth: 15,
+            barWidth: 25,
             emphasis: {
               focus: 'series'
             },
@@ -90,7 +90,7 @@ export default {
           {
             name: '产出',
             type: 'bar',
-            barWidth: 15,
+            barWidth: 25,
             stack: 'Ad',
             emphasis: {
               focus: 'series'
@@ -107,7 +107,7 @@ export default {
             name: '不良',
             type: 'bar',
             stack: 'Ad',
-            barWidth: 10,
+            barWidth: 25,
             data:[],
             //data: [12, 22, 32, 12, 32, 12, 32],
             emphasis: {
@@ -150,7 +150,7 @@ export default {
           }, {
             name: 'UPH',
             type: 'line',
-            barWidth: 15,
+            barWidth: 20,
             data:[],
             //data: [12, 22, 32, 12, 32, 12, 32],
             emphasis: {
@@ -200,7 +200,7 @@ export default {
       }
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "1=1",
+          condition:  "V_LICODE='" + sessionStorage.getItem('li_code') + "'"
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);

src/components/assemblyechart/bottom/bottomRightChart/index.vue

@@ -67,8 +67,18 @@ export default {
               type: 'value',
               axisLabel: {
                 fontSize: 16
+              },
+              min:60,
+              splitLine: {
+                show: true,
+                lineStyle: {
+                  // 使用深浅的间隔色
+                  type: "dashed",
+                  color: ['#aaa', '#aaa']
+                }
               }
             }
+
           ],
           series: newData.series
         }

src/components/assemblyechart/center/top5Chart/index.vue

@@ -52,7 +52,7 @@ export default {
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",
               {
                 params: {
-                  condition: "mb_ymd="+formatDate(new Date())
+                  condition: "mb_ymd="+formatDate(new Date()) +" and V_LICODE in ('CSC','CSB')"
                 }
               }) .then((result)=>{
                         let dataList = JSON.parse(result.data.data);

src/components/assemblyechart/centerLeft/centerLeft1Chart/index.vue

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

src/components/assemblyechart/centerRight/centerRightChart/index.vue

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

src/main.js

@@ -77,7 +77,7 @@ Vue.prototype.$http.interceptors.request.use(config => {
   if(config.params && config.params['condition']) {
     //console.log(sessionStorage.getItem('li_code'));
     if(sessionStorage.getItem('li_code') != '所有') {
-      config.params['condition'] = config.params['condition'] + " and V_LICODE='" + sessionStorage.getItem('li_code') + "'";
+      config.params['condition'] = config.params['condition'] + " ";
     }
   }
   return config;

src/views/assembly/bottomRight.vue

@@ -6,7 +6,7 @@
                  <span>
                     <icon name="chart-line" class="text-icon"></icon>
                   </span>
-          <span class="fs-xxl text mx-2 fw-b">近30天产线累计产量统计</span>
+          <span class="fs-xxl text mx-2 fw-b">近7天产线良率统计</span>
         </div>
         <div class="body-box">
           <div class="pt-2 " >
@@ -53,10 +53,9 @@ export default {
 
     async getdata() {
       var caller = 'ZZ!30DaysData';
-      var cond = "1=1";
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: cond
+          condition:  "V_LICODE in ('" + sessionStorage.getItem('li_code') + "','CSC','CSB')"
         }
       }).then((result)=>{
             let dataList = JSON.parse(result.data.data);
@@ -84,7 +83,7 @@ export default {
               seriesdata.push(se);
             }
             //30天内
-            for (let i =29 ;i>=0;i--){
+            for (let i =7 ;i>=0;i--){
               let formattedDate;
               if(i == 0){
                 formattedDate = this.$moment().format('MM/DD');
@@ -95,7 +94,7 @@ export default {
               //获取分组当天数据
               for (let value of seriesdata) {
                 let dataall = groupByLonglineMap[value.name];
-                let data0 = 0;
+                let data0 = 100;
                 if(null != dataall) {
                   let datam = dataall.filter(item => item.v_ymd1 == formattedDate);
                   if(datam.length>0){
@@ -117,6 +116,11 @@ export default {
                 },
                 emphasis: {
                   focus: 'series'
+                },
+                label: {
+                  show: true, // 显示标签
+                  position: 'top', // 标签位置，可以是'top', 'bottom', 'left', 'right'
+                  formatter: '{c}%' // 格式化显示，c代表数据值
                 }
               });
             }

src/views/assembly/center.vue

@@ -6,7 +6,7 @@
           <icon name="chart-bar" class="text-icon"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">不良现象TOP5</span>
+          <span class="fs-xl text mx-2">二测不良现象TOP5</span>
           <dv-decoration-3 class="dv-dec-3" />
         </div>
       </div>

src/views/assembly/centerLeft1.vue

@@ -6,7 +6,7 @@
           <icon name="chart-bar" class="text-icon"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">不良现象TOP5</span>
+          <span class="fs-xl text mx-2">一测不良现象TOP5</span>
           <dv-decoration-3 class="dv-dec-3" />
         </div>
       </div>

src/views/assembly/centerRight1.vue

@@ -66,7 +66,7 @@ export default {
     //  const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
-          condition: "1=1",
+          condition:  "V_LICODE in ('" + sessionStorage.getItem('li_code') + "','CSC','CSB')"
         }
       }).then((result)=>{
                     let dataList = JSON.parse(result.data.data);