From 31e18c2c2dbe1d635e8672f7beee118b7b4f0511 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 27 Apr 2023 13:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9bug=E3=80=91?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=B0=E5=BD=95=E8=B7=AF=E7=94=B1=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Menu.vue                       |  4 +--
 src/components/ProcessHeader.vue              | 32 ++++++++++++++++++-
 .../monitorProcesses/monitorDetail.vue        | 12 ++++---
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index a418acc..a796572 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -4,7 +4,7 @@
         <MenuItem :key="item.id" v-for="(item, index) in menuData" :menuItemData="item">
             <!-- 没有children的子菜单 -->
             <template v-if="!item.children">
-                <div class="menu-content" :class="{'active': item.href.indexOf($route.path) !== -1 || (item.href==$store.state.pathUrl)}">
+                <div class="menu-content" :class="{'active': item.href.indexOf($route.path) !== -1 }">
                     <div class="menu-data" @click="handleRouter(item)"
                          :style="{'padding-left': item.level >= 2 ? '30px' : '10px'}">
                         <div class="menu-data-flex">
@@ -17,7 +17,7 @@
             <!-- 有children的子菜单 -->
             <template v-else>
                 <div class="menu-content"
-                     :class="{'active': item.href.indexOf($route.path) !== -1  || (item.href==$store.state.pathUrl), 'is-collage': !item.isCollage}"
+                     :class="{'active': item.href.indexOf($route.path) !== -1  , 'is-collage': !item.isCollage}"
                      @click="collageMenu(item)">
                     <div class="menu-data"
                          :class="item.level === 1 ? 'bor-b' : ''"
diff --git a/src/components/ProcessHeader.vue b/src/components/ProcessHeader.vue
index 78b0ebe..8474675 100644
--- a/src/components/ProcessHeader.vue
+++ b/src/components/ProcessHeader.vue
@@ -2,9 +2,13 @@
 <template>
   <div>
     <div class="prc-header-wrap">
-      <div class="processtitle">{{title}}</div>
+      <div class="processtitle">
+        <span  class="back" title="返回" @click="back"><i class="el-icon-back" ></i>
+          </span>
+        {{title}}</div>
       <div class="processnum" v-if="proceesNum">流程编号:{{proceesNum}}</div>
     </div>
+
   </div>
 </template>
 
@@ -32,6 +36,17 @@ export default {
     }
   },
   methods: {
+    back(){
+      let index=''
+      if(this.$route.query.isDraft){
+        index='five'
+      }
+      if(this.$route.query.type){
+        index='second'
+      }
+      this.$store.commit('setActiveTabIndex',index)
+      this.$router.back(-1)
+    }
   },
   computed: {
   },
@@ -59,4 +74,19 @@ export default {
 .processnum{
   font-size: 13px;
 }
+.back{
+  display: inline-block;
+  width: 30px;
+  height: 30px;
+  background: #1890FF;
+  color: #fff;
+  border-radius: 50%;
+  //text-align: center;
+  line-height: 30px;
+  font-size: 25px;
+  font-weight: 700;
+  cursor: pointer;
+  text-align: center;
+  vertical-align: sub;
+}
 </style>
diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
index 1b84e60..02925b6 100644
--- a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
@@ -349,14 +349,16 @@ export default {
   }
 }
 .back{
-  width: 45px;
-  height: 45px;
+  width: 30px;
+  height: 30px;
   background: #1890FF;
   color: #fff;
-  text-align: center;
-  line-height: 45px;
-  font-size: 30px;
+  border-radius: 50%;
+  //text-align: center;
+  line-height: 30px;
+  font-size: 25px;
   font-weight: 700;
   cursor: pointer;
+  text-align: center;
 }
 </style>