diff --git a/business-css/frontend/.env.development b/business-css/frontend/.env.development index 470ff49..0a98f5c 100644 --- a/business-css/frontend/.env.development +++ b/business-css/frontend/.env.development @@ -7,3 +7,4 @@ VITE_APP_TITLE = '临界事故情景分析模拟系统' VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/dev-api' VITE_APP_BASE_HTTP = 'http://localhost:3000' +VITE_APP_WS_API = 'http://192.168.1.76:8090' diff --git a/business-css/frontend/.env.production b/business-css/frontend/.env.production index 7a2d7c7..5f08010 100644 --- a/business-css/frontend/.env.production +++ b/business-css/frontend/.env.production @@ -4,4 +4,5 @@ NODE_ENV='production' VITE_APP_TITLE = 'NewFrameWork2023-WEB' VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/prod-api' -VITE_APP_BASE_HTTP = 'http://localhost:3000' \ No newline at end of file +VITE_APP_BASE_HTTP = 'http://localhost:3000' +VITE_APP_WS_API = 'http://192.168.1.76:8090' \ No newline at end of file diff --git a/business-css/frontend/package.json b/business-css/frontend/package.json index 0d4da51..b79b2e6 100644 --- a/business-css/frontend/package.json +++ b/business-css/frontend/package.json @@ -31,7 +31,9 @@ "path-to-regexp": "^6.2.0", "pinia": "^2.0.12", "screenfull": "^6.0.0", + "sockjs-client": "^1.6.1", "sortablejs": "^1.14.0", + "stompjs": "^2.3.3", "vue": "^3.2.40", "vue-i18n": "^9.1.9", "vue-router": "^4.1.6", diff --git a/business-css/frontend/src/assets/table/loading.gif b/business-css/frontend/src/assets/table/loading.gif new file mode 100644 index 0000000..26d2516 Binary files /dev/null and b/business-css/frontend/src/assets/table/loading.gif differ diff --git a/business-css/frontend/src/components/antvx6/connectingwire.vue b/business-css/frontend/src/components/antvx6/connectingwire.vue index 28e8bcb..bc169f9 100644 --- a/business-css/frontend/src/components/antvx6/connectingwire.vue +++ b/business-css/frontend/src/components/antvx6/connectingwire.vue @@ -200,6 +200,7 @@ onMounted(() => { border: 1px solid #ccc; margin: 5px; cursor: pointer; + border-radius: 4px; } .connectingwire-customize{ width: 200px; diff --git a/business-css/frontend/src/store/modules/user.ts b/business-css/frontend/src/store/modules/user.ts index d825937..249e270 100644 --- a/business-css/frontend/src/store/modules/user.ts +++ b/business-css/frontend/src/store/modules/user.ts @@ -13,6 +13,7 @@ export const useUserStore = defineStore('user', () => { // state const Token = ref(getToken() || ''); const nickname = ref(''); + const userId = ref(''); const avatar = ref(''); const roles = ref>([]); // 用户角色编码集合 → 判断路由权限 const perms = ref>([]); // 用户权限编码集合 → 判断按钮权限 @@ -48,6 +49,7 @@ export const useUserStore = defineStore('user', () => { reject('getUserInfo: roles must be a non-null array!'); } nickname.value = data.userInfo.nickname; + userId.value = data.userInfo.id; avatar.value = data.userInfo.avatar; roles.value = data.roles; perms.value = data.permissions; @@ -79,6 +81,7 @@ export const useUserStore = defineStore('user', () => { removeToken(); Token.value = ''; nickname.value = ''; + userId.value = ''; avatar.value = ''; roles.value = []; perms.value = []; @@ -86,6 +89,7 @@ export const useUserStore = defineStore('user', () => { return { Token, nickname, + userId, avatar, roles, perms, diff --git a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue index 1243596..7e1fa3b 100644 --- a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue +++ b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue @@ -5,14 +5,21 @@ export default {