Merge branch 'ft' into 'main_dev'

feat: 管理台新增部分缺失的权限标识 See merge request yunteng/thingskit-front!825

Merge branch 'ft' into 'main_dev'
feat: 管理台新增部分缺失的权限标识 See merge request yunteng/thingskit-front!825
xp.Huang
2 parents 13b41e9f 5fb3aae1
Showing 11 changed files with 107 additions and 47 deletions
src/views/alarm/config/index.vue
src/views/device/list/cpns/tabs/Detail.vue
src/views/device/list/cpns/tabs/commandRecord/index.vue
src/views/device/list/index.vue
src/views/operation/ota/components/PackagesDetailDrawer.vue
src/views/rule/dataFlow/enum/index.ts
src/views/rule/dataFlow/index.vue
src/views/rule/linkedge/index.vue
src/views/rule/script/RuleChainConversionScript/index.vue
src/views/task/center/components/TaskCard/index.vue
src/views/task/center/config/index.ts
--- a/src/views/alarm/config/index.vue
View file @ca7e400
+++ b/src/views/alarm/config/index.vue
View file @ca7e400
@@ -37,13 +37,21 @@
           </a-button>
         </template>
         <template #status="{ record }">
-          <Switch
-            :checked="record.status === 1"
-            :loading="record.pendingStatus"
-            checkedChildren="启用"
-            unCheckedChildren="禁用"
-            @change="(checked:boolean)=>statusChange(checked,record)"
-          />
+          <Authority value="api:yt:alarm:profile:status">
+            <Switch
+              :checked="record.status === 1"
+              :loading="record.pendingStatus"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              @change="(checked:boolean)=>statusChange(checked,record)"
+            />
+          </Authority>
+          <Tag
+            v-if="!hasPermission('api:yt:alarm:profile:status')"
+            :color="record.status ? 'green' : 'red'"
+          >
+            {{ record.status ? '启用' : '禁用' }}
+          </Tag>
         </template>
         <template #action="{ record }">
           <TableAction
@@ -88,7 +96,7 @@
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { deleteAlarmConfig, queryAlarmConfig } from '/@/api/alarm/config/alarmConfig';
   import { searchFormSchema, columns } from './config.data';
-  import { Modal, Popconfirm } from 'ant-design-vue';
+  import { Modal, Popconfirm, Tag } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
@@ -97,6 +105,7 @@
   import { putAlarmConfigStatus } from '/@/api/alarm/config/alarmConfig';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
+  import { usePermission } from '/@/hooks/web/usePermission';
   export default defineComponent({
     components: {
@@ -108,8 +117,10 @@
       Switch,
       Authority,
       Popconfirm,
+      Tag,
     },
     setup() {
+      const { hasPermission } = usePermission();
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 刷新
@@ -250,6 +261,7 @@
         showAlarmContact,
         showMessageMode,
         statusChange,
+        hasPermission,
       };
     },
   });
--- a/src/views/device/list/cpns/tabs/Detail.vue
View file @ca7e400
+++ b/src/views/device/list/cpns/tabs/Detail.vue
View file @ca7e400
@@ -52,7 +52,9 @@
     <div class="mt-4" v-if="!isCustomer">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
       <a-button type="primary" class="mr-4" @click="copyDeviceToken">复制访问令牌</a-button>
-      <a-button type="primary" class="mr-4" @click="manageDeviceToken">管理设备凭证</a-button>
+      <Authority value="api:yt:device:equipment">
+        <a-button type="primary" class="mr-4" @click="manageDeviceToken">管理设备凭证</a-button>
+      </Authority>
       <ManageDeviceTokenModal @register="registerModal" />
     </div>
     <div class="mt-4">
@@ -84,10 +86,10 @@
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { useAuthDeviceDetail } from '../../hook/useAuthDeviceDetail';
   import { useClipboard } from '@vueuse/core';
-
   import wz from '/@/assets/images/wz.png';
   import { useAsyncQueue } from '../../../localtion/useAsyncQueue';
   import locationImage from '/@/assets/icons/location.svg';
+  import { Authority } from '/@/components/Authority';
   export default defineComponent({
     components: {
@@ -98,6 +100,7 @@
       BasicModal,
       Tooltip,
       Empty,
+      Authority,
     },
     props: {
       deviceDetail: {
--- a/src/views/device/list/cpns/tabs/commandRecord/index.vue
View file @ca7e400
+++ b/src/views/device/list/cpns/tabs/commandRecord/index.vue
View file @ca7e400
@@ -5,7 +5,9 @@
   >
     <template #toolbar>
       <Space>
-        <Button type="primary" @click="openModal(true)">命令下发</Button>
+        <Authority value="api:yt:device:rpc">
+          <Button type="primary" @click="openModal(true)">命令下发</Button>
+        </Authority>
       </Space>
     </template>
     <template #recordContent="{ record }">
@@ -43,6 +45,7 @@
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { BasicModal, useModal } from '/@/components/Modal';
   import CommandIssuance from '../CommandIssuance.vue';
+  import { Authority } from '/@/components/Authority';
   const props = defineProps({
     fromId: {
--- a/src/views/device/list/index.vue
View file @ca7e400
+++ b/src/views/device/list/index.vue
View file @ca7e400
@@ -24,14 +24,16 @@
           <Authority value="api:yt:device:import">
             <Button type="primary" @click="handleBatchImport">导入</Button>
           </Authority>
-          <a-button
-            v-if="authBtn(role)"
-            type="primary"
-            @click="handleBatchAssign"
-            :disabled="!isExistOption"
-          >
-            批量分配
-          </a-button>
+          <Authority value="api:yt:device:assign">
+            <a-button
+              v-if="authBtn(role)"
+              type="primary"
+              @click="handleBatchAssign"
+              :disabled="!isExistOption"
+            >
+              批量分配
+            </a-button>
+          </Authority>
         </template>
         <template #img="{ record }">
           <TableImg
@@ -134,6 +136,7 @@
                     label: '分配客户',
                     icon: 'mdi:account-arrow-right',
                     ifShow: authBtn(role),
+                    auth: 'api:yt:device:assign',
                     onClick: handleDispatchCustomer.bind(null, record),
                   },
               {
--- a/src/views/operation/ota/components/PackagesDetailDrawer.vue
View file @ca7e400
+++ b/src/views/operation/ota/components/PackagesDetailDrawer.vue
View file @ca7e400
@@ -135,10 +135,14 @@
       <Tabs.TabPane tab="详情" key="detail">
         <Space>
           <!-- <Button type="primary" @click="openDetailPage">打开详情页</Button> -->
-          <Button type="primary" @click="downloadPackage" :disabled="!!otaRecord.url">
-            下载包
-          </Button>
-          <Button type="primary" @click="deletePackage" danger>删除包</Button>
+          <Authority :value="OtaPermissionKey.DOWNLOAD">
+            <Button type="primary" @click="downloadPackage" :disabled="!!otaRecord.url">
+              下载包
+            </Button>
+          </Authority>
+          <Authority :value="OtaPermissionKey.DELETE">
+            <Button type="primary" @click="deletePackage" danger>删除包</Button>
+          </Authority>
         </Space>
         <div class="mt-3">
           <Space>
--- a/src/views/rule/dataFlow/enum/index.ts
View file @ca7e400
+++ b/src/views/rule/dataFlow/enum/index.ts
View file @ca7e400
@@ -8,6 +8,7 @@ export enum PermissionDataFlowEnum {
   PERMISSION_GET = 'api:yt:convert:config:get',
   PERMISSION_DELETE = 'api:yt:convert:config:delete',
   PERMISSION_UPDATE = 'api:yt:convert:config:update',
+  PERMISSION_STATUS = 'api:yt:convert:config:status',
 }
 //业务文字描述配置枚举
--- a/src/views/rule/dataFlow/index.vue
View file @ca7e400
+++ b/src/views/rule/dataFlow/index.vue
View file @ca7e400
@@ -79,13 +79,21 @@
         />
       </template>
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>hanldeSwitch(checked,record)"
-        />
+        <Authority :value="PermissionDataFlowEnum.PERMISSION_STATUS">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>hanldeSwitch(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission(PermissionDataFlowEnum.PERMISSION_STATUS)"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
     </BasicTable>
     <DataFlowModal @register="registerModal" @success="handleSuccess" />
@@ -103,15 +111,18 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { PermissionDataFlowEnum, BusinessDataFlowTextEnum } from './enum';
   import { DataFlowModal } from './components/dataflowmodal';
   import { defaultTableAttribute } from './config';
+  import { usePermission } from '/@/hooks/web/usePermission';
   const { createMessage } = useMessage();
   const loading = ref(true);
+  const { hasPermission } = usePermission();
+
   const handleSuccess = () => {
     reload();
   };
--- a/src/views/rule/linkedge/index.vue
View file @ca7e400
+++ b/src/views/rule/linkedge/index.vue
View file @ca7e400
@@ -50,13 +50,21 @@
       </template>
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Authority value="api:yt:sceneLinkage:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:sceneLinkage:status')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
     </BasicTable>
     <SceneLinkAgeDrawer @register="registerDrawer" @success="handleSuccess" />
@@ -72,16 +80,18 @@
     screenLinkPagePutApi,
   } from '/@/api/ruleengine/ruleengineApi';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { columns, searchFormSchema } from './config/config.data';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import SceneLinkAgeDrawer from './SceneLinkAgeDrawer.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
+  import { usePermission } from '/@/hooks/web/usePermission';
   const userInfo: any = getAuthCache(USER_INFO_KEY);
   const userId = userInfo.userId;
+  const { hasPermission } = usePermission();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
--- a/src/views/rule/script/RuleChainConversionScript/index.vue
View file @ca7e400
+++ b/src/views/rule/script/RuleChainConversionScript/index.vue
View file @ca7e400
@@ -17,13 +17,21 @@
         </Authority>
       </template>
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Authority value="api:yt:convert:js:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:convert:js:status')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -69,7 +77,7 @@
 <script lang="ts" setup>
   import { ref, nextTick } from 'vue';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { columns } from '../config/config.data';
   import { getConvertApi, deleteTransformApi } from '/@/api/device/TransformScriptApi';
@@ -81,11 +89,14 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import { computed, unref } from 'vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
   const props = defineProps<{ searchInfo: Recordable }>();
   const getSearchInfo = computed(() => props.searchInfo);
+  const { hasPermission } = usePermission();
+
   const handleSuccess = () => {
     reload();
   };
--- a/src/views/task/center/components/TaskCard/index.vue
View file @ca7e400
+++ b/src/views/task/center/components/TaskCard/index.vue
View file @ca7e400
@@ -133,6 +133,7 @@
             text: '详情',
             event: DropMenuEvent.DETAIL,
             icon: 'ant-design:eye-outlined',
+            auth: PermissionEnum.DETAIL,
             onClick: emit.bind(null, 'detail', getRecord),
           },
           {
--- a/src/views/task/center/config/index.ts
View file @ca7e400
+++ b/src/views/task/center/config/index.ts
View file @ca7e400
@@ -7,6 +7,7 @@ export enum PermissionEnum {
   DELETE = 'api:yt:task_center:delete',
   ALLOW = 'api:yt:task_center:cancel:allow',
   EXECUTE = 'api:yt:task_center:immediate:execute',
+  DETAIL = 'api:yt:task_center:get',
 }
 export enum FormFieldsEnum {