This commit is contained in:
parent
d7f7b85783
commit
1e278e4b84
|
|
@ -199,13 +199,13 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="归属部门" prop="deptId">
|
<el-form-item label="部门" prop="deptId">
|
||||||
<treeselect
|
<treeselect
|
||||||
v-model="form.deptId"
|
v-model="form.deptId"
|
||||||
:options="deptOptions"
|
:options="deptOptions"
|
||||||
:show-count="true"
|
:show-count="true"
|
||||||
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
|
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
|
||||||
placeholder="请选择归属部门"
|
placeholder="请选择部门"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="单位类型名称"
|
label="单位类型"
|
||||||
align="center"
|
align="center"
|
||||||
prop="dictLabel"
|
prop="dictLabel"
|
||||||
sortable
|
sortable
|
||||||
|
|
@ -149,13 +149,13 @@
|
||||||
<el-form-item label="单位类型" prop="dictLabel">
|
<el-form-item label="单位类型" prop="dictLabel">
|
||||||
<el-input v-model="form.dictLabel" placeholder="请输入单位类型" />
|
<el-input v-model="form.dictLabel" placeholder="请输入单位类型" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数据键值" prop="dictValue">
|
<el-form-item label="字典键值" prop="dictValue">
|
||||||
<el-input v-model="form.dictValue" placeholder="请输入数据键值" />
|
<el-input v-model="form.dictValue" placeholder="请输入字典键值" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="样式属性" prop="cssClass">
|
<el-form-item label="样式属性" prop="cssClass">
|
||||||
<el-input v-model="form.cssClass" placeholder="请输入样式属性" />
|
<el-input v-model="form.cssClass" placeholder="请输入样式属性" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="显示排序" prop="dictSort">
|
<el-form-item label="字典排序" prop="dictSort">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="form.dictSort"
|
v-model="form.dictSort"
|
||||||
controls-position="right"
|
controls-position="right"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态" prop="status">
|
<el-form-item label="状态" prop="status">
|
||||||
<el-select v-model="queryParams.status" placeholder="部门状态" clearable>
|
<el-select v-model="queryParams.status" placeholder="状态" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in dict.type.sys_normal_disable"
|
v-for="dict in dict.type.sys_normal_disable"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
|
|
@ -119,7 +119,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="显示排序" prop="orderNum">
|
<el-form-item label="排序" prop="orderNum">
|
||||||
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
|
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -143,7 +143,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="部门状态">
|
<el-form-item label="状态">
|
||||||
<el-radio-group v-model="form.status">
|
<el-radio-group v-model="form.status">
|
||||||
<el-radio
|
<el-radio
|
||||||
v-for="dict in dict.type.sys_normal_disable"
|
v-for="dict in dict.type.sys_normal_disable"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<div class="filter-container">
|
<div class="filter-container">
|
||||||
|
<el-form :model="listQuery" inline label-width="80px">
|
||||||
|
<el-form-item label="IP地址">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="listQuery.ip"
|
v-model="listQuery.ip"
|
||||||
placeholder="请输入IP地址"
|
placeholder="请输入IP地址"
|
||||||
|
|
@ -9,6 +11,8 @@
|
||||||
:maxlength="30"
|
:maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="操作时间">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
class="filter-item ml-20"
|
class="filter-item ml-20"
|
||||||
v-model="listQuery.startTime"
|
v-model="listQuery.startTime"
|
||||||
|
|
@ -25,6 +29,8 @@
|
||||||
placeholder="结束日期"
|
placeholder="结束日期"
|
||||||
style="width: 135px"
|
style="width: 135px"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="异常等级">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.grade"
|
v-model="listQuery.grade"
|
||||||
placeholder="请选择异常等级"
|
placeholder="请选择异常等级"
|
||||||
|
|
@ -38,10 +44,12 @@
|
||||||
:label="levelList[item]"
|
:label="levelList[item]"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<!-- <el-input v-model="listQuery.errType" placeholder="请输入异常类型"
|
<!-- <el-input v-model="listQuery.errType" placeholder="请输入异常类型"
|
||||||
style="width: 200px" class="filter-item" :maxlength="30"
|
style="width: 200px" class="filter-item" :maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/> -->
|
/> -->
|
||||||
|
<el-form-item label="异常类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.errType"
|
v-model="listQuery.errType"
|
||||||
placeholder="请选择异常类型"
|
placeholder="请选择异常类型"
|
||||||
|
|
@ -55,7 +63,9 @@
|
||||||
:label="typeList[item]"
|
:label="typeList[item]"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.logSort"
|
v-model="listQuery.logSort"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -71,6 +81,8 @@
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="顺序">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.logDesc"
|
v-model="listQuery.logDesc"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -86,6 +98,7 @@
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
style="margin-left: 20px"
|
style="margin-left: 20px"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
|
|
@ -104,6 +117,7 @@
|
||||||
<el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
|
<el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
|
||||||
备份
|
备份
|
||||||
</el-button>
|
</el-button>
|
||||||
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<div class="filter-container">
|
<div class="filter-container">
|
||||||
|
<el-form :model="listQuery" inline label-width="80px">
|
||||||
|
<el-form-item label="操作人">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="listQuery.operaUserName"
|
v-model="listQuery.operaUserName"
|
||||||
placeholder="请输入操作人"
|
placeholder="请输入操作人"
|
||||||
|
|
@ -9,6 +11,8 @@
|
||||||
:maxlength="30"
|
:maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="IP地址">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="listQuery.ip"
|
v-model="listQuery.ip"
|
||||||
placeholder="请输入IP地址"
|
placeholder="请输入IP地址"
|
||||||
|
|
@ -17,6 +21,8 @@
|
||||||
:maxlength="30"
|
:maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="操作时间">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
class="filter-item ml-20"
|
class="filter-item ml-20"
|
||||||
v-model="listQuery.startTime"
|
v-model="listQuery.startTime"
|
||||||
|
|
@ -33,10 +39,12 @@
|
||||||
placeholder="结束日期"
|
placeholder="结束日期"
|
||||||
style="width: 135px"
|
style="width: 135px"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
|
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
|
||||||
style="width: 200px" class="filter-item ml-20" :maxlength="30"
|
style="width: 200px" class="filter-item ml-20" :maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/> -->
|
/> -->
|
||||||
|
<el-form-item label="事件结果">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.result"
|
v-model="listQuery.result"
|
||||||
placeholder="请选择事件结果"
|
placeholder="请选择事件结果"
|
||||||
|
|
@ -50,6 +58,8 @@
|
||||||
:label="outcomeList[item]"
|
:label="outcomeList[item]"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="操作类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.operType"
|
v-model="listQuery.operType"
|
||||||
placeholder="请选择操作类型"
|
placeholder="请选择操作类型"
|
||||||
|
|
@ -63,7 +73,9 @@
|
||||||
:label="operateList[item]"
|
:label="operateList[item]"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.logSort"
|
v-model="listQuery.logSort"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -74,6 +86,8 @@
|
||||||
>
|
>
|
||||||
<el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id"/>
|
<el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="顺序">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.logDesc"
|
v-model="listQuery.logDesc"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -84,6 +98,7 @@
|
||||||
>
|
>
|
||||||
<el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id"/>
|
<el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
|
<el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
|
||||||
查询
|
查询
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -91,6 +106,7 @@
|
||||||
<el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
|
<el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
|
||||||
备份
|
备份
|
||||||
</el-button>
|
</el-button>
|
||||||
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<div class="filter-container">
|
<div class="filter-container">
|
||||||
|
<el-form :model="listQuery" inline label-width="80px">
|
||||||
|
<el-form-item label="操作人">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="listQuery.operaUserName"
|
v-model="listQuery.operaUserName"
|
||||||
placeholder="请输入操作人"
|
placeholder="请输入操作人"
|
||||||
|
|
@ -9,6 +11,8 @@
|
||||||
:maxlength="30"
|
:maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="IP地址">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="listQuery.ip"
|
v-model="listQuery.ip"
|
||||||
placeholder="请输入IP地址"
|
placeholder="请输入IP地址"
|
||||||
|
|
@ -17,6 +21,8 @@
|
||||||
:maxlength="30"
|
:maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="操作时间">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
class="filter-item ml-20"
|
class="filter-item ml-20"
|
||||||
v-model="listQuery.startTime"
|
v-model="listQuery.startTime"
|
||||||
|
|
@ -33,6 +39,7 @@
|
||||||
placeholder="结束日期"
|
placeholder="结束日期"
|
||||||
style="width: 135px"
|
style="width: 135px"
|
||||||
/>
|
/>
|
||||||
|
</el-form-item>
|
||||||
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
|
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
|
||||||
style="width: 200px" class="filter-item ml-20" :maxlength="30"
|
style="width: 200px" class="filter-item ml-20" :maxlength="30"
|
||||||
@keyup.enter.native="handleFilter"
|
@keyup.enter.native="handleFilter"
|
||||||
|
|
@ -40,6 +47,7 @@
|
||||||
<el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 200px" class="filter-item ml-20">
|
<el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 200px" class="filter-item ml-20">
|
||||||
<el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
|
<el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
|
||||||
</el-select>-->
|
</el-select>-->
|
||||||
|
<el-form-item label="操作类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.operType"
|
v-model="listQuery.operType"
|
||||||
placeholder="请选择操作类型"
|
placeholder="请选择操作类型"
|
||||||
|
|
@ -53,7 +61,9 @@
|
||||||
:label="operateList[item]"
|
:label="operateList[item]"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.logSort"
|
v-model="listQuery.logSort"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -69,6 +79,8 @@
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="顺序">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.logDesc"
|
v-model="listQuery.logDesc"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -84,6 +96,7 @@
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
style="margin-left: 20px"
|
style="margin-left: 20px"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
|
|
@ -107,6 +120,7 @@
|
||||||
>
|
>
|
||||||
备份
|
备份
|
||||||
</el-button>
|
</el-button>
|
||||||
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@
|
||||||
<el-form-item label="岗位编码" prop="postCode">
|
<el-form-item label="岗位编码" prop="postCode">
|
||||||
<el-input v-model="form.postCode" placeholder="请输入编码名称" />
|
<el-input v-model="form.postCode" placeholder="请输入编码名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="岗位顺序" prop="postSort">
|
<el-form-item label="岗位排序" prop="postSort">
|
||||||
<el-input-number v-model="form.postSort" controls-position="right" :min="0" />
|
<el-input-number v-model="form.postSort" controls-position="right" :min="0" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="岗位状态" prop="status">
|
<el-form-item label="岗位状态" prop="status">
|
||||||
|
|
@ -201,7 +201,7 @@ export default {
|
||||||
{ required: true, message: "岗位编码不能为空", trigger: "blur" }
|
{ required: true, message: "岗位编码不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
postSort: [
|
postSort: [
|
||||||
{ required: true, message: "岗位顺序不能为空", trigger: "blur" }
|
{ required: true, message: "岗位排序不能为空", trigger: "blur" }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@
|
||||||
<el-table-column label="角色编号" prop="roleId" min-width="120" align="center"/>
|
<el-table-column label="角色编号" prop="roleId" min-width="120" align="center"/>
|
||||||
<el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" min-width="150"/>
|
<el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" min-width="150"/>
|
||||||
<el-table-column label="权限字符" align="center" prop="roleKey" :show-overflow-tooltip="true" min-width="150"/>
|
<el-table-column label="权限字符" align="center" prop="roleKey" :show-overflow-tooltip="true" min-width="150"/>
|
||||||
<el-table-column label="显示顺序" align="center" prop="roleSort" min-width="100"/>
|
<el-table-column label="角色顺序" align="center" prop="roleSort" min-width="100"/>
|
||||||
<el-table-column label="状态" align="center" min-width="100">
|
<el-table-column label="状态" align="center" min-width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-switch
|
<el-switch
|
||||||
|
|
|
||||||
|
|
@ -182,9 +182,9 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="归属部门" prop="deptId">
|
<el-form-item label="部门" prop="deptId">
|
||||||
<treeselect v-model="form.deptId" :searchable="true" :disable-branch-nodes="true" :options="deptOptions"
|
<treeselect v-model="form.deptId" :searchable="true" :disable-branch-nodes="true" :options="deptOptions"
|
||||||
:show-count="true" placeholder="请选择归属部门"
|
:show-count="true" placeholder="请选择部门"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -436,7 +436,7 @@ export default {
|
||||||
trigger: ['blur', 'change']
|
trigger: ['blur', 'change']
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
deptId:[ { required: true, message: '请选择归属部门', trigger: 'blur' }],
|
deptId:[ { required: true, message: '请选择部门', trigger: 'blur' }],
|
||||||
phonenumber: [
|
phonenumber: [
|
||||||
{ required: true, message: '手机号不能为空', trigger: 'blur' },
|
{ required: true, message: '手机号不能为空', trigger: 'blur' },
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue