From 1e76b8ee46c99ce3824771bd236743dded3e6416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 12 Sep 2022 21:17:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9event?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  |  4 +--
 src/views/am/area.vue             | 22 ++-------------
 src/views/ecm/event.vue           | 46 ++++++++++++-------------------
 src/views/ecm/event_cate_form.vue |  2 +-
 src/views/opm/operation_form.vue  |  7 +++--
 src/views/sys/user.vue            |  2 +-
 6 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/.env.development b/.env.development
index 3787c6b3..9b458fcf 100644
--- a/.env.development
+++ b/.env.development
@@ -7,8 +7,8 @@ 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_API_BASEURL = http://127.0.0.1:8000/api
+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
 
 # 本地端口
diff --git a/src/views/am/area.vue b/src/views/am/area.vue
index 431caca2..809ee55f 100644
--- a/src/views/am/area.vue
+++ b/src/views/am/area.vue
@@ -15,7 +15,7 @@
             <div class="right-panel">
               <div class="right-panel-search">
                 <el-input
-                  v-model="search.keyword"
+                  v-model="query.search"
                   placeholder="编号/名称"
                   clearable
                 ></el-input>
@@ -162,21 +162,6 @@
               @click="handleFormaccess('add')"
             ></el-button>
           </div>
-          <!-- <div class="right-panel">
-            <div class="right-panel-search">
-              <el-input
-                v-model="search.keyword"
-                placeholder="姓名/手机号"
-                clearable
-                @click="handleQuery"
-              ></el-input>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                @click="handleQuery"
-              ></el-button>
-            </div>
-          </div> -->
         </el-header>
         <el-main class="nopadding">
           <scTable
@@ -306,9 +291,6 @@ export default {
       apiObj: this.$API.am.area.list,
       query: {},
       selection: [],
-      search: {
-        keyword: null,
-      },
       levels: {
         10: "低风险",
         20: "一般风险",
@@ -438,7 +420,7 @@ export default {
 
     //搜索
     handleQuery() {
-      	this.$refs.table.queryData(this.search)
+      	this.$refs.table.queryData(this.query)
     },
 
     //根据ID获取树结构
diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index f9fd218d..3eaf047c 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -64,39 +64,16 @@
           </template>
         </el-table-column>
         <el-table-column label="发生区域" prop="area_.name"></el-table-column>
-        <el-table-column label="当事人" prop="employee_.name">
+        <el-table-column label="事件类型" prop="obj_cate">
           <template #default="scope">
-            <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">{{
-              scope.row.employee_.name
-            }}</span>
-            <span v-else>未知人员</span>
+            {{objCateOptions[scope.row.obj_cate]}}
           </template>
         </el-table-column>
-
-        <el-table-column label="人员类型" prop="employee_.type">
+        <el-table-column label="事件对象">
           <template #default="scope">
-            <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">
-              <span
-                v-if="
-                  scope.row.employee_.type != '' &&
-                  scope.row.employee_.type == 'employee'
-                "
-                >正式员工</span
-              >
-              <span
-                v-if="
-                  scope.row.employee_.type != '' &&
-                  scope.row.employee_.type == 'remployee'
-                "
-                >相关方</span
-              >
-              <span
-                v-if="
-                  scope.row.employee_.type != '' &&
-                  scope.row.employee_.type == 'visitor'
-                "
-                >访客</span
-              >
+            <span v-if="scope.opl"></span>
+            <span v-else-if="scope.employee">
+              {{eTypeOptions[scope.row.employee_.type]}}-{{scope.row.employee_.name}}
             </span>
           </template>
         </el-table-column>
@@ -166,6 +143,17 @@ export default {
     return {
       defaultTime: ['00:00:00', '23:59:59'],
       timeRange: [],
+      objCateOptions: {
+        'people':'人员',
+        'opl': '作业',
+        'other': '其他'
+      },
+      eTypeOptions:{
+        'employee': '正式员工',
+        'remployee': '相关方',
+        'visitor': '访客',
+        'driver': '司机'
+      },
       cateOptions: [],
       areaOptions: [],
       dialog: {
diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue
index 14aec6d5..2bd82d6f 100644
--- a/src/views/ecm/event_cate_form.vue
+++ b/src/views/ecm/event_cate_form.vue
@@ -40,7 +40,7 @@
         </el-col>
 
         <el-col :md="12" :sm="24">
-          <el-form-item label="自主算法" prop="self_algo">
+          <el-form-item label="需布设" prop="self_algo">
             <el-switch v-model="form.self_algo"></el-switch>
           </el-form-item>
         </el-col>
diff --git a/src/views/opm/operation_form.vue b/src/views/opm/operation_form.vue
index 6d560e42..82d83124 100644
--- a/src/views/opm/operation_form.vue
+++ b/src/views/opm/operation_form.vue
@@ -55,7 +55,7 @@
             </el-col>
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="作业区域" prop="area">
-                <el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange">
+                <el-select v-model="form.area" placeholder="选择作业区域">
                   <el-option
                     v-for="item in areaoptions"
                     :key="item.id"
@@ -194,6 +194,7 @@ export default {
   mounted() {
     this.getDept();
     this.getArea();
+    this.getVchannels();
   },
   methods: {
     //所属部门,属地部门，业务部门
@@ -218,8 +219,8 @@ export default {
         this.coordinatoroptions = res;
       });
     },
-    areaChange(val) {
-      this.$API.third.tdevice.list.req({ type: 60, page: 0, area: val }).then((res) => {
+    getVchannels(){
+      this.$API.third.tdevice.list.req({ type: 60, page: 0 }).then((res) => {
         this.vchannelOptions = res;
       });
     },
diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index eb1cfff4..5c3b4d63 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -296,7 +296,7 @@ export default {
         'employee': '正式员工',
         'remployee': '相关方',
         'visitor': '访客',
-        'driver':'司机'
+        'driver':'货车司机'
       },
       userTypeOptions2: [
         {label:"正式员工", value:"employee"},

From 60a352aec89f13153e48e6c16caf3a471f8d4785 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, 13 Sep 2022 11:17:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?event=20vue=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ecm/event.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index e11d5ade..6a78da1e 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -71,8 +71,8 @@
         </el-table-column>
         <el-table-column label="事件对象">
           <template #default="scope">
-            <span v-if="scope.opl"></span>
-            <span v-else-if="scope.employee">
+            <span v-if="scope.row.opl">{{scope.row.operation_name}}</span>
+            <span v-else-if="scope.row.employee">
               {{eTypeOptions[scope.row.employee_.type]}}-{{scope.row.employee_.name}}
             </span>
           </template>