事件页面美化调整
This commit is contained in:
parent
0d114bf349
commit
48e83cc4fa
|
|
@ -5,9 +5,9 @@ NODE_ENV = development
|
|||
VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
|
||||
|
||||
# 接口地址
|
||||
VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
|
||||
# VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
|
||||
VUE_APP_WS_API = 'ws://localhost:8000'
|
||||
#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
|
||||
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
|
||||
|
||||
# 本地端口
|
||||
VUE_APP_PORT = 2800
|
||||
|
|
|
|||
|
|
@ -47,7 +47,14 @@ export default {
|
|||
req: async function(id){
|
||||
return await http.delete(`${config.API_URL}/hrm/employee/${id}/`);
|
||||
}
|
||||
},
|
||||
improve_info: {
|
||||
name: "完善个人信息",
|
||||
req: async function(data){
|
||||
return await http.post(`${config.API_URL}/hrm/employee/improve_info/`, data);
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
certificate: {
|
||||
list: {
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ const routes = [
|
|||
"path": "/ecm",
|
||||
"meta": {
|
||||
"title": "事件",
|
||||
"icon": "el-icon-goods-filled",
|
||||
"icon": "el-icon-alarm-clock",
|
||||
"type": "menu",
|
||||
"perms": ["ecm"]
|
||||
},
|
||||
|
|
@ -86,7 +86,7 @@ const routes = [
|
|||
"path": "/ecm/event",
|
||||
"meta": {
|
||||
"title": "事件列表",
|
||||
"icon": "el-icon-document",
|
||||
"icon": "el-icon-alarm-clock",
|
||||
"perms": ["event"]
|
||||
},
|
||||
"component": "ecm/event",
|
||||
|
|
@ -99,7 +99,6 @@ const routes = [
|
|||
"title": "事件详情",
|
||||
"icon": "el-icon-menu",
|
||||
"hidden": true,
|
||||
"perms": ["eventfrom"]
|
||||
},
|
||||
"component": "ecm/event_from"
|
||||
}
|
||||
|
|
@ -111,7 +110,6 @@ const routes = [
|
|||
"title": "处理作业",
|
||||
"icon": "el-icon-menu",
|
||||
"hidden": true,
|
||||
"perms": ["eventhandlefrom"]
|
||||
},
|
||||
"component": "ecm/event_handlefrom"
|
||||
},
|
||||
|
|
@ -120,7 +118,7 @@ const routes = [
|
|||
"path": "/ecm/myevent",
|
||||
"meta": {
|
||||
"title": "我的事件",
|
||||
"icon": "el-icon-document-remove",
|
||||
"icon": "el-icon-notification",
|
||||
"perms": ["myevent"]
|
||||
},
|
||||
"component": "ecm/myevent"
|
||||
|
|
@ -141,7 +139,7 @@ const routes = [
|
|||
"path": "/ecm/algo",
|
||||
"meta": {
|
||||
"title": "算法配置",
|
||||
"icon": "el-icon-setting",
|
||||
"icon": "el-icon-set-up",
|
||||
"perms": ["algo"]
|
||||
},
|
||||
"component": "ecm/algo"
|
||||
|
|
|
|||
|
|
@ -78,14 +78,14 @@
|
|||
</div>
|
||||
<el-dropdown class="user panel-item" trigger="click" @command="handleUser">
|
||||
<div class="user-avatar">
|
||||
<el-avatar :size="30">{{ userNameF }}</el-avatar>
|
||||
<el-avatar :size="34" shape="square">{{ userNameF }}</el-avatar>
|
||||
<label>{{ userName }}</label>
|
||||
<el-icon class="el-icon--right"><el-icon-arrow-down /></el-icon>
|
||||
</div>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item command="uc">帐号信息</el-dropdown-item>
|
||||
<el-dropdown-item command="clearCache">清除缓存</el-dropdown-item>
|
||||
<!-- <el-dropdown-item command="clearCache">清除缓存</el-dropdown-item> -->
|
||||
<el-dropdown-item divided command="outLogin"
|
||||
>退出登录</el-dropdown-item
|
||||
>
|
||||
|
|
@ -124,7 +124,7 @@ export default {
|
|||
},
|
||||
created() {
|
||||
var userInfo = this.$TOOL.data.get("USER_INFO");
|
||||
this.userName = userInfo.username;
|
||||
this.userName = userInfo.name;
|
||||
this.userNameF = this.userName.substring(0, 1);
|
||||
|
||||
},
|
||||
|
|
@ -246,7 +246,7 @@ this.msg=false;
|
|||
.user-bar .user-avatar label {
|
||||
display: inline-block;
|
||||
margin-left: 5px;
|
||||
font-size: 12px;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ export default {
|
|||
forgetPassword: 'Forget password',
|
||||
signIn: 'Sign in',
|
||||
signInOther: 'Sign in with',
|
||||
userPlaceholder: 'user / phone / email',
|
||||
userPlaceholder: 'user / phone / idnumber',
|
||||
userError: 'Please input a user name',
|
||||
PWPlaceholder: 'Please input a password',
|
||||
PWError: 'Please input a password',
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ export default {
|
|||
forgetPassword: '忘记密码',
|
||||
signIn: '登录',
|
||||
signInOther: '其他登录方式',
|
||||
userPlaceholder: '用户名 / 手机 / 邮箱',
|
||||
userPlaceholder: '用户名 / 手机号 / 身份证号',
|
||||
userError: '请输入用户名',
|
||||
PWPlaceholder: '请输入密码',
|
||||
PWError: '请输入密码',
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ router.beforeEach(async (to, from, next) => {
|
|||
//加载动态/静态路由
|
||||
if (!isGetRouter) {
|
||||
// let apiMenu = tool.data.get("MENU") || []
|
||||
let permissions = tool.data.get("PERMISSIONS");
|
||||
let permissions = tool.data.get("PERMISSIONS") || [];
|
||||
let userMenu = userRoutes;
|
||||
if (permissions.indexOf('superuser') == -1) {
|
||||
userMenu = treeFilter(userRoutes, node => {
|
||||
|
|
@ -107,7 +107,7 @@ router.onError((error) => {
|
|||
//入侵追加自定义方法、对象
|
||||
router.sc_getMenu = () => {
|
||||
// var apiMenu = tool.data.get("MENU") || []
|
||||
let permissions = tool.data.get("PERMISSIONS");
|
||||
let permissions = tool.data.get("PERMISSIONS") || [];
|
||||
let userMenu = userRoutes;
|
||||
if (permissions.indexOf('superuser') == -1) {
|
||||
userMenu = treeFilter(userRoutes, node => {
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
}
|
||||
|
||||
.el-main {
|
||||
padding: 15px;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.el-main.nopadding {
|
||||
|
|
|
|||
|
|
@ -23,12 +23,10 @@
|
|||
@resetQuery="resetQuery"
|
||||
>
|
||||
<el-table-column label="#" type="index" width="50"></el-table-column>
|
||||
<el-table-column label="事件种类" >
|
||||
<el-table-column label="事件种类" width="200">
|
||||
<template #default="scope" >
|
||||
<el-span v-for="item in scope.row.cates_"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">{{item.name}}</el-span>
|
||||
<el-tag v-for="item in scope.row.cates_"
|
||||
:key="item.id" type="warning">{{item.name}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发生区域" prop="area_.name"></el-table-column>
|
||||
|
|
@ -68,40 +66,40 @@
|
|||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发生时间" prop="create_time"></el-table-column>
|
||||
<el-table-column label="发生时间" prop="create_time" width="150"></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="处理人"
|
||||
prop="handle_user_name"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column label="处理时间" prop="handle_time"></el-table-column>
|
||||
<!-- <el-table-column label="处理时间" prop="handle_time"></el-table-column> -->
|
||||
<el-table-column label="事件标记" prop="mark">
|
||||
<template #default="scope">
|
||||
<el-span v-if="scope.row.mark == 20" color="red">误报</el-span>
|
||||
<el-span v-else color="green">正常</el-span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否超时">
|
||||
<el-table-column label="处理超时">
|
||||
<template #default="scope">
|
||||
<el-span v-if="scope.row.is_timeout" color="red">是</el-span>
|
||||
<el-span v-else color="green">否</el-span>
|
||||
<el-tag v-if="scope.row.is_timeout" type="warning">是</el-tag>
|
||||
<el-tag v-else type="success">否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" fixed="right" align="right">
|
||||
<el-table-column label="操作" fixed="right" align="center">
|
||||
<template #default="scope">
|
||||
<el-button-group>
|
||||
<el-button
|
||||
text
|
||||
type="primary"
|
||||
link
|
||||
type="info"
|
||||
size="small"
|
||||
@click="table_show(scope.row, scope.$index)"
|
||||
>查看</el-button>
|
||||
<el-button
|
||||
text
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
v-if="scope.row.handle_user==null"
|
||||
@click="table_handle(scope.row, scope.$index)"
|
||||
>处理</el-button>
|
||||
<!-- <el-button text type="warning" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button> -->
|
||||
|
|
@ -110,7 +108,6 @@
|
|||
<el-button text type="danger" size="small">删除</el-button>
|
||||
</template>
|
||||
</el-popconfirm> -->
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
|
|
@ -145,7 +142,7 @@ export default {
|
|||
//查看
|
||||
table_show(row) {
|
||||
this.$router.push({
|
||||
name: "eventfrom",
|
||||
name: "eventhandlefrom",
|
||||
query: {
|
||||
id: row.id,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
<sc-title title="音响配置"></sc-title>
|
||||
<el-row>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="事件优先级" prop="priority">
|
||||
<el-form-item label="事件优先级" prop="priority" placeholder="数字越小级别越高">
|
||||
<el-input-number
|
||||
v-model="form.priority"
|
||||
:min="1"
|
||||
|
|
|
|||
|
|
@ -1,79 +1,51 @@
|
|||
<template>
|
||||
<el-container v-loading="loading">
|
||||
<!--<sc-title title="详细信息"></sc-title>-->
|
||||
<el-main style="padding: 0 20px 20px 20px">
|
||||
<el-card class="box-card">
|
||||
<sc-title title="事件基本信息"> </sc-title>
|
||||
|
||||
<el-form :model="form" label-width="120px">
|
||||
<el-row>
|
||||
<el-col :md="4" :sm="24">
|
||||
<el-form-item label="事件种类" prop="cates">
|
||||
<el-tag
|
||||
<el-main>
|
||||
<el-card>
|
||||
<el-descriptions title="事件基本信息" :border="true">
|
||||
<el-descriptions-item label="事件种类"><el-tag
|
||||
v-for="item in form.cates_"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
type="warning"
|
||||
>{{ item.name }}</el-tag
|
||||
>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="4" :sm="24" >
|
||||
<el-form-item label="当事人" prop="employee">
|
||||
<el-tag v-if="form.employee" clearable>{{ form.employee_.name }}</el-tag>
|
||||
<el-tag v-else clearable>未知人员</el-tag>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24" v-if="form.area">
|
||||
<el-form-item label="发生区域" prop="area">
|
||||
<el-input v-model="form.area_.name" clearable :disabled="true"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col
|
||||
:md="8"
|
||||
:sm="24"
|
||||
v-if="form.employee && form.employee_.type"
|
||||
>
|
||||
<el-form-item label="人员类型" prop="employee">
|
||||
<el-select v-model="form.employee_.type" style="width: 100%" :disabled="true">
|
||||
<el-option
|
||||
v-for="item in type_options"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-form-item label="发生时间">
|
||||
<el-input v-model="form.create_time" clearable :disabled="true"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-form-item label="是否超时">
|
||||
<el-switch v-model="form.is_timeout" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-form-item label="人脸照">
|
||||
></el-descriptions-item>
|
||||
<el-descriptions-item label="事件标记">{{mark_options2[form.mark]}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="发生时间">{{form.create_time}}</el-descriptions-item>
|
||||
<el-descriptions-item label="发生区域" v-if="form.area_">{{form.area_.name}}</el-descriptions-item>
|
||||
<el-descriptions-item label="人员类型">
|
||||
<span v-if="form.employee">{{type_options2[form.employee_.type]}}</span>
|
||||
<span v-else>未知人员</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="当事人">
|
||||
<span v-if="form.employee">{{form.employee_.name}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="图片" column=3>
|
||||
<div style="display:flex;">
|
||||
<sc-upload v-model="form.global_img" title="全景照" :disabled="true" style="margin-right:8px"></sc-upload>
|
||||
<sc-upload v-model="form.face_img" title="人脸照" :disabled="true"></sc-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-form-item label="全景照">
|
||||
<sc-upload v-model="form.global_img" title="全景照" :disabled="true"></sc-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :md="6" :sm="24">
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-card v-if="form.handle_user" style="margin-top:8px">
|
||||
<el-descriptions title="事件处理" :border="true">
|
||||
<el-descriptions-item label="事件标记">{{mark_options2[form.mark]}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="处理人">
|
||||
<span v-if="form.handle_user"></span>{{form.handle_user_name}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="处理时间">
|
||||
{{form.handle_time}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="处理描述" column=3>
|
||||
{{form.handle_desc}}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-card header="事件处理" v-else style="margin-top:8px">
|
||||
<el-form :inline="true">
|
||||
<el-form-item label="事件标记">
|
||||
<el-select v-model="form.mark" style="width: 100%">
|
||||
<el-option
|
||||
|
|
@ -84,43 +56,43 @@
|
|||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-form-item label="处理描述">
|
||||
<el-input v-model="form.handle_desc" clearable ></el-input>
|
||||
<el-input v-model="form.handle_desc" clearable type="textarea"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="onSubmit">保存</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row><el-col> <el-button type="primary" style="float:right" @click="submit()">提交</el-button></el-col></el-row>
|
||||
</el-form>
|
||||
|
||||
<sc-title title="事件推送列表"></sc-title>
|
||||
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card header="事件推送情况" style="margin-top:8px">
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="remindData"
|
||||
row-key="id"
|
||||
height="300px"
|
||||
fit
|
||||
stripe
|
||||
@resetQuery="resetQuery"
|
||||
hidePagination
|
||||
>
|
||||
<el-table-column label="#" type="index" width="50"></el-table-column>
|
||||
<el-table-column label="事件种类">
|
||||
<el-table-column label="事件种类" width="200">
|
||||
<template #default="scope">
|
||||
<el-span
|
||||
v-for="item in scope.row.event_.cates_"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
>{{ item.name }}</el-span
|
||||
>
|
||||
<el-tag v-for="item in scope.row.event_.cates_"
|
||||
:key="item.id" type="warning">{{item.name}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="事件处理状态" prop="can_handle">
|
||||
<template #default="scope">
|
||||
<el-span v-if="scope.row.handle_user==null">未处理</el-span>
|
||||
<el-span v-else>已处理</el-span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="警报信息"
|
||||
prop="event_.voice_msg"
|
||||
width="200"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
|
|
@ -141,9 +113,10 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="创建时间" prop="create_time"></el-table-column>
|
||||
<el-table-column label="发送时间" prop="create_time"></el-table-column>
|
||||
</scTable>
|
||||
</el-card>
|
||||
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -157,7 +130,6 @@ export default {
|
|||
loading: false,
|
||||
visible: false,
|
||||
isSaveing: false,
|
||||
|
||||
mode: "show",
|
||||
titleMap: {
|
||||
show: "事件信息查看",
|
||||
|
|
@ -167,11 +139,20 @@ export default {
|
|||
{ id: "remployee", name: "相关方" },
|
||||
{ id: "visitor", name: "访客" },
|
||||
],
|
||||
type_options2: {
|
||||
"employee": "企业员工",
|
||||
"remployee": "相关方",
|
||||
"visitor": "访客"
|
||||
},
|
||||
mark_options2: {
|
||||
10: "正常",
|
||||
20: "误报"
|
||||
},
|
||||
mark_options: [
|
||||
{ id: 10, name: "正常" },
|
||||
{ id: 20, name: "误报" },
|
||||
],
|
||||
form: [],
|
||||
form: {},
|
||||
remindData: [],
|
||||
eventID: "",
|
||||
};
|
||||
|
|
@ -183,23 +164,25 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
getEvent() {
|
||||
this.loading = true
|
||||
this.$API.ecm.event.item.req(this.eventID).then((res) => {
|
||||
this.loading = false
|
||||
this.form = res;
|
||||
});
|
||||
}).catch(e=>{this.loading=false});
|
||||
},
|
||||
getRemind() {
|
||||
|
||||
this.$API.ecm.remind.list
|
||||
.req({ event: this.eventID, page: 0 })
|
||||
.then((res) => {
|
||||
this.remindData = res;
|
||||
});
|
||||
},
|
||||
submit(){
|
||||
onSubmit(){
|
||||
|
||||
|
||||
this.$API.ecm.event.handle.req(this.form.id, this.form)
|
||||
.then((res) => {
|
||||
|
||||
this.$router.go(-1)
|
||||
this.$message.success("操作成功");
|
||||
return res;
|
||||
|
|
|
|||
|
|
@ -24,20 +24,15 @@
|
|||
@resetQuery="resetQuery"
|
||||
>
|
||||
<el-table-column label="#" type="index" width="50"></el-table-column>
|
||||
<el-table-column label="事件种类">
|
||||
<el-table-column label="事件种类" width="200">
|
||||
<template #default="scope">
|
||||
<el-span
|
||||
v-for="item in scope.row.event_.cates_"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
>{{ item.name }}</el-span
|
||||
>
|
||||
<el-tag v-for="item in scope.row.event_.cates_"
|
||||
:key="item.id" type="warning">{{item.name}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="事件处理状态" prop="can_handle">
|
||||
<template #default="scope">
|
||||
<el-span v-if="scope.row.handle_user==''">未处理</el-span>
|
||||
<el-span v-if="scope.row.handle_user==null">未处理</el-span>
|
||||
<el-span v-else>已处理</el-span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -45,6 +40,7 @@
|
|||
<el-table-column
|
||||
label="警报信息"
|
||||
prop="event_.voice_msg"
|
||||
width="200"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
|
|
@ -65,16 +61,22 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="创建时间" prop="create_time"></el-table-column>
|
||||
<el-table-column label="发送时间" prop="create_time"></el-table-column>
|
||||
|
||||
<el-table-column label="操作" fixed="right" align="right">
|
||||
<el-table-column label="操作" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button-group>
|
||||
<el-button
|
||||
link
|
||||
type="info"
|
||||
size="small"
|
||||
@click="table_show(scope.row, scope.$index)"
|
||||
>查看</el-button>
|
||||
<el-button
|
||||
text
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="table_show(scope.row, scope.$index)"
|
||||
v-if="scope.row.can_handle && scope.row.event_.handle_user == null"
|
||||
>处理</el-button
|
||||
>
|
||||
<!-- <el-button text type="warning" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button> -->
|
||||
|
|
@ -83,7 +85,6 @@
|
|||
<el-button text type="danger" size="small">删除</el-button>
|
||||
</template>
|
||||
</el-popconfirm> -->
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
|
|
@ -124,6 +125,16 @@ export default {
|
|||
},
|
||||
});
|
||||
},
|
||||
table_handle(row) {
|
||||
|
||||
this.$router.push({
|
||||
name: "eventhandlefrom",
|
||||
query: {
|
||||
id: row.event_.id,
|
||||
},
|
||||
});
|
||||
|
||||
},
|
||||
//搜索
|
||||
upsearch() {},
|
||||
//本地更新数据
|
||||
|
|
|
|||
|
|
@ -174,8 +174,8 @@ export default {
|
|||
id: null,
|
||||
obj_cate: null,
|
||||
can_handle: true,
|
||||
wechat_enable: true,
|
||||
sms_enable: false,
|
||||
wechat_enable: false,
|
||||
sms_enable: true,
|
||||
filter_recipient: null,
|
||||
filter_area_level: null,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,23 +1,36 @@
|
|||
<template>
|
||||
<el-container class="page-user">
|
||||
<el-aside style="width: 240px;">
|
||||
<el-aside style="width: 240px">
|
||||
<el-container>
|
||||
<el-header style="height: auto;display: block;">
|
||||
<el-header style="height: auto; display: block">
|
||||
<div class="user-info-top">
|
||||
<el-avatar :size="100" :src="userData.avatar" class="el-avatar--circle"></el-avatar>
|
||||
|
||||
<h2>{{ userData.username }}</h2>
|
||||
<el-avatar
|
||||
:size="100"
|
||||
:src="userData.avatar"
|
||||
shape="square"
|
||||
></el-avatar>
|
||||
|
||||
<h2>{{ userData.name }}</h2>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<el-menu class="menu" :default-active="page">
|
||||
<el-menu-item-group v-for="group in menu" :key="group.groupName" :title="group.groupName">
|
||||
<el-menu-item v-for="item in group.list" :key="item.component" :index="item.component" @click="openPage">
|
||||
<el-icon v-if="item.icon"><component :is="item.icon"/></el-icon>
|
||||
<el-menu-item-group
|
||||
v-for="group in menu"
|
||||
:key="group.groupName"
|
||||
:title="group.groupName"
|
||||
>
|
||||
<el-menu-item
|
||||
v-for="item in group.list"
|
||||
:key="item.component"
|
||||
:index="item.component"
|
||||
@click="openPage"
|
||||
>
|
||||
<el-icon v-if="item.icon"
|
||||
><component :is="item.icon"
|
||||
/></el-icon>
|
||||
<template #title>
|
||||
<span>{{ item.title }}</span>
|
||||
|
||||
</template>
|
||||
</el-menu-item>
|
||||
</el-menu-item-group>
|
||||
|
|
@ -39,14 +52,14 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
import { defineAsyncComponent } from "vue";
|
||||
|
||||
export default {
|
||||
name: 'userCenter',
|
||||
name: "userCenter",
|
||||
components: {
|
||||
account: defineAsyncComponent(() => import('./user/account')),
|
||||
seting: defineAsyncComponent(() => import('./user/seting')),
|
||||
pushSettings: defineAsyncComponent(() => import('./user/pushSettings'))
|
||||
account: defineAsyncComponent(() => import("./user/account")),
|
||||
seting: defineAsyncComponent(() => import("./user/seting")),
|
||||
pushSettings: defineAsyncComponent(() => import("./user/pushSettings")),
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -57,63 +70,54 @@
|
|||
{
|
||||
icon: "el-icon-postcard",
|
||||
title: "账号信息",
|
||||
component: "account"
|
||||
component: "account",
|
||||
},
|
||||
{
|
||||
icon: "el-icon-operation",
|
||||
title: "个人设置",
|
||||
component: "seting",
|
||||
|
||||
},
|
||||
{
|
||||
icon: "el-icon-bell",
|
||||
icon: "el-icon-lock",
|
||||
title: "修改密码",
|
||||
component: "pushSettings"
|
||||
}
|
||||
]
|
||||
}
|
||||
component: "pushSettings",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
userData: {},
|
||||
page: "account"
|
||||
}
|
||||
page: "account",
|
||||
};
|
||||
},
|
||||
//路由跳转进来 判断from是否有特殊标识做特殊处理
|
||||
beforeRouteEnter(to, from, next) {
|
||||
next((vm) => {
|
||||
if (from.is) {
|
||||
//删除特殊标识,防止标签刷新重复执行
|
||||
delete from.is
|
||||
delete from.is;
|
||||
//执行特殊方法
|
||||
vm.$alert('路由跳转过来后含有特殊标识,做特殊处理', '提示', {
|
||||
type: 'success',
|
||||
center: true
|
||||
}).then(() => {}).catch(() => {})
|
||||
}
|
||||
vm.$alert("路由跳转过来后含有特殊标识,做特殊处理", "提示", {
|
||||
type: "success",
|
||||
center: true,
|
||||
})
|
||||
.then(() => {})
|
||||
.catch(() => {});
|
||||
}
|
||||
});
|
||||
},
|
||||
mounted() {
|
||||
this.getUserlogin();
|
||||
},
|
||||
methods: {
|
||||
openPage(item) {
|
||||
this.page = item.index
|
||||
this.page = item.index;
|
||||
},
|
||||
|
||||
getUserlogin() {
|
||||
|
||||
this.$API.system.user.read.req({page:0}).then(res=>{
|
||||
this.userData = res;
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
this.userData = this.$TOOL.data.get("USER_INFO");
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
.el-avatar--circle{
|
||||
border-radius: 1% !important;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -6,24 +6,27 @@
|
|||
label-width="120px"
|
||||
style="margin-top: 20px"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :md="6" :sm="24">
|
||||
<el-avatar :size="100" :src="form.avatar" class="el-avatar--circle"></el-avatar>
|
||||
<!-- <el-row>
|
||||
<el-col :md="6" :sm="24" style="text-align:center">
|
||||
<el-avatar :size="100" :src="form.avatar" shape="square"></el-avatar>
|
||||
</el-col>
|
||||
<el-col :md="18" :sm="24">
|
||||
<el-col :md="18" :sm="24"> -->
|
||||
<el-form-item label="账号">
|
||||
<el-input v-model="form.username" disabled></el-input>
|
||||
<el-input v-model="form.username" readonly></el-input>
|
||||
<div class="el-form-item-msg">账号信息用于登录,系统不允许修改</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="姓名">
|
||||
<el-input v-model="form.name" disabled></el-input>
|
||||
<el-input v-model="form.name" readonly></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="岗位">
|
||||
<el-input v-model="form.posts" disabled></el-input>
|
||||
</el-form-item></el-col>
|
||||
<el-form-item label="主岗">
|
||||
<el-tag v-if="form.belong_dept_name">{{form.belong_dept_name}}</el-tag>
|
||||
<el-tag v-if="form.post_name" type="success">{{form.post_name}}</el-tag>
|
||||
<el-tag v-if="form.is_superuser">超级管理员</el-tag>
|
||||
</el-form-item>
|
||||
<!-- </el-col>
|
||||
|
||||
</el-row>
|
||||
</el-row> -->
|
||||
</el-form>
|
||||
</el-card>
|
||||
</template>
|
||||
|
|
@ -44,17 +47,8 @@ export default {
|
|||
},
|
||||
|
||||
getUserlogin() {
|
||||
this.$API.system.user.read.req({ page: 0 }).then((res) => {
|
||||
this.form = res;
|
||||
});
|
||||
this.form = this.$TOOL.data.get("USER_INFO");
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-avatar--circle{
|
||||
border-radius: 1% !important;
|
||||
margin-left:50%;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<el-input v-model="formData.new_password2" placeholder="请再次输入新密码" clearable show-password
|
||||
:style="{width: '100%'}"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item size="large">
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="submitForm">提交</el-button>
|
||||
<el-button @click="resetForm">重置</el-button>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -9,28 +9,28 @@
|
|||
<el-row>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="姓名">
|
||||
<el-input v-model="form.name"></el-input>
|
||||
<el-input v-model="form.name" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="编号">
|
||||
<el-input v-model="form.number"></el-input>
|
||||
<el-input v-model="form.number" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="学历">
|
||||
<el-input v-model="form.qualification"></el-input>
|
||||
<el-input v-model="form.qualification" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="性别">
|
||||
<el-input v-model="form.gender"></el-input>
|
||||
<el-input v-model="form.gender" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="生日">
|
||||
<el-input v-model="form.birthday"></el-input>
|
||||
<el-input v-model="form.birthday" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
|
|
@ -42,60 +42,36 @@
|
|||
<el-form-item label="邮箱">
|
||||
<el-input v-model="form.birthday"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="部门">
|
||||
<el-input v-model="form.belong_dept_name"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="身份证号">
|
||||
<el-input v-model="form.id_number" ></el-input>
|
||||
<el-input v-model="form.id_number" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="岗位名称">
|
||||
<el-input v-model="form.post_name"></el-input>
|
||||
<el-form-item label="部门">
|
||||
<el-input v-model="form.belong_dept_name" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="是否在岗">
|
||||
<el-switch v-model="form.is_atwork"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="是否在职">
|
||||
<el-switch v-model="form.job_state"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
|
||||
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="最后打卡时间">
|
||||
<el-input v-model="form.last_check_time"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="当前未打卡说明">
|
||||
<el-input v-model="form.not_work_remark"></el-input>
|
||||
<el-form-item label="岗位">
|
||||
<el-input v-model="form.post_name" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="证件照">
|
||||
<sc-upload
|
||||
v-model="form.photo"
|
||||
:modelValue="form.photo"
|
||||
title="证件照"
|
||||
></sc-upload>
|
||||
<sc-upload v-model="form.photo" title="证件照" :disabled="true"></sc-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="签名照">
|
||||
<sc-upload v-model="form.signature" title="签名照"></sc-upload>
|
||||
<el-form-item label="签名">
|
||||
<el-image :src="form.signature" style="width: 148px; height: 80px"></el-image>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="submitForm" :loading="saveLoading">保存</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -108,6 +84,7 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
form: {},
|
||||
saveLoading: false
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -119,10 +96,23 @@ export default {
|
|||
},
|
||||
|
||||
getemployee() {
|
||||
this.$API.hrm.employee.read.req({ page: 0 }).then((res) => {
|
||||
this.$API.hrm.employee.read.req().then((res) => {
|
||||
this.form = res;
|
||||
});
|
||||
},
|
||||
submitForm() {
|
||||
let sform = {
|
||||
"phone": this.form.phone,
|
||||
"email": this.form.email
|
||||
}
|
||||
this.saveLoading = true
|
||||
this.$API.hrm.employee.improve_info.req(sform).then(res=>{
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
}).catch(e=>{
|
||||
this.saveLoading = false
|
||||
})
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue