Commit 965e9266 by Elune

代码优化

parent b3528e88
......@@ -8,10 +8,11 @@ export function add(data) {
})
}
export function del(id) {
export function del(ids) {
return request({
url: 'api/app/' + id,
method: 'delete'
url: 'api/app',
method: 'delete',
data: ids
})
}
......
......@@ -8,10 +8,11 @@ export function add(data) {
})
}
export function del(id) {
export function del(ids) {
return request({
url: 'api/database/' + id,
method: 'delete'
url: 'api/database',
method: 'delete',
data: ids
})
}
......
......@@ -8,10 +8,11 @@ export function add(data) {
})
}
export function del(id) {
export function del(ids) {
return request({
url: 'api/deploy/' + id,
method: 'delete'
url: 'api/deploy',
method: 'delete',
data: ids
})
}
......
import request from '@/utils/request'
export function del(id) {
export function del(ids) {
return request({
url: 'api/deployHistory/' + id,
method: 'delete'
url: 'api/deployHistory',
method: 'delete',
data: ids
})
}
......
......@@ -8,10 +8,11 @@ export function add(data) {
})
}
export function del(id) {
export function del(ids) {
return request({
url: 'api/serverDeploy/' + id,
method: 'delete'
url: 'api/serverDeploy',
method: 'delete',
data: ids
})
}
......
......@@ -43,6 +43,7 @@
<el-button
v-if="crud.optShow.download"
:loading="crud.downloadLoading"
:disabled="!crud.data.length"
class="filter-item"
size="mini"
type="warning"
......
......@@ -19,7 +19,7 @@
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<div class="login-code">
<img :src="codeUrl" alt="加载失败" @click="getCode">
<img :src="codeUrl" @click="getCode">
</div>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
......
......@@ -5,12 +5,24 @@
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable placeholder="模糊搜索" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-date-picker
v-model="query.createTime"
:default-time="['00:00:00','23:59:59']"
type="daterange"
range-separator=":"
size="small"
class="date-item"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
<rrOperation :crud="crud" />
</div>
<crudOperation :permission="permission">
<el-button
slot="right"
v-permission="['admin','database:add']"
:disabled="!selectIndex"
class="filter-item"
size="mini"
type="warning"
......@@ -49,6 +61,11 @@
<el-table-column v-if="columns.visible('name')" prop="name" 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="创建日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column v-permission="['admin','database:edit','database:del']" label="操作" width="150px" align="center">
<template slot-scope="scope">
<udOperation
......@@ -121,11 +138,7 @@ export default {
})
},
execute() {
if (!this.selectIndex) {
this.$message.error('请先选择数据库')
} else {
this.$refs.execute.dialog = true
}
this.$refs.execute.dialog = true
},
handleCurrentChange(row) {
this.currentRow = row
......
......@@ -100,7 +100,7 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="columns.visible('app.name')" prop="app.name" label="应用名称" />
<el-table-column v-if="columns.visible('servers')" prop="servers" label="服务器列表" />
<el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
<el-table-column v-if="columns.visible('createTime')" prop="createTime" label="部署日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
......
......@@ -5,6 +5,18 @@
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable placeholder="输入搜索内容" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-date-picker
v-model="query.deployDate"
:default-time="['00:00:00','23:59:59']"
type="daterange"
range-separator=":"
size="small"
class="date-item"
value-format="yyyy-MM-dd HH:mm:ss"
style="width: 240px"
start-placeholder="部署开始日期"
end-placeholder="部署结束日期"
/>
<rrOperation :crud="crud" />
</div>
<crudOperation :permission="permission" />
......@@ -14,8 +26,12 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="columns.visible('appName')" prop="appName" label="应用名称" />
<el-table-column v-if="columns.visible('ip')" prop="ip" label="部署IP" />
<el-table-column v-if="columns.visible('deployDate')" prop="deployDate" label="部署时间" />
<el-table-column v-if="columns.visible('deployUser')" prop="deployUser" label="部署人员" />
<el-table-column v-if="columns.visible('deployDate')" prop="deployDate" label="部署时间">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.deployDate) }}</span>
</template>
</el-table-column>
<el-table-column v-permission="['admin','deployHistory:del']" label="操作" width="100px" align="center">
<template slot-scope="scope">
<el-popover
......
......@@ -143,7 +143,7 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column v-if="columns.visible('username')" :show-overflow-tooltip="true" prop="username" label="用户名" />
<el-table-column v-if="columns.visible('nickName')" :show-overflow-tooltip="true" prop="nickName" label="昵称" />
<el-table-column v-if="columns.visible('sex')" prop="sex" label="性别" />
......@@ -418,6 +418,9 @@ export default {
getLevel().then(res => {
this.level = res.level
}).catch(() => { })
},
checkboxT(row, rowIndex) {
return row.id !== this.user.id
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment