diff --git a/src/api/model/ecm.js b/src/api/model/ecm.js
index d1615d49..b30abf74 100644
--- a/src/api/model/ecm.js
+++ b/src/api/model/ecm.js
@@ -84,6 +84,7 @@ export default {
 		},
 	}
 	,
+	
 	myevent:{
         list: {
 			name: "获取",
diff --git a/src/config/route.js b/src/config/route.js
index e0361c18..14b4f10b 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -84,6 +84,28 @@ const routes = [
           "icon": "el-icon-menu",
         },
         "component": "ecm/event"
+      }
+      ,
+      {
+        "name": "eventfrom",
+        "path": "/ecm/event_from",
+        "meta": {
+          "title": "作业详情",
+          "icon": "el-icon-menu",
+          "hidden": true
+        },
+        "component": "ecm/event_from"
+      }
+      ,
+      {
+        "name": "eventhandlefrom",
+        "path": "/ecm/event_handlefrom",
+        "meta": {
+          "title": "处理作业",
+          "icon": "el-icon-menu",
+          "hidden": true
+        },
+        "component": "ecm/event_handlefrom"
       },
       {
         "name": "myevent",
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 259b1aae..2ff3749c 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -18,7 +18,8 @@
       <el-drawer
         title="新消息"
         v-model="msg"
-        :size="400"
+        style="width:400px !important"
+
         append-to-body
         destroy-on-close
       >
@@ -26,30 +27,39 @@
           <el-main class="nopadding">
             <el-scrollbar>
               <ul class="msg-list">
-				
                 <li v-for="item in msgList" v-bind:key="item.id">
-                  <a target="_blank">
-                    <div class="msg-list__main">
+                  <div style="width: 100%; padding: 10px">
+                    <div style="width: 35%; float: left">
                       <el-span
+                        style="color:red:float:left"
                         v-for="items in item.event_.cates_"
                         :key="items.id"
                         :label="items.name"
                         :value="items.id"
-                        >事件种类：{{ items.name }}</el-span>
-						
-
-
-						
+                        >{{ items.name }}</el-span
+                      >
                     </div>
-                    <div style="width:100px">
-                      <p v-if="item.can_handle">可处理</p>
-                      <p v-else-if="item.can_handle=='false'">不可处理</p>
+                    <div style="width: 32%; float: left">
+                      <p>{{ item.event_.create_time }}</p>
                     </div>
-                   
-                    <div class="msg-list__time">
-                      <p>警报信息{{ item.event_.voice_msg }}</p>
+                    <div style="width: 30%; float: right">
+                      <el-button
+                        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>
-                  </a>
+                  </div>
+                  <div style="width: 100%; padding: 10px">
+                    <p>警报信息{{ item.event_.voice_msg }}</p>
+                  </div>
                 </li>
                 <el-empty
                   v-if="msgList.length == 0"
@@ -116,15 +126,34 @@ export default {
     var userInfo = this.$TOOL.data.get("USER_INFO");
     this.userName = userInfo.username;
     this.userNameF = this.userName.substring(0, 1);
-    this.getMyVents();
+    
   },
   methods: {
     getMyVents() {
-      this.$API.ecm.myevent.list.req({ page: 0 }).then((res) => {
-        this.msgList = res;
-        console.log(this.msgList.event_);
-      });
+      this.$API.ecm.myevent.list
+        .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) {
       if (command == "uc") {
@@ -176,6 +205,7 @@ export default {
     //显示短消息
     showMsg() {
       this.msg = true;
+	  this.getMyVents();
     },
     //标记已读
     markRead() {
diff --git a/src/style/media.scss b/src/style/media.scss
index 01cd3e1e..b3d639fe 100644
--- a/src/style/media.scss
+++ b/src/style/media.scss
@@ -4,7 +4,7 @@
 	.el-form-item__label {display: block;text-align: left;padding: 0 0 10px;}
 	.el-dialog {width: 90%!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;}
 
 	.adminui-main {
diff --git a/src/views/am/access_form.vue b/src/views/am/access_form.vue
index 485d66a2..7de8cb80 100644
--- a/src/views/am/access_form.vue
+++ b/src/views/am/access_form.vue
@@ -13,6 +13,14 @@
       label-width="120px"
     >
       <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-form-item label="关联区域" prop="area">
             <el-select v-model="form.area" style="width: 100%">
@@ -84,6 +92,7 @@
               v-model="form.stay_minute_min"
               :min="0"
               :max="32767"
+              placeholder="分钟"
               controls-position="right"
             ></el-input-number>
           </el-form-item>
@@ -94,18 +103,12 @@
               v-model="form.stay_minute_max"
               :min="0"
               :max="32767"
+              placeholder="分钟"
               controls-position="right"
             ></el-input-number>
           </el-form-item>
         </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-form>
     <template #footer>
@@ -131,8 +134,8 @@ export default {
       loading: false,
       mode: "add",
       titleMap: {
-        add: "新增区域",
-        edit: "区域编辑",
+        add: "新增",
+        edit: "编辑",
       },
       cateOptions: [
         { id: "post", name: "岗位" },
@@ -219,6 +222,9 @@ export default {
     open(mode) {
       this.mode = mode;
       this.visible = true;
+       if (mode == "add") {
+        this.form.area = this.$parent.area;
+      }
       return this;
     },
     closeDrawer() {
diff --git a/src/views/am/area.vue b/src/views/am/area.vue
index 9fa8dc9e..87319a58 100644
--- a/src/views/am/area.vue
+++ b/src/views/am/area.vue
@@ -32,16 +32,12 @@
               ref="table"
               :apiObj="apiObj"
               row-key="id"
-              @selection-change="selectionChange"
+            
               stripe
               @resetQuery="resetQuery"
 			   @row-click="rowClick"
             >
-              <el-table-column
-                fixed="left"
-                type="selection"
-                width="50"
-              ></el-table-column>
+             
               <el-table-column
                 label="序号"
                 type="index"
@@ -187,11 +183,11 @@
             ref="accesstable"
             :data="apiaccessObj"
             row-key="id"
-            @selection-change="selectionChange"
+          
             stripe
             @resetQuery="resetQuery"
           >
-            <el-table-column type="selection" width="50"></el-table-column>
+           
             <el-table-column
               label="序号"
               type="index"
@@ -216,12 +212,12 @@
                   cate_[scope.row.obj_cate]
                 }}</template></el-table-column>
             <el-table-column
-              label="最短停留时间"
+              label="最短停留时间(分)"
               prop="stay_minute_min"
               min-width="180"
             ></el-table-column>
             <el-table-column
-              label="最长停留时间"
+              label="最长停留时间(分)"
               prop="stay_minute_max"
               width="160"
             ></el-table-column>
@@ -376,7 +372,7 @@ export default {
       this.$API.am.access.list.req({ area:row.id, page: 0 }).then((res) => {
         this.apiaccessObj = res;
       });
-  
+        this.area = row.id;
     },
     //围栏，添加
     handleRail(row) {
diff --git a/src/views/am/area_rail_form.vue b/src/views/am/area_rail_form.vue
index 8cb65c37..c8964073 100644
--- a/src/views/am/area_rail_form.vue
+++ b/src/views/am/area_rail_form.vue
@@ -194,7 +194,5 @@
 </script>
 
 <style>
-	.el-drawer.rtl{
-		width: 90%!important;
-	}
+
 </style>
diff --git a/src/views/am/vchannel_view.vue b/src/views/am/vchannel_view.vue
index a784f930..17530ff3 100644
--- a/src/views/am/vchannel_view.vue
+++ b/src/views/am/vchannel_view.vue
@@ -218,7 +218,5 @@
 </script>
 
 <style>
-	.el-drawer.rtl{
-		width: 90%!important;
-	}
+	
 </style>
diff --git a/src/views/ecm/algos_form.vue b/src/views/ecm/algos_form.vue
index 8a6cd1c8..dcd12e03 100644
--- a/src/views/ecm/algos_form.vue
+++ b/src/views/ecm/algos_form.vue
@@ -136,7 +136,7 @@ export default {
     setData(data) {
       Object.assign(this.form, data);
       debugger;
-      console.log(this.form);
+      
     },
   },
 };
diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index eba6fd44..b3b321fe 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -97,10 +97,6 @@
                 type="primary"
                 size="small"
                 @click="table_show(scope.row, scope.$index)"
-<<<<<<< HEAD
-                >查看/处理</el-button
-              >
-=======
                 >查看</el-button>
 				 <el-button
                 text
@@ -108,7 +104,6 @@
                 size="small"
                 @click="table_handle(scope.row, scope.$index)"
                 >处理</el-button>
->>>>>>> 9c88f3f5fb481911f97fec3ac0e2716865333312
               <!-- <el-button text type="warning" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button> -->
               <!-- <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 								<template #reference>
@@ -121,38 +116,16 @@
       </scTable>
     </el-main>
   </el-container>
-<<<<<<< HEAD
-    <save-dialog
-    v-if="dialog.save"
-    ref="saveDialog"
-    @success="handleSaveSuccess"
-=======
-   <save-dialog
-    v-if="dialog.save"
-    ref="saveDialog"
   
->>>>>>> 9c88f3f5fb481911f97fec3ac0e2716865333312
-    @closed="dialog.save = false"
-  ></save-dialog>
 </template>
     <script>
-<<<<<<< HEAD
-import saveDialog from "./event_form.vue";
 import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue";
-=======
-import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue";
-import saveDialog from "./event_from.vue";
->>>>>>> 9c88f3f5fb481911f97fec3ac0e2716865333312
 export default {
   name: "event",
   components: {
     CircleCheckFilled,
     CircleCloseFilled,
-<<<<<<< HEAD
-    saveDialog,
-=======
-	saveDialog
->>>>>>> 9c88f3f5fb481911f97fec3ac0e2716865333312
+	
   },
   data() {
     return {
@@ -171,35 +144,28 @@ export default {
   methods: {
     //查看
     table_show(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("show").setData(row);
+       this.$router.push({
+        name: "eventfrom",
+        query: {
+          id: row.id,
+        },
       });
     },
-<<<<<<< HEAD
-    //搜索
-    upsearch() {},
-    //本地更新数据
-    handleSaveSuccess(data, mode) {
-      if (mode == "add") {
-        this.$refs.table.refresh();
-      } else if (mode == "edit") {
-        this.$refs.table.refresh();
-      }
-    },
-=======
 	//事件处理
 	table_handle(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("show").setData(row);
+
+		 this.$router.push({
+        name: "eventhandlefrom",
+        query: {
+          id: row.id,
+        },
       });
+     
     },
     //搜索
     upsearch() {},
     //本地更新数据
    
->>>>>>> 9c88f3f5fb481911f97fec3ac0e2716865333312
     resetQuery() {
       this.query = {};
     },
diff --git a/src/views/ecm/event_from.vue b/src/views/ecm/event_from.vue
index 2cc864db..c0398915 100644
--- a/src/views/ecm/event_from.vue
+++ b/src/views/ecm/event_from.vue
@@ -1,45 +1,41 @@
 <template>
-  <el-drawer
-    :title="titleMap[mode]"
-    v-model="visible"
-    :size="1000"
-    destroy-on-close
-    @closed="closeDrawer"
-  >
-    <el-container v-loading="loading">
-      <!--<sc-title title="详细信息"></sc-title>-->
-      <el-main style="padding: 0 20px 20px 20px">
+  <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" :disabled="mode === 'show'" label-width="120px">
           <el-row>
-            <el-col :md="12" :sm="24">
+            <el-col :md="8" :sm="24">
               <el-form-item label="事件种类" prop="cates">
-               
-                      <el-tag v-for="item in form.cates_"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">{{item.name}}</el-tag>
-    
-			
+                <el-tag
+                  v-for="item in form.cates_"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  >{{ item.name }}</el-tag
+                >
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24" v-if="form.area">
+            <el-col :md="8" :sm="24" v-if="form.area">
               <el-form-item label="发生区域" prop="area">
                 <el-input v-model="form.area_.name" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24" v-if="form.employee">
+            <el-col :md="8" :sm="24" >
               <el-form-item label="当事人" prop="employee">
-                <el-input v-model="form.employee_.name" clearable></el-input>
+                 <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="12"
+              :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%">
+                <el-select v-model="form.employee_.type" style="width: 100%">
                   <el-option
                     v-for="item in type_options"
                     :key="item.id"
@@ -47,45 +43,34 @@
                     :value="item.id"
                   />
                 </el-select>
+              </el-form-item>
+            </el-col>
 
-              </el-form-item>
-            </el-col>
-           
-             <el-col :md="12" :sm="24">
+            <el-col :md="8" :sm="24">
               <el-form-item label="发生时间">
-                <el-input
-                  v-model="form.create_time"
-                  clearable
-                ></el-input>
+                <el-input v-model="form.create_time" clearable></el-input>
               </el-form-item>
             </el-col>
-          
-            <el-col :md="12" :sm="24">
+
+            <el-col :md="8" :sm="24">
               <el-form-item label="处理人">
-               <el-input v-model="form.handle_user" />
+                <el-input v-model="form.handle_user_name" />
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="8" :sm="24">
               <el-form-item label="处理时间">
-                <el-input
-                  v-model="form.handle_time"
-                  clearable
-                ></el-input>
+                <el-input v-model="form.handle_time" clearable></el-input>
               </el-form-item>
             </el-col>
-			 <el-col :md="12" :sm="24">
+            <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></el-input>
               </el-form-item>
             </el-col>
-			
-            <el-col :md="12" :sm="24">
+
+            <el-col :md="6" :sm="24">
               <el-form-item label="事件标记">
-              
-                  <el-select v-model="form.mark " style="width: 100%">
+                <el-select v-model="form.mark" style="width: 100%">
                   <el-option
                     v-for="item in mark_options"
                     :key="item.id"
@@ -93,40 +78,36 @@
                     :value="item.id"
                   />
                 </el-select>
-
-				
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="6" :sm="24">
               <el-form-item label="是否超时">
                 <el-switch v-model="form.is_timeout" />
               </el-form-item>
             </el-col>
-          
-            <el-col :md="12" :sm="24">
+
+            <el-col :md="6" :sm="24">
               <el-form-item label="人脸照">
-                <sc-upload
-                  v-model="form.face_img"
-                
-                  title="人脸照"
-                ></sc-upload>
+                <sc-upload v-model="form.face_img" title="人脸照"></sc-upload>
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="6" :sm="24">
               <el-form-item label="全景照">
                 <sc-upload v-model="form.global_img" title="全景照"></sc-upload>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-		  <scTable
+      <sc-title title="事件推送列表"></sc-title>
+      <scTable
         ref="table"
         :data="remindData"
         row-key="id"
-		height="250px"
+        height="300px"
         fit
         stripe
         @resetQuery="resetQuery"
+		hidePagination
       >
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="事件种类">
@@ -140,17 +121,17 @@
             >
           </template>
         </el-table-column>
-       
+
         <el-table-column
           label="警报信息"
           prop="event_.voice_msg"
         ></el-table-column>
-       
+
         <el-table-column
           label="接收人"
           prop="recipient_.name"
         ></el-table-column>
-      
+
         <el-table-column label="是否可处理" prop="can_handle">
           <template #default="scope">
             <el-span v-if="scope.row.can_handle">是</el-span>
@@ -165,28 +146,22 @@
         </el-table-column>
 
         <el-table-column label="创建时间" prop="create_time"></el-table-column>
-
-       
       </scTable>
-      </el-main>
-    </el-container>
-  </el-drawer>
+	   </el-card>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-const defaultForm = {
-  id: null,
- 
-};
 export default {
+  name: "eventfrom",
   emits: ["success", "closed"],
   data() {
     return {
       loading: false,
       visible: false,
       isSaveing: false,
-      form: defaultForm,
-	  
+
       mode: "show",
       titleMap: {
         show: "事件信息查看",
@@ -196,53 +171,56 @@ export default {
         { id: "remployee", name: "相关方" },
         { id: "visitor", name: "访客" },
       ],
-	    mark_options: [
+      mark_options: [
         { id: 10, name: "正常" },
-        { id: 20, name: "误报" }
+        { id: 20, name: "误报" },
       ],
-	  remindData:[],
-	  eventID:""
+      form: [],
+      remindData: [],
+      eventID: "",
     };
   },
   mounted() {
-	
+    this.eventID = this.$route.query.id; //事件的ID
+    this.getEvent();
+    this.getRemind();
   },
   methods: {
-	 getRemind() {
-		console.log(this.eventID)
-      this.$API.ecm.remind.list.req({event:this.eventID,page: 0 }).then((res) => {
-        this.remindData = res;
+    getEvent() {
+      this.$API.ecm.event.item.req(this.eventID).then((res) => {
+        this.form = res;
       });
     },
-    //显示
-    open(mode) {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-    closeDrawer() {
-      this.visible = false;
-      this.$emit("closed");
-    },
-
-    //表单注入数据
-    setData(data) {
-      //debugger;
-      console.log(defaultForm);
-      // this.form = defaultForm;
-      Object.assign(this.form, data);
-	  this.eventID=this.form.id;
-	  this.getRemind();
-	  
-    },
-    //设置过滤项
-    setFilters(filters) {
-      this.selectionFilters = filters;
-      this.setFiltersVisible = true;
+    getRemind() {
+      this.$API.ecm.remind.list
+        .req({ event: this.eventID, page: 0 })
+        .then((res) => {
+          this.remindData = res;
+        });
     },
   },
 };
 </script>
 
-<style>
+<style scoped>
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    margin-bottom: 18px;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
+
+  .box-card {
+    width: 100%;
+  }
 </style>
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index 2cc864db..656df4b0 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -1,45 +1,43 @@
 <template>
-  <el-drawer
-    :title="titleMap[mode]"
-    v-model="visible"
-    :size="1000"
-    destroy-on-close
-    @closed="closeDrawer"
-  >
-    <el-container v-loading="loading">
-      <!--<sc-title title="详细信息"></sc-title>-->
-      <el-main style="padding: 0 20px 20px 20px">
-        <el-form :model="form" :disabled="mode === 'show'" label-width="120px">
+  <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="12" :sm="24">
-              <el-form-item label="事件种类" prop="cates">
-               
-                      <el-tag v-for="item in form.cates_"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">{{item.name}}</el-tag>
-    
-			
+            <el-col :md="4" :sm="24">
+              <el-form-item label="事件种类"  prop="cates">
+                <el-tag
+                  v-for="item in form.cates_"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  >{{ item.name }}</el-tag
+                >
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24" v-if="form.area">
-              <el-form-item label="发生区域" prop="area">
-                <el-input v-model="form.area_.name" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24" v-if="form.employee">
+              <el-col :md="4" :sm="24" >
               <el-form-item label="当事人" prop="employee">
-                <el-input v-model="form.employee_.name" clearable></el-input>
+                 <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="12"
+              :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%">
+                <el-select v-model="form.employee_.type" style="width: 100%" :disabled="true">
                   <el-option
                     v-for="item in type_options"
                     :key="item.id"
@@ -47,45 +45,37 @@
                     :value="item.id"
                   />
                 </el-select>
+              </el-form-item>
+            </el-col>
 
-              </el-form-item>
-            </el-col>
-           
-             <el-col :md="12" :sm="24">
+            <el-col :md="8" :sm="24">
               <el-form-item label="发生时间">
-                <el-input
-                  v-model="form.create_time"
-                  clearable
-                ></el-input>
+                <el-input v-model="form.create_time" clearable :disabled="true"></el-input>
               </el-form-item>
             </el-col>
+
           
-            <el-col :md="12" :sm="24">
-              <el-form-item label="处理人">
-               <el-input v-model="form.handle_user" />
+           
+            <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="12" :sm="24">
-              <el-form-item label="处理时间">
-                <el-input
-                  v-model="form.handle_time"
-                  clearable
-                ></el-input>
+
+            <el-col :md="8" :sm="24">
+              <el-form-item label="人脸照">
+                <sc-upload v-model="form.face_img" title="人脸照" :disabled="true"></sc-upload>
               </el-form-item>
             </el-col>
-			 <el-col :md="12" :sm="24">
-              <el-form-item label="处理描述">
-                <el-input
-                  v-model="form.handle_desc"
-                  clearable
-                ></el-input>
+            <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="12" :sm="24">
+             
+              <el-col :md="6" :sm="24">
               <el-form-item label="事件标记">
-              
-                  <el-select v-model="form.mark " style="width: 100%">
+                <el-select v-model="form.mark" style="width: 100%" >
                   <el-option
                     v-for="item in mark_options"
                     :key="item.id"
@@ -93,40 +83,27 @@
                     :value="item.id"
                   />
                 </el-select>
-
-				
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="是否超时">
-                <el-switch v-model="form.is_timeout" />
-              </el-form-item>
-            </el-col>
-          
-            <el-col :md="12" :sm="24">
-              <el-form-item label="人脸照">
-                <sc-upload
-                  v-model="form.face_img"
-                
-                  title="人脸照"
-                ></sc-upload>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="全景照">
-                <sc-upload v-model="form.global_img" title="全景照"></sc-upload>
+              <el-col :md="8" :sm="24">
+              <el-form-item label="处理描述">
+                <el-input v-model="form.handle_desc" clearable ></el-input>
               </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>
-		  <scTable
+         
+      <sc-title title="事件推送列表"></sc-title>
+      <scTable
         ref="table"
         :data="remindData"
         row-key="id"
-		height="250px"
+        height="300px"
         fit
         stripe
         @resetQuery="resetQuery"
+		hidePagination
       >
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="事件种类">
@@ -140,17 +117,17 @@
             >
           </template>
         </el-table-column>
-       
+
         <el-table-column
           label="警报信息"
           prop="event_.voice_msg"
         ></el-table-column>
-       
+
         <el-table-column
           label="接收人"
           prop="recipient_.name"
         ></el-table-column>
-      
+
         <el-table-column label="是否可处理" prop="can_handle">
           <template #default="scope">
             <el-span v-if="scope.row.can_handle">是</el-span>
@@ -165,28 +142,22 @@
         </el-table-column>
 
         <el-table-column label="创建时间" prop="create_time"></el-table-column>
-
-       
       </scTable>
-      </el-main>
-    </el-container>
-  </el-drawer>
+	   </el-card>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-const defaultForm = {
-  id: null,
- 
-};
 export default {
+  name: "eventfrom",
   emits: ["success", "closed"],
   data() {
     return {
       loading: false,
       visible: false,
       isSaveing: false,
-      form: defaultForm,
-	  
+
       mode: "show",
       titleMap: {
         show: "事件信息查看",
@@ -196,53 +167,69 @@ export default {
         { id: "remployee", name: "相关方" },
         { id: "visitor", name: "访客" },
       ],
-	    mark_options: [
+      mark_options: [
         { id: 10, name: "正常" },
-        { id: 20, name: "误报" }
+        { id: 20, name: "误报" },
       ],
-	  remindData:[],
-	  eventID:""
+      form: [],
+      remindData: [],
+      eventID: "",
     };
   },
   mounted() {
-	
+    this.eventID = this.$route.query.id; //事件的ID
+    this.getEvent();
+    this.getRemind();
   },
   methods: {
-	 getRemind() {
-		console.log(this.eventID)
-      this.$API.ecm.remind.list.req({event:this.eventID,page: 0 }).then((res) => {
-        this.remindData = res;
+    getEvent() {
+      this.$API.ecm.event.item.req(this.eventID).then((res) => {
+        this.form = res;
       });
     },
-    //显示
-    open(mode) {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-    closeDrawer() {
-      this.visible = false;
-      this.$emit("closed");
+    getRemind() {
+      this.$API.ecm.remind.list
+        .req({ event: this.eventID, page: 0 })
+        .then((res) => {
+          this.remindData = res;
+        });
     },
+    submit(){
 
-    //表单注入数据
-    setData(data) {
-      //debugger;
-      console.log(defaultForm);
-      // this.form = defaultForm;
-      Object.assign(this.form, data);
-	  this.eventID=this.form.id;
-	  this.getRemind();
-	  
-    },
-    //设置过滤项
-    setFilters(filters) {
-      this.selectionFilters = filters;
-      this.setFiltersVisible = true;
-    },
+     
+       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;
+              })
+
+    }
   },
 };
 </script>
 
-<style>
+<style scoped>
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    margin-bottom: 18px;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
+
+  .box-card {
+    width: 100%;
+  }
 </style>
diff --git a/src/views/ecm/myevent.vue b/src/views/ecm/myevent.vue
index 63563e58..1cdf845b 100644
--- a/src/views/ecm/myevent.vue
+++ b/src/views/ecm/myevent.vue
@@ -35,6 +35,12 @@
             >
           </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-else>已处理</el-span>
+          </template>
+        </el-table-column>
        
         <el-table-column
           label="警报信息"
@@ -111,9 +117,11 @@ export default {
     
     //查看
     table_show(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("show").setData(row);
+     this.$router.push({
+        name: "eventhandlefrom",
+        query: {
+          id: row.event_.id,
+        },
       });
     },
     //搜索