华研看板，成型车间调整

package-lock.json

@@ -25,7 +25,8 @@
         "vue-awesome-swiper": "^2.6.7",
         "vue-router": "^3.1.5",
         "vue-seamless-scroll": "^1.1.23",
-        "vuex": "^3.1.2"
+        "vuex": "^3.1.2",
+        "vuex-persistedstate": "^4.1.0"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "^4.2.0",
@@ -4357,9 +4358,23 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001610",
-      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz",
-      "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA=="
+      "version": "1.0.30001651",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
+      "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -13833,6 +13848,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/shvl": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz",
+      "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==",
+      "deprecated": "older versions vulnerable to prototype pollution"
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
@@ -16256,6 +16277,27 @@
         "vue": "^2.0.0"
       }
     },
+    "node_modules/vuex-persistedstate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz",
+      "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "dependencies": {
+        "deepmerge": "^4.2.2",
+        "shvl": "^2.0.3"
+      },
+      "peerDependencies": {
+        "vuex": "^3.0 || ^4.0.0-rc"
+      }
+    },
+    "node_modules/vuex-persistedstate/node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",

package.json

@@ -25,7 +25,8 @@
     "vue-awesome-swiper": "^2.6.7",
     "vue-router": "^3.1.5",
     "vue-seamless-scroll": "^1.1.23",
-    "vuex": "^3.1.2"
+    "vuex": "^3.1.2",
+    "vuex-persistedstate": "^4.1.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.0",

src/assets/scss/indexcx.scss

@@ -130,7 +130,7 @@
       //下方区域的布局
       .content-box {
         display: grid;
-        grid-template-columns: 2fr 2fr 2fr;
+        grid-template-columns: 1.5fr 2fr 2.5fr;
         .item-box {
           display: grid;
           grid-template-columns: 1fr 1fr

src/views/cx/up1.vue

@@ -6,7 +6,7 @@
             <span>
               <icon name="align-left" class="text-icon"></icon>
             </span>
-                <span class="fs-xl text mx-2">设备情况统计</span>
+                <span class="fs-xxl text mx-2 fw-b">设备情况统计</span>
             </div>
             <div class="d-flex ai-center flex-column body-box">
                 <div class="info">
@@ -42,20 +42,20 @@
                 <span>
                       <icon name="align-left" class="text-icon"></icon>
                  </span>
-               <span class="fs-xl text mx-2">稼动率</span>
+               <span class="fs-xxl text mx-2 fw-b">稼动率</span>
             </div>
            <dv-water-level-pond :config="water" style="width:120px;height:120px" class="water"/>
         </div>
     </div>
 
     <div class="right">
-    <div class="ranking bg-color-black">
+<!--    <div class="ranking bg-color-black">
         <span>
           <icon name="chart-pie" class="text-icon"></icon>
         </span>
         <span class="fs-xl text mx-2 mb-1 pl-3">设备维保执行情况</span>
         <dv-capsule-chart :config="config" style="width:240px;height:180px" />
-      </div>
+      </div>-->
     </div>
   </div>
 </template>
@@ -128,7 +128,7 @@
           );
 
         //设备类别维保执行情况
-          await this.$http.get("kanban/datalist.action?caller=CX!DeviceMaintainData&_noc=1&page=1&pageSize=100",{
+        /*  await this.$http.get("kanban/datalist.action?caller=CX!DeviceMaintainData&_noc=1&page=1&pageSize=100",{
               params: {
                   condition: "1=1",
               }
@@ -147,7 +147,7 @@
               },(result)=>{
                   console.error(result)
               }
-          );
+          );*/
 
       }
     }
@@ -165,7 +165,7 @@
       padding: 0px 5px 0px 0px;
    }
     .left {
-      width: 40%;
+      width: 65%;
       padding: 6px 4px;
       .info {
           display: flex;
@@ -189,13 +189,13 @@
     }
     .center {
         padding: 5px 0px 0px 0px;
-        width: 20%;
+        width: 35%;
         .water {
             margin-top: 20px;
         }
     }
 
-    .right {
+    /*.right {
       padding: 6px 4px;
       padding-bottom: 0;
       width: 40%;
@@ -211,7 +211,7 @@
           height: 140px;
         }
       }
-    }
+    }*/
   }
 
 </style>

src/views/cx/up4.vue

@@ -6,10 +6,10 @@
               <icon name="chart-line" class="text-icon"></icon>
             </span>
               <div class="d-flex">
-                  <span class="fs-xl text mx-2">计划完成进度</span>
+                  <span class="fs-xxl text mx-2 fw-b">计划完成进度</span>
               </div>
           </div>
-          <div class="d-flex jc-center body-box">
+          <div class="body-box">
               <dv-scroll-board class="dv-scr-board" :config="config" ref="scroll-board" />
           </div>
       </div>
@@ -22,7 +22,7 @@
     data() {
       return {
           config: {
-              header:  ['工单', '产品','完成数', '完成比%','未完成数'],
+              header:  ['项目号', '计划数','产出数', '良品数','良率%','达成率','WIP结存'],
               data: [
               ],
               rowNum: 4, //表格行数
@@ -30,7 +30,7 @@
               headerBGC: '#0f1325', //表头
               oddRowBGC: '#0f1325', //奇数行
               evenRowBGC: '#171c33', //偶数行
-              columnWidth: [180,180,110,100,110],
+              columnWidth: [130,110,110,110,100,100,100],
               align: ['center','center','center','center','center']
           },
           timing :null
@@ -52,7 +52,33 @@
         }, 30000);
       },
       async setData () {
-          await this.$http.get("kanban/datalist.action?caller=CX!MakePlan&_noc=1&page=1&pageSize=100",{
+
+        await this.$http.get("kanban/datalist.action?caller=KB!MakePlanOut&_noc=1&page=1&pageSize=100",{
+          params: {
+            condition: "shop='"+this.$store.getters.shop+"'",
+          }
+        }).then((result)=>{
+              let dataList = JSON.parse(result.data.data);
+              let resultList = new Array();
+              for (let index = 0; index < dataList.length; index++) {
+                const element = dataList[index];
+                let item = new Array();
+                item.push("<span  class='colorGrass fs-xl'>"+element.v_itemcode+"</span>");
+                item.push("<span  class='colorGrass fs-xl'>"+element.v_planqty+"</span>");
+                item.push("<span  class='colorGrass fs-xl'>"+element.v_outqty+"</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_okqty + "</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_okrate + "%</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_rate + "%</span>");
+                item.push("<span  class='colorGrass fs-xl'>" + element.v_wipqty + "</span>");
+                resultList.push(item);
+              }
+              const scrollBoard = this.$refs['scroll-board'];
+              //刷新数据
+              scrollBoard.updateRows(resultList);
+            },(result)=>{
+              console.error(result)
+            }
+          /*await this.$http.get("kanban/datalist.action?caller=CX!MakePlan&_noc=1&page=1&pageSize=100",{
               params: {
                   condition: "1=1",
               }
@@ -74,7 +100,7 @@
                   scrollBoard.updateRows(resultList);
               },(result)=>{
                   console.error(result)
-              }
+              }*/
           );
       }
     }
@@ -98,8 +124,10 @@
       .body-box {
           border-radius: 10px;
           overflow: hidden;
+        ::v-deep .dv-scroll-board .header{
+          font-size: 20px;
+        }
           .dv-scr-board {
-              width: 600px;
               height: 170px;
           }
       }

src/views/oth/right1.vue

@@ -9,7 +9,7 @@
                   <span class="fs-xxl text mx-2">计划完成进度</span>
               </div>
           </div>
-          <div class="d-flex jc-center body-box pt-3">
+          <div class="d-flex body-box pt-3">
               <dv-scroll-board class="dv-scr-board" :config="config" ref="scroll-board" />
           </div>
       </div>

yarn.lock

@@ -2503,9 +2503,9 @@
     "lodash.uniq" "^4.5.0"
 
 "caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001449", "caniuse-lite@^1.0.30001610":
-  "integrity" "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA=="
-  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz"
-  "version" "1.0.30001610"
+  "integrity" "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg=="
+  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz"
+  "version" "1.0.30001651"
 
 "case-sensitive-paths-webpack-plugin@^2.3.0":
   "integrity" "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="
@@ -3329,6 +3329,11 @@
   "resolved" "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz"
   "version" "1.5.2"
 
+"deepmerge@^4.2.2":
+  "integrity" "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
+  "resolved" "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz"
+  "version" "4.3.1"
+
 "default-gateway@^4.2.0":
   "integrity" "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="
   "resolved" "https://registry.npmmirror.com/default-gateway/-/default-gateway-4.2.0.tgz"
@@ -7828,6 +7833,11 @@
   "resolved" "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.0.tgz"
   "version" "1.8.0"
 
+"shvl@^2.0.3":
+  "integrity" "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw=="
+  "resolved" "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz"
+  "version" "2.0.3"
+
 "side-channel@^1.0.4":
   "integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
   "resolved" "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz"
@@ -8874,7 +8884,15 @@
     "@vue/compiler-sfc" "2.7.14"
     "csstype" "^3.1.0"
 
-"vuex@^3.1.2":
+"vuex-persistedstate@^4.1.0":
+  "integrity" "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ=="
+  "resolved" "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz"
+  "version" "4.1.0"
+  dependencies:
+    "deepmerge" "^4.2.2"
+    "shvl" "^2.0.3"
+
+"vuex@^3.0 || ^4.0.0-rc", "vuex@^3.1.2":
   "integrity" "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
   "resolved" "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz"
   "version" "3.6.2"