代码优化

src/views/mnt/deploy/index.vue

@@ -3,125 +3,109 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
+      <el-input v-model="query.appName" clearable placeholder="输入应用名称查询" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-date-picker
+        v-model="query.createTime"
+        :default-time="['00:00:00','23:59:59']"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
       />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
       <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-upload"
+        @click="sysRestore"
+      >系统还原
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-upload"
+        @click="serverStatus"
+      >状态查询
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
         class="filter-item"
         size="mini"
         type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索
+        icon="el-icon-upload"
+        @click="startServer"
+      >启动
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-upload"
+        @click="stopServer"
+      >停止
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload"
+        @click="deploy"
+      >一键部署
       </el-button>
-      <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px">
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-upload"
-          @click="sysRestore"
-        >系统还原
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-upload"
-          @click="serverStatus"
-        >状态查询
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="success"
-          icon="el-icon-upload"
-          @click="startServer"
-        >启动
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-upload"
-          @click="stopServer"
-        >停止
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="warning"
-          icon="el-icon-upload"
-          @click="deploy"
-        >一键部署
-        </el-button>
-      </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
-    <!--    系统还原组件-->
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="应用" prop="app.id">
+          <el-select v-model.number="form.app.id" placeholder="请选择" style="width: 370px">
+            <el-option v-for="item in apps" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服务器" prop="deploys">
+          <el-select v-model="form.deploys" multiple placeholder="请选择" style="width: 370px">
+            <el-option v-for="item in servers" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--统还原组件-->
     <fForm ref="sysRestore" :key="times" :app-name="appName" />
     <dForm ref="deploy" />
     <!--表格渲染-->
-    <el-table
-      v-loading="loading"
-      :data="data"
-      highlight-current-row
-      stripe
-      size="small"
-      style="width: 100%"
-      @current-change="handleCurrentChange"
-    >
-      <el-table-column :formatter="formatterAppId" prop="appId" label="应用名称" />
-      <el-table-column prop="ip" label="服务器列表" />
-      <el-table-column
-        v-if="checkPermission(['admin','deploy:edit','deploy:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
+    <el-table v-loading="loading" :data="data" highlight-current-row stripe size="small" style="width: 100%" @current-change="handleCurrentChange">
+      <el-table-column prop="app.name" label="应用名称" />
+      <el-table-column prop="servers" label="服务器列表" />
+      <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','deploy:edit']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"
-          />
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','deploy:edit','deploy:del'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','deploy:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','deploy:del']"
@@ -131,13 +115,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right;margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定
-              </el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -157,29 +135,39 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, stopServer, serverStatus, startServer } from '@/api/deploy'
-import { queryApps } from '@/api/app'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudDeploy from '@/api/mnt/deploy'
 import dForm from './deploy'
 import fForm from './sysRestore'
 export default {
-  components: { eForm, dForm, fForm },
-  mixins: [initData],
+  components: { dForm, fForm },
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      queryTypeOptions: [{ key: 'ip', display_name: '服务器列表' }],
-      appList: [],
-      appMap: {},
+      title: '部署',
+      crudMethod: { ...crudDeploy },
       currentRow: {},
       selectIndex: '',
-      appName: '111',
+      appName: '',
       urlHistory: '',
       times: 0,
       appId: '',
-      deployId: ''
+      deployId: '',
+      apps: [],
+      servers: [],
+      form: {
+        id: null,
+        app: { id: null },
+        deploys: []
+      },
+      rules: {
+        'app.id': [
+          { required: true, message: '应用不能为空', trigger: 'blur', type: 'number' }
+        ],
+        deploys: [
+          { required: true, message: '服务器不能为空', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -188,51 +176,38 @@ export default {
     })
   },
   methods: {
-    checkPermission,
-    async beforeInit() {
+    beforeInit() {
       this.url = 'api/deploy'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      await queryApps({}).then(res => {
-        this.appList = res.content
-        this.appList.forEach(({ id, name }) => {
-          this.appMap[id] = name
-        })
-      })
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
+    // 打开新增弹窗前做的操作
+    beforeShowAddForm() {
+      this.initSelect()
+    },
+    // 打开编辑弹窗前做的操作
+    beforeShowEditForm(data) {
+      this.initSelect()
+      const deploys = []
+      data.deploys.forEach(function(deploy, index) {
+        deploys.push(deploy.id)
+      })
+      this.form.deploys = deploys
+    },
+    // 提交前
+    beforeSubmitMethod() {
+      const deploys = []
+      this.form.deploys.forEach(function(data, index) {
+        const deploy = { id: data }
+        deploys.push(deploy)
+      })
+      this.form.deploys = deploys
+      return true
     },
     deploy() {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
         this.$refs.deploy.dialog = true
-        debugger
         this.$refs.deploy.deployInfo = this.currentRow
       }
     },
@@ -240,31 +215,13 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        this.$refs.form.$emit('open')
         this.$refs.sysRestore.dialog = true
       }
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        appId: data.appId,
-        ip: data.ip
-      }
-      _this.dialog = true
-    },
-    formatterAppId(row, column) {
-      return this.appMap[row.appId]
-    },
     handleCurrentChange(row) {
       this.currentRow = row
       this.selectIndex = !row ? null : row.id
-      this.appName = !row ? null : this.appMap[row.appId]
+      this.appName = !row ? null : row.app.name
       this.times = this.times + !row ? 0 : 1
       this.appId = !row ? null : row.appId
       this.deployId = !row ? null : row.id
@@ -273,7 +230,7 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        startServer(JSON.stringify(this.currentRow))
+        this.crudMethod.startServer(JSON.stringify(this.currentRow))
           .then(res => {
           })
           .catch(err => {
@@ -285,7 +242,7 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        stopServer(JSON.stringify(this.currentRow))
+        this.crudMethod.stopServer(JSON.stringify(this.currentRow))
           .then(res => {
           })
           .catch(err => {
@@ -297,13 +254,21 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        serverStatus(JSON.stringify(this.currentRow))
+        this.crudMethod.serverStatus(JSON.stringify(this.currentRow))
           .then(res => {
           })
           .catch(err => {
             console.log('error:' + err.response.data.message)
           })
       }
+    },
+    initSelect() {
+      this.crudMethod.getApps().then(res => {
+        this.apps = res.content
+      })
+      this.crudMethod.getServers().then(res => {
+        this.servers = res.content
+      })
     }
   }
 }