From 5a910c67d1b6958e3d9955280873bee5817c20b3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 25 May 2023 13:53:40 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E4=BA=BA=E9=83=A8=E9=97=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E6=B7=BB=E5=92=8C=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=A5=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/ecm.js    |  6 ++++++
 src/views/ecm/event.vue | 40 +++++++++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/api/model/ecm.js b/src/api/model/ecm.js
index ae32c8f4..d0ffb12c 100644
--- a/src/api/model/ecm.js
+++ b/src/api/model/ecm.js
@@ -82,6 +82,12 @@ export default {
 					data);
 			}
 		},
+		delete:{
+			name: "删除",
+			req: async function(id){
+				return await http.delete(`${config.API_URL}/ecm/event/${id}/`);
+			}
+		},
 		cateAgg: {
 			name: "时间分类聚合",
 			req: async function(data){
diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index e1bfb061..d65ee856 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -60,6 +60,7 @@
         stripe
         @resetQuery="resetQuery"
       >
+        <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
           <template #default="scope">
@@ -73,7 +74,7 @@
           </template>
         </el-table-column>
         <el-table-column label="发生区域" prop="area_.name"></el-table-column>
-        <el-table-column label="事件类型" prop="obj_cate">
+        <el-table-column label="事件类型" prop="obj_cate" width="100">
           <template #default="scope">
             {{objCateOptions[scope.row.obj_cate]}}
           </template>
@@ -82,7 +83,7 @@
           <template #default="scope">
             <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}}
+              {{eTypeOptions[scope.row.employee_.type]}}-{{scope.row.employee_.name}}-{{ scope.row.employee_.belong_dept_name }}
             </span>
           </template>
         </el-table-column>
@@ -96,8 +97,6 @@
           label="处理人"
           prop="handle_user_name"
         ></el-table-column>
-
-        <!-- <el-table-column label="处理时间" prop="handle_time"></el-table-column> -->
         <el-table-column label="事件标记" prop="mark">
           <template #default="scope">
             <el-tag v-if="scope.row.mark == 20" type="warning" effect="plain">误报</el-tag>
@@ -128,12 +127,11 @@
               @click="table_handle(scope.row, scope.$index)"
               >处理</el-button
             >
-            <!-- <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)">
+            <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)">
 								<template #reference>
 									<el-button text type="danger" size="small">删除</el-button>
 								</template>
-							</el-popconfirm> -->
+							</el-popconfirm>
           </template>
         </el-table-column>
       </scTable>
@@ -142,9 +140,13 @@
       v-if="dialog.handle"
       ref="handleDialog"
       :eventID="eventID"
+      @oplDetail="oplDetail"
       @success="handleSuccess"
       @closed="dialog.handle = false"
     ></detail-dialog>
+    <el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情" :close-on-click-modal="false">
+      <sc-fire :id="oplId"></sc-fire>
+    </el-drawer>
   </el-container>
 </template>
     <script>
@@ -160,6 +162,7 @@ export default {
   data() {
     return {
       dLoading: false,
+      showLimited:false,
       defaultTime: ['00:00:00', '23:59:59'],
       timeRange: [],
       objCateOptions: {
@@ -187,6 +190,7 @@ export default {
         keyword: null,
       },
       eventID:'',
+      oplId:null,
     };
   },
   created() {
@@ -202,6 +206,11 @@ export default {
         this.$refs.handleDialog.open("edit").setData(row);
       });
     },
+    table_del(row){
+      this.$API.ecm.event.delete.req(row.id).then(res=>{
+        this.$refs.table.refresh();
+      })
+    },
     //查看
     table_show(row) {
       this.eventID = row.id;
@@ -223,7 +232,12 @@ export default {
     handleSuccess(){
       this.$refs.table.refresh();
     },
-    
+    oplDetail(data){
+      debugger;
+      console.log(data)
+      this.oplId = data;
+      this.showLimited = true;
+    },
     //搜索
     handleQuery() {
       if(this.timeRange){
@@ -249,11 +263,11 @@ export default {
     exportList() {
       this.dLoading = true;
      this.$API.ecm.event.export_excel
-              .req(this.query)
-              .then(res=>{
-                window.open(res.path, "_blank");
-                this.dLoading = false;
-              }).catch(e=>{this.dLoading = false;})
+      .req(this.query)
+      .then(res=>{
+        window.open(res.path, "_blank");
+        this.dLoading = false;
+      }).catch(e=>{this.dLoading = false;})
     }
   },
 };

From 4a9694c429f400574139e604cd401119cdab6f78 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 25 May 2023 13:57:22 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A5=A8=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=94=B9=E5=8A=A8=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=9D=83=E9=99=90=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scOpl/scFire.vue    | 6 ++++--
 src/directives/auth.js             | 7 ++++---
 src/directives/authsAll.js         | 6 +++---
 src/views/ecm/event_handlefrom.vue | 5 ++++-
 src/views/opm/opl.vue              | 2 +-
 src/views/wf/ticketdetail.vue      | 2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue
index 4766432f..5c30f329 100644
--- a/src/components/scOpl/scFire.vue
+++ b/src/components/scOpl/scFire.vue
@@ -294,12 +294,12 @@
 		mounted() {
 			let that = this;
 			that.oplId = that.id; //许可证ID
-			that.operationId = that.wfId; //zuoyeID
+			
 			this.$nextTick(()=>{
 				that.getOplData();
 				that.getworkerList();
 				that.getgasList();
-				that.getOperation();
+				
 			})
 		},
 		methods: {
@@ -325,6 +325,8 @@
 					that.form = res;
 					that.oplcateCode = res.cate_code;
 					that.ticketId = res.ticket;
+					that.operationId = res.operation; //zuoyeID
+					that.getOperation();
 					res.create_imgs_.forEach(item=>{
 						console.log(item)
 						that.create_imgs_list.push({
diff --git a/src/directives/auth.js b/src/directives/auth.js
index 805ad4ce..14d1d72e 100644
--- a/src/directives/auth.js
+++ b/src/directives/auth.js
@@ -13,9 +13,10 @@ export default {
 			return
 		}
 		let permissions = tool.data.get("PERMISSIONS");
-		if (permissions.indexOf('superuser') > -1){
-			return
-		} 
+
+		// if (permissions.indexOf('superuser') > -1){
+		// 	return
+		// } 
 		if (!permissions.some((v) => v === binding.value)) el.parentNode.removeChild(el);
 	}
 }
diff --git a/src/directives/authsAll.js b/src/directives/authsAll.js
index 2ca84c0b..883abb3c 100644
--- a/src/directives/authsAll.js
+++ b/src/directives/authsAll.js
@@ -13,9 +13,9 @@ export default {
 			return
 		}
 		let permissions = tool.data.get("PERMISSIONS");
-		if (permissions.indexOf('superuser') > -1){
-			return
-		}
+		// if (permissions.indexOf('superuser') > -1){
+		// 	return
+		// }
 		const flag = judementSameArr(binding.value, permissions);
 		if (!flag) el.parentNode.removeChild(el);
 	}
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index cd9bcb07..4fc3471d 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -41,7 +41,7 @@
             <el-form-item v-if="form.obj_cate=='people'" label="触发人：">
               <span v-if="form.employee_">{{ form.employee_.name }}</span>
             </el-form-item>
-            <el-form-item v-if="form.obj_cate=='opl'" label="触发作业:"><span>{{ form.operation_name }}</span></el-form-item>
+            <el-form-item v-if="form.obj_cate=='opl'" label="触发作业:"><span @click="oplClick(form.opl)">{{ form.operation_name }}</span></el-form-item>
             <el-form-item v-if="form.obj_cate=='area'" label="触发区域:"><span v-if="form.area_">{{ form.area_.name }}</span></el-form-item>
            </el-col>
            <el-col :span="10">
@@ -271,6 +271,9 @@ export default {
         return res;
       });
     },
+    oplClick(opl){
+      this.$emit("oplDetail",opl);
+    },
   },
 };
 </script>
diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue
index 80b7056a..b8b37e6d 100644
--- a/src/views/opm/opl.vue
+++ b/src/views/opm/opl.vue
@@ -87,7 +87,7 @@
       </scTable>
     </el-card>
     <el-drawer :size="'50%'" v-model="showLimited" class="scOplDrawer" :show-close="showClose" id="scOplDrawer">
-      <sc-fire :id="oplId" :wfId="operationId"></sc-fire>
+      <sc-fire :id="oplId"></sc-fire>
     </el-drawer>
   </el-main>
 </template>
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index 4b8bcdca..ffa72656 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -211,7 +211,7 @@
 		</div>
 	</el-dialog>
 	<el-drawer :size="'50%'" v-model="showLimited" title="作业许可证详情" :close-on-click-modal="false">
-		<sc-fire :id="projectId" :wfId="operationId"></sc-fire>
+		<sc-fire :id="projectId"></sc-fire>
 	</el-drawer>
 </template>
 

From 61e4a0a42efe35f8ab69e4872290f44135a14a8c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 25 May 2023 14:00:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E4=BB=A5=E5=8F=8A=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E5=85=B3=E8=81=94=E9=83=A8=E9=97=A8=E5=92=8C=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=A5=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ecm/event.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue
index d65ee856..57f076a0 100644
--- a/src/views/ecm/event.vue
+++ b/src/views/ecm/event.vue
@@ -60,7 +60,6 @@
         stripe
         @resetQuery="resetQuery"
       >
-        <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
           <template #default="scope">

From dc4764c6ffcfe626a520d8bc708b5980d10bc48e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 25 May 2023 14:23:43 +0800
Subject: [PATCH 4/4] 1

---
 src/directives/auths.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/directives/auths.js b/src/directives/auths.js
index 99b6bd27..a6fbeb00 100644
--- a/src/directives/auths.js
+++ b/src/directives/auths.js
@@ -13,9 +13,9 @@ export default {
 			return
 		}
 		let permissions = tool.data.get("PERMISSIONS");
-		if (permissions.indexOf('superuser') > -1){
-			return
-		}
+		// if (permissions.indexOf('superuser') > -1){
+		// 	return
+		// }
 		let flag = false;
 		permissions.map((val) => {
 			binding.value.map((v) => {