From f9868d0494cb04288dc048bfc592854a70d8905c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 6 Sep 2022 15:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   5 +-
 public/img/driver.png                         | Bin 0 -> 3857 bytes
 src/api/model/hrm.js                          |   4 +-
 src/components/ehsSelect/epselect.vue         |   4 +-
 src/components/ehsSelect/userselect.vue       |   4 +-
 src/layout/components/userbar.vue             |   7 +-
 src/views/bigScreen/index.vue                 |  12 ++--
 src/views/ecm/event.vue                       |  17 ++---
 src/views/ecm/event_from.vue                  |   2 +-
 src/views/ecm/event_handlefrom.vue            |   4 +-
 .../home/widgets/components/eventlist.vue     |   4 +-
 src/views/home/widgets/components/ticket.vue  |  65 ++++++++++++++----
 src/views/hrm/employee.vue                    |   2 +-
 src/views/hrm/ep_form.vue                     |   2 +-
 src/views/sys/user.vue                        |   2 +-
 15 files changed, 86 insertions(+), 48 deletions(-)
 create mode 100644 public/img/driver.png

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 0000000000000000000000000000000000000000..be35912600c65cbaf39c00d7403244c54494fe14
GIT binary patch
literal 3857
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
T_lz-N00000NkvXXu0mjfev(9<

literal 0
HcmV?d00001

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': '访客'
       },