diff --git a/.env.development b/.env.development
index 44539dd5..3787c6b3 100644
--- a/.env.development
+++ b/.env.development
@@ -7,8 +7,9 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
 # 接口地址
 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
 #VUE_APP_WS_API = 'ws://localhost:8000'
-VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
-#VUE_APP_BASEURL = http://127.0.0.1:8000
+#VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
+VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
+VUE_APP_BASEURL = http://127.0.0.1:8000
 
 # 本地端口
 VUE_APP_PORT = 2800
diff --git a/public/img/driver.png b/public/img/driver.png
new file mode 100644
index 00000000..be359126
Binary files /dev/null and b/public/img/driver.png differ
diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 1ae804c6..a879fc45 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -4,7 +4,7 @@ import http from "@/utils/request"
 export default {
 	employee: {
 		list: {
-			name: "获取企业员工",
+			name: "获取正式员工",
 			req: async function(data){
 				return await http.get(
 					`${config.API_URL}/hrm/employee/`,
@@ -19,7 +19,7 @@ export default {
 			}
 		},
 		item: {
-			name: "获取企业员工",
+			name: "获取正式员工",
 			req: async function(id){
 				return await http.get(
 					`${config.API_URL}/hrm/employee/${id}/`,
diff --git a/src/components/ehsSelect/epselect.vue b/src/components/ehsSelect/epselect.vue
index a0ca6e51..c6c5b4b1 100644
--- a/src/components/ehsSelect/epselect.vue
+++ b/src/components/ehsSelect/epselect.vue
@@ -229,7 +229,7 @@ export default {
       // choseTypeOptions: [
       //   {
       //     value: 'employee',
-      //     label: '企业员工'
+      //     label: '正式员工'
       //   },
       //   {
       //     value: 'remployee',
@@ -237,7 +237,7 @@ export default {
       //   }
       // ]
       userTypeOptions :{
-        'employee': '企业员工',
+        'employee': '正式员工',
         'remployee': '相关方',
         'visitor': '访客'
       }
diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue
index 542daec2..b4db3a80 100644
--- a/src/components/ehsSelect/userselect.vue
+++ b/src/components/ehsSelect/userselect.vue
@@ -233,7 +233,7 @@ export default {
       choseTypeOptions: [
         {
           value: 'employee',
-          label: '企业员工'
+          label: '正式员工'
         },
         {
           value: 'remployee',
@@ -249,7 +249,7 @@ export default {
         }
       ],
       userTypeOptions :{
-        'employee': '企业员工',
+        'employee': '正式员工',
         'remployee': '相关方',
         'visitor': '访客'
       }
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 8d783216..371af74a 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -70,8 +70,8 @@
             </el-scrollbar>
           </el-main>
           <el-footer>
-            <el-button type="primary">消息中心</el-button>
-            <el-button @click="markRead">全部设为已读</el-button>
+            <el-button type="primary" @click="goEvent">事件中心</el-button>
+            <!-- <el-button @click="markRead">全部设为已读</el-button> -->
           </el-footer>
         </el-container>
       </el-drawer>
@@ -136,6 +136,9 @@ export default {
           this.msgList = res;
         });
     },
+    goEvent() {
+      this.$router.push({name:"event"})
+    },
     createhandele(id) {
 this.$router.push({
         name: "eventhandlefrom",
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index df429eb8..5daed683 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -54,7 +54,7 @@
 							 :class="{'active':dropIndex==='1'}">全部
 						</div>
 						<div @click="changeDropIndex('2')" class="drop-content-item"
-							 :class="{'active':dropIndex==='2'}">内部员工
+							 :class="{'active':dropIndex==='2'}">正式员工
 							<div></div>
 						</div>
 						<div @click="changeDropIndex('3')" class="drop-content-item"
@@ -105,7 +105,7 @@
 					<div class="count-list-item">
 						<div class="item-img item-img2"></div>
 						<div class="item-info">
-							<div title="员工" class="normal">内部员工</div>
+							<div title="员工" class="normal">正式员工</div>
 							<div class="bottom">
 								<span class="large">{{ userCount.count_employee }}</span>&nbsp;<span
 									class="normal">人</span>
@@ -383,7 +383,7 @@
 							</div>
 							<div class="info-item">
 								<span class="info-item-name">类型：</span>
-								<span class="info-item-info" v-if="screenUserItem.type === 'employee'">内部员工</span>
+								<span class="info-item-info" v-if="screenUserItem.type === 'employee'">正式员工</span>
 								<span class="info-item-info" v-else>访客</span>
 							</div>
 							<div class="info-item">
@@ -800,7 +800,7 @@ export default {
 			//数据统计
 			userCount: {
 				total: 0,
-				count_employee: 0,//内部员工
+				count_employee: 0,//正式员工
 				count_remployee: 0,//访客
 				count_visitor: 0//相关方
 			},
@@ -1094,8 +1094,8 @@ export default {
 						obj.label = '全部';
 					} else if (i === 1) {
 						obj.id = '';
-						obj.name = '内部员工';
-						obj.label = '内部员工';
+						obj.name = '正式员工';
+						obj.label = '正式员工';
 						obj.children = children;
 					} else if (i === 2) {
 						obj.id = '';
diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index ddde3c3c..e2fec50d 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -1,18 +1,15 @@
 <template>
   <el-container>
-    <!-- <el-header>
+    <el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
-				<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
-				<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button>
+<el-select v-model="query.cates" placeholder="事件种类" @change="handleQuery">
+  <el-option v-for="item in cateOptions" :key="item.id">{{item.name}}</el-option>
+</el-select>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="姓名/手机号" clearable @click="handleQuery"></el-input>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+
 			</div>
-		</el-header> -->
+		</el-header>
     <el-main class="nopadding">
       <scTable
         ref="table"
@@ -47,7 +44,7 @@
                   scope.row.employee_.type != '' &&
                   scope.row.employee_.type == 'employee'
                 "
-                >企业员工</span
+                >正式员工</span
               >
               <span
                 v-if="
diff --git a/src/views/ecm/event_from.vue b/src/views/ecm/event_from.vue
index c0398915..265f1b11 100644
--- a/src/views/ecm/event_from.vue
+++ b/src/views/ecm/event_from.vue
@@ -167,7 +167,7 @@ export default {
         show: "事件信息查看",
       },
       type_options: [
-        { id: "employee", name: "企业员工" },
+        { id: "employee", name: "正式员工" },
         { id: "remployee", name: "相关方" },
         { id: "visitor", name: "访客" },
       ],
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index 6cb000f8..fc10a9fc 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -167,12 +167,12 @@ export default {
         show: "事件信息查看",
       },
       type_options: [
-        { id: "employee", name: "企业员工" },
+        { id: "employee", name: "正式员工" },
         { id: "remployee", name: "相关方" },
         { id: "visitor", name: "访客" },
       ],
       type_options2: {
-        employee: "企业员工",
+        employee: "正式员工",
         remployee: "相关方",
         visitor: "访客",
       },
diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue
index ae8ffd88..ee9b97a0 100644
--- a/src/views/home/widgets/components/eventlist.vue
+++ b/src/views/home/widgets/components/eventlist.vue
@@ -11,7 +11,7 @@
           <div v-for="item in dutyAgg" :key="item.workflow">
               <el-badge :value="item.count" class="item">
                 <el-button
-                  icon="el-icon-document-copy"
+                  icon="el-icon-promotion"
                   type="primary"
                   size="small"
                   @click="toTicket"
@@ -71,7 +71,7 @@
                     scope.row.employee_.type != '' &&
                     scope.row.employee_.type == 'employee'
                   "
-                  >企业员工</span
+                  >正式员工</span
                 >
                 <span
                   v-if="
diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue
index f2c8eaf7..fdd591c9 100644
--- a/src/views/home/widgets/components/ticket.vue
+++ b/src/views/home/widgets/components/ticket.vue
@@ -12,8 +12,8 @@
             <el-badge :value="operationnumber" class="item">
               <el-button
                 class="projecting"
-                icon="el-icon-document-copy"
-                type="primary"
+                icon="el-icon-bell"
+                type="danger"
                 size="small"
               ></el-button>
             </el-badge>
@@ -23,23 +23,34 @@
             <el-badge :value="rpjnumber" class="item">
               <el-button
                 class="projecting"
-                icon="el-icon-document-copy"
+                icon="el-icon-user"
+                type="success"
+                size="small"
+              ></el-button>
+            </el-badge>
+            <div style="font-size: 16px">相关方入厂</div>
+          </div>
+          <div>
+            <el-badge :value="visitnumber2" class="item">
+              <el-button
+                class="projecting"
+                icon="el-icon-van"
                 type="warning"
                 size="small"
               ></el-button>
             </el-badge>
-            <div style="font-size: 16px">相关方项目</div>
+            <div style="font-size: 16px">拉送货</div>
           </div>
           <div>
             <el-badge :value="visitnumber" class="item">
               <el-button
                 class="projecting"
-                icon="el-icon-document-copy"
-                type="success"
+                icon="el-icon-view"
+                type="primary"
                 size="small"
               ></el-button>
             </el-badge>
-            <div style="font-size: 16px">来访项目</div>
+            <div style="font-size: 16px">来访</div>
           </div>
         </div>
       </el-card>
@@ -61,7 +72,7 @@
               <div class="count-list-item">
                 <div class="item-img item-img1"></div>
                 <div class="item-info">
-                  <div title="员工" class="normal">内部员工</div>
+                  <div title="正式员工" class="normal">正式员工</div>
                   <div class="bottom">
                     <span class="large">{{ userCount.count_employee }}</span
                     >&nbsp;<span class="normal">人</span>
@@ -71,17 +82,27 @@
               <div class="count-list-item">
                 <div class="item-img item-img3"></div>
                 <div class="item-info">
-                  <div title="承包商" class="normal">相关方</div>
+                  <div title="相关方" class="normal">相关方</div>
                   <div class="bottom">
                     <span class="large">{{ userCount.count_remployee }}</span
                     >&nbsp;<span class="normal">人</span>
                   </div>
                 </div>
               </div>
+              <div class="count-list-item">
+                <div class="item-img item-img4"></div>
+                <div class="item-info">
+                  <div title="司机" class="normal">货车司机</div>
+                  <div class="bottom">
+                    <span class="large">{{ userCount.count_driver }}</span
+                    >&nbsp;<span class="normal">人</span>
+                  </div>
+                </div>
+              </div>
               <div class="count-list-item">
                 <div class="item-img item-img2"></div>
                 <div class="item-info">
-                  <div title="外来人员" class="normal">访客</div>
+                  <div title="访客" class="normal">访客</div>
                   <div class="bottom">
                     <span class="large">{{ userCount.count_visitor }}</span
                     >&nbsp;<span class="normal">人</span>
@@ -105,13 +126,15 @@ export default {
       ep_count_type: "2",
       userCount: {
         total: 0,
-        count_employee: 0, //内部员工
+        count_employee: 0, //正式员工
         count_remployee: 0, //访客
         count_visitor: 0, //相关方
+        count_driver: 0,
       },
-      operationnumber: null,
-      rpjnumber: null,
-      visitnumber: null,
+      operationnumber: 0,
+      rpjnumber: 0,
+      visitnumber: 0,
+      visitnumber2: 0,
     };
   },
   created() {
@@ -120,6 +143,7 @@ export default {
     this.getOperation();
     this.getRpj();
     this.getVisit();
+    this.getVisit2();
   },
   methods: {
     //工单待办
@@ -175,6 +199,14 @@ export default {
           this.visitnumber = res.count;
         });
     },
+    //司机
+    getVisit2() {
+      this.$API.vm.visit.list
+        .req({ page: 1, page_size: 1, state: 40, type: 50 })
+        .then((res) => {
+          this.visitnumber2 = res.count;
+        });
+    },
   },
 };
 </script>
@@ -296,6 +328,11 @@ export default {
           background-size: 100% 100%;
         }
 
+        .item-img4 {
+          background: url(/public/img/driver.png) no-repeat;
+          background-size: 100% 100%;
+        }
+
         .item-info {
           .normal {
             font-size: 12px;
diff --git a/src/views/hrm/employee.vue b/src/views/hrm/employee.vue
index 23fc3c2c..97ff370d 100644
--- a/src/views/hrm/employee.vue
+++ b/src/views/hrm/employee.vue
@@ -199,7 +199,7 @@ export default {
         employee: "",
       },
       userTypeOptions: {
-        employee: "企业员工",
+        employee: "正式员工",
         remployee: "相关方",
         visitor: "访客",
       },
diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue
index 9a3ef75d..15529245 100644
--- a/src/views/hrm/ep_form.vue
+++ b/src/views/hrm/ep_form.vue
@@ -173,7 +173,7 @@
 				isSaveing: false,
 				form: defaultForm,
 				epTypes: {
-					'employee': "企业员工",
+					'employee': "正式员工",
 					"remployee": "相关方",
 					"visitor": "访客"
 				},
diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index 75d018ba..a443b9f9 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -277,7 +277,7 @@ export default {
       temp: [],
       postList: [],
 	  userTypeOptions :{
-        'employee': '企业员工',
+        'employee': '正式员工',
         'remployee': '相关方',
         'visitor': '访客'
       },