From f81f1c17d33da05be59076b59dfdf7925cf5a466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 31 Aug 2022 14:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8C=85=E6=8B=AC=E5=B7=A5=E5=8D=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js                    |   5 -
 src/views/ecm/notify_setting.vue       |   2 +-
 src/views/ecm/notify_settings_form.vue |   2 +-
 src/views/opm/fire.vue                 |  19 +--
 src/views/opm/operation_form.vue       |  52 ++++++--
 src/views/ops/server.vue               |   2 +-
 src/views/wf/details.vue               | 173 +++++++++++++++----------
 src/views/wf/state.vue                 |   2 +-
 src/views/wf/ticketdetail.vue          |  11 +-
 src/views/wf/transform.vue             |  10 +-
 10 files changed, 169 insertions(+), 109 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 0dfcf3ce..cee2d38c 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -195,7 +195,6 @@ const routes = [
         "meta": {
           "title": "我创建的",
           "icon": "el-icon-folder-add",
-          "perms": ["ownerwork"]
         },
         "component": "wf/ownerwork"
       }
@@ -207,7 +206,6 @@ const routes = [
         "meta": {
           "title": "待办工单",
           "icon": "el-icon-folder-opened",
-          "perms": ["duty"]
         },
         "component": "wf/dutywork"
       },
@@ -217,7 +215,6 @@ const routes = [
         "meta": {
           "title": "我处理的",
           "icon": "el-icon-expand",
-          "perms": ["worked"]
         },
         "component": "wf/worked"
       },
@@ -227,7 +224,6 @@ const routes = [
         "meta": {
           "title": "抄送我的",
           "icon": "el-icon-edit-pen",
-          "perms": ["ccwork"]
         },
         "component": "wf/ccwork"
       },
@@ -238,7 +234,6 @@ const routes = [
           "title": "工单详情",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["allwork"]
         },
         "component": "wf/ticketdetail"
       },
diff --git a/src/views/ecm/notify_setting.vue b/src/views/ecm/notify_setting.vue
index d0adcdb6..9d2b7bec 100644
--- a/src/views/ecm/notify_setting.vue
+++ b/src/views/ecm/notify_setting.vue
@@ -40,7 +40,7 @@
             <el-table-column
               label="标识"
               prop="code"
-              width="80"
+              width="100"
             ></el-table-column>
             <el-table-column label="触发" prop="trigger" width="80">
               <template #default="scope">
diff --git a/src/views/ecm/notify_settings_form.vue b/src/views/ecm/notify_settings_form.vue
index 6687f3af..f4a7ec83 100644
--- a/src/views/ecm/notify_settings_form.vue
+++ b/src/views/ecm/notify_settings_form.vue
@@ -175,7 +175,7 @@ export default {
         wechat_enable: false,
         sms_enable: true,
         filter_recipient: null,
-        filter_area_level: null,
+        filter_area_level: 10,
       },
       //验证规则
       rules: {
diff --git a/src/views/opm/fire.vue b/src/views/opm/fire.vue
index c4fedc2f..72c631d8 100644
--- a/src/views/opm/fire.vue
+++ b/src/views/opm/fire.vue
@@ -486,6 +486,7 @@
 			<div style="margin-top:20px;text-align:center">
 			<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
 			<el-button
+				:loading="tLoading"
 				v-for=" item in initForm.transitions"
 				:key="item.id"
 				type="primary"
@@ -589,6 +590,7 @@
 					true: "正常",
 					false: "不正常",
 				},
+				tLoading: false
 			};
 		},
 		mounted() {
@@ -761,7 +763,7 @@
 						.req(this.formworker)
 						.then((res) => {
 							this.$message.success("创建作业人员成功");
-							this.$refs.workerTable.refresh();
+							this.getworkerList(this.oplId);
 							this.workerdialog = false;
 						})
 						.catch((err) => {
@@ -793,7 +795,7 @@
 						.req(this.formgas)
 						.then((res) => {
 							this.$message.success("创建气体检测记录成功");
-							this.$refs.gasTable.refresh();
+							this.getgasList(this.oplId);
 							this.gasdialog = false;
 
 						})
@@ -831,14 +833,13 @@
 				ticket.workflow = this.initForm.workflow;
 				ticket.ticket_data = {opl: this.oplId};
 				ticket.transition = id;
-				ticket.title = this.form.name + this.pagtitle + '申请';
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
 				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
 					this.$message.success("提交成功");
-					this.$router.push({
-						name: "opl",
-						query: {},
-					});
-				});
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
 			},
 
 			//退出界面
@@ -846,7 +847,7 @@
 				this.$router.push({
 					name: "opl",
 					query: {
-						operationid: this.$route.query.id,//作业ID
+						operationid: this.operationId,//作业ID
 
 					},
 				});
diff --git a/src/views/opm/operation_form.vue b/src/views/opm/operation_form.vue
index 521cb931..28a8f969 100644
--- a/src/views/opm/operation_form.vue
+++ b/src/views/opm/operation_form.vue
@@ -21,11 +21,6 @@
                 <el-input v-model="form.name" type="text" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="具体地点" prop="place">
-                <el-input v-model="form.place" type="text" clearable></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="开始时间"  prop="start_time">
                 <el-date-picker
@@ -60,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="选择作业区域">
+                <el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange">
                   <el-option
                     v-for="item in areaoptions"
                     :key="item.id"
@@ -70,18 +65,24 @@
                 </el-select>
               </el-form-item>
             </el-col>
-         
+                      <el-col :md="24" :sm="12" :xs="24">
+              <el-form-item label="具体地点" prop="place">
+                <el-input v-model="form.place" type="text" clearable></el-input>
+              </el-form-item>
+            </el-col>
          
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="业务部门" prop="dept_bus">
                 <el-cascader
                   placeholder="选择业务部门"
+                  @change="dept1Change"
                    getCheckedNodes="true"
                    :props="{
                     expandTrigger: 'hover', // 次级菜单的展开方式
                     label: 'label', //
                     value: 'value', //
                     emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+                    checkStrictly: true                  
                   }"
                   v-model="form.dept_bus"
                   :options="deptoptions"
@@ -117,11 +118,27 @@
                     label: 'label', //
                     value: 'value', //
                     emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+                    checkStrictly: true
                   }"
                   clearable
                 />
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24" :xs="24">
+              <el-form-item label="监控摄像头"  prop="vchannels">
+                <el-select
+                  v-model="form.vchannels"
+                  :multiple = "true"
+                >
+                  <el-option
+                    v-for="item in vchannelOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
       </el-main>
@@ -171,12 +188,13 @@ export default {
       deptoptions: [],
       areaoptions: [],
       coordinatoroptions:[],
+      vchannelOptions: []
     };
   },
   mounted() {
     this.getDept();
     this.getArea();
-     this.getUser();
+    //  this.getUser();
   },
   methods: {
     //所属部门,属地部门，业务部门
@@ -194,13 +212,25 @@ export default {
         this.areaoptions = res;
       });
     },
-    //业务部门协调员
-     getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
+    dept1Change(val) {
+      // 业务部门变化
+      this.$API.system.user.list.req({ page: 0, belong_dept: val }).then((res) => {
        
         this.coordinatoroptions = res;
       });
     },
+    areaChange(val) {
+      this.$API.third.tdevice.list.req({ type: 60, page: 0, area: val }).then((res) => {
+        this.vchannelOptions = res;
+      });
+    },
+    //业务部门协调员
+    //  getUser() {
+    //   this.$API.system.user.list.req({ page: 0 }).then((res) => {
+       
+    //     this.coordinatoroptions = res;
+    //   });
+    // },
     
     //显示
     open(mode = "add") {
diff --git a/src/views/ops/server.vue b/src/views/ops/server.vue
index 3c072a23..60a1bbf6 100644
--- a/src/views/ops/server.vue
+++ b/src/views/ops/server.vue
@@ -42,7 +42,7 @@
                 >{{ diskData.used }}GB</el-descriptions-item
               >
               <el-descriptions-item label="当前使用率"
-                >{{ diskData.percent }}GB</el-descriptions-item
+                >{{ diskData.percent }}%</el-descriptions-item
               >
             </el-descriptions>
           </el-card>
diff --git a/src/views/wf/details.vue b/src/views/wf/details.vue
index 4f2dad88..e7b4d24d 100644
--- a/src/views/wf/details.vue
+++ b/src/views/wf/details.vue
@@ -1,78 +1,107 @@
 <template>
-	<el-container>
-		<el-main class="nopadding">
-			<el-table
-				:data="logs"
-				fit
-				stripe
-				style="width: 100%;"
-				height="400"
-				highlight-current-row
-			>
-				<el-table-column label="工单标题" min-width="100">
-					<template #default="scope">
-						<span v-if="scope.row.ticket_data.title">{{ scope.row.ticket_data.title }}中</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="进行状态" min-width="100">
-					<template #default="scope">
-						<span>{{ scope.row.state_.name }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作人" min-width="100">
-					<template #default="scope">
-						<el-span v-if="scope.row.participant_">{{scope.row.participant_.name }}</el-span>
-						<el-span v-if="scope.row.participant_str">{{scope.row.participant_str }}</el-span>
-					</template>
-				</el-table-column>
-				<el-table-column
-					label="操作意见"
-					min-width="100"
-					prop="suggestion"
-				>
-				</el-table-column>
-				<el-table-column
-					label="更新时间"
-					min-width="100"
-					prop="update_time"
-				>
-				</el-table-column>
-			</el-table>
-		</el-main>
-	</el-container>
+  <el-container>
+    <el-main class="nopadding">
+      <el-table
+        :data="logs"
+        fit
+        stripe
+        style="width: 100%"
+        height="400"
+        highlight-current-row
+      >
+        <el-table-column label="工单标题" min-width="100">
+          <template #default="scope">
+            <span v-if="scope.row.ticket_data.title">{{
+              scope.row.ticket_data.title
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="进行状态" min-width="100">
+          <template #default="scope">
+            <span>{{ scope.row.state_.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作属性" min-width="100">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.transition_attribute == 1"
+              >同意</el-tag
+            >
+            <el-tag
+              type="success"
+              v-else-if="scope.row.transition_attribute == 2"
+              >拒绝</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="操作类型" min-width="100">
+          <template #default="scope">
+            <span>{{ interveneTypeOptions[scope.row.intervene_type] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人" min-width="100">
+          <template #default="scope">
+            <el-span v-if="scope.row.participant_">{{
+              scope.row.participant_.name
+            }}</el-span>
+            <el-span v-if="scope.row.participant_str">{{
+              scope.row.participant_str
+            }}</el-span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作意见" min-width="100" prop="suggestion">
+        </el-table-column>
+        <el-table-column label="更新时间" min-width="100" prop="update_time">
+        </el-table-column>
+      </el-table>
+    </el-main>
+  </el-container>
 </template>
 <!--工单处理详情组件-->
 <script>
-	export default {
-		name: "detail",
-		props: {
-			ticket: {
-				type: String,
-				default: null
-			}
-		},
-		data() {
-			return {
-				logs: [],
-				ticketId: null,
-			};
-		},
-		mounted() {
-			debugger;
-			this.ticketId = this.ticket;
-			this.getFlowlogss();
-		},
-		methods: {
-			getFlowlogss() {
-				let that = this;
-				this.$API.wf.ticket.ticketFlowlogs.req(that.ticketId).then(res => {
-					if (res.err_msg) {
-					} else {
-						that.logs = res;
-					}
-				});
-			},
-		},
-	};
+export default {
+  name: "detail",
+  props: {
+    ticket: {
+      type: String,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      logs: [],
+      ticketId: null,
+      interveneTypeOptions: {
+        0: "正常处理",
+        1: "转交",
+        2: "加签",
+        3: "加签完成",
+        4: "接单",
+        5: "评论",
+        6: "删除",
+        7: "强制关闭",
+        8: "强制修改状态",
+        9: "hook",
+        10: "撤回",
+        11: "抄送",
+      },
+    };
+  },
+  mounted() {
+    debugger;
+    this.ticketId = this.ticket;
+    this.getFlowlogss();
+  },
+  methods: {
+    getFlowlogss() {
+      let that = this;
+      this.$API.wf.ticket.ticketFlowlogs.req(that.ticketId).then((res) => {
+        if (res.err_msg) {
+        } else {
+          that.logs = res;
+        }
+      });
+    },
+  },
+};
 </script>
 
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index 266c6f2e..5d6200c2 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -23,7 +23,7 @@
         <el-table-column label="名称" prop="name"></el-table-column>
         <el-table-column label="是否隐藏">
           <template #default="scope">
-            <span v-if="scope.row.is_hidde">是</span>
+            <span v-if="scope.row.is_hidden">是</span>
             <span v-else>否</span>
           </template>
         </el-table-column>
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index 4e7b7453..ee3dda19 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -5,7 +5,7 @@
 				<work-step v-if="ticketDetail.state" ref="workStep" :ticket="ticketDetail"></work-step>
 				<el-button
 					class="ticketRetry"
-					v-if="ticketDetail.state_&&ticketDetail.state_.name==='任务执行'"
+					v-if="!ticketDetail.script_run_last_result"
 					@click="reStart"
 					type="primary"
 				>
@@ -159,7 +159,7 @@
 						</el-button>
 					</div>
 					<div>
-						<el-button v-for="item in operationBtn" :key="item.id" class="filter-item"
+						<el-button :loading="submitLoading" v-for="item in operationBtn" :key="item.id" class="filter-item"
 								   :type="item.attribute_type===2?'danger':'primary'" @click="operationSubmit(item.id)">
 							{{item.name}}
 						</el-button>
@@ -275,6 +275,7 @@
 					{id: 40, name: '其他'},
 				],
 				dosOption: [],
+				submitLoading: false,
 			};
 		},
 		created() {
@@ -408,16 +409,18 @@
 				params.transition = id;
 				params.ticket_data = {};
 				params.suggestion = this.form.suggestion;
-				if (this.ticketDetail.state_.name === '作业负责人关闭') {
+				this.submitLoading = true
+				if (this.ticketDetail.state_.key === 'opl_close') {
 					params.ticket_data.close_note = this.form.close_note;
 					params.ticket_data.close_dos = this.form.close_dos;
 				}
 				this.$API.wf.ticket.ticketHandle.req(this.ticketId, params).then(res => {
+					this.submitLoading = false;
 					if (res.err_msg) {
 					} else {
 						this.$router.push("dutywork");
 					}
-				})
+				}).catch(e=>{this.submitLoading=false;})
 			},
 			reStart() {
 				this.$API.wf.ticket.retryScript.req(this.ticketId).then(res => {
diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue
index d16c1708..bf7c3192 100644
--- a/src/views/wf/transform.vue
+++ b/src/views/wf/transform.vue
@@ -34,15 +34,17 @@
 				width="220px"
 			>
 				<template #default="scope">
-					<el-link @click="handleEdit(scope.row)">
+					<el-button @click="handleEdit(scope.row)" link size="small">
 						编辑
-					</el-link>
-					<el-link
+					</el-button>
+					<el-button
 						type="danger"
+						link
+						size="small"
 						@click="handleDelete(scope.row)"
 					>
 						删除
-					</el-link>
+					</el-button>
 				</template>
 			</el-table-column>
 		</scTable>