From 1e1705be5001e0708dbe4b490f2f28d7d6f42a03 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 21 Dec 2019 21:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E7=BB=B4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mnt/app/index.vue           |  6 +++---
 src/views/mnt/database/execute.vue    |  2 +-
 src/views/mnt/database/index.vue      | 18 +++++++++---------
 src/views/mnt/deploy/sysRestore.vue   |  2 +-
 src/views/mnt/deployHistory/index.vue |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index 3779207..fdb6277 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -49,12 +49,12 @@
         <el-form-item label="备份目录" prop="backupPath">
           <el-input v-model="form.backupPath" style="width: 670px" placeholder="例如: /opt/backup" />
         </el-form-item>
-        <el-form-item label="启动脚本" prop="startScript">
-          <el-input v-model="form.startScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
-        </el-form-item>
         <el-form-item label="部署脚本" prop="deployScript">
           <el-input v-model="form.deployScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
         </el-form-item>
+        <el-form-item label="启动脚本" prop="startScript">
+          <el-input v-model="form.startScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="crud.cancelCU">取消</el-button>
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
index 22841d1..94622fc 100644
--- a/src/views/mnt/database/execute.vue
+++ b/src/views/mnt/database/execute.vue
@@ -41,7 +41,7 @@ export default {
       loading: false,
       dialog: false,
       headers: {
-        Authorization: 'Bearer ' + getToken()
+        Authorization: getToken()
       },
       rules: {}
     }
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 5fd6918..c5fb4dd 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -36,14 +36,14 @@
     <eForm ref="execute" :database-info="currentRow" />
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="530px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-        <el-form-item label="数据库名称" prop="name">
+        <el-form-item label="连接名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
         </el-form-item>
-        <el-form-item label="连接地址" prop="jdbcUrl">
+        <el-form-item label="JDBC地址" prop="jdbcUrl">
           <el-input v-model="form.jdbcUrl" style="width: 300px" />
-          <el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
+          <el-button :loading="loading" type="success" @click="testConnectDatabase">测试</el-button>
         </el-form-item>
-        <el-form-item label="用户名" prop="userName">
+        <el-form-item label="用户" prop="userName">
           <el-input v-model="form.userName" style="width: 370px" />
         </el-form-item>
         <el-form-item label="密码" prop="pwd">
@@ -58,10 +58,10 @@
     <!--表格渲染-->
     <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row stripe style="width: 100%" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
       <el-table-column type="selection" width="55" />
-      <el-table-column v-if="columns.visible('name')" prop="name" label="数据库名称" />
+      <el-table-column v-if="columns.visible('name')" prop="name" width="130px" label="数据库名称" />
       <el-table-column v-if="columns.visible('jdbcUrl')" prop="jdbcUrl" label="连接地址" />
-      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
-      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('userName')" prop="userName" width="200px" label="用户名" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" width="200px" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -91,7 +91,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '数据库', url: 'api/database', crudMethod: { ...crudDatabase }})
-const defaultForm = { id: null, name: null, jdbcUrl: null, userName: null, pwd: null }
+const defaultForm = { id: null, name: null, jdbcUrl: 'jdbc:mysql://', userName: null, pwd: null }
 export default {
   name: 'DataBase',
   components: { eForm, pagination, crudOperation, rrOperation, udOperation },
@@ -130,7 +130,7 @@ export default {
           this.loading = true
           testDbConnect(this.form).then((res) => {
             this.loading = false
-            crud.notify(res ? '连接成功' : '连接失败', res ? 'success' : 'error')
+            this.crud.notify(res ? '连接成功' : '连接失败', res ? 'success' : 'error')
           }).catch(() => {
             this.loading = false
           })
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index 636f99c..46b568d 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -104,7 +104,7 @@ export default {
             this.dialog = false
             this.submitLoading = false
             this.appNames = ''
-            this.$parent.init()
+            this.$parent.crud.toQuery()
           })
           .catch(err => {
             this.submitLoading = false
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index 924589a..21397fa 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -86,7 +86,7 @@ export default {
   methods: {
     delMethod(id) {
       this.delLoading = true
-      del(id).then(() => {
+      del([id]).then(() => {
         this.delLoading = false
         this.$refs[id].doClose()
         this.crud.dleChangePage(1)