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