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

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
曹前明 2022-09-13 20:18:32 +08:00
parent ea7c1defe2 051526c243
commit be537d884f
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/ecm/event.vue
View File

@ -21,6 +21,7 @@
@change="handleQuery" @change="handleQuery"
style="margin-left:2px" style="margin-left:2px"
clearable clearable
filterable
> >
<el-option <el-option
v-for="item in areaOptions" v-for="item in areaOptions"

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

@ -2,15 +2,15 @@
<el-drawer <el-drawer
:title="titleMap[mode]" :title="titleMap[mode]"
v-model="visible" v-model="visible"
:size="1000" size="60%"
destroy-on-close destroy-on-close
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-container v-loading="loading">
<el-main> <el-main>
<el-card> <el-card>
<el-descriptions title="事件信息" :border="true"> <el-descriptions title="事件信息" :border="true" :column="24">
<el-descriptions-item label="事件种类" <el-descriptions-item label="事件种类" :span="8"
><el-tag ><el-tag
v-for="item in form.cates_" v-for="item in form.cates_"
:key="item.id" :key="item.id"
@ -18,34 +18,36 @@
>{{ item.name }}</el-tag >{{ item.name }}</el-tag
></el-descriptions-item ></el-descriptions-item
> >
<el-descriptions-item label="事件标记" <el-descriptions-item label="事件标记" :span="8"
>{{ mark_options2[form.mark] }} >{{ mark_options2[form.mark] }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="发生时间">{{ <el-descriptions-item label="发生时间" :span="8">{{
form.create_time form.create_time
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="发生区域" v-if="form.area_">{{ <el-descriptions-item label="发生区域" :span="8" v-if="form.area_">{{
form.area_.name form.area_.name
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="人员类型"> <el-descriptions-item label="事件对象" span=8>
<span v-if="form.employee">{{ <span v-if="form.obj_cate==='opl'">作业</span>
type_options2[form.employee_.type] <span v-else-if="form.obj_cate==='people'">人员</span>
}}</span> <span v-else>其他</span>
<span v-else>未知人员</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="当事人"> <el-descriptions-item label="触发人" v-if="form.obj_cate==='people'" span=8>
<span v-if="form.employee">{{ form.employee_.name }}</span> <span v-if="form.employee">{{ form.employee_.name }}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="抓拍设备" v-if="form.vchannel"> <el-descriptions-item label="触发作业" v-else-if="form.obj_cate==='opl'" span=8>
<span v-if="form.employee">{{ form.operation_name }}</span>
</el-descriptions-item>
<el-descriptions-item label="抓拍设备" v-if="form.vchannel" span=8>
{{ form.vchannel_.code }}-{{ form.vchannel_.name }} {{ form.vchannel_.code }}-{{ form.vchannel_.name }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="图片" span=2> <el-descriptions-item label="图片" span=16 >
<div style="display: flex"> <div style="display: flex">
<sc-upload <sc-upload
v-model="form.global_img" v-model="form.global_img"
title="全景照" title="全景照"
:disabled="true" :disabled="true"
style="margin-right: 8px; width: auto" style="margin-right: 8px; width: auto;flex: 1;"
></sc-upload> ></sc-upload>
<sc-upload <sc-upload
v-model="form.face_img" v-model="form.face_img"