diff --git a/src/api/model/ecm.js b/src/api/model/ecm.js
index e7d61a04..b30abf74 100644
--- a/src/api/model/ecm.js
+++ b/src/api/model/ecm.js
@@ -66,11 +66,20 @@ export default {
 				);
 			}
 		},
-		read:{
-			name: "详情",
-			req: async function (id) {
+		item: {
+			name: "获取",
+			req: async function(id){
 				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 {
 	}
 	
 	
-}
\ No newline at end of file
+}
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 76d20958..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,27 +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"
@@ -113,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;
-     
-      });
+      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") {
@@ -173,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/event_from.vue b/src/views/ecm/event_from.vue
index 8682a42f..c0398915 100644
--- a/src/views/ecm/event_from.vue
+++ b/src/views/ecm/event_from.vue
@@ -187,7 +187,7 @@ export default {
   },
   methods: {
     getEvent() {
-      this.$API.ecm.event.read.req(this.eventID).then((res) => {
+      this.$API.ecm.event.item.req(this.eventID).then((res) => {
         this.form = res;
       });
     },
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index 2c91dfcf..656df4b0 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -72,11 +72,7 @@
                 <sc-upload v-model="form.global_img" title="全景照" :disabled="true"></sc-upload>
               </el-form-item>
             </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-form-item label="事件标记">
                 <el-select v-model="form.mark" style="width: 100%" >
@@ -187,7 +183,7 @@ export default {
   },
   methods: {
     getEvent() {
-      this.$API.ecm.event.read.req(this.eventID).then((res) => {
+      this.$API.ecm.event.item.req(this.eventID).then((res) => {
         this.form = res;
       });
     },
@@ -200,8 +196,16 @@ export default {
     },
     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;
+              })
 
-      
     }
   },
 };
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,
+        },
       });
     },
     //搜索