fix: some jumps and some displays

src/router/index.js

@@ -306,7 +306,8 @@ export const asyncRoutes = [
             name: 'device-management-settings',
             path: 'settings/:id',
             component: () => import('@/views/platform/tenant/device/settings/index'),
-            meta: { title: '配置', cache: 'DeviceManagement' }
+            meta: { title: '配置', cache: 'DeviceManagement' },
+            props: { redirect: 'device-management' }
           }
         ]
       },
@@ -398,7 +399,8 @@ export const asyncRoutes = [
             name: 'tenant-device-management-settings',
             path: 'settings/:id',
             component: () => import('@/views/platform/tenant/device/settings/index'),
-            meta: { title: '配置', cache: 'TenantDeviceManagement' }
+            meta: { title: '配置', cache: 'TenantDeviceManagement' },
+            props: { redirect: 'tenant-device-management' }
           }
         ]
       },

src/views/platform/tenant/device/settings/index.vue

@@ -68,6 +68,12 @@ export default {
     Gateway,
     DeviceShadow
   },
+  props: {
+    redirect: {
+      type: String,
+      default: ''
+    }
+  },
   data () {
     return {
       loading: true,
@@ -131,9 +137,13 @@ export default {
       })
     },
     onBack () {
-      this.$router.replace({
-        name: 'device-management'
-      })
+      if (this.redirect) {
+        this.$router.replace({
+          name: this.redirect
+        })
+      } else {
+        this.$router.back(-1)
+      }
     }
   }
 }

src/views/screen/review/workflow/mine/index.vue

@@ -53,10 +53,18 @@ import {
 import { transformCalendarRelease } from '@/views/screen/review/utils'
 
 const Category = {
-  minio: '资源',
-  item: '节目',
-  carousel: '轮播',
-  program: '排期'
+  ASSET: 'minio',
+  PROGRAM: 'item',
+  PROGRAM_RECUR: 'carousel',
+  SCHEDULE: 'program',
+  CALENDAR: 'calendar'
+}
+
+const CategoryInfo = {
+  [Category.ASSET]: '资源',
+  [Category.PROGRAM]: '节目',
+  [Category.PROGRAM_RECUR]: '轮播',
+  [Category.SCHEDULE]: '排期'
 }
 
 export default {
@@ -158,10 +166,10 @@ export default {
       return children
     },
     renderRejectItem (item, h, isView = false) {
-      const category = Category[item.category]
+      const category = CategoryInfo[item.category]
       const canClick = !isView && !!category
       return h('div', {
-        staticClass: canClick ? 'u-color--blue u-pointer' : 'u-color--black',
+        staticClass: canClick ? 'u-color--blue has-active u-pointer' : 'u-color--black',
         staticStyle: { padding: '4px 0' },
         on: canClick
           ? {
@@ -204,11 +212,11 @@ export default {
     getStatus ({ status, rejectEvent, reason }) {
       if (status === State.REJECTED) {
         const events = JSON.parse(rejectEvent)
-        const canResubmit = !(events && events.length === 1 && events[0].category === 'calendar')
+        const canResubmit = !(events && events.length === 1 && events[0].category === Category.CALENDAR)
         return {
           status,
           canResubmit,
-          rejectEvent: (events || []).filter(({ category }) => category !== 'calendar'),
+          rejectEvent: (events || []).filter(({ category }) => category !== Category.CALENDAR),
           reason
         }
       }
@@ -252,22 +260,22 @@ export default {
     },
     onViewOrEditItem (data) {
       switch (data.category) {
-        case 'minio':
+        case Category.ASSET:
           this.$refs.previewDialog.show({
             type: data.type,
             url: data.id
           })
           break
-        case 'item':
+        case Category.PROGRAM:
           this.$designProgram(data.id)
           break
-        case 'carousel':
+        case Category.PROGRAM_RECUR:
           this.$router.push({
             name: 'recur-design',
             params: { id: data.id }
           })
           break
-        case 'program':
+        case Category.SCHEDULE:
           this.$router.push({
             name: 'schedule-design',
             params: { id: data.id }