From 50a17fbd1d3b4bbaf435d495f2d5dadc8cec1a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 1 Sep 2022 11:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E5=A4=87=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/am/audio.vue            |  1 +
 src/views/am/blt.vue              |  1 +
 src/views/am/em1.vue              |  1 +
 src/views/am/monitor.vue          |  3 ++-
 src/views/ecm/event_cate_form.vue |  4 ++--
 src/views/ecm/notify_setting.vue  |  2 +-
 src/views/wf/state.vue            | 11 ++++++-----
 src/views/wf/ticketdetail.vue     | 10 +++++++++-
 src/views/wf/transform.vue        |  5 +++++
 9 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/am/audio.vue b/src/views/am/audio.vue
index a07d31d4..b4bd8813 100644
--- a/src/views/am/audio.vue
+++ b/src/views/am/audio.vue
@@ -120,6 +120,7 @@ export default {
     async syncData() {
       this.syncLoading = true;
       var res = await this.$API.third.tdevice.speakerSync.req({});
+      this.$refs.table.refresh();
       this.syncLoading = false;
     },
   },
diff --git a/src/views/am/blt.vue b/src/views/am/blt.vue
index 4dc4c6a1..7c1e3bb7 100644
--- a/src/views/am/blt.vue
+++ b/src/views/am/blt.vue
@@ -165,6 +165,7 @@ export default {
     async syncData() {
       this.syncLoading = true;
       var res = await this.$API.third.tdevice.vchannelSync.req({});
+      this.$refs.table.refresh();
       this.syncLoading = false;
     },
     getEmployeeList() {
diff --git a/src/views/am/em1.vue b/src/views/am/em1.vue
index 02466edb..7642bbcf 100644
--- a/src/views/am/em1.vue
+++ b/src/views/am/em1.vue
@@ -163,6 +163,7 @@ export default {
     async syncData() {
       this.syncLoading = true;
       var res = await this.$API.third.tdevice.dchannelSync.req({});
+      this.$refs.table.refresh();
       this.syncLoading = false;
     },
   },
diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue
index ee91cad7..6d0b4b05 100644
--- a/src/views/am/monitor.vue
+++ b/src/views/am/monitor.vue
@@ -50,7 +50,7 @@
         <el-table-column label="所在区域" prop="my_info.area_name" min-width="80"></el-table-column>
         <el-table-column label="所在位置" min-width="150">
           <template #default="scope">
-            <div v-if="scope.row.my_info.location.x">
+            <div v-if="scope.row.my_info.location">
               <div>
                 x:{{ scope.row.my_info.location.x }}
               </div>
@@ -198,6 +198,7 @@ export default {
     async syncData() {
       this.syncLoading = true;
       var res = await this.$API.third.tdevice.vchannelSync.req({});
+      this.$refs.table.refresh();
       this.syncLoading = false;
     },
   },
diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue
index c4b9fee4..2dcd00d5 100644
--- a/src/views/ecm/event_cate_form.vue
+++ b/src/views/ecm/event_cate_form.vue
@@ -46,9 +46,9 @@
         </el-col>
 
         <el-col :md="12" :sm="24">
-          <el-form-item label="处理时间" prop="hanle_minute">
+          <el-form-item label="处理时间" prop="handle_minute">
             <el-input-number
-              v-model="form.hanle_minute"
+              v-model="form.handle_minute"
               :min="0"
               :max="32767"
               placeholder="分钟"
diff --git a/src/views/ecm/notify_setting.vue b/src/views/ecm/notify_setting.vue
index 9d2b7bec..1f44575e 100644
--- a/src/views/ecm/notify_setting.vue
+++ b/src/views/ecm/notify_setting.vue
@@ -50,7 +50,7 @@
             </el-table-column>
               <el-table-column
               label="处理时间"
-              prop="hanle_minute"
+              prop="handle_minute"
               width="80"
             ></el-table-column>
             <el-table-column label="喇叭开启" prop="speaker_on" width="80">
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index 5d6200c2..8f6d0b17 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -54,11 +54,7 @@
           <template #default="scope">
             <el-button link size="small" @click="handleEdit(scope.row)"
               >编辑</el-button>
-            <el-popconfirm title="确定删除吗？">
-              <template #reference>
-                <el-button link size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
+                <el-button link size="small" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </scTable>
@@ -581,6 +577,11 @@ export default {
       this.dialogVisible = true;
       this.addForm = Object.assign({}, row);
     },
+    handleDelete(row) {
+      this.$API.wf.state.delete.req(row.id).then(res=>{
+        this.getList()
+      })
+    },
     async getList() {
       let res = await this.$API.wf.workflow.states.req(this.id);
       console.log(res);
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index ee3dda19..21cd3b39 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -101,7 +101,7 @@
 						<span v-if="oplDetail.operation">{{oplDetail.operation_.area_.name}}</span>
 					</el-descriptions-item>
 					<el-descriptions-item label="作业状态:">
-						<span v-if="oplDetail.operation">{{state_[oplDetail.operation_.state]}}</span>
+						<span v-if="oplDetail.operation">{{state2_[oplDetail.operation_.state]}}</span>
 					</el-descriptions-item>
 					<el-descriptions-item label="生产状态:">
 						<span v-if="oplDetail.operation">{{oplDetail.operation_.state_work }}</span>
@@ -267,6 +267,14 @@
 					30: "待入厂",
 					40: "进行中",
 					50: "已完成",
+					60: "已关闭"
+				},
+				state2_: {
+					10: "创建中",
+					20: "审批中",
+					30: "待作业",
+					40: "作业中",
+					50: "已结束",
 				},
 				noteOption: [
 					{id: 10, name: '作业正常结束'},
diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue
index bf7c3192..0a533f53 100644
--- a/src/views/wf/transform.vue
+++ b/src/views/wf/transform.vue
@@ -191,6 +191,11 @@
 				this.dialogVisible = true;
 				this.addForm = Object.assign({}, row);
 			},
+			handleDelete(row) {
+				this.$API.wf.transition.delete.req(row.id).then(res=>{
+					this.getList()
+				})
+			},
 			async getList() {
 				let res = await this.$API.wf.workflow.transitions.req(this.id);
 				this.list = res;