diff --git a/package.json b/package.json index e9a2c9d..4a01ae4 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "vite-plugin-commonjs": "^0.10.1", "vue": "^3.3.8", "vue-router": "^4.0.13", - "vuex": "^4.0.2" + "vuex": "^4.0.2", + "ws": "^8.16.0" }, "devDependencies": { "@vitejs/plugin-vue": "^4.5.0", diff --git a/src/components/update/CinemaUpdate.vue b/src/components/update/CinemaUpdate.vue index 2ad61fc..d522a43 100644 --- a/src/components/update/CinemaUpdate.vue +++ b/src/components/update/CinemaUpdate.vue @@ -1,9 +1,11 @@ @@ -204,6 +343,8 @@ const handleUpdate = async () => { 执行脚本 + {{ cmd.desc }} @@ -212,6 +353,8 @@ const handleUpdate = async () => { 数据库 + {{ cmd.desc }} @@ -219,6 +362,8 @@ const handleUpdate = async () => { 执行升级 + {{ cmd.desc }} @@ -226,6 +371,8 @@ const handleUpdate = async () => { 修改设置 + {{ cmd.desc }} @@ -233,6 +380,8 @@ const handleUpdate = async () => { 客户端 + {{ cmd.desc }} @@ -272,4 +421,8 @@ const handleUpdate = async () => { margin-right: 100px; } +:deep(.el-divider--horizontal .el-icon) { + margin-left: 10px; +} + \ No newline at end of file diff --git a/src/components/update/ProcessIcon.vue b/src/components/update/ProcessIcon.vue new file mode 100644 index 0000000..4e387d7 --- /dev/null +++ b/src/components/update/ProcessIcon.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 9252c70..21fb70b 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue' +import {createApp} from 'vue' import './style.css' import App from './App.vue' import ElementPlus from 'element-plus' @@ -9,7 +9,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs' const app = createApp(App) -for (const name in ELIcons){ +for (const name in ELIcons) { app.component(name, ELIcons[name]); } diff --git a/src/request/config.js b/src/request/config.js index 5f67651..0302e32 100644 --- a/src/request/config.js +++ b/src/request/config.js @@ -1,7 +1,9 @@ export default { // method: 'get', - // baseURL: 'http://172.16.1.63:8000', - baseURL: 'http://127.0.0.1:8000', + baseURL: 'http://172.16.1.63:8000', + // baseURL: 'http://127.0.0.1:8000', + baseWS: 'ws://172.16.1.63:8000', + // baseWS: 'ws://127.0.0.1:8000', headers: { 'Content-Type': 'application/json;charset=UTF-8', 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' diff --git a/yarn.lock b/yarn.lock index 7c196b9..a7cb416 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1298,3 +1298,8 @@ webpack-virtual-modules@^0.6.0: version "0.6.1" resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz" integrity sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg== + +ws@^8.16.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==