From e2a6b3e49b6ac5a7e76cec946e0ad82c962a72d8 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 18 Dec 2023 16:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/getters.js                          |   4 +-
 src/store/modules/socket.js                   |  25 +-
 src/utils/signalR.js                          |  10 +-
 .../quality/qualityStatistics.vue             |  28 +-
 src/views/qualityManagement/FQC/againFQC.vue  |  53 +-
 src/views/qualityManagement/FQC/firstFQC.vue  |  57 +-
 src/views/qualityManagement/FQC/thirtyFQC.vue | 693 +++++++++---------
 7 files changed, 452 insertions(+), 418 deletions(-)

diff --git a/src/store/getters.js b/src/store/getters.js
index 33d5edf..274d034 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -18,6 +18,8 @@ const getters = {
   sidebarRouters: (state) => state.permission.sidebarRouters,
   onlineUserNum: (state) => state.socket.onlineNum,
   noticeList: (state) => state.socket.noticeList,
-  counterList: (state) => state.socket.counter,
+  counterList_v1: (state) => state.socket.counter_v1,
+  counterList_v2: (state) => state.socket.counter_v2,
+  counterList_v3: (state) => state.socket.counter_v3,
 }
 export default getters
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index c1a0e1c..a6867db 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -1,7 +1,9 @@
 const state = {
   onlineNum: 0,
   noticeList: [],
-  counter:0
+  counter_v1:0,
+  counter_v2:0,
+  counter_v3:0,
 
 }
 const mutations = {
@@ -11,8 +13,14 @@ const mutations = {
   SET_NOTICE_list: (state, data) => {
     state.noticeList = data;
   },
-  SET_GetCache: (state, data) => {
-    state.counter = data;
+  SET_GetCache_v1: (state, data) => {
+    state.counter_v1 = data;
+  },
+  SET_GetCache_v2: (state, data) => {
+    state.counter_v2 = data;
+  },
+  SET_GetCache_v3: (state, data) => {
+    state.counter_v3 = data;
   },
 }
 
@@ -27,8 +35,15 @@ const actions = {
   },
 
   //更新缺陷点击
-  GetCache({commit},data){
-    commit("SET_GetCache",data);
+
+  GetCache_v1({commit},data){
+    commit("SET_GetCache_v1",data);
+  },
+  GetCache_v2({commit},data){
+    commit("SET_GetCache_v2",data);
+  },
+  GetCache_v3({commit},data){
+    commit("SET_GetCache_v3",data);
   }
 }
 
diff --git a/src/utils/signalR.js b/src/utils/signalR.js
index bc5e3f5..ae45757 100644
--- a/src/utils/signalR.js
+++ b/src/utils/signalR.js
@@ -84,8 +84,14 @@ export default {
     })
 
     //接受缓存
-    connection.on('GetCache', (Moudle,checkid, sum) => {
-      store.dispatch('socket/GetCache', {Moudle,checkid,sum})
+    connection.on('GetCache_v1', (Moudle,checkid, sum) => {
+      store.dispatch('socket/GetCache_v1', {Moudle,checkid,sum})
+    })
+    connection.on('GetCache_v2', (Moudle,checkid, sum) => {
+      store.dispatch('socket/GetCache_v2', {Moudle,checkid,sum})
+    })
+    connection.on('GetCache_v3', (Moudle,checkid, sum) => {
+      store.dispatch('socket/GetCache_v3', {Moudle,checkid,sum})
     })
 
 
diff --git a/src/views/OperationManagement/quality/qualityStatistics.vue b/src/views/OperationManagement/quality/qualityStatistics.vue
index e2155b0..9ac5615 100644
--- a/src/views/OperationManagement/quality/qualityStatistics.vue
+++ b/src/views/OperationManagement/quality/qualityStatistics.vue
@@ -19,10 +19,10 @@
       </el-form>
     </div>
 
-    <vxe-table :data="QualityStatisticsTable" align="center" :loading="loading">
+    <vxe-table :data="QualityStatisticsTable" align="center" :loading="loading" border :column-config="{ resizable: true }">
       <vxe-column type="seq" width="60"></vxe-column>
       <vxe-column field="id" title="id"></vxe-column>
-      <vxe-column field="fk_workorder_id" title="工单id"></vxe-column>
+      <vxe-column field="fkWorkorderId" title="工单id"></vxe-column>
       <vxe-column field="productName" title="产品名称"></vxe-column>
       <vxe-column field="color" title="颜色"></vxe-column>
       <vxe-column field="require" title="投入数"></vxe-column>
@@ -44,6 +44,14 @@
         <vxe-column field="polishNum03" title="三检打磨数量"></vxe-column>
         <vxe-column field="scrapNum03" title="三检报废数量"></vxe-column>
       </vxe-colgroup>
+      <vxe-colgroup title="统计分析" fixed="right">
+        <vxe-column field="firstgoodNum" title="一次合格数量"></vxe-column>
+        <vxe-column field="firstgoodRate" title="一次合格率"></vxe-column>
+        <vxe-column field="finalgoodNum" title="最终合格数量"></vxe-column>
+        <vxe-column field="finalgoodRate" title="最终合格率"></vxe-column>
+        <vxe-column field="scrapNum" title="报废数"></vxe-column>
+        <vxe-column field="scrapRate" title="报废率"></vxe-column>
+      </vxe-colgroup>
     </vxe-table>
     <pagination
       :total="pagination.total"
@@ -64,7 +72,7 @@ export default {
         year: 2023,
         week: null,
         date: null,
-        workorderid: "",
+        workorderid: '',
       },
       pagination: {
         total: 0,
@@ -76,22 +84,22 @@ export default {
     }
   },
   mounted() {
-    this.GetQualityStatisticsTable();
+    this.GetQualityStatisticsTable()
   },
   methods: {
     // todo 获取表格
     GetQualityStatisticsTable() {
       const query = { ...this.search, ...this.pagination }
-      if (query.year == null||query.year==0) query.year = -1
-      if (query.week == null||query.week==0) query.week = -1
-      if (query.date == null||query.date==0) query.date = -1
-      if (query.date == null||query.date==0) query.date = -1
+      if (query.year == null || query.year == 0) query.year = -1
+      if (query.week == null || query.week == 0) query.week = -1
+      if (query.date == null || query.date == 0) query.date = -1
+      if (query.date == null || query.date == 0) query.date = -1
 
       QueryQualityStatisticsTable(query)
         .then((res) => {
           if (res.code == 200) {
-            this.QualityStatisticsTable = res.data.item1;
-            this.pagination.total = res.data.item2;
+            this.QualityStatisticsTable = res.data.item1
+            this.pagination.total = res.data.item2
             this.loading = false
           }
         })
diff --git a/src/views/qualityManagement/FQC/againFQC.vue b/src/views/qualityManagement/FQC/againFQC.vue
index 85fdf7b..e5ceede 100644
--- a/src/views/qualityManagement/FQC/againFQC.vue
+++ b/src/views/qualityManagement/FQC/againFQC.vue
@@ -1,15 +1,15 @@
 <template>
     <div>
-      <div class="animate__animated animate__shakeX title">车镜油漆缺陷采集系统</div>
+      <div class="animate__animated animate__shakeX title">车镜油漆缺陷采集系统(二检)</div>
       <el-row>
         <el-col :span="1">
           <div style="height: 225px">
-            <div class="title_Line">抛光</div>
+        
             <div class="title_Line">打磨</div>
             <div class="title_Line">报废</div>
           </div>
           <div style="height: 250px">
-            <div class="title_Line">抛光</div>
+    
             <div class="title_Line">打磨</div>
             <div class="title_Line">报废</div>
           </div>
@@ -20,7 +20,7 @@
               <div class="a">
                 <div class="title_sub">{{ paint[0].inspectionModule }}</div>
                 <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of paint" :key="index">
+                  <div class="a_11" v-for="(item, index) of paint" :key="index"   v-show="parseInt((item.id / 10) % 10) > 1">
                     <div @click="Accumulator(item, index)" class="button_">
                       <el-badge :value="item.counter" type="primary"
                         ><div class="context">{{ item.inspectionName }}</div></el-badge
@@ -32,7 +32,7 @@
               <div class="b">
                 <div class="title_sub">{{ device[0].inspectionModule }}</div>
                 <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of device" :key="index">
+                  <div class="a_11" v-for="(item, index) of device" :key="index"   v-show="parseInt((item.id / 10) % 10) > 1">
                     <div @click="Accumulator(item, index)" class="button_">
                       <el-badge :value="item.counter" type="primary"
                         ><div class="context">{{ item.inspectionName }}</div></el-badge
@@ -44,7 +44,7 @@
               <div class="c">
                 <div class="title_sub">{{ blank[0].inspectionModule }}</div>
                 <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of blank" :key="index">
+                  <div class="a_11" v-for="(item, index) of blank" :key="index"   v-show="parseInt((item.id / 10) % 10) > 1">
                     <div @click="Accumulator(item, index)" class="button_">
                       <el-badge :value="item.counter" type="primary"
                         ><div class="context">{{ item.inspectionName }}</div></el-badge
@@ -56,7 +56,7 @@
               <div class="d">
                 <div class="title_sub">{{ program[0].inspectionModule }}</div>
                 <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of program" :key="index">
+                  <div class="a_11" v-for="(item, index) of program" :key="index"   v-show="parseInt((item.id / 10) % 10) > 1">
                     <div @click="Accumulator(item, index)" class="button_">
                       <el-badge :value="item.counter" type="primary"
                         ><div class="context">{{ item.inspectionName }}</div></el-badge
@@ -68,7 +68,7 @@
               <div class="e">
                 <div class="title_sub">{{ team[0].inspectionModule }}</div>
                 <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of team" :key="index">
+                  <div class="a_11" v-for="(item, index) of team" :key="index"   v-show="parseInt((item.id / 10) % 10) > 1">
                     <div @click="Accumulator(item, index)" class="button_">
                       <el-badge :value="item.counter" type="primary"
                         ><div class="context">{{ item.inspectionName }}</div></el-badge
@@ -123,7 +123,7 @@
           workorderid:"VW123456",
           productName: 'VW12309',
           direction: '左',
-          color: 'blued',
+          color: 'blue',
           team: 'A',
           inputNum: 7852,
         },
@@ -132,30 +132,33 @@
       }
     },
     watch: {
-      '$store.getters.counterList': {
-        immediate: true,
-        deep: true,
-        handler(newValue, oldValue) {
-          switch (this.$store.getters.counterList.Moudle) {
+    '$store.getters.counterList_v2': {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        if (newValue.checkid && newValue.checkid.length > 0) {
+          let checkid_ = newValue.checkid.substring(0, 3)
+          switch (this.$store.getters.counterList_v2.Moudle) {
             case '油漆':
-              this.paint.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.paint.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v2.sum
               break
             case '设备':
-              this.device.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.device.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v2.sum
               break
             case '毛坯':
-              this.blank.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.blank.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v2.sum
               break
             case '程序':
-              this.program.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.program.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v2.sum
               break
             case '班组操作':
-              this.team.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.team.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v2.sum
               break
           }
-        },
+        }
       },
     },
+  },
     computed: {
       ...mapGetters(['counterList']),
     },
@@ -198,29 +201,29 @@
         switch (item.inspectionModule) {
           case '油漆':
             // 把数据传递到redis
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => {
+            this.signalr.SR.invoke('SaveCacheInformation_v2', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => {
               console.log(err)
             })
             // redis再将数据返回
   
             break
           case '设备':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => {
+            this.signalr.SR.invoke('SaveCacheInformation_v2', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => {
               console.log(err)
             })
             break
           case '毛坯':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => {
+            this.signalr.SR.invoke('SaveCacheInformation_v2', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => {
               console.log(err)
             })
             break
           case '程序':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => {
+            this.signalr.SR.invoke('SaveCacheInformation_v2', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => {
               console.log(err)
             })
             break
           case '班组操作':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => {
+            this.signalr.SR.invoke('SaveCacheInformation_v2', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => {
               console.log(err)
             })
             break
diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue
index 4d38110..3098486 100644
--- a/src/views/qualityManagement/FQC/firstFQC.vue
+++ b/src/views/qualityManagement/FQC/firstFQC.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="animate__animated animate__shakeX title">车镜油漆缺陷采集系统</div>
+    <div class="animate__animated animate__shakeX title">车镜油漆缺陷采集系统（首检）</div>
     <el-row>
       <el-col :span="1">
         <div style="height: 225px">
@@ -120,10 +120,10 @@ export default {
       team: [{ inspectionModule: '' }], //班组
 
       ProductSituationForm: {
-        workorderid:"VW123456",
+        workorderid: 'VW123456',
         productName: 'VW12309',
         direction: '左',
-        color: 'blued',
+        color: 'blue',
         team: 'A',
         inputNum: 7852,
       },
@@ -132,33 +132,34 @@ export default {
     }
   },
   watch: {
-    '$store.getters.counterList': {
+    '$store.getters.counterList_v1': {
       immediate: true,
       deep: true,
       handler(newValue, oldValue) {
-        switch (this.$store.getters.counterList.Moudle) {
-          case '油漆':
-            this.paint.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
-            break
-          case '设备':
-            this.device.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
-            break
-          case '毛坯':
-            this.blank.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
-            break
-          case '程序':
-            this.program.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
-            break
-          case '班组操作':
-            this.team.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
-            break
+        if (newValue.checkid && newValue.checkid.length > 0) {
+          let checkid_ = newValue.checkid.substring(0, 3)
+          switch (this.$store.getters.counterList_v1.Moudle) {
+            case '油漆':
+              this.paint.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v1.sum
+              break
+            case '设备':
+              this.device.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v1.sum
+              break
+            case '毛坯':
+              this.blank.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v1.sum
+              break
+            case '程序':
+              this.program.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v1.sum
+              break
+            case '班组操作':
+              this.team.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v1.sum
+              break
+          }
         }
       },
     },
   },
-  computed: {
-    ...mapGetters(['counterList']),
-  },
+
   created() {
     this.getCheckItemList()
   },
@@ -198,29 +199,29 @@ export default {
       switch (item.inspectionModule) {
         case '油漆':
           // 把数据传递到redis
-          this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => {
+          this.signalr.SR.invoke('SaveCacheInformation_v1', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => {
             console.log(err)
           })
           // redis再将数据返回
 
           break
         case '设备':
-          this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => {
+          this.signalr.SR.invoke('SaveCacheInformation_v1', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => {
             console.log(err)
           })
           break
         case '毛坯':
-          this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => {
+          this.signalr.SR.invoke('SaveCacheInformation_v1', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => {
             console.log(err)
           })
           break
         case '程序':
-          this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => {
+          this.signalr.SR.invoke('SaveCacheInformation_v1', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => {
             console.log(err)
           })
           break
         case '班组操作':
-          this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => {
+          this.signalr.SR.invoke('SaveCacheInformation_v1', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => {
             console.log(err)
           })
           break
diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue
index d7966cb..4c652e1 100644
--- a/src/views/qualityManagement/FQC/thirtyFQC.vue
+++ b/src/views/qualityManagement/FQC/thirtyFQC.vue
@@ -1,242 +1,242 @@
 <template>
-    <div>
-      <div class="animate__animated animate__shakeX title">车镜油漆缺陷采集系统</div>
-      <el-row>
-        <el-col :span="1">
-          <div style="height: 225px">
-            <div class="title_Line">抛光</div>
-            <div class="title_Line">打磨</div>
-            <div class="title_Line">报废</div>
-          </div>
-          <div style="height: 250px">
-            <div class="title_Line">抛光</div>
-            <div class="title_Line">打磨</div>
-            <div class="title_Line">报废</div>
-          </div>
-        </el-col>
-        <el-col :span="23">
-          <div>
-            <div class="grid">
-              <div class="a">
-                <div class="title_sub">{{ paint[0].inspectionModule }}</div>
-                <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of paint" :key="index">
-                    <div @click="Accumulator(item, index)" class="button_">
-                      <el-badge :value="item.counter" type="primary"
-                        ><div class="context">{{ item.inspectionName }}</div></el-badge
-                      >
-                    </div>
+  <div>
+    <div class="animate__animated animate__shakeX title">车镜油漆缺陷采集系统(三检)</div>
+    <el-row>
+      <el-col :span="1">
+        <div style="height: 225px">
+          <div class="title_Line">打磨</div>
+          <div class="title_Line">报废</div>
+        </div>
+        <div style="height: 250px">
+          <div class="title_Line">打磨</div>
+          <div class="title_Line">报废</div>
+        </div>
+      </el-col>
+      <el-col :span="23">
+        <div>
+          <div class="grid">
+            <div class="a">
+              <div class="title_sub">{{ paint[0].inspectionModule }}</div>
+              <div class="grid_sub">
+                <div class="a_11" v-for="(item, index) of paint" :key="index" v-show="parseInt((item.id / 10) % 10) > 1">
+                  <div @click="Accumulator(item, index)" class="button_">
+                    <el-badge :value="item.counter" type="primary"
+                      ><div class="context">{{ item.inspectionName }}</div></el-badge
+                    >
                   </div>
                 </div>
               </div>
-              <div class="b">
-                <div class="title_sub">{{ device[0].inspectionModule }}</div>
-                <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of device" :key="index">
-                    <div @click="Accumulator(item, index)" class="button_">
-                      <el-badge :value="item.counter" type="primary"
-                        ><div class="context">{{ item.inspectionName }}</div></el-badge
-                      >
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="c">
-                <div class="title_sub">{{ blank[0].inspectionModule }}</div>
-                <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of blank" :key="index">
-                    <div @click="Accumulator(item, index)" class="button_">
-                      <el-badge :value="item.counter" type="primary"
-                        ><div class="context">{{ item.inspectionName }}</div></el-badge
-                      >
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="d">
-                <div class="title_sub">{{ program[0].inspectionModule }}</div>
-                <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of program" :key="index">
-                    <div @click="Accumulator(item, index)" class="button_">
-                      <el-badge :value="item.counter" type="primary"
-                        ><div class="context">{{ item.inspectionName }}</div></el-badge
-                      >
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="e">
-                <div class="title_sub">{{ team[0].inspectionModule }}</div>
-                <div class="grid_sub">
-                  <div class="a_11" v-for="(item, index) of team" :key="index">
-                    <div @click="Accumulator(item, index)" class="button_">
-                      <el-badge :value="item.counter" type="primary"
-                        ><div class="context">{{ item.inspectionName }}</div></el-badge
-                      >
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="f">
-                <div class="f_item">
-                  <div class="f_name">工单id：{{ ProductSituationForm.workorderid }}</div>
-                </div>
-                <div class="f_item">
-                  <div class="f_name">产品名称：{{ ProductSituationForm.productName }}</div>
-                </div>
-                <div class="f_item">
-                  <div class="f_name">左右:{{ ProductSituationForm.direction }}</div>
-                </div>
-                <div class="f_item">
-                  <div class="f_name">颜色:{{ ProductSituationForm.color }}</div>
-                </div>
-  
-                <div class="f_item">
-                  <div class="f_name">班组: {{ ProductSituationForm.team }}</div>
-                </div>
-  
-                <div class="f_item">
-                  <div class="f_name">投入数:{{ ProductSituationForm.inputNum }}</div>
-                </div>
-              </div>
+            </div>
+            <div class="b">
+              <div class="title_sub">{{ device[0].inspectionModule }}</div>
+              <div class="grid_sub">
+                <div class="a_11" v-for="(item, index) of device" :key="index" v-show="parseInt((item.id / 10) % 10) > 1">
+                  <div @click="Accumulator(item, index)" class="button_">
+                    <el-badge :value="item.counter" type="primary"
+                      ><div class="context">{{ item.inspectionName }}</div></el-badge
+                    >
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="c">
+              <div class="title_sub">{{ blank[0].inspectionModule }}</div>
+              <div class="grid_sub">
+                <div class="a_11" v-for="(item, index) of blank" :key="index" v-show="parseInt((item.id / 10) % 10) > 1">
+                  <div @click="Accumulator(item, index)" class="button_">
+                    <el-badge :value="item.counter" type="primary"
+                      ><div class="context">{{ item.inspectionName }}</div></el-badge
+                    >
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="d">
+              <div class="title_sub">{{ program[0].inspectionModule }}</div>
+              <div class="grid_sub">
+                <div class="a_11" v-for="(item, index) of program" :key="index" v-show="parseInt((item.id / 10) % 10) > 1">
+                  <div @click="Accumulator(item, index)" class="button_">
+                    <el-badge :value="item.counter" type="primary"
+                      ><div class="context">{{ item.inspectionName }}</div></el-badge
+                    >
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="e">
+              <div class="title_sub">{{ team[0].inspectionModule }}</div>
+              <div class="grid_sub">
+                <div class="a_11" v-for="(item, index) of team" :key="index" v-show="parseInt((item.id / 10) % 10) > 1">
+                  <div @click="Accumulator(item, index)" class="button_">
+                    <el-badge :value="item.counter" type="primary"
+                      ><div class="context">{{ item.inspectionName }}</div></el-badge
+                    >
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="f">
+              <div class="f_item">
+                <div class="f_name">工单id：{{ ProductSituationForm.workorderid }}</div>
+              </div>
+              <div class="f_item">
+                <div class="f_name">产品名称：{{ ProductSituationForm.productName }}</div>
+              </div>
+              <div class="f_item">
+                <div class="f_name">左右:{{ ProductSituationForm.direction }}</div>
+              </div>
+              <div class="f_item">
+                <div class="f_name">颜色:{{ ProductSituationForm.color }}</div>
+              </div>
+
+              <div class="f_item">
+                <div class="f_name">班组: {{ ProductSituationForm.team }}</div>
+              </div>
+
+              <div class="f_item">
+                <div class="f_name">投入数:{{ ProductSituationForm.inputNum }}</div>
+              </div>
             </div>
           </div>
-        </el-col>
-      </el-row>
-    </div>
-  </template>
-  
-  <script>
-  import { GetcheckItemTable } from '@/api/qualityManagement/firstFQC.js'
-  import { mapGetters } from 'vuex'
-  export default {
-    name: 'thirtyFQC',
-    data() {
-      return {
-        paint: [{ inspectionModule: '' }],
-        device: [{ inspectionModule: '' }],
-        blank: [{ inspectionModule: '' }], // 毛坯
-        program: [{ inspectionModule: '' }], // 程序
-        team: [{ inspectionModule: '' }], //班组
-  
-        ProductSituationForm: {
-          workorderid:"VW123456",
-          productName: 'VW12309',
-          direction: '左',
-          color: 'blued',
-          team: 'A',
-          inputNum: 7852,
-        },
-        signal: null,
-        data: null,
-      }
-    },
-    watch: {
-      '$store.getters.counterList': {
-        immediate: true,
-        deep: true,
-        handler(newValue, oldValue) {
-          switch (this.$store.getters.counterList.Moudle) {
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { GetcheckItemTable } from '@/api/qualityManagement/firstFQC.js'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'thirtyFQC',
+  data() {
+    return {
+      paint: [{ inspectionModule: '' }],
+      device: [{ inspectionModule: '' }],
+      blank: [{ inspectionModule: '' }], // 毛坯
+      program: [{ inspectionModule: '' }], // 程序
+      team: [{ inspectionModule: '' }], //班组
+
+      ProductSituationForm: {
+        workorderid: 'VW123456',
+        productName: 'VW12309',
+        direction: '左',
+        color: 'blue',
+        team: 'A',
+        inputNum: 7852,
+      },
+      signal: null,
+      data: null,
+    }
+  },
+  watch: {
+    '$store.getters.counterList_v3': {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        if (newValue.checkid && newValue.checkid.length > 0) {
+          let checkid_ = newValue.checkid.substring(0, 3)
+          switch (this.$store.getters.counterList_v3.Moudle) {
             case '油漆':
-              this.paint.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.paint.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v3.sum
               break
             case '设备':
-              this.device.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.device.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v3.sum
               break
             case '毛坯':
-              this.blank.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.blank.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v3.sum
               break
             case '程序':
-              this.program.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.program.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v3.sum
               break
             case '班组操作':
-              this.team.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum
+              this.team.filter((it) => it.id == checkid_)[0].counter = this.$store.getters.counterList_v3.sum
               break
           }
-        },
-      },
-    },
-    computed: {
-      ...mapGetters(['counterList']),
-    },
-    created() {
-      this.getCheckItemList()
-    },
-    mounted() {},
-    methods: {
-      //todo  获取检测项
-      getCheckItemList() {
-        GetcheckItemTable()
-          .then((result) => {
-            if (result.code == 200) {
-              this.paint = result.data.paint
-              this.paint.forEach((item) => {
-                if (item.counter == null) item.counter = 0
-              })
-              this.device = result.data.device
-              this.device.forEach((item) => {
-                if (item.counter == null) item.counter = 0
-              })
-              this.blank = result.data.blank
-              this.blank.forEach((item) => {
-                if (item.counter == null) item.counter = 0
-              })
-              this.program = result.data.program
-              this.program.forEach((item) => {
-                if (item.counter == null) item.counter = 0
-              })
-              this.team = result.data.team
-              this.team.forEach((item) => {
-                if (item.counter == null) item.counter = 0
-              })
-            }
-          })
-          .catch((err) => {})
-      },
-      //todo  累加器
-      Accumulator(item, index) {
-        switch (item.inspectionModule) {
-          case '油漆':
-            // 把数据传递到redis
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => {
-              console.log(err)
-            })
-            // redis再将数据返回
-  
-            break
-          case '设备':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => {
-              console.log(err)
-            })
-            break
-          case '毛坯':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => {
-              console.log(err)
-            })
-            break
-          case '程序':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => {
-              console.log(err)
-            })
-            break
-          case '班组操作':
-            this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => {
-              console.log(err)
-            })
-            break
-          default:
-            this.$notify.warning('异常操作，警告')
-            break
         }
       },
-      //todo  数据同步
-      /*
+    },
+  },
+
+ 
+  created() {
+    this.getCheckItemList()
+  },
+  mounted() {},
+  methods: {
+    //todo  获取检测项
+    getCheckItemList() {
+      GetcheckItemTable()
+        .then((result) => {
+          if (result.code == 200) {
+            this.paint = result.data.paint
+            this.paint.forEach((item) => {
+              if (item.counter == null) item.counter = 0
+            })
+            this.device = result.data.device
+            this.device.forEach((item) => {
+              if (item.counter == null) item.counter = 0
+            })
+            this.blank = result.data.blank
+            this.blank.forEach((item) => {
+              if (item.counter == null) item.counter = 0
+            })
+            this.program = result.data.program
+            this.program.forEach((item) => {
+              if (item.counter == null) item.counter = 0
+            })
+            this.team = result.data.team
+            this.team.forEach((item) => {
+              if (item.counter == null) item.counter = 0
+            })
+          }
+        })
+        .catch((err) => {})
+    },
+    //todo  累加器
+    Accumulator(item, index) {
+      switch (item.inspectionModule) {
+        case '油漆':
+          // 把数据传递到redis
+          this.signalr.SR.invoke('SaveCacheInformation_v3', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => {
+            console.log(err)
+          })
+          // redis再将数据返回
+
+          break
+        case '设备':
+          this.signalr.SR.invoke('SaveCacheInformation_v3', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => {
+            console.log(err)
+          })
+          break
+        case '毛坯':
+          this.signalr.SR.invoke('SaveCacheInformation_v3', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => {
+            console.log(err)
+          })
+          break
+        case '程序':
+          this.signalr.SR.invoke('SaveCacheInformation_v3', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => {
+            console.log(err)
+          })
+          break
+        case '班组操作':
+          this.signalr.SR.invoke('SaveCacheInformation_v3', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => {
+            console.log(err)
+          })
+          break
+        default:
+          this.$notify.warning('异常操作，警告')
+          break
+      }
+    },
+    //todo  数据同步
+    /*
      1.从后台获取数据
   
      */
-  
-      //todo 初始话 signalR
-      /*initSignalR() {
+
+    //todo 初始话 signalR
+    /*initSignalR() {
         this.signal = new signalR.HubConnectionBuilder()
           //服务器地址
           //  .withUrl('http://192.168.0.110:8100/myHub', {})
@@ -261,143 +261,142 @@
   
         // this.signalr.SR.invoke('SendMessage', 'All', 'root', '123456').catch((err) => console.log('err', err))
       },*/
-    },
-  }
-  </script>
-  
-  <style lang="scss" scoped>
-  .title {
-    font-family: Arial, sans-serif;
-    font-size: 30px;
-    color: #303133;
-    line-height: 1.5;
-    text-align: center;
-  }
-  .grid {
-    width: 100%;
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    grid-template-rows: 1fr 1fr;
-    grid-gap: 0.5em;
-    .a {
-      .title_sub {
-        font-family: Arial, sans-serif;
-        font-size: 1.5rem;
-        color: #303133;
-        text-align: center;
-      }
-      .grid_sub {
-        width: 100%;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-        grid-template-rows: 1fr 1fr 1fr;
-        grid-gap: 0.5em;
-      }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.title {
+  font-family: Arial, sans-serif;
+  font-size: 30px;
+  color: #303133;
+  line-height: 1.5;
+  text-align: center;
+}
+.grid {
+  width: 100%;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+  grid-gap: 0.5em;
+  .a {
+    .title_sub {
+      font-family: Arial, sans-serif;
+      font-size: 1.5rem;
+      color: #303133;
+      text-align: center;
     }
-    .b {
-      .title_sub {
-        font-family: Arial, sans-serif;
-        font-size: 1.5rem;
-        color: #303133;
-        text-align: center;
-      }
-      .grid_sub {
-        width: 100%;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-        grid-template-rows: 1fr 1fr 1fr;
-        grid-gap: 0.5em;
-      }
-    }
-    .c {
-      .title_sub {
-        font-family: Arial, sans-serif;
-        font-size: 1.5rem;
-        color: #303133;
-        text-align: center;
-      }
-      .grid_sub {
-        width: 100%;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-        grid-template-rows: 1fr 1fr 1fr;
-        grid-gap: 0.5em;
-      }
-    }
-    .d {
-      .title_sub {
-        font-family: Arial, sans-serif;
-        font-size: 1.5rem;
-        color: #303133;
-        text-align: center;
-      }
-      .grid_sub {
-        width: 100%;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-        grid-template-rows: 1fr 1fr 1fr;
-        grid-gap: 0.5em;
-      }
-    }
-    .e {
-      .title_sub {
-        font-family: Arial, sans-serif;
-        font-size: 1.5rem;
-        color: #303133;
-        text-align: center;
-      }
-      .grid_sub {
-        width: 100%;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-        grid-template-rows: 1fr 1fr 1fr;
-        grid-gap: 0.5em;
-      }
-    }
-    .f {
+    .grid_sub {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+      grid-template-rows: 1fr 1fr 1fr;
+      grid-gap: 0.5em;
     }
   }
-  .grid > * {
-    height: 250px;
-    background-color: #ebeef5;
-    color: white;
-    border-radius: 0.5em;
-  }
-  
-  .grid_sub > * {
-    height: 60px;
-    background-color: #11a983;
-    color: white;
-    border-radius: 0.2em;
-    transition: all 0.2s ease-in-out;
-    &:hover {
-      cursor: pointer;
-      box-shadow: 0 0 0 rgba(0, 0, 0, 0.2), 0 0 0 #c6e2ff, inset 18px 18px 30px rgba(0, 0, 0, 0.1), inset -18px -18px 30px #c6e2ff;
+  .b {
+    .title_sub {
+      font-family: Arial, sans-serif;
+      font-size: 1.5rem;
+      color: #303133;
+      text-align: center;
+    }
+    .grid_sub {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+      grid-template-rows: 1fr 1fr 1fr;
+      grid-gap: 0.5em;
     }
   }
-  
-  .title_Line {
-    color: #409eff;
-    font-family: Arial, sans-serif;
-    font-size: 1.5rem;
-    text-align: center;
-    margin-top: 40px;
+  .c {
+    .title_sub {
+      font-family: Arial, sans-serif;
+      font-size: 1.5rem;
+      color: #303133;
+      text-align: center;
+    }
+    .grid_sub {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+      grid-template-rows: 1fr 1fr 1fr;
+      grid-gap: 0.5em;
+    }
   }
-  .f_item {
-    margin-top: 10px;
-    margin-left: 20px;
+  .d {
+    .title_sub {
+      font-family: Arial, sans-serif;
+      font-size: 1.5rem;
+      color: #303133;
+      text-align: center;
+    }
+    .grid_sub {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+      grid-template-rows: 1fr 1fr 1fr;
+      grid-gap: 0.5em;
+    }
   }
-  .f_name {
-    color: #dd7118;
-    font-family: Arial, sans-serif;
-    font-size: 1.2rem;
+  .e {
+    .title_sub {
+      font-family: Arial, sans-serif;
+      font-size: 1.5rem;
+      color: #303133;
+      text-align: center;
+    }
+    .grid_sub {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+      grid-template-rows: 1fr 1fr 1fr;
+      grid-gap: 0.5em;
+    }
   }
-  .context {
-    margin: 0.5em 1em;
+  .f {
   }
-  .button_ {
-    width: 100%;
-    height: 100%;
+}
+.grid > * {
+  height: 250px;
+  background-color: #ebeef5;
+  color: white;
+  border-radius: 0.5em;
+}
+
+.grid_sub > * {
+  height: 60px;
+  background-color: #11a983;
+  color: white;
+  border-radius: 0.2em;
+  transition: all 0.2s ease-in-out;
+  &:hover {
+    cursor: pointer;
+    box-shadow: 0 0 0 rgba(0, 0, 0, 0.2), 0 0 0 #c6e2ff, inset 18px 18px 30px rgba(0, 0, 0, 0.1), inset -18px -18px 30px #c6e2ff;
   }
-  </style>
-  
\ No newline at end of file
+}
+
+.title_Line {
+  color: #409eff;
+  font-family: Arial, sans-serif;
+  font-size: 1.5rem;
+  text-align: center;
+  margin-top: 40px;
+}
+.f_item {
+  margin-top: 10px;
+  margin-left: 20px;
+}
+.f_name {
+  color: #dd7118;
+  font-family: Arial, sans-serif;
+  font-size: 1.2rem;
+}
+.context {
+  margin: 0.5em 1em;
+}
+.button_ {
+  width: 100%;
+  height: 100%;
+}
+</style>