Преглед изворни кода

feat: role Access.MANAGE_EMERGENCY_SCREEN

Casper Dai пре 1 година
родитељ
комит
a10170b320
3 измењених фајлова са 12 додато и 6 уклоњено
  1. 6 0
      src/constant.js
  2. 1 1
      src/router/index.js
  3. 5 5
      src/views/platform/remote-log/index.vue

+ 6 - 0
src/constant.js

@@ -298,6 +298,7 @@ export const Role = {
   SUPERVISOR: 'ROLE_OPERATION_SUPERVISOR',
   STAFF: 'ROLE_OPERATION_STAFF',
   MARKETER: 'ROLE_OPERATION_MARKETER',
+  EMERGENCY_SCREEN: 'ROLE_OPERATION_EMERGENCY_SCREEN',
   EMERGENCY: 'ROLE_OPERATION_EMERGENCY',
   FIRST_LEVEL_REVIEWER: 'ROLE_FIRST_LEVEL_REVIEWER',
   SECOND_LEVEL_REVIEWER: 'ROLE_SECOND_LEVEL_REVIEWER',
@@ -312,6 +313,7 @@ export const Access = {
   MANAGE_DEVICE: 'manage-device',
   MANAGE_CALENDAR: 'manage-calendar',
   MANAGE_MARKETING: 'manage-marketing',
+  MANAGE_EMERGENCY_SCREEN: 'manage-emergency-screen',
   MANAGE_EMERGENCY: 'manage-emergency',
   VIEW_LOGS: 'view-logs',
   REVIEW_RELEASE_FIRST: 'review-release-first',
@@ -327,6 +329,7 @@ export const RoleAccess = {
     Access.MANAGE_CALENDAR,
     Access.MANAGE_DEVICE,
     Access.MANAGE_MARKETING,
+    Access.MANAGE_EMERGENCY_SCREEN,
     Access.MANAGE_EMERGENCY,
     Access.REVIEW_RELEASE_FIRST,
     Access.REVIEW_RELEASE_SECOND,
@@ -349,6 +352,9 @@ export const RoleAccess = {
   [Role.MARKETER]: [
     Access.MANAGE_MARKETING
   ],
+  [Role.EMERGENCY_SCREEN]: [
+    Access.MANAGE_EMERGENCY_SCREEN
+  ],
   [Role.EMERGENCY]: [
     Access.MANAGE_EMERGENCY
   ],

+ 1 - 1
src/router/index.js

@@ -406,7 +406,7 @@ export const asyncRoutes = [
   {
     path: '/bm',
     component: Layout,
-    access: Access.MANAGE_EMERGENCY,
+    access: Access.MANAGE_EMERGENCY_SCREEN,
     meta: { title: '大屏应急广播', icon: 'bm' },
     children: [
       {

+ 5 - 5
src/views/platform/remote-log/index.vue

@@ -155,7 +155,7 @@ export default {
           ], width: 300 }
         ]
       },
-      curDeviceId: null,
+      currDeviceId: null,
       currDeviceTenant: null,
       title: '',
       sn: ''
@@ -194,7 +194,7 @@ export default {
       return {
         list: getRemoteLogs,
         autoRefresh: true,
-        condition: { tenant: this.currDeviceTenant, deviceId: this.curDeviceId },
+        condition: { tenant: this.currDeviceTenant, deviceId: this.currDeviceId },
         cols: [
           { prop: 'settingId', label: '事件' },
           { label: '执行状态', type: 'tag', render: ({ status }) => {
@@ -269,7 +269,7 @@ export default {
           this.logSetting = { ...defaultLogSettingForm }
         }
         this.currDeviceTenant = device.tenant
-        this.curDeviceId = device.id
+        this.currDeviceId = device.id
         this.$refs.editDialog.show()
       })
     },
@@ -285,7 +285,7 @@ export default {
 
       await startRemoteLog({
         tenant: this.currDeviceTenant,
-        deviceId: this.curDeviceId,
+        deviceId: this.currDeviceId,
         duration,
         activate: true,
         commands: commands.split(';'),
@@ -296,7 +296,7 @@ export default {
     onResult (device) {
       this.$deviceName = device.name
       this.currDeviceTenant = device.tenant
-      this.curDeviceId = device.id
+      this.currDeviceId = device.id
       this.$refs.resultDialog.show()
     },
     showDocument () {