Skip to content

Commit 5e5dcda

Browse files
ss1917ss1917
committed
修复删除角色属性为空的时候报错的BUG
1 parent 534e613 commit 5e5dcda

7 files changed

Lines changed: 74 additions & 72 deletions

File tree

‎src/view/task-order/history-task-list.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default {
7676
{
7777
title: '状态',
7878
key: 'handle',
79-
width: 100,
79+
width: 85,
8080
align: 'center',
8181
render: (h, params) => {
8282
let status = params.row.status
@@ -88,7 +88,7 @@ export default {
8888
return h('div', [h('Tag', { props: { color: 'cyan' } }, '等待')])
8989
} else if (status === '2') {
9090
return h('div', [
91-
h('Tag', { props: { color: 'green' } }, '运行中')
91+
h('Tag', { props: { color: 'green' } }, '运行')
9292
])
9393
} else if (status === '3') {
9494
return h('div', [

‎src/view/task-order/task-order-list.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default {
6060
{
6161
title: '状态',
6262
key: 'handle',
63-
width: 100,
63+
width: 85,
6464
align: 'center',
6565
render: (h, params) => {
6666
let status = params.row.status
@@ -72,7 +72,7 @@ export default {
7272
return h('div', [h('Tag', { props: { color: 'cyan' } }, '等待')])
7373
} else if (status === '2') {
7474
return h('div', [
75-
h('Tag', { props: { color: 'green' } }, '运行中')
75+
h('Tag', { props: { color: 'green' } }, '运行')
7676
])
7777
} else if (status === '3') {
7878
return h('div', [

‎src/view/tasks-center/task-submit/task-post.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
2-
<div style="height:100%; background:#eee">
3-
<Card style="height:100%; ">
2+
<div style="height:100%">
3+
<Card>
44
<Row style="margin-top:10px;">
55
<Col span="14">
66
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="120">
77
<FormItem label="POST JSON" prop="post_data" >
8-
<Input v-model="formValidate.post_data" type="textarea" :rows="20" :maxlength=4000
8+
<Input v-model="formValidate.post_data" type="textarea" :rows="23" :maxlength=6000
99
placeholder="请输入你的数据，参考上面的示例，你也可以二次开发对接自己的CMDB获取主机, 时间字段从下面获取，方便处理">
1010
</Input>
1111
</FormItem>

‎src/view/user-manage/functions.vue‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<template>
2-
<Card style="height:100%">
3-
<div class="search-con search-con-top">
4-
<Select v-model="searchKey" class="search-col">
5-
<Option v-for="item in columns" v-if="item.key !== 'handle' && item.key !== 'status' && item.key !== ''" :value="item.key" :key="`search-col-${item.key}`">{{ item.title }}</Option>
6-
</Select>
7-
<Input @on-change="handleClear" clearable placeholder="输入关键字搜索" class="search-input" v-model="searchValue"/>
8-
<Button @click="handleSearch" class="search-btn" type="primary">搜索</Button>
9-
<slot name="new_btn" ><Button type="primary" @click="editModal('', 'post', '新建权限')" class="search-btn" >新建</Button></slot>
10-
</div>
11-
<Table size="small" ref="selection" border :columns="columns" :data="tableData"></Table>
12-
<div style="margin: 10px;overflow: hidden">
13-
<div style="float: left;">
14-
<Page :total="pageTotal" :current="pageNum" :page-size="pageSize" :page-size-opts=[10,15,25,35,50,100] show-sizer show-total @on-change="changePage" @on-page-size-change="handlePageSize"></Page>
15-
</div>
2+
<div style="height:100%">
3+
<Card>
4+
5+
<div class="search-con search-con-top">
6+
<Select v-model="searchKey" class="search-col">
7+
<Option v-for="item in columns" v-if="item.key !== 'handle' && item.key !== 'status' && item.key !== ''" :value="item.key" :key="`search-col-${item.key}`">{{ item.title }}</Option>
8+
</Select>
9+
<Input @on-change="handleClear" clearable placeholder="输入关键字搜索" class="search-input" v-model="searchValue"/>
10+
<Button @click="handleSearch" class="search-btn" type="primary">搜索</Button>
11+
<slot name="new_btn" ><Button type="primary" @click="editModal('', 'post', '新建权限')" class="search-btn" >新建</Button></slot>
12+
</div>
13+
14+
<Table size="small" ref="selection" border :columns="columns" :data="tableData"></Table>
15+
16+
<div style="margin: 10px;overflow: hidden">
17+
<div style="float: left;">
18+
<Page :total="pageTotal" :current="pageNum" :page-size="pageSize" :page-size-opts=[10,15,25,35,50,100] show-sizer show-total @on-change="changePage" @on-page-size-change="handlePageSize"></Page>
19+
</div>
20+
</div>
21+
22+
<Modal v-model="modalMap.modalVisible" :title="modalMap.modalTitle" :loading=true :footer-hide=true>
23+
<form-group :list="formList" @on-submit-success="handleSubmit"></form-group>
24+
</Modal>
25+
</Card>
1626
</div>
17-
<Modal v-model="modalMap.modalVisible" :title="modalMap.modalTitle" :loading=true :footer-hide=true>
18-
<form-group :list="formList" @on-submit-success="handleSubmit"></form-group>
19-
</Modal>
20-
</Card>
2127
</template>
2228

2329
<script>

‎src/view/user-manage/role.vue‎

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<div style="height:100%; background: #f8f8f9">
3-
<Card style="height:100%">
2+
<div style="height:100%">
3+
<Card>
44
<div class="split">
55
<Split v-model="offset">
66
<div slot="left" class="split-pane">
@@ -443,52 +443,48 @@ export default {
443443
}
444444
})
445445
},
446-
handleChange (newTargetKeys) {
446+
handleChange (newTargetKeys, direction, moveKeys) {
447447
this.targetKeys = newTargetKeys
448-
if (this.editTransfer === 'user') {
449-
operationRoleUser(
450-
{ role_id: this.role_id, user_list: this.targetKeys },
451-
'post'
452-
).then(res => {
453-
if (res.data.code === 0) {
454-
this.$Message.success(`${res.data.msg}`)
455-
} else {
456-
this.$Message.error(`${res.data.msg}`)
457-
}
458-
})
448+
let methodType = "post"
449+
if (direction === "left") {
450+
methodType = "delete"
451+
}
452+
if (this.editTransfer === 'user') {
453+
operationRoleUser( { role_id: this.role_id, user_list: moveKeys }, methodType
454+
).then(res => {
455+
if (res.data.code === 0) {
456+
this.$Message.success(`${res.data.msg}`)
457+
} else {
458+
this.$Message.error(`${res.data.msg}`)
459+
}
460+
})
459461
} else if (this.editTransfer === 'component') {
460-
operationRoleComponent(
461-
{ role_id: this.role_id, comp_list: this.targetKeys },
462-
'post'
463-
).then(res => {
464-
if (res.data.code === 0) {
465-
this.$Message.success(`${res.data.msg}`)
466-
} else {
467-
this.$Message.error(`${res.data.msg}`)
468-
}
469-
})
462+
operationRoleComponent( { role_id: this.role_id, comp_list: moveKeys }, methodType
463+
).then(res => {
464+
if (res.data.code === 0) {
465+
this.$Message.success(`${res.data.msg}`)
466+
} else {
467+
this.$Message.error(`${res.data.msg}`)
468+
}
469+
})
470470
} else if (this.editTransfer === 'menu') {
471-
operationRoleMenu(
472-
{ role_id: this.role_id, menu_list: this.targetKeys },
473-
'post'
471+
operationRoleMenu({ role_id: this.role_id, menu_list: moveKeys}, methodType
474472
).then(res => {
475-
if (res.data.code === 0) {
476-
this.$Message.success(`${res.data.msg}`)
477-
} else {
478-
this.$Message.error(`${res.data.msg}`)
479-
}
480-
})
473+
if (res.data.code === 0) {
474+
this.$Message.success(`${res.data.msg}`)
475+
} else {
476+
this.$Message.error(`${res.data.msg}`)
477+
}
478+
})
481479
} else if (this.editTransfer === 'func') {
482-
operationRoleFunc(
483-
{ role_id: this.role_id, func_list: this.targetKeys },
484-
'post'
485-
).then(res => {
486-
if (res.data.code === 0) {
487-
this.$Message.success(`${res.data.msg}`)
488-
} else {
489-
this.$Message.error(`${res.data.msg}`)
490-
}
491-
})
480+
operationRoleFunc( { role_id: this.role_id, func_list: moveKeys }, methodType
481+
).then(res => {
482+
if (res.data.code === 0) {
483+
this.$Message.success(`${res.data.msg}`)
484+
} else {
485+
this.$Message.error(`${res.data.msg}`)
486+
}
487+
})
492488
} else {
493489
this.$Message.error('你在修改个锤子呀')
494490
}

‎src/view/user-manage/routescomponents.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
>
1010
<tables
1111
ref="tables"
12-
:height="720"
12+
:height="680"
1313
editable
1414
searchable
1515
search-place="top"
@@ -35,7 +35,7 @@
3535
>
3636
<tables
3737
ref="tables"
38-
:height="720"
38+
:height="680"
3939
editable
4040
searchable
4141
search-place="top"

‎src/view/user-manage/user.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<div style="height:100%; background: #f8f8f9">
3-
<Card style="height:100%">
2+
<div style="height:100%">
3+
<Card>
44
<tables ref="tables" editable searchable search-place="top" v-model="tableData" :columns="columns"
55
@on-delete="handleDelete" @on-save-edit="handleInput"
66
@on-search-table="handleSearchTable"

0 commit comments

Comments
 (0)