Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…

…eat/device-new-protocol

@@ -33,6 +33,7 @@
   import { openWindow } from '/@/utils';
 
   import { useOpenKeys } from './useOpenKeys';
+  import { useMenuActiveFix } from '/@/hooks/business/useMenuActiveFix';
   export default defineComponent({
     name: 'SimpleMenu',
     components: {
@@ -120,7 +121,9 @@
           isClickGo.value = false;
           return;
         }
-        const path = (route || unref(currentRoute)).path;
+
+        let { flag, path } = useMenuActiveFix(route || unref(currentRoute));
+        path = flag ? path : (route || unref(currentRoute)).path;
 
         menuState.activeName = path;
 

@@ -29,7 +29,6 @@ export function useOpenKeys(
           return;
         }
         const keys = getAllParentPath(menuList, path);
-
         if (!unref(accordion)) {
           menuState.openNames = uniq([...menuState.openNames, ...keys]);
         } else {

+import { RouteLocationNormalizedLoaded } from 'vue-router';
+
+const menuMap = new Map();
+
+menuMap.set('/visual/board/detail/:boardId/:boardName?', '/visual/board');
+
+export const useMenuActiveFix = (route: RouteLocationNormalizedLoaded) => {
+  let flag = false;
+  let path;
+
+  const matchPath = route.matched.map((item) => item.path);
+  const needFixMenus: string[] = Array.from(menuMap.keys());
+
+  for (const item of matchPath) {
+    for (const menu of needFixMenus) {
+      if (menu === item) {
+        flag = true;
+        path = menuMap.get(menu);
+        break;
+      }
+    }
+  }
+
+  return {
+    flag,
+    path,
+  };
+};

@@ -19,6 +19,7 @@
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useDesign } from '/@/hooks/web/useDesign';
+  import { OUTSIDE_LINK_PREFIX } from '/@/router/helper/routeHelper';
 
   export default defineComponent({
     name: 'LayoutMenu',
@@ -113,6 +114,11 @@
        */
 
       function handleMenuClick(path: string) {
+        if (path.startsWith(OUTSIDE_LINK_PREFIX)) {
+          path = path.replace(OUTSIDE_LINK_PREFIX, '');
+          window.open(path);
+          return;
+        }
         go(path);
       }
 

@@ -6,6 +6,7 @@ import { cloneDeep, omit } from 'lodash-es';
 import { warn } from '/@/utils/log';
 import { createRouter, createWebHashHistory } from 'vue-router';
 
+export const OUTSIDE_LINK_PREFIX = '/outside/link';
 export type LayoutMapKey = 'LAYOUT';
 const IFRAME = () => import('/@/views/sys/iframe/FrameBlank.vue');
 
@@ -81,6 +82,9 @@ export function transformObjToRoute<T = AppRouteModule>(routeList: AppRouteModul
         route.meta = meta;
       }
     }
+    if (!route.path.startsWith('/') && route.meta.isLink) {
+      route.path = `${OUTSIDE_LINK_PREFIX}${route.path}`;
+    }
     route.children && asyncImportRoute(route.children);
   });
   return routeList as unknown as T[];

@@ -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,
       };
     },
   });

@@ -17,7 +17,8 @@ export enum ConfigurationPermission {
   UPDATE = 'api:yt:dataview:center:update',
   DELETE = 'api:yt:dataview:center:delete',
   SHARE = 'api:yt:dataview:center:share',
-  DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
+  // DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
+  DESIGN = 'api:yt:dataview:center:get_dataview_info:design',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
   PUBLISH = 'api:yt:dataview:center:publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',

@@ -280,6 +280,7 @@
                 </Tooltip>
                 <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
+                    :auth="ConfigurationPermission.DESIGN"
                     :disabled="item.state === 1"
                     icon="ant-design:edit-outlined"
                     @click="handleDesign(item)"

@@ -169,12 +169,12 @@ export const alarmColumns: BasicColumn[] = [
   {
     title: '告警时间',
     dataIndex: 'createdTime',
-    width: 120,
+    width: 180,
   },
   {
     title: '告警设备',
     dataIndex: 'deviceName',
-    width: 100,
+    width: 120,
   },
   {
     title: '告警场景',
@@ -184,14 +184,20 @@ export const alarmColumns: BasicColumn[] = [
   {
     title: '告警级别',
     dataIndex: 'severity',
-    width: 160,
+    width: 90,
     format: (text) => alarmLevel(text),
   },
   {
+    title: '告警详情',
+    dataIndex: 'details',
+    slots: { customRender: 'details' },
+    width: 160,
+  },
+  {
     title: '状态',
     dataIndex: 'status',
     format: (text) => statusType(text),
-    width: 160,
+    width: 100,
   },
 ];
 
@@ -263,14 +269,6 @@ export const alarmSchemasForm: FormSchema[] = [
       disabled: true,
     },
   },
-  {
-    field: 'details',
-    label: '详情',
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-    },
-  },
 ];
 // 子设备
 export const childDeviceSchemas: FormSchema[] = [

@@ -54,10 +54,6 @@
         await resetFields();
         await setFieldsValue({
           ...data,
-          details: JSON.stringify(data?.details?.data).slice(
-            1,
-            JSON.stringify(data?.details?.data).length - 1
-          ),
           severity: alarmLevel(data.severity),
           status: statusType(data.status),
         });

@@ -145,6 +145,8 @@
           // !!!此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'map');
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'marker');
+          Reflect.deleteProperty(DeviceStep1Ref.value.devicePositionState, 'map');
+          Reflect.deleteProperty(DeviceStep1Ref.value.devicePositionState, 'marker');
           setModalProps({
             confirmLoading: true,
           });
@@ -156,7 +158,7 @@
               customerId: currentDeviceData.customerId,
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
-                ...DeviceStep1Ref.value?.positionState,
+                ...DeviceStep1Ref.value?.devicePositionState,
               },
             };
             validateNameLength(stepRecord.name);
@@ -168,7 +170,7 @@
               sn: stepRecord.name,
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
-                ...DeviceStep1Ref.value?.positionState,
+                ...DeviceStep1Ref.value?.devicePositionState,
               },
               deviceToken:
                 unref(current) === 0 || !unref(stepState).addAgree

@@ -46,7 +46,7 @@
           </div>
         </template>
         <template #deviceAddress>
-          <Input disabled v-model:value="positionState.address">
+          <Input disabled v-model:value="devicePositionState.address">
             <template #addonAfter>
               <EnvironmentTwoTone @click="selectPosition" />
             </template>
@@ -128,6 +128,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { TaskTypeEnum } from '/@/views/task/center/config';
+  import { toRaw } from 'vue';
 
   export default defineComponent({
     components: {
@@ -239,8 +240,14 @@
       const selectPosition = () => {
         visible.value = true;
         if (!positionState.longitude) {
-          positionState.longitude = '104.04666605565338';
-          positionState.latitude = '30.543516387560476';
+          positionState.longitude = '104.05326410962411';
+          positionState.latitude = '30.54855093076791';
+
+          // 根据经纬度获取详细位置
+          if (positionState.longitude && positionState.latitude) {
+            var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+            getAddrByPoint(pt);
+          }
           initMap(positionState.longitude, positionState.latitude);
         } else {
           initMap(positionState.longitude, positionState.latitude);
@@ -261,6 +268,15 @@
         map: null,
         marker: null,
       });
+
+      const devicePositionState = ref({
+        longitude: '',
+        latitude: '',
+        address: '',
+        map: null,
+        marker: null,
+      });
+
       /**
        * 逆地址解析函数（根据坐标点获取详细地址）
        * @param {Object} point   百度地图坐标点，必传
@@ -371,6 +387,7 @@
       // 确定选择的位置
       const handleOk = () => {
         visible.value = false;
+        devicePositionState.value = { ...toRaw(positionState) };
       };
       // 取消选择位置
       const handleCancel = () => {
@@ -385,6 +402,7 @@
         positionState.longitude = deviceInfo.longitude;
         positionState.latitude = deviceInfo.latitude;
         positionState.address = deviceInfo.address;
+        devicePositionState.value = { ...toRaw(positionState) };
         devicePic.value = deviceInfo.avatar;
         setFieldsValue({
           ...data,
@@ -418,11 +436,13 @@
       function parentResetDevicePic(deviceInfo) {
         devicePic.value = deviceInfo.avatar;
       }
+
       // 父组件重置位置
       function parentResetPositionState() {
         for (let key in positionState) {
           positionState[key] = '';
         }
+        devicePositionState.value = { ...toRaw(positionState) };
       }
       // 禁用设备类型
       function disabledDeviceType(disabled: boolean) {
@@ -474,6 +494,7 @@
         handleOpenOrgDrawer,
         handleSuccess,
         handleTreeOrg,
+        devicePositionState,
       };
     },
   });

@@ -12,17 +12,31 @@
           ]"
         />
       </template>
+      <template #details="{ record }">
+        <a-button type="link" class="ml-2" @click="handleViewAlarmDetails(record)">
+          查看告警详情
+        </a-button>
+      </template>
     </BasicTable>
     <AlarmDetailModal @register="registerDetailModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, h, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { alarmColumns, alarmSearchSchemas } from '../../config/detail.config';
   import { getDeviceAlarm } from '/@/api/device/deviceManager';
   import AlarmDetailModal from '../modal/AlarmDetailModal.vue';
   import { useModal } from '/@/components/Modal';
+  import { Modal } from 'ant-design-vue';
+  import { JsonPreview } from '/@/components/CodeEditor';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    operationNumber_OR_TIME,
+    operationString,
+    operationBoolean,
+  } from '/@/views/rule/linkedge/config/formatData';
   export default defineComponent({
     name: 'DeviceManagement',
     components: {
@@ -66,11 +80,85 @@
       const handleSuccess = () => {
         reload();
       };
+      const handleViewAlarmDetails = async (record: Recordable) => {
+        await nextTick();
+        const { details } = record;
+        const deviceIdKeys = Object.keys(details);
+        const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
+        const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
+        const dataFormats = detailObject.reduce((acc: any, curr: any) => {
+          dataFormat.forEach((item) => {
+            if (item.tbDeviceId === curr.label) {
+              const findName = item.attribute.find(
+                (item) => item.identifier === curr.value.key
+              )?.name;
+              const findLogin = [
+                ...operationNumber_OR_TIME,
+                ...operationString,
+                ...operationBoolean,
+              ].find((item) => item.value === curr.value.logic)?.symbol;
+              const findAttribute = item.attribute.find(
+                (findItem) => findItem.identifier === curr.value.key
+              );
+              const value = {
+                ['触发属性']: findName,
+                ['触发条件']: `${findLogin}${curr.value.logicValue}`,
+                ['触发值']: `${curr.value.realValue}${findAttribute.detail?.dataType?.specs?.unit?.key}`,
+              };
+              const data = {
+                [item.name]: value,
+              };
+              acc.push(data);
+            }
+          });
+          return [...acc];
+        }, []);
+        const objectFormat = dataFormats.reduce((acc: any, curr: any) => {
+          return {
+            ...acc,
+            ...curr,
+          };
+        }, {});
+        Modal.info({
+          title: '告警详情',
+          width: 600,
+          centered: true,
+          maskClosable: true,
+          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(objectFormat)) }),
+        });
+      };
+      const handleAlarmDetailFormat = async (keys: string[]) => {
+        const temp: any = [];
+        for (let item of keys) {
+          if (item === 'key' || item === 'data') return; //旧数据则终止
+          const deviceDetailRes = await getDeviceDetail(item);
+          const { deviceProfileId } = deviceDetailRes;
+          if (!deviceProfileId) return;
+          const attributeRes = await getAttribute(deviceProfileId);
+          const dataFormat: any = handleDataFormat(deviceDetailRes, attributeRes);
+          temp.push(dataFormat);
+        }
+        return temp;
+      };
+      const handleDataFormat = (deviceDetail: any, attributes: any) => {
+        const { name, tbDeviceId } = deviceDetail;
+        const attribute = attributes.map((item) => ({
+          identifier: item.identifier,
+          name: item.name,
+          detail: item.detail,
+        }));
+        return {
+          name,
+          tbDeviceId,
+          attribute,
+        };
+      };
       return {
         registerTable,
         registerDetailModal,
         handleDetail,
         handleSuccess,
+        handleViewAlarmDetails,
       };
     },
   });

@@ -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: {

@@ -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: {

@@ -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),
                   },
               {

@@ -33,9 +33,15 @@
                 </Button>
               </Authority>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
-              <Upload v-if="isShowBtn" :show-upload-list="false" :customRequest="handleImportModel">
-                <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
-              </Upload>
+              <Authority value="api:yt:things_model:import">
+                <Upload
+                  v-if="isShowBtn"
+                  :show-upload-list="false"
+                  :customRequest="handleImportModel"
+                >
+                  <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
+                </Upload>
+              </Authority>
             </div>
             <div class="flex gap-2">
               <Authority :value="ModelOfMatterPermission.RELEASE">

@@ -19,6 +19,6 @@
 </template>
 <style scoped>
   :deep(.ant-table-body) {
-    overflow: hidden !important;
+    overflow: auto !important;
   }
 </style>

@@ -17,16 +17,26 @@
         </Authority>
       </template>
       <template #config="{ record }">
-        <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
+        <Authority value="api:yt:message:get">
+          <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
+        </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:message:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:message:status')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -62,18 +72,20 @@
   import { useDrawer } from '/@/components/Drawer';
   import ConfigDrawer from './ConfigDrawer.vue';
   import { columns, searchFormSchema } from './config.data';
-  import { Modal, Popconfirm } from 'ant-design-vue';
+  import { Modal, Popconfirm, Tag } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Switch } from 'ant-design-vue';
   import { setMessageConfigStatus } from '/@/api/message/config';
   import { Authority } from '/@/components/Authority';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
   export default defineComponent({
     name: 'MessageConfigManagement',
-    components: { BasicTable, ConfigDrawer, TableAction, Switch, Authority, Popconfirm },
+    components: { BasicTable, ConfigDrawer, TableAction, Switch, Authority, Popconfirm, Tag },
     setup() {
+      const { hasPermission } = usePermission();
       const [registerDrawer, { openDrawer }] = useDrawer();
       function handleSuccess() {
         reload();
@@ -168,6 +180,7 @@
         handleDeleteOrBatchDelete,
         hasBatchDelete,
         statusChange,
+        hasPermission,
       };
     },
   });

@@ -22,13 +22,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:template:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:template:status')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -80,9 +88,10 @@
   import SendEmail from '/@/views/message/template/SendEmail.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { setMessageTemplateStatus } from '/@/api/message/template';
   import { Authority } from '/@/components/Authority';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
   export default defineComponent({
     name: 'MessageTemplateManagement',
@@ -95,8 +104,10 @@
       Switch,
       Authority,
       Popconfirm,
+      Tag,
     },
     setup() {
+      const { hasPermission } = usePermission();
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const go = useGo();
@@ -218,6 +229,7 @@
         handleDeleteOrBatchDelete,
         statusChange,
         hasBatchDelete,
+        hasPermission,
       };
     },
   });

@@ -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>

@@ -9,6 +9,7 @@ export enum PermissionReportConfigEnum {
   PERMISSION_GET = 'api:yt:report:get',
   PERMISSION_DELETE = 'api:yt:report_form:config:delete',
   PERMISSION_UPDATE = 'api:yt:report_form:config:update',
+  PERMISSION_STATUS = 'api:yt:report_form:config:status',
 }
 
 //业务文字描述配置枚举

@@ -74,14 +74,22 @@
         />
       </template>
       <template #configStatus="{ record }">
-        <Switch
-          :disabled="disabledSwitch"
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          :checkedChildren="BusinessReportConfigTextEnum.BUSINESS_ENABLE_TEXT"
-          :unCheckedChildren="BusinessReportConfigTextEnum.BUSINESS_DISABLE_TEXT"
-          @change="(checked: boolean) => statusChange(checked, record)"
-        />
+        <Authority :value="PermissionReportConfigEnum.PERMISSION_STATUS">
+          <Switch
+            :disabled="disabledSwitch"
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            :checkedChildren="BusinessReportConfigTextEnum.BUSINESS_ENABLE_TEXT"
+            :unCheckedChildren="BusinessReportConfigTextEnum.BUSINESS_DISABLE_TEXT"
+            @change="(checked: boolean) => statusChange(checked, record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission(PermissionReportConfigEnum.PERMISSION_STATUS)"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
     </BasicTable>
     <ReportConfigDrawer @register="registerDrawer" @success="handleSuccess" />
@@ -101,7 +109,7 @@
   import { defaultTableAttribtes } from './config';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Popconfirm, Switch } from 'ant-design-vue';
+  import { Popconfirm, Switch, Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import { useGo } from '/@/hooks/web/usePage';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -111,6 +119,9 @@
     BusinessReportConfigTextEnum,
     BusinessReportConfigStatusEnum,
   } from './enum';
+  import { usePermission } from '/@/hooks/web/usePermission';
+
+  const { hasPermission } = usePermission();
 
   const disabledSwitch = ref(false);
 

@@ -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',
 }
 
 //业务文字描述配置枚举

@@ -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();
   };

@@ -164,26 +164,26 @@ export const genActionData = (actionData) => {
 };
 
 export const operationNumber_OR_TIME = [
-  { label: '等于', value: Number_Operation.EQUAL },
-  { label: '不等于', value: Number_Operation.NOT_EQUAL },
-  { label: '小于', value: Number_Operation.LESS },
-  { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL },
-  { label: '大于', value: Number_Operation.GREATER },
-  { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL },
+  { label: '等于', value: Number_Operation.EQUAL, symbol: '=' },
+  { label: '不等于', value: Number_Operation.NOT_EQUAL, symbol: '!=' },
+  { label: '小于', value: Number_Operation.LESS, symbol: '<' },
+  { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL, symbol: '<=' },
+  { label: '大于', value: Number_Operation.GREATER, symbol: '>' },
+  { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL, symbol: '>=' },
 ];
 
 export const operationString = [
-  { label: '等于', value: String_Operation.EQUAL },
-  { label: '不等于', value: String_Operation.NOT_EQUAL },
-  { label: '开始于', value: String_Operation.BEGAN_IN },
-  { label: '结束于', value: String_Operation.END_IN },
-  { label: '包含', value: String_Operation.INCLUDE },
-  { label: '不包含', value: String_Operation.NOT_INCLUDE },
+  { label: '等于', value: String_Operation.EQUAL, symbol: '=' },
+  { label: '不等于', value: String_Operation.NOT_EQUAL, symbol: '!=' },
+  { label: '开始于', value: String_Operation.BEGAN_IN, symbol: '开始于' },
+  { label: '结束于', value: String_Operation.END_IN, symbol: '结束于' },
+  { label: '包含', value: String_Operation.INCLUDE, symbol: '包含' },
+  { label: '不包含', value: String_Operation.NOT_INCLUDE, symbol: '不包含' },
 ];
 
 export const operationBoolean = [
-  { label: '等于', value: Boolean_Operation.EQUAL },
-  { label: '不等于', value: Boolean_Operation.NOT_EQUAL },
+  { label: '等于', value: Boolean_Operation.EQUAL, symbol: '=' },
+  { label: '不等于', value: Boolean_Operation.NOT_EQUAL, symbol: '!=' },
 ];
 
 export const scheduleOptions = [

@@ -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({

@@ -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();
   };

@@ -24,8 +24,9 @@
                   :customRequest="customUploadIconPic"
                   :before-upload="beforeUploadIconPic"
                 >
-                  <div v-if="iconPic">
+                  <div v-if="iconPic" class="relative">
                     <img :src="iconPic" class="m-auto fill-img" />
+                    <CloseCircleOutlined class="absolute icon-delete" @click.stop="handleDelete" />
                     <div style="background-color: #ccc; margin-top: 20px">重新上传</div>
                   </div>
                   <div v-else>
@@ -81,7 +82,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { iconUpload, getPlatForm, updatePlatForm, resetPlateInfo } from '/@/api/oem/index';
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { createLocalStorage } from '/@/utils/cache/index';
   import { Authority } from '/@/components/Authority';
@@ -100,6 +101,7 @@
       ContentUploadText,
       Spin,
       CustomUploadComp,
+      CloseCircleOutlined,
     },
     setup() {
       const loading = ref(false);
@@ -188,6 +190,11 @@
         storage.set('platformInfo', newFieldValue);
       }
 
+      // 删除浏览器ico图标
+      const handleDelete = () => {
+        iconPic.value = '';
+      };
+
       onMounted(async () => {
         const res = await getPlatForm();
         setFieldsValue(res);
@@ -227,6 +234,7 @@
         handleResetInfo,
         handleSetBgImgUrl,
         handleSetLogoImgUrl,
+        handleDelete,
       };
     },
   });
@@ -251,4 +259,12 @@
     width: 100%;
     height: 100%;
   }
+
+  .icon-delete {
+    top: -13px;
+    right: -13px;
+    color: rgb(146, 145, 145);
+    font-size: 1rem;
+    z-index: 9999;
+  }
 </style>

 <script setup name="CustomUploadComp" lang="ts">
-  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
   import { Upload, Spin } from 'ant-design-vue';
   import { ref, watchEffect } from 'vue';
   import { useUpload } from './hooks/useUploadFile.hook';
@@ -40,6 +40,12 @@
     }
   };
 
+  // 删除图片
+  const handleDelete = () => {
+    uploadImgUrl.value = '';
+    emit('setImg', uploadImgUrl.value);
+  };
+
   watchEffect(() => {
     init();
   });
@@ -59,7 +65,10 @@
       :customRequest="customUpload"
       :before-upload="beforeUploadVerify"
     >
-      <img v-if="uploadImgUrl" class="fill-img" :src="uploadImgUrl" alt="avatar" />
+      <div v-if="uploadImgUrl" class="w-full h-full modal-div relative">
+        <img class="fill-img" :src="uploadImgUrl" alt="avatar" />
+        <CloseCircleOutlined class="absolute icon-delete" @click.stop="handleDelete" />
+      </div>
       <div v-else>
         <Spin v-if="uploadLoading" tip="正在上传中..." />
         <PlusOutlined v-else />
@@ -74,4 +83,12 @@
     width: 100%;
     height: 100%;
   }
+
+  .icon-delete {
+    top: -13px;
+    right: -13px;
+    color: rgb(146, 145, 145);
+    font-size: 1rem;
+    z-index: 9999;
+  }
 </style>

@@ -21,13 +21,18 @@
         </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:role:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag v-if="!hasPermission('api:yt:role:status')" :color="record.status ? 'green' : 'red'">
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -67,12 +72,14 @@
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
   export default defineComponent({
     name: 'RoleManagement',
-    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm },
+    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm, Tag },
     setup() {
+      const { hasPermission } = usePermission();
       const [registerDrawer, { openDrawer }] = useDrawer();
       function handleSuccess() {
         reload();
@@ -157,6 +164,7 @@
         hasBatchDelete,
         handleDeleteOrBatchDelete,
         statusChange,
+        hasPermission,
       };
     },
   });

@@ -7,7 +7,7 @@ export const validateDevicePicker = () => {
     validateTrigger: 'blur',
     validator(_rule: Recordable, value: Recordable, _callback: Fn) {
       const device = Reflect.get(value || {}, FormFieldsEnum.DEVICE);
-      if (!device) return Promise.reject('请选择设备');
+      if (!device || !device.length) return Promise.reject('请选择设备');
       return Promise.resolve();
     },
   } as Rule;

@@ -133,6 +133,7 @@
             text: '详情',
             event: DropMenuEvent.DETAIL,
             icon: 'ant-design:eye-outlined',
+            auth: PermissionEnum.DETAIL,
             onClick: emit.bind(null, 'detail', getRecord),
           },
           {

@@ -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 {

@@ -54,7 +54,7 @@
     },
     labelWidth: 120,
     fieldMapToTime: [
-      [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:ss'],
+      [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:mm:ss'],
     ],
     submitButtonOptions: {
       loading: loading as unknown as boolean,
@@ -260,7 +260,7 @@
     :show-ok-btn="false"
     cancel-text="关闭"
     width="70%"
-    title="历史趋势"
+    title="选择时间"
   >
     <section
       class="flex flex-col p-4 h-full w-full min-w-7/10"