From 4697aef3ee5115baaa81019934f2d964a1f617c3 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 1 Dec 2023 15:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=A4=87signalR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/main.js | 6 +-- src/permission.js | 2 +- src/router/index.js | 6 +++ src/store/modules/permission.js | 2 +- src/utils/signalR.js | 4 +- src/views/qualityManagement/FQC/firstFQC.vue | 57 +++++++++++++++----- 7 files changed, 60 insertions(+), 19 deletions(-) diff --git a/src/App.vue b/src/App.vue index 44ee14d..b8a1e05 100644 --- a/src/App.vue +++ b/src/App.vue @@ -16,7 +16,7 @@ export default { token: { handler: function (val) { if (val) { - this.signalr.start(); + this.signalr.start(); //todo 如果token发生更替 重启signal } }, deep: true, diff --git a/src/main.js b/src/main.js index 7bfcbcd..052e7bc 100644 --- a/src/main.js +++ b/src/main.js @@ -15,11 +15,11 @@ import store from './store' import router from './router' import permission from './directive/permission' import plugins from './plugins' // plugins -import signalR from '@/utils/signalR' +import signalR from '@/utils/signalR' // todo websocket实时传输 import { downFile } from '@/utils/request' import './assets/icons' // icon -import './permission' // permission control +import './permission' // permission control 动态路由 import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, handleDict } from "@/utils/ruoyi"; @@ -95,7 +95,7 @@ DictData.install() Vue.config.productionTip = false signalR.init(process.env.VUE_APP_SOCKET_API); -Vue.prototype.signalr = signalR +Vue.prototype.signalr = signalR //todo 绑定在原型对象里 new Vue({ el: '#app', diff --git a/src/permission.js b/src/permission.js index 4ec5adc..db2d5ea 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo'] +const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo',"/firstFQC"] //白名单 router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/router/index.js b/src/router/index.js index 39422a0..b4f9467 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -86,6 +86,12 @@ export const constantRoutes = [{ component: (resolve) => require(['@/views/components/icons/index'], resolve), hidden: true }, + // 质量检验中的初次检验 + { + path: '/firstFQC', + component: (resolve) => require(['@/views/qualityManagement/FQC/firstFQC.vue'], resolve), + hidden: true + } ] export default new Router({ diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 5493903..d115cc4 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -35,7 +35,7 @@ const permission = { // 生成路由 GenerateRoutes({ commit }) { return new Promise(resolve => { - // 向后端请求路由数据 + //todo 向后端请求路由数据 getRouters().then(res => { const sdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data)) diff --git a/src/utils/signalR.js b/src/utils/signalR.js index 505e7be..20cacad 100644 --- a/src/utils/signalR.js +++ b/src/utils/signalR.js @@ -64,7 +64,7 @@ export default { // 接收欢迎语 connection.on('welcome', (data) => { console.log('welcome', data) - Notification.info(data) + // Notification.info(data) }) // 接收后台手动推送消息 connection.on('receiveNotice', (title, data) => { @@ -82,5 +82,7 @@ export default { store.dispatch('socket/getNoticeList', data.data) } }) + + }, } diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue index dd73c7d..c211174 100644 --- a/src/views/qualityManagement/FQC/firstFQC.vue +++ b/src/views/qualityManagement/FQC/firstFQC.vue @@ -1,5 +1,5 @@