This commit is contained in:
caoqianming 2024-02-20 10:01:29 +08:00
commit 2597e63aeb
2 changed files with 181 additions and 281 deletions

View File

@ -2,100 +2,50 @@
<el-container>
<el-header>
<div class="left-panel">
<el-select
v-model="query.cates"
placeholder="事件种类"
@change="handleQuery"
clearable
>
<el-option
v-for="item in cateOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
<el-select v-model="query.cates" placeholder="事件种类" @change="handleQuery" clearable>
<el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
<el-select
v-model="query.area"
placeholder="发生区域"
@change="handleQuery"
style="margin-left:2px"
clearable
filterable
>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
<el-select v-model="query.area" placeholder="发生区域" @change="handleQuery" style="margin-left:2px" clearable
filterable>
<el-option v-for="item in areaOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
<el-date-picker
v-model="timeRange"
type="datetimerange"
range-separator="至"
start-placeholder="发生时间始"
end-placeholder="发生时间止"
style="margin-left:2px"
value-format="YYYY-MM-DD HH:mm:ss"
@change="handleQuery"
clearable
/>
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="" start-placeholder="发生时间始"
end-placeholder="发生时间止" style="margin-left:2px" value-format="YYYY-MM-DD HH:mm:ss" @change="handleQuery"
clearable />
<el-button type="danger" @click="handleDelete">批量删除</el-button>
</div>
<div class="right-panel">
<el-button
type="primary"
:loading = 'dLoading'
icon="el-icon-download"
@click="exportList"
>下载</el-button>
<el-button type="primary" :loading='dLoading' icon="el-icon-download" @click="exportList">下载</el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
fit
stripe
@resetQuery="resetQuery"
>
<scTable ref="table" :apiObj="apiObj" row-key="id" fit stripe @selection-change="handleSelectionChange"
@resetQuery="resetQuery">
<el-table-column type="selection" width="55" />
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
<template #default="scope">
<el-tag
v-for="item in scope.row.cates_"
:key="item.id"
type="warning"
effect="plain"
>{{ item.name }}</el-tag
>
<el-tag v-for="item in scope.row.cates_" :key="item.id" type="warning" effect="plain">{{ item.name }}</el-tag>
</template>
</el-table-column>
<el-table-column label="发生区域" prop="area_.name"></el-table-column>
<el-table-column label="事件类型" prop="obj_cate" width="100">
<template #default="scope">
{{objCateOptions[scope.row.obj_cate]}}
{{ objCateOptions[scope.row.obj_cate] }}
</template>
</el-table-column>
<el-table-column label="事件对象" :show-overflow-tooltip="true">
<template #default="scope">
<span v-if="scope.row.opl">{{scope.row.operation_name}}</span>
<span v-if="scope.row.opl">{{ scope.row.operation_name }}</span>
<span v-else-if="scope.row.employee">
{{eTypeOptions[scope.row.employee_.type]}}-{{scope.row.employee_.name}}-{{ scope.row.employee_.belong_dept_name }}
{{ eTypeOptions[scope.row.employee_.type] }}-{{ scope.row.employee_.name }}-{{
scope.row.employee_.belong_dept_name }}
</span>
</template>
</el-table-column>
<el-table-column
label="发生时间"
prop="create_time"
width="150"
></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_user_name"></el-table-column>
<el-table-column label="事件标记" prop="mark">
<template #default="scope">
<el-tag v-if="scope.row.mark == 20" type="warning" effect="plain">误报</el-tag>
@ -111,45 +61,27 @@
<el-table-column label="操作" fixed="right" align="center">
<template #default="scope">
<el-button
link
type="info"
size="small"
@click="table_show(scope.row, scope.$index)"
>查看</el-button
>
<el-button
link
type="primary"
size="small"
v-if="scope.row.handle_user == null"
@click="table_handle(scope.row, scope.$index)"
>处理</el-button
>
<el-button link type="info" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
<el-button link type="primary" size="small" v-if="scope.row.handle_user == null"
@click="table_handle(scope.row, scope.$index)">处理</el-button>
<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row)">
<template #reference>
<el-button link type="danger" size="small">删除</el-button>
</template>
</el-popconfirm>
<template #reference>
<el-button link type="danger" size="small">删除</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column>
</scTable>
</el-main>
<detail-dialog
v-if="dialog.handle"
ref="handleDialog"
:eventID="eventID"
@oplDetail="oplDetail"
@success="handleSuccess"
@closed="dialog.handle = false"
></detail-dialog>
<detail-dialog v-if="dialog.handle" ref="handleDialog" :eventID="eventID" @oplDetail="oplDetail"
@success="handleSuccess" @closed="dialog.handle = false"></detail-dialog>
<el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情" :close-on-click-modal="false">
<sc-fire :id="oplId"></sc-fire>
</el-drawer>
</el-container>
</template>
<script>
import detailDialog from "./event_handlefrom.vue";
<script>
import detailDialog from "./event_handlefrom.vue";
import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue";
export default {
name: "event",
@ -161,15 +93,16 @@ export default {
data() {
return {
dLoading: false,
showLimited:false,
showLimited: false,
defaultTime: ['00:00:00', '23:59:59'],
timeRange: [],
selectionList: [],
objCateOptions: {
'people':'人员',
'people': '人员',
'opl': '作业',
'other': '其他'
},
eTypeOptions:{
eTypeOptions: {
'employee': '正式员工',
'remployee': '相关方',
'visitor': '访客',
@ -188,8 +121,8 @@ export default {
search: {
keyword: null,
},
eventID:'',
oplId:null,
eventID: '',
oplId: null,
};
},
created() {
@ -205,11 +138,32 @@ export default {
this.$refs.handleDialog.open("edit").setData(row);
});
},
table_del(row){
this.$API.ecm.event.delete.req(row.id).then(res=>{
handleSelectionChange(val) {
this.selectionList = val;
},
table_del(row) {
this.$API.ecm.event.delete.req(row.id).then(res => {
this.$refs.table.refresh();
})
},
handleDelete() {
let that = this;
if (that.selectionList.length > 0) {
that.$confirm(`确定删除选中的${that.selectionList.length}条数据吗?`, "提示", { type: "warning" }).then(() => {
let ids = [];
that.selectionList.forEach(function (item) {
ids.push(item.id);
});
that.$API.ecm.event.delete.req('bulk', { ids: ids }).then((res) => {
that.$message.success("批量删除成功");
that.$refs.table.refresh();
return res;
}).catch((err) => {
that.$message.warning(err);
});
})
}
},
//
table_show(row) {
this.eventID = row.id;
@ -224,14 +178,14 @@ export default {
});
},
getAreaOptions() {
this.$API.am.area.list.req({page: 0}).then(res=>{
this.$API.am.area.list.req({ page: 0 }).then(res => {
this.areaOptions = res;
})
},
handleSuccess(){
handleSuccess() {
this.$refs.table.refresh();
},
oplDetail(data){
oplDetail(data) {
debugger;
console.log(data)
this.oplId = data;
@ -239,16 +193,16 @@ export default {
},
//
handleQuery() {
if(this.timeRange){
if (this.timeRange) {
this.query.start_create = this.timeRange[0]
this.query.end_create = this.timeRange[1]
}else{
} else {
this.query.end_create = null
this.query.start_create = null
}
if(this.query.cates){
if (this.query.cates) {
}else{
} else {
this.query.cates = null
}
this.$refs.table.queryData(this.query);
@ -261,12 +215,12 @@ export default {
exportList() {
this.dLoading = true;
this.$API.ecm.event.export_excel
.req(this.query)
.then(res=>{
window.open(res.path, "_blank");
this.dLoading = false;
}).catch(e=>{this.dLoading = false;})
this.$API.ecm.event.export_excel
.req(this.query)
.then(res => {
window.open(res.path, "_blank");
this.dLoading = false;
}).catch(e => { this.dLoading = false; })
}
},
};

View File

@ -2,41 +2,21 @@
<el-container>
<el-header>
<div class="left-panel">
<el-date-picker
v-model="timeRange"
type="datetimerange"
range-separator="至"
start-placeholder="发生时间始"
end-placeholder="发生时间止"
style="margin-right:10px"
value-format="YYYY-MM-DD HH:mm:ss"
@change="handleQuery"
clearable
/>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="" start-placeholder="发生时间始"
end-placeholder="发生时间止" style="margin-right:10px" value-format="YYYY-MM-DD HH:mm:ss" @change="handleQuery"
clearable />
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
<el-button type="danger" @click="handleDelete">批量删除</el-button>
</div>
<div class="right-panel">
<el-button
type="primary"
@click="eventSetting"
>提醒配置
<el-button type="primary" @click="eventSetting">提醒配置
</el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
:params="query"
fit
stripe
@resetQuery="resetQuery"
>
<scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" fit stripe
@selection-change="handleSelectionChange" @resetQuery="resetQuery">
<el-table-column type="selection" width="55" />
<el-table-column label="发生类型" prop="buy_date">
</el-table-column>
<el-table-column label="事件信息" prop="voice_msg" show-overflow-tooltip>
@ -68,18 +48,10 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="120px">
<template #default="scope">
<el-link
type="primary"
@click="table_handle(scope.row)"
v-auth="'equipment.update'"
>处理
<el-link type="primary" @click="table_handle(scope.row)" v-auth="'equipment.update'">处理
</el-link>
<el-divider direction="vertical"></el-divider>
<el-link
type="danger"
@click="table_del(scope.row)"
v-auth="'equipment.delete'"
>删除
<el-link type="danger" @click="table_del(scope.row)" v-auth="'equipment.delete'">删除
</el-link>
</template>
</el-table-column>
@ -89,40 +61,39 @@
<el-card header="事件信息">
<el-form :model="eventItem" label-width="100px">
<el-row>
<el-col :span='12'>
<el-form-item label="所属部门:">{{ eventItem.deptName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所属工段:">{{ eventItem.mgroupName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所在班组:">{{ eventItem.teamName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所在班次:">{{ eventItem.shiftName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="发生时间:">{{ eventItem.production_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="发生类型:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="状态:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="处理人:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="备注:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所属部门:">{{ eventItem.deptName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所属工段:">{{ eventItem.mgroupName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所在班组:">{{ eventItem.teamName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所在班次:">{{ eventItem.shiftName }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="发生时间:">{{ eventItem.production_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="发生类型:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="状态:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="处理人:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="备注:">{{ eventItem.buy_date }}</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card v-if="eventItem.handle_user" style="margin-top: 8px">
<el-descriptions title="事件处理" :border="true">
<el-descriptions-item label="事件标记"
>{{ mark_options2[eventItem.mark] }}
<el-descriptions-item label="事件标记">{{ mark_options2[eventItem.mark] }}
</el-descriptions-item>
<el-descriptions-item label="处理人">
<span v-if="eventItem.handle_user"></span>{{ eventItem.handle_user_name }}
@ -141,27 +112,18 @@
<el-col :span='12'>
<el-form-item label="事件标记">
<el-select v-model="form.mark" style="width: 100%">
<el-option
v-for="item in mark_options"
:key="item.id"
:label="item.name"
:value="item.id"
:disabled="mode==='show'"
/>
<el-option v-for="item in mark_options" :key="item.id" :label="item.name" :value="item.id"
:disabled="mode === 'show'" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span='12'>
<el-form-item label="处理描述">
<el-input
v-model="form.handle_desc"
clearable
type="textarea"
></el-input>
</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="处理描述">
<el-input v-model="form.handle_desc" clearable type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="width: 50%;text-align: center;">
@ -169,25 +131,11 @@
</div>
</el-card>
<el-card header="事件推送情况" style="margin-top: 8px">
<scTable
ref="table"
:data="remindData"
row-key="id"
fit
stripe
hidePagination
hideRefresh
hideDo
>
<scTable ref="table" :data="remindData" row-key="id" fit stripe hidePagination hideRefresh hideDo>
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="事件种类" width="200">
<template #default="scope">
<el-tag
v-for="item in scope.row.event_.cates_"
:key="item.id"
type="warning"
>{{ item.name }}</el-tag
>
<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">
@ -197,16 +145,9 @@
</template>
</el-table-column>
<el-table-column
label="警报信息"
prop="event_.voice_msg"
width="200"
></el-table-column>
<el-table-column label="警报信息" prop="event_.voice_msg" width="200"></el-table-column>
<el-table-column
label="接收人"
prop="recipient_.name"
></el-table-column>
<el-table-column label="接收人" prop="recipient_.name"></el-table-column>
<el-table-column label="是否可处理" prop="can_handle">
<template #default="scope">
@ -221,37 +162,21 @@
</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-drawer>
<el-dialog
title="提醒配置"
width="50%"
v-model="visible"
:append-to-body="true"
>
<el-form
:model="cateItem"
label-width="100px"
>
<el-dialog title="提醒配置" width="50%" v-model="visible" :append-to-body="true">
<el-form :model="cateItem" label-width="100px">
<el-form-item label="告警间隔">
<el-input-number
v-model="cateItem.unhandled_push_interval"
:min="0"
style="width: 90%;"
controls-position="right"
></el-input-number>
<el-input-number v-model="cateItem.unhandled_push_interval" :min="0" style="width: 90%;"
controls-position="right"></el-input-number>
<span>毫秒</span>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" :loading="isSaveing" @click="submitSetting"
> </el-button>
<el-button type="primary" :loading="isSaveing" @click="submitSetting"> </el-button>
</template>
</el-dialog>
</el-container>
@ -266,43 +191,43 @@ export default {
},
data() {
return {
visible:false,
visible: false,
dLoading: false,
showLimited:false,
showLimited: false,
defaultTime: ['00:00:00', '23:59:59'],
timeRange: [],
apiObj: this.$API.ecm.event.list,
query: {
cates__code__in:'consume_exceed'
cates__code__in: 'consume_exceed'
},
cateItem:{},
eventItem:{},
eventID:'',
cateItem: {},
eventItem: {},
eventID: '',
mark_options2: {
10: "正常",
20: "误报",
},
form:{
mark:10,
handle_desc:''
form: {
mark: 10,
handle_desc: ''
},
mark_options: [
{ id: 10, name: "正常" },
{ id: 20, name: "误报" },
],
remindData:[],
remindData: [],
};
},
created() {
this.getSetting();
},
mounted(){},
mounted() { },
methods: {
getSetting(){
getSetting() {
this.$API.ecm.event_cate.list.req({ page: 0 }).then((res) => {
let that = this;
res.filter((item) => {
if(item.code=='consume_exceed'){
if (item.code == 'consume_exceed') {
that.cateItem = item;
// that.query.cates = item.id;
}
@ -312,15 +237,15 @@ export default {
});
},
//
eventSetting(){
eventSetting() {
this.visible = true;
},
//
submitSetting(){
submitSetting() {
let that = this;
if(that.cateItem.unhandled_push_interval!==null&&that.cateItem.unhandled_push_interval!==undefined){
if (that.cateItem.unhandled_push_interval !== null && that.cateItem.unhandled_push_interval !== undefined) {
that.visible = true;
this.$API.ecm.event_cate.update.req(that.cateItem.id,that.cateItem).then(res=>{
this.$API.ecm.event_cate.update.req(that.cateItem.id, that.cateItem).then(res => {
debugger;
that.visible = false;
that.isSaveing = false;
@ -328,7 +253,7 @@ export default {
})
}
},
//
table_handle(row) {
this.eventID = row.id;
@ -337,17 +262,38 @@ export default {
this.$refs.handleDialog.open("edit").setData(row);
});
},
handleSelectionChange(val) {
this.selectionList = val;
},
//
table_del(row) {
this.$confirm( `确定删除该事件吗?`,"提示",{type: "warning"}).then(() => {
this.$API.vm.visit.delete.req(row.id).then((res) => {
this.$confirm(`确定删除该事件吗?`, "提示", { type: "warning" }).then(() => {
this.$API.ecm.event.delete.req(row.id).then((res) => {
this.$message.success("删除成功");
this.$refs.table.refresh();
return res;
}).catch((err) => {
this.$message.warning(err);
});
})
})
},
handleDelete() {
let that = this;
if (that.selectionList.length > 0) {
that.$confirm(`确定删除选中的${that.selectionList.length}条数据吗?`, "提示", { type: "warning" }).then(() => {
let ids = [];
that.selectionList.forEach(function (item) {
ids.push(item.id);
});
that.$API.ecm.event.delete.req('bulk', { ids: ids }).then((res) => {
that.$message.success("批量删除成功");
that.$refs.table.refresh();
return res;
}).catch((err) => {
that.$message.warning(err);
});
})
}
},
//
table_show(row) {
@ -359,16 +305,16 @@ export default {
},
//
handleQuery() {
if(this.timeRange){
if (this.timeRange) {
this.query.start_create = this.timeRange[0]
this.query.end_create = this.timeRange[1]
}else{
} else {
this.query.end_create = null
this.query.start_create = null
}
if(this.query.cates){
if (this.query.cates) {
}else{
} else {
this.query.cates = null
}
this.$refs.table.queryData(this.query);
@ -386,12 +332,12 @@ export default {
},
exportList() {
this.dLoading = true;
this.$API.ecm.event.export_excel
.req(this.query)
.then(res=>{
window.open(res.path, "_blank");
this.dLoading = false;
}).catch(e=>{this.dLoading = false;})
this.$API.ecm.event.export_excel
.req(this.query)
.then(res => {
window.open(res.path, "_blank");
this.dLoading = false;
}).catch(e => { this.dLoading = false; })
}
},
};