From 67a9c88fa0a35344ea590b68420bdbff91a992cb Mon Sep 17 00:00:00 2001
From: "2309368887@qq.com" <2309368887@qq.com>
Date: Tue, 12 Jul 2022 13:50:04 +0800
Subject: [PATCH] tijiao

---
 src/views/ecm/event_cate_form.vue | 204 ++++++++++++++++++------------
 src/views/wf/details.vue          |   1 +
 src/views/wf/steps.vue            |  22 +++-
 src/views/wf/visitdetail.vue      |   2 +
 4 files changed, 146 insertions(+), 83 deletions(-)

diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue
index 3b728645..ba9327e9 100644
--- a/src/views/ecm/event_cate_form.vue
+++ b/src/views/ecm/event_cate_form.vue
@@ -2,7 +2,6 @@
   <el-dialog
     :title="titleMap[mode]"
     v-model="visible"
-    :width="500"
     destroy-on-close
     @closed="$emit('closed')"
     :draggable="true"
@@ -14,85 +13,130 @@
       ref="dialogForm"
       label-width="100px"
     >
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="form.name" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="标识" prop="code">
-        <el-input v-model="form.code" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="触发" prop="trigger">
-        <el-select v-model="form.trigger">
-          <el-option
-            v-for="item in trigger_options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="自主算法" prop="self_algo">
-        <el-switch v-model="form.self_algo"></el-switch>
-      </el-form-item>
-      <el-form-item label="处理时间" prop="hanle_minute">
-        <el-input-number
-          v-model="form.hanle_minute"
-          :min="0"
-          :max="32767"
-          placeholder="分钟"
-          controls-position="right"
-        ></el-input-number>
-      </el-form-item>
-      <sc-title title="音响配置"></sc-title>
-       <el-form-item label="事件优先级" prop="priority">
-        <el-input-number
-          v-model="form.priority"
-          :min="1"
-          :max="99"
-          controls-position="right"
-        ></el-input-number>
-      </el-form-item>
-      <el-form-item label="喇叭" prop="speakers">
-        <el-select v-model="form.speakers" multiple="true">
-          <el-option
-            v-for="item in speakersptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-       <el-form-item label="播放次数" prop="voice_num">
-        <el-input-number
-          v-model="form.voice_num"
-          :min="2"
-          :max="10"
-          controls-position="right"
-        ></el-input-number>
-      </el-form-item>
-      <el-form-item label="喇叭声音" prop="voice_person">
-        <el-select v-model="form.voice_person">
-          <el-option
-            v-for="item in voiceoptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
+      <el-row>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" clearable></el-input>
+          </el-form-item>
+        </el-col>
 
-      <el-form-item label="喇叭开启" prop="speaker_on">
-        <el-switch v-model="form.speaker_on"></el-switch>
-      </el-form-item>
-      <el-form-item label="开启区域" prop="filter_area_level">
-        <el-select v-model="form.filter_area_level">
-          <el-option
-            v-for="item in filter_area_level_options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="标识" prop="code">
+            <el-input v-model="form.code" clearable></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="触发" prop="trigger">
+            <el-select v-model="form.trigger">
+              <el-option
+                v-for="item in trigger_options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="自主算法" prop="self_algo">
+            <el-switch v-model="form.self_algo"></el-switch>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="处理时间" prop="hanle_minute">
+            <el-input-number
+              v-model="form.hanle_minute"
+              :min="0"
+              :max="32767"
+              placeholder="分钟"
+              controls-position="right"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <sc-title title="音响配置"></sc-title>
+      <el-row>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="事件优先级" prop="priority">
+            <el-input-number
+              v-model="form.priority"
+              :min="1"
+              :max="99"
+              controls-position="right"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="喇叭" prop="speakers">
+            <el-select v-model="form.speakers" multiple="true">
+              <el-option
+                v-for="item in speakersptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="播放次数" prop="voice_num">
+            <el-input-number
+              v-model="form.voice_num"
+              :min="2"
+              :max="10"
+              controls-position="right"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="喇叭声音" prop="voice_person">
+            <el-select v-model="form.voice_person">
+              <el-option
+                v-for="item in voiceoptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="允许时间" prop="same_allow_minute">
+            <el-input-number
+              v-model="form.same_allow_minute"
+              :min="0"
+              controls-position="right"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="喇叭开启" prop="speaker_on">
+            <el-switch v-model="form.speaker_on"></el-switch>
+          </el-form-item>
+        </el-col>
+
+        <el-col :md="12" :sm="24">
+          <el-form-item label="开启区域" prop="filter_area_level">
+            <el-select v-model="form.filter_area_level">
+              <el-option
+                v-for="item in filter_area_level_options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button @click="visible = false">取 消</el-button>
@@ -154,7 +198,7 @@ export default {
           label: "定位",
         },
       ],
-      voiceoptions:[
+      voiceoptions: [
         {
           value: 3,
           label: "男生",
diff --git a/src/views/wf/details.vue b/src/views/wf/details.vue
index 5b7439ca..b976f0f1 100644
--- a/src/views/wf/details.vue
+++ b/src/views/wf/details.vue
@@ -65,6 +65,7 @@ export default {
      
              this.$API.wf.ticket.ticketFlowlogs.req(this.workId).then(res => {
                                 this.logs = res
+                               
                             })                
     },
   },
diff --git a/src/views/wf/steps.vue b/src/views/wf/steps.vue
index 2dbacb6c..e6aa4853 100644
--- a/src/views/wf/steps.vue
+++ b/src/views/wf/steps.vue
@@ -27,6 +27,7 @@ export default {
   name: "workstep",
   data() {
     return {
+       sort: 0,
       actives: 4,
       flowSteps: [],
     };
@@ -36,10 +37,25 @@ export default {
     this.getFlowSteps();
   },
   methods: {
-    async getFlowSteps() {
-      let res = await this.$API.wf.ticket.ticketFlowSteps.req(this.workId);
+   getFlowSteps() {
+ 
+      this.$API.wf.ticket.ticketFlowSteps.req(this.workId).then((res) => {;
+      this.flowSteps = res
+       this.$API.wf.ticket.ticketItem.req(this.workId).then((res) => {
+          let state = res.state;
+                let dat = this.flowSteps.filter((item) => {
+                  return item.id == state;
+                })
+                this.sort = dat[0].sort;
+                this.actives = this.flowSteps.indexOf(dat[0]);
+                if (this.flowSteps.length - this.actives > 1) {
+                } else {
+                  this.actives = this.flowSteps.length;
+                }
+      });
+       });
+      
       
-      this.flowSteps = res;
            
     },
   },
diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue
index 0a62eec7..43bf5933 100644
--- a/src/views/wf/visitdetail.vue
+++ b/src/views/wf/visitdetail.vue
@@ -89,12 +89,14 @@ export default {
     this.visitId = this.$route.query.visitID;
     this.getticketItem();
     this.getVisit();
+
   },
   methods: {
     //工单详情
     getticketItem() {
       this.$API.wf.ticket.ticketItem.req(this.workId).then((res) => {
         this.ticketDetail = res;
+        
       });
     },
     //访客详情