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 @@ - + - + @@ -44,6 +44,14 @@ + + + + + + + + { 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 @@