From 541627b9b5b11f93c6e62ce220891ccd5d1fb1cc Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 13 Sep 2022 18:52:50 +0800
Subject: [PATCH] eventDetail

---
 src/views/ecm/event.vue            |  1 +
 src/views/ecm/event_handlefrom.vue | 32 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index 6a78da1e..0c0c8e37 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -21,6 +21,7 @@
           @change="handleQuery"
           style="margin-left:2px"
           clearable
+          filterable
         >
           <el-option
             v-for="item in areaOptions"
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index 84223e22..387b67fe 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -2,15 +2,15 @@
     <el-drawer
     :title="titleMap[mode]"
     v-model="visible"
-    :size="1000"
+    size="60%"
     destroy-on-close
     @closed="$emit('closed')"
   >
   <el-container v-loading="loading">
     <el-main>
       <el-card>
-        <el-descriptions title="事件信息" :border="true">
-          <el-descriptions-item label="事件种类"
+        <el-descriptions title="事件信息" :border="true" :column="24">
+          <el-descriptions-item label="事件种类" :span="8"
             ><el-tag
               v-for="item in form.cates_"
               :key="item.id"
@@ -18,34 +18,36 @@
               >{{ item.name }}</el-tag
             ></el-descriptions-item
           >
-          <el-descriptions-item label="事件标记"
+          <el-descriptions-item label="事件标记" :span="8"
             >{{ mark_options2[form.mark] }}
           </el-descriptions-item>
-          <el-descriptions-item label="发生时间">{{
+          <el-descriptions-item label="发生时间"  :span="8">{{
             form.create_time
           }}</el-descriptions-item>
-          <el-descriptions-item label="发生区域" v-if="form.area_">{{
+          <el-descriptions-item label="发生区域" :span="8" 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 label="事件对象"  span=8>
+            <span v-if="form.obj_cate==='opl'">作业</span>
+						<span v-else-if="form.obj_cate==='people'">人员</span>
+						<span v-else>其他</span>
           </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>
           </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 }}
           </el-descriptions-item>
-          <el-descriptions-item label="图片" span=2>
+          <el-descriptions-item label="图片" span=16 >
             <div style="display: flex">
               <sc-upload
                 v-model="form.global_img"
                 title="全景照"
                 :disabled="true"
-                style="margin-right: 8px; width: auto"
+                style="margin-right: 8px; width: auto;flex: 1;"
               ></sc-upload>
               <sc-upload
                 v-model="form.face_img"