From 882dc03e3c83804e7c1dc057ccb7902f6c8c6e45 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Mon, 25 Nov 2019 16:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- src/api/{ => mnt}/app.js | 10 +- src/api/{ => mnt}/database.js | 2 + src/api/{ => mnt}/deploy.js | 2 + src/api/{ => mnt}/deployHistory.js | 20 -- src/api/{ => mnt}/serverDeploy.js | 2 + src/api/monitor/server.js | 2 + src/api/serverAccount.js | 32 --- src/assets/icons/svg/404.svg | 1 - src/assets/icons/svg/add.svg | 1 - src/assets/icons/svg/app.svg | 1 + src/assets/icons/svg/backup.svg | 1 + src/assets/icons/svg/bug.svg | 1 - src/assets/icons/svg/clipboard.svg | 1 - src/assets/icons/svg/component.svg | 1 - src/assets/icons/svg/database.svg | 1 + src/assets/icons/svg/deploy.svg | 1 + src/assets/icons/svg/documentation.svg | 1 - src/assets/icons/svg/drag.svg | 1 - src/assets/icons/svg/example.svg | 1 - src/assets/icons/svg/excel.svg | 1 - src/assets/icons/svg/eye-open.svg | 1 - src/assets/icons/svg/eye.svg | 1 - src/assets/icons/svg/form.svg | 1 - src/assets/icons/svg/guide.svg | 1 - src/assets/icons/svg/language.svg | 1 - src/assets/icons/svg/mnt.svg | 1 + src/assets/icons/svg/mntsvg | 1 + src/assets/icons/svg/money.svg | 1 - src/assets/icons/svg/pdf.svg | 1 - src/assets/icons/svg/qq.svg | 1 - src/assets/icons/svg/server.svg | 1 + src/assets/icons/svg/shopping.svg | 1 - src/assets/icons/svg/star.svg | 1 - src/assets/icons/svg/sys-tools.svg | 2 +- src/assets/icons/svg/table.svg | 1 - src/assets/icons/svg/zip.svg | 1 - src/assets/icons/svg/zujian.svg | 2 +- src/mixins/crud.js | 1 - src/views/mnt/account/form.vue | 108 -------- src/views/mnt/account/index.vue | 176 ------------- src/views/mnt/app/form.vue | 180 ------------- src/views/mnt/app/index.vue | 251 ++++++++---------- src/views/mnt/database/form.vue | 134 ---------- src/views/mnt/database/index.vue | 167 ++++-------- src/views/mnt/deploy/deploy.vue | 33 +-- src/views/mnt/deploy/form.vue | 132 ---------- src/views/mnt/deploy/index.vue | 335 +++++++++++-------------- src/views/mnt/deploy/sysRestore.vue | 90 +++---- src/views/mnt/deployHistory/form.vue | 133 ---------- src/views/mnt/deployHistory/index.vue | 109 +------- src/views/mnt/server/index.vue | 146 +++++++++++ src/views/mnt/serverDeploy/form.vue | 137 ---------- src/views/mnt/serverDeploy/index.vue | 183 -------------- src/views/monitor/server/form.vue | 131 ---------- src/views/monitor/server/index.vue | 172 ++++++------- 57 files changed, 594 insertions(+), 2130 deletions(-) rename src/api/{ => mnt}/app.js (76%) rename src/api/{ => mnt}/database.js (91%) rename src/api/{ => mnt}/deploy.js (91%) rename src/api/{ => mnt}/deployHistory.js (54%) rename src/api/{ => mnt}/serverDeploy.js (91%) delete mode 100644 src/api/serverAccount.js delete mode 100644 src/assets/icons/svg/404.svg delete mode 100644 src/assets/icons/svg/add.svg create mode 100644 src/assets/icons/svg/app.svg create mode 100644 src/assets/icons/svg/backup.svg delete mode 100644 src/assets/icons/svg/bug.svg delete mode 100644 src/assets/icons/svg/clipboard.svg delete mode 100644 src/assets/icons/svg/component.svg create mode 100644 src/assets/icons/svg/database.svg create mode 100644 src/assets/icons/svg/deploy.svg delete mode 100644 src/assets/icons/svg/documentation.svg delete mode 100644 src/assets/icons/svg/drag.svg delete mode 100644 src/assets/icons/svg/example.svg delete mode 100644 src/assets/icons/svg/excel.svg delete mode 100644 src/assets/icons/svg/eye-open.svg delete mode 100644 src/assets/icons/svg/eye.svg delete mode 100644 src/assets/icons/svg/form.svg delete mode 100644 src/assets/icons/svg/guide.svg delete mode 100644 src/assets/icons/svg/language.svg create mode 100644 src/assets/icons/svg/mnt.svg create mode 100644 src/assets/icons/svg/mntsvg delete mode 100644 src/assets/icons/svg/money.svg delete mode 100644 src/assets/icons/svg/pdf.svg delete mode 100644 src/assets/icons/svg/qq.svg create mode 100644 src/assets/icons/svg/server.svg delete mode 100644 src/assets/icons/svg/shopping.svg delete mode 100644 src/assets/icons/svg/star.svg delete mode 100644 src/assets/icons/svg/table.svg delete mode 100644 src/assets/icons/svg/zip.svg delete mode 100644 src/views/mnt/account/form.vue delete mode 100644 src/views/mnt/account/index.vue delete mode 100644 src/views/mnt/app/form.vue delete mode 100644 src/views/mnt/database/form.vue delete mode 100644 src/views/mnt/deploy/form.vue delete mode 100644 src/views/mnt/deployHistory/form.vue create mode 100644 src/views/mnt/server/index.vue delete mode 100644 src/views/mnt/serverDeploy/form.vue delete mode 100644 src/views/mnt/serverDeploy/index.vue delete mode 100644 src/views/monitor/server/form.vue diff --git a/.env.development b/.env.development index aea9ac3..d9a2132 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 接口地址 VUE_APP_BASE_API = 'http://localhost:8000' -VUE_APP_WS_API: '"ws://localhost:8000"', +VUE_APP_WS_API = 'ws://localhost:8000' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 0ac5a49..c841017 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ ENV = 'production' # 接口地址 VUE_APP_BASE_API = 'https://api.auauz.net' -VUE_APP_WS_API: '"ws://api.auauz.net"', +VUE_APP_WS_API = 'ws://api.auauz.net' diff --git a/src/api/app.js b/src/api/mnt/app.js similarity index 76% rename from src/api/app.js rename to src/api/mnt/app.js index 8762fc1..584d322 100644 --- a/src/api/app.js +++ b/src/api/mnt/app.js @@ -1,13 +1,5 @@ import request from '@/utils/request' -export function queryApps(data) { - return request({ - url: 'api/app', - method: 'get', - data - }) -} - export function add(data) { return request({ url: 'api/app', @@ -30,3 +22,5 @@ export function edit(data) { data }) } + +export default { add, edit, del } diff --git a/src/api/database.js b/src/api/mnt/database.js similarity index 91% rename from src/api/database.js rename to src/api/mnt/database.js index f26f48d..084a74d 100644 --- a/src/api/database.js +++ b/src/api/mnt/database.js @@ -22,3 +22,5 @@ export function edit(data) { data }) } + +export default { add, edit, del } diff --git a/src/api/deploy.js b/src/api/mnt/deploy.js similarity index 91% rename from src/api/deploy.js rename to src/api/mnt/deploy.js index da3f139..1647585 100644 --- a/src/api/deploy.js +++ b/src/api/mnt/deploy.js @@ -72,3 +72,5 @@ export function serverStatus(data) { data }) } + +export default { add, edit, del, stopServer, serverStatus, startServer, getServers, getApps } diff --git a/src/api/deployHistory.js b/src/api/mnt/deployHistory.js similarity index 54% rename from src/api/deployHistory.js rename to src/api/mnt/deployHistory.js index a19512f..eb36dce 100644 --- a/src/api/deployHistory.js +++ b/src/api/mnt/deployHistory.js @@ -1,17 +1,5 @@ import request from '@/utils/request' -/** - * 部署管理 - * @param data - */ -export function add(data) { - return request({ - url: 'api/deployHistory', - method: 'post', - data - }) -} - export function del(id) { return request({ url: 'api/deployHistory/' + id, @@ -19,14 +7,6 @@ export function del(id) { }) } -export function edit(data) { - return request({ - url: 'api/deployHistory', - method: 'put', - data - }) -} - /** * 版本回退 * @param data 选中行 diff --git a/src/api/serverDeploy.js b/src/api/mnt/serverDeploy.js similarity index 91% rename from src/api/serverDeploy.js rename to src/api/mnt/serverDeploy.js index 0110ddc..29fb6bb 100644 --- a/src/api/serverDeploy.js +++ b/src/api/mnt/serverDeploy.js @@ -22,3 +22,5 @@ export function edit(data) { data }) } + +export default { add, edit, del } diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js index e68a22c..5c2b234 100644 --- a/src/api/monitor/server.js +++ b/src/api/monitor/server.js @@ -22,3 +22,5 @@ export function edit(data) { data }) } + +export default { add, edit, del } diff --git a/src/api/serverAccount.js b/src/api/serverAccount.js deleted file mode 100644 index 0408d67..0000000 --- a/src/api/serverAccount.js +++ /dev/null @@ -1,32 +0,0 @@ -import request from '@/utils/request' - -export function queryServerAccount(data) { - return request({ - url: 'api/serverAccount', - method: 'get', - data - }) -} - -export function add(data) { - return request({ - url: 'api/serverAccount', - method: 'post', - data - }) -} - -export function del(id) { - return request({ - url: 'api/serverAccount/' + id, - method: 'delete' - }) -} - -export function edit(data) { - return request({ - url: 'api/serverAccount', - method: 'put', - data - }) -} diff --git a/src/assets/icons/svg/404.svg b/src/assets/icons/svg/404.svg deleted file mode 100644 index 6df5019..0000000 --- a/src/assets/icons/svg/404.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/add.svg b/src/assets/icons/svg/add.svg deleted file mode 100644 index d9edd88..0000000 --- a/src/assets/icons/svg/add.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/app.svg b/src/assets/icons/svg/app.svg new file mode 100644 index 0000000..0796da3 --- /dev/null +++ b/src/assets/icons/svg/app.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/backup.svg b/src/assets/icons/svg/backup.svg new file mode 100644 index 0000000..a3272a4 --- /dev/null +++ b/src/assets/icons/svg/backup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/bug.svg b/src/assets/icons/svg/bug.svg deleted file mode 100644 index 05a150d..0000000 --- a/src/assets/icons/svg/bug.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/clipboard.svg b/src/assets/icons/svg/clipboard.svg deleted file mode 100644 index 90923ff..0000000 --- a/src/assets/icons/svg/clipboard.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/component.svg b/src/assets/icons/svg/component.svg deleted file mode 100644 index 207ada3..0000000 --- a/src/assets/icons/svg/component.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/database.svg b/src/assets/icons/svg/database.svg new file mode 100644 index 0000000..7fbad9b --- /dev/null +++ b/src/assets/icons/svg/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/deploy.svg b/src/assets/icons/svg/deploy.svg new file mode 100644 index 0000000..f4a1c56 --- /dev/null +++ b/src/assets/icons/svg/deploy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/documentation.svg b/src/assets/icons/svg/documentation.svg deleted file mode 100644 index 7043122..0000000 --- a/src/assets/icons/svg/documentation.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/drag.svg b/src/assets/icons/svg/drag.svg deleted file mode 100644 index 4185d3c..0000000 --- a/src/assets/icons/svg/drag.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/example.svg b/src/assets/icons/svg/example.svg deleted file mode 100644 index 46f42b5..0000000 --- a/src/assets/icons/svg/example.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/excel.svg b/src/assets/icons/svg/excel.svg deleted file mode 100644 index 74d97b8..0000000 --- a/src/assets/icons/svg/excel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/eye-open.svg b/src/assets/icons/svg/eye-open.svg deleted file mode 100644 index 88dcc98..0000000 --- a/src/assets/icons/svg/eye-open.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/eye.svg b/src/assets/icons/svg/eye.svg deleted file mode 100644 index 16ed2d8..0000000 --- a/src/assets/icons/svg/eye.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/form.svg b/src/assets/icons/svg/form.svg deleted file mode 100644 index dcbaa18..0000000 --- a/src/assets/icons/svg/form.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/guide.svg b/src/assets/icons/svg/guide.svg deleted file mode 100644 index b271001..0000000 --- a/src/assets/icons/svg/guide.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/language.svg b/src/assets/icons/svg/language.svg deleted file mode 100644 index 0082b57..0000000 --- a/src/assets/icons/svg/language.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/mnt.svg b/src/assets/icons/svg/mnt.svg new file mode 100644 index 0000000..502a7c0 --- /dev/null +++ b/src/assets/icons/svg/mnt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/mntsvg b/src/assets/icons/svg/mntsvg new file mode 100644 index 0000000..09f40bd --- /dev/null +++ b/src/assets/icons/svg/mntsvg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/money.svg b/src/assets/icons/svg/money.svg deleted file mode 100644 index c1580de..0000000 --- a/src/assets/icons/svg/money.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/pdf.svg b/src/assets/icons/svg/pdf.svg deleted file mode 100644 index 957aa0c..0000000 --- a/src/assets/icons/svg/pdf.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/qq.svg b/src/assets/icons/svg/qq.svg deleted file mode 100644 index ee13d4e..0000000 --- a/src/assets/icons/svg/qq.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/server.svg b/src/assets/icons/svg/server.svg new file mode 100644 index 0000000..db6dcdf --- /dev/null +++ b/src/assets/icons/svg/server.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shopping.svg b/src/assets/icons/svg/shopping.svg deleted file mode 100644 index 87513e7..0000000 --- a/src/assets/icons/svg/shopping.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/star.svg b/src/assets/icons/svg/star.svg deleted file mode 100644 index 6cf86e6..0000000 --- a/src/assets/icons/svg/star.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/sys-tools.svg b/src/assets/icons/svg/sys-tools.svg index c813067..324aa04 100644 --- a/src/assets/icons/svg/sys-tools.svg +++ b/src/assets/icons/svg/sys-tools.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/table.svg b/src/assets/icons/svg/table.svg deleted file mode 100644 index 0e3dc9d..0000000 --- a/src/assets/icons/svg/table.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/zip.svg b/src/assets/icons/svg/zip.svg deleted file mode 100644 index f806fc4..0000000 --- a/src/assets/icons/svg/zip.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/zujian.svg b/src/assets/icons/svg/zujian.svg index 8e0cc0a..2aba32f 100644 --- a/src/assets/icons/svg/zujian.svg +++ b/src/assets/icons/svg/zujian.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/mixins/crud.js b/src/mixins/crud.js index 244fc29..551c6eb 100644 --- a/src/mixins/crud.js +++ b/src/mixins/crud.js @@ -158,7 +158,6 @@ export default { this.delLoading = true this.crudMethod.del(id).then(() => { this.delLoading = false - console.log(this.$refs[id]) this.$refs[id].doClose() this.dleChangePage() this.delSuccessNotify() diff --git a/src/views/mnt/account/form.vue b/src/views/mnt/account/form.vue deleted file mode 100644 index fda8b91..0000000 --- a/src/views/mnt/account/form.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/views/mnt/account/index.vue b/src/views/mnt/account/index.vue deleted file mode 100644 index cba59be..0000000 --- a/src/views/mnt/account/index.vue +++ /dev/null @@ -1,176 +0,0 @@ - - - - - diff --git a/src/views/mnt/app/form.vue b/src/views/mnt/app/form.vue deleted file mode 100644 index efadb42..0000000 --- a/src/views/mnt/app/form.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - - - diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue index ab49f17..b6230ac 100644 --- a/src/views/mnt/app/index.vue +++ b/src/views/mnt/app/index.vue @@ -3,83 +3,83 @@
- + - - - + 搜索 + 搜索 - -
- 新增 - 复制新增 -
+ type="primary" + icon="el-icon-plus" + @click="showAddFormDialog" + >新增 + 复制新增
- + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ - + + - + + + + + - - diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue index 99a228a..26c93c5 100644 --- a/src/views/mnt/database/index.vue +++ b/src/views/mnt/database/index.vue @@ -3,69 +3,47 @@
- - - - + + 搜索 + 搜索 - -
- 新增 -
+ type="primary" + icon="el-icon-plus" + @click="showAddFormDialog" + >新增
- + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ - - + - + - - diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue index 324402d..f413240 100644 --- a/src/views/mnt/deploy/index.vue +++ b/src/views/mnt/deploy/index.vue @@ -3,125 +3,109 @@
- + - - - + 搜索 + 新增 + + 系统还原 + + 状态查询 + + 搜索 + icon="el-icon-upload" + @click="startServer" + >启动 + + 停止 + + 一键部署 - -
- 新增 - - 系统还原 - - 状态查询 - - 启动 - - 停止 - - 一键部署 - -
- - + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ + - - - - + + + + + + + - - diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue index bb8b2a6..ceaeecc 100644 --- a/src/views/mnt/deployHistory/index.vue +++ b/src/views/mnt/deployHistory/index.vue @@ -3,50 +3,16 @@
- - - - - 搜索 + + 搜索
- - - + + + diff --git a/src/views/mnt/serverDeploy/form.vue b/src/views/mnt/serverDeploy/form.vue deleted file mode 100644 index 3baf118..0000000 --- a/src/views/mnt/serverDeploy/form.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - - diff --git a/src/views/mnt/serverDeploy/index.vue b/src/views/mnt/serverDeploy/index.vue deleted file mode 100644 index 9852641..0000000 --- a/src/views/mnt/serverDeploy/index.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - diff --git a/src/views/monitor/server/form.vue b/src/views/monitor/server/form.vue deleted file mode 100644 index 802c357..0000000 --- a/src/views/monitor/server/form.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue index 223da40..6e0b238 100644 --- a/src/views/monitor/server/index.vue +++ b/src/views/monitor/server/index.vue @@ -3,37 +3,49 @@
- - - - + 搜索 -
- 新增 - -
+ 新增 + -
- 刷新 - -
+ 刷新 +
- + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ @@ -48,8 +60,8 @@ - - + + @@ -90,7 +102,7 @@