zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wodeshijian

This commit is contained in:
2309368887@qq.com 2022-07-05 14:13:57 +08:00
parent 6de230462d 9c88f3f5fb
commit ebcd31833a
10 changed files with 114 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/api/model/ecm.js
View File

@ -66,11 +66,20 @@ export default {
); );
} }
}, },
read:{ item: {
name: "详情", name: "获取",
req: async function (id) { req: async function(id){
return await http.get( return await http.get(
`${config.API_URL}/ecm/event/${id}/`); `${config.API_URL}/ecm/event/${id}/`
);
}
},
handle: {
name: "创建",
req: async function(id,data){
return await http.post(
`${config.API_URL}/ecm/event/${id}/handle/`,
data);
} }
}, },
} }
@ -138,4 +147,4 @@ export default {
} }
} }

69
src/layout/components/userbar.vue
View File

@ -18,7 +18,8 @@
<el-drawer <el-drawer
title="新消息" title="新消息"
v-model="msg" v-model="msg"
:size="400" style="width:400px !important"
append-to-body append-to-body
destroy-on-close destroy-on-close
> >
@ -26,27 +27,39 @@
<el-main class="nopadding"> <el-main class="nopadding">
<el-scrollbar> <el-scrollbar>
<ul class="msg-list"> <ul class="msg-list">
<li v-for="item in msgList" v-bind:key="item.id"> <li v-for="item in msgList" v-bind:key="item.id">
<a target="_blank"> <div style="width: 100%; padding: 10px">
<div class="msg-list__main"> <div style="width: 35%; float: left">
<el-span <el-span
style="color:red:float:left"
v-for="items in item.event_.cates_" v-for="items in item.event_.cates_"
:key="items.id" :key="items.id"
:label="items.name" :label="items.name"
:value="items.id" :value="items.id"
>事件种类：{{ items.name }}</el-span> >{{ items.name }}</el-span
>
</div> </div>
<div style="width:100px"> <div style="width: 32%; float: left">
<p v-if="item.can_handle">可处理</p> <p>{{ item.event_.create_time }}</p>
<p v-else-if="item.can_handle=='false'">不可处理</p>
</div> </div>
<div style="width: 30%; float: right">
<div class="msg-list__time"> <el-button
<p>警报信息{{ item.event_.voice_msg }}</p> style="float: right"
v-if="item.event_.handle_user == ''"
@click="createhandele(item.event_.id)"
>待处理</el-button
>
<el-button
style="float: right"
v-else
@click="handele(item.event_.id)"
>已处理</el-button
>
</div> </div>
</a> </div>
<div style="width: 100%; padding: 10px">
<p>警报信息{{ item.event_.voice_msg }}</p>
</div>
</li> </li>
<el-empty <el-empty
v-if="msgList.length == 0" v-if="msgList.length == 0"
@ -113,15 +126,34 @@ export default {
var userInfo = this.$TOOL.data.get("USER_INFO"); var userInfo = this.$TOOL.data.get("USER_INFO");
this.userName = userInfo.username; this.userName = userInfo.username;
this.userNameF = this.userName.substring(0, 1); this.userNameF = this.userName.substring(0, 1);
this.getMyVents();
}, },
methods: { methods: {
getMyVents() { getMyVents() {
this.$API.ecm.myevent.list.req({ page: 0 }).then((res) => { this.$API.ecm.myevent.list
this.msgList = res; .req({ is_read: false, page: 0 })
.then((res) => {
}); this.msgList = res;
});
}, },
createhandele(id) {
this.$router.push({
name: "eventhandlefrom",
query: {
id: id,
},
});
this.msg=false;
},
handele(id) {
this.$router.push({
name: "eventhandlefrom",
query: {
id: id,
},
});
this.msg=false;
},
//个人信息 //个人信息
handleUser(command) { handleUser(command) {
if (command == "uc") { if (command == "uc") {
@ -173,6 +205,7 @@ export default {
//显示短消息 //显示短消息
showMsg() { showMsg() {
this.msg = true; this.msg = true;
this.getMyVents();
}, },
//标记已读 //标记已读
markRead() { markRead() {

2
src/style/media.scss
View File

@ -4,7 +4,7 @@
.el-form-item__label {display: block;text-align: left;padding: 0 0 10px;} .el-form-item__label {display: block;text-align: left;padding: 0 0 10px;}
.el-dialog {width: 90%!important;} .el-dialog {width: 90%!important;}
.el-dialog.is-fullscreen {width: 100%!important;} .el-dialog.is-fullscreen {width: 100%!important;}
.el-drawer.rtl {width: 90%!important;} //.el-drawer.rtl {width: 90%!important;}
.el-form-item__content {margin-left: 0px!important;} .el-form-item__content {margin-left: 0px!important;}
.adminui-main { .adminui-main {

26
src/views/am/access_form.vue
View File

@ -13,6 +13,14 @@
label-width="120px" label-width="120px"
> >
<el-row> <el-row>
<el-col :md="12" :sm="24">
<el-form-item label="准入类型" prop="type">
<el-radio-group v-model="form.type">
<el-radio :label="10">准入</el-radio>
<el-radio :label="20">禁入</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="关联区域" prop="area"> <el-form-item label="关联区域" prop="area">
<el-select v-model="form.area" style="width: 100%"> <el-select v-model="form.area" style="width: 100%">
@ -84,6 +92,7 @@
v-model="form.stay_minute_min" v-model="form.stay_minute_min"
:min="0" :min="0"
:max="32767" :max="32767"
placeholder="分钟"
controls-position="right" controls-position="right"
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
@ -94,18 +103,12 @@
v-model="form.stay_minute_max" v-model="form.stay_minute_max"
:min="0" :min="0"
:max="32767" :max="32767"
placeholder="分钟"
controls-position="right" controls-position="right"
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="准入类型" prop="type">
<el-radio-group v-model="form.type">
<el-radio :label="10">准入</el-radio>
<el-radio :label="20">禁入</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
@ -131,8 +134,8 @@ export default {
loading: false, loading: false,
mode: "add", mode: "add",
titleMap: { titleMap: {
add: "新增区域", add: "新增",
edit: "区域编辑", edit: "编辑",
}, },
cateOptions: [ cateOptions: [
{ id: "post", name: "岗位" }, { id: "post", name: "岗位" },
@ -219,6 +222,9 @@ export default {
open(mode) { open(mode) {
this.mode = mode; this.mode = mode;
this.visible = true; this.visible = true;
if (mode == "add") {
this.form.area = this.$parent.area;
}
return this; return this;
}, },
closeDrawer() { closeDrawer() {

18
src/views/am/area.vue
View File

@ -32,16 +32,12 @@
ref="table" ref="table"
:apiObj="apiObj" :apiObj="apiObj"
row-key="id" row-key="id"
@selection-change="selectionChange"
stripe stripe
@resetQuery="resetQuery" @resetQuery="resetQuery"
@row-click="rowClick" @row-click="rowClick"
> >
<el-table-column
fixed="left"
type="selection"
width="50"
></el-table-column>
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
@ -187,11 +183,11 @@
ref="accesstable" ref="accesstable"
:data="apiaccessObj" :data="apiaccessObj"
row-key="id" row-key="id"
@selection-change="selectionChange"
stripe stripe
@resetQuery="resetQuery" @resetQuery="resetQuery"
> >
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
@ -216,12 +212,12 @@
cate_[scope.row.obj_cate] cate_[scope.row.obj_cate]
}}</template></el-table-column> }}</template></el-table-column>
<el-table-column <el-table-column
label="最短停留时间" label="最短停留时间(分)"
prop="stay_minute_min" prop="stay_minute_min"
min-width="180" min-width="180"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="最长停留时间" label="最长停留时间(分)"
prop="stay_minute_max" prop="stay_minute_max"
width="160" width="160"
></el-table-column> ></el-table-column>
@ -376,7 +372,7 @@ export default {
this.$API.am.access.list.req({ area:row.id, page: 0 }).then((res) => { this.$API.am.access.list.req({ area:row.id, page: 0 }).then((res) => {
this.apiaccessObj = res; this.apiaccessObj = res;
}); });
this.area = row.id;
}, },
//围栏，添加 //围栏，添加
handleRail(row) { handleRail(row) {

4
src/views/am/area_rail_form.vue
View File

@ -194,7 +194,5 @@
</script> </script>
<style> <style>
.el-drawer.rtl{
width: 90%!important;
}
</style> </style>

4
src/views/am/vchannel_view.vue
View File

@ -218,7 +218,5 @@
</script> </script>
<style> <style>
.el-drawer.rtl{
width: 90%!important;
}
</style> </style>

2
src/views/ecm/event_from.vue
View File

@ -187,7 +187,7 @@ export default {
}, },
methods: { methods: {
getEvent() { getEvent() {
this.$API.ecm.event.read.req(this.eventID).then((res) => { this.$API.ecm.event.item.req(this.eventID).then((res) => {
this.form = res; this.form = res;
}); });
}, },

18
src/views/ecm/event_handlefrom.vue
View File

@ -72,11 +72,7 @@
<sc-upload v-model="form.global_img" title="全景照" :disabled="true"></sc-upload> <sc-upload v-model="form.global_img" title="全景照" :disabled="true"></sc-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :sm="24">
<el-form-item label="处理人">
<el-input v-model="form.handle_user_name" />
</el-form-item>
</el-col>
<el-col :md="6" :sm="24"> <el-col :md="6" :sm="24">
<el-form-item label="事件标记"> <el-form-item label="事件标记">
<el-select v-model="form.mark" style="width: 100%" > <el-select v-model="form.mark" style="width: 100%" >
@ -187,7 +183,7 @@ export default {
}, },
methods: { methods: {
getEvent() { getEvent() {
this.$API.ecm.event.read.req(this.eventID).then((res) => { this.$API.ecm.event.item.req(this.eventID).then((res) => {
this.form = res; this.form = res;
}); });
}, },
@ -200,8 +196,16 @@ export default {
}, },
submit(){ submit(){
this.$API.ecm.event.handle.req(this.form.id, this.form)
.then((res) => {
this.isSaveing = false;
this.visible = false;
this.$emit("success", this.form, this.mode);
this.$message.success("操作成功");
return res;
})
} }
}, },
}; };

14
src/views/ecm/myevent.vue
View File

@ -35,6 +35,12 @@
> >
</template> </template>
</el-table-column> </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-else>已处理</el-span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="警报信息" label="警报信息"
@ -111,9 +117,11 @@ export default {
//查看 //查看
table_show(row) { table_show(row) {
this.dialog.save = true; this.$router.push({
this.$nextTick(() => { name: "eventhandlefrom",
this.$refs.saveDialog.open("show").setData(row); query: {
id: row.event_.id,
},
}); });
}, },
//搜索 //搜索