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

…ix/board-style-issues

@@ -8,6 +8,7 @@ export interface BigScreenCenterItemsModel {
   remark: string;
   remark: string;
   state: number;
   state: number;
   publicId: string;
   publicId: string;
+  organizationId?: string;
 }
 }
 export type queryPageParams = BasicPageParams & {
 export type queryPageParams = BasicPageParams & {
   name?: Nullable<string>;
   name?: Nullable<string>;

@@ -7,6 +7,7 @@ export interface ConfigurationCenterItemsModal {
   creator: string;
   creator: string;
   remark: string;
   remark: string;
   publicId?: string;
   publicId?: string;
+  organizationId?: string;
 }
 }
 export type queryPageParams = BasicPageParams & {
 export type queryPageParams = BasicPageParams & {
   name?: Nullable<string>;
   name?: Nullable<string>;

@@ -85,7 +85,7 @@ interface TrendParamsType {
 }
 }
 // 获取租户趋势或者客户趋势数据
 // 获取租户趋势或者客户趋势数据
 export const getTrendData = (params: TrendParamsType) => {
 export const getTrendData = (params: TrendParamsType) => {
-  return defHttp.get({
+  return defHttp.get<Record<'date' | 'value', string>[]>({
     url: HomeEnum.TrendAPI,
     url: HomeEnum.TrendAPI,
     params,
     params,
   });
   });

@@ -30,6 +30,8 @@ enum DeviceManagerApi {
 
 
   ALARM_BATCH_ACK = '/alarm/batch/ack',
   ALARM_BATCH_ACK = '/alarm/batch/ack',
 
 
+  ALARM_BATCH_CLEAR = '/alarm/batch/clear',
+
   DEVICE_CREDENTIALS = '/device/credentials',
   DEVICE_CREDENTIALS = '/device/credentials',
 
 
   COMMAND_ISSUANCE = '/rpc',
   COMMAND_ISSUANCE = '/rpc',
@@ -358,3 +360,13 @@ export const doBatchAckAlarm = (ids: string[]) => {
     { joinPrefix: false }
     { joinPrefix: false }
   );
   );
 };
 };
+
+export const doBatchClearAlarm = (ids: string[]) => {
+  return defHttp.post(
+    {
+      url: DeviceManagerApi.ALARM_BATCH_CLEAR,
+      data: { alarmIds: ids },
+    },
+    { joinPrefix: false }
+  );
+};

@@ -9,7 +9,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { computed, ref, unref } from 'vue';
   import { computed, ref, unref } from 'vue';
   import { cloneDeep } from 'lodash-es';
   import { cloneDeep } from 'lodash-es';
-  import { isFunction, isNumber, isObject } from '/@/utils/is';
+  import { isFunction, isNumber, isObject, isString } from '/@/utils/is';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
 
 
   export interface FileItem {
   export interface FileItem {
@@ -59,10 +59,19 @@
   );
   );
 
 
   const handleBeforeUpload = (file: File, fileList: File[]) => {
   const handleBeforeUpload = (file: File, fileList: File[]) => {
-    const { beforeUpload } = props;
+    const { beforeUpload, accept } = props;
 
 
     if (beforeUpload && isFunction(beforeUpload)) return beforeUpload?.(file, fileList);
     if (beforeUpload && isFunction(beforeUpload)) return beforeUpload?.(file, fileList);
 
 
+    if (accept && isString(accept)) {
+      const limitFileSuffix = accept.split(',');
+
+      if (limitFileSuffix.length && !limitFileSuffix.some((suffix) => file.name.includes(suffix))) {
+        createMessage.warning(`允许上传的文件类型包括${accept}`);
+        return false;
+      }
+    }
+
     if (file.size > props.maxSize) {
     if (file.size > props.maxSize) {
       createMessage.warning(`文件大小超过${Math.floor(props.maxSize / 1024 / 1024)}mb`);
       createMessage.warning(`文件大小超过${Math.floor(props.maxSize / 1024 / 1024)}mb`);
       return false;
       return false;

@@ -2,7 +2,7 @@ import { RouteLocationNormalizedLoaded } from 'vue-router';
 
 
 const menuMap = new Map();
 const menuMap = new Map();
 
 
-menuMap.set('/visual/board/detail/:boardId/:boardName?', '/visual/board');
+menuMap.set('/visual/board/detail/:boardId/:boardName/:organizationId?', '/visual/board');
 menuMap.set('/rule/chain/:id', '/rule/chain');
 menuMap.set('/rule/chain/:id', '/rule/chain');
 
 
 export const useMenuActiveFix = (route: RouteLocationNormalizedLoaded) => {
 export const useMenuActiveFix = (route: RouteLocationNormalizedLoaded) => {

@@ -37,7 +37,7 @@
           </a-button>
           </a-button>
         </template>
         </template>
         <template #status="{ record }">
         <template #status="{ record }">
-          <Authority value="api:yt:alarm:profile:status">
+          <Authority value="api:yt:alarm:profile:update">
             <Switch
             <Switch
               :checked="record.status === 1"
               :checked="record.status === 1"
               :loading="record.pendingStatus"
               :loading="record.pendingStatus"
@@ -47,7 +47,7 @@
             />
             />
           </Authority>
           </Authority>
           <Tag
           <Tag
-            v-if="!hasPermission('api:yt:alarm:profile:status')"
+            v-if="!hasPermission('api:yt:alarm:profile:update')"
             :color="record.status ? 'green' : 'red'"
             :color="record.status ? 'green' : 'red'"
           >
           >
             {{ record.status ? '启用' : '禁用' }}
             {{ record.status ? '启用' : '禁用' }}

@@ -19,7 +19,30 @@
         </a-button>
         </a-button>
       </template>
       </template>
       <template #toolbar>
       <template #toolbar>
-        <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">批量处理</Button>
+        <Tooltip>
+          <template #title>
+            <div>激活未确认: 可以处理，清除</div>
+            <div>激活已确认: 只可清除，已经处理</div>
+            <div>清除未确认: 只可处理，已经清除</div>
+            <div>清除已确认: 不需要做处理和清除</div>
+          </template>
+          <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear">
+            <QuestionCircleOutlined class="cursor-pointer" />
+            <span>批量清除</span>
+          </Button>
+        </Tooltip>
+        <Tooltip>
+          <template #title>
+            <div>激活未确认: 可以处理，清除</div>
+            <div>激活已确认: 只可清除，已经处理</div>
+            <div>清除未确认: 只可处理，已经清除</div>
+            <div>清除已确认: 不需要做处理和清除</div>
+          </template>
+          <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">
+            <QuestionCircleOutlined class="cursor-pointer" />
+            <span>批量处理</span>
+          </Button>
+        </Tooltip>
       </template>
       </template>
     </BasicTable>
     </BasicTable>
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
@@ -29,10 +52,10 @@
   import { defineComponent, nextTick, h, computed } from 'vue';
   import { defineComponent, nextTick, h, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { alarmColumns, alarmSearchSchemas } from './config/detail.config';
   import { alarmColumns, alarmSearchSchemas } from './config/detail.config';
-  import { doBatchAckAlarm, getDeviceAlarm } from '/@/api/device/deviceManager';
+  import { doBatchAckAlarm, doBatchClearAlarm, getDeviceAlarm } from '/@/api/device/deviceManager';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue';
   import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue';
-  import { Modal, Button } from 'ant-design-vue';
+  import { Modal, Button, Tooltip } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { getDeviceDetail } from '/@/api/device/deviceManager';
   import { getDeviceDetail } from '/@/api/device/deviceManager';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
@@ -44,6 +67,7 @@
   import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel';
   import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'AlarmCenter',
     name: 'AlarmCenter',
@@ -52,6 +76,8 @@
       BasicTable,
       BasicTable,
       TableAction,
       TableAction,
       AlarmDetailDrawer,
       AlarmDetailDrawer,
+      QuestionCircleOutlined,
+      Tooltip,
     },
     },
 
 
     setup() {
     setup() {
@@ -60,6 +86,7 @@
           title: '告警记录列表',
           title: '告警记录列表',
           api: getDeviceAlarm,
           api: getDeviceAlarm,
           columns: alarmColumns,
           columns: alarmColumns,
+          rowKey: 'id',
           useSearchForm: true,
           useSearchForm: true,
           formConfig: {
           formConfig: {
             labelWidth: 120,
             labelWidth: 120,
@@ -168,9 +195,30 @@
         };
         };
       };
       };
 
 
+      const getCanBatchClear = computed(() => {
+        const rowSelection = getRowSelection();
+        const getRows: AlarmLogItem[] = getSelectRows();
+
+        return (
+          !rowSelection.selectedRowKeys?.length ||
+          getRows.some(
+            (item) =>
+              item.status === AlarmStatus.CLEARED_ACK || item.status === AlarmStatus.CLEARED_UN_ACK
+          )
+        );
+      });
+
       const getCanBatchAck = computed(() => {
       const getCanBatchAck = computed(() => {
         const rowSelection = getRowSelection();
         const rowSelection = getRowSelection();
-        return !rowSelection.selectedRowKeys?.length;
+        const getRows: AlarmLogItem[] = getSelectRows();
+
+        return (
+          !rowSelection.selectedRowKeys?.length ||
+          getRows.some(
+            (item) =>
+              item.status === AlarmStatus.CLEARED_ACK || item.status === AlarmStatus.ACTIVE_ACK
+          )
+        );
       });
       });
 
 
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
@@ -183,6 +231,15 @@
         reload();
         reload();
       };
       };
 
 
+      const handleBatchClear = async () => {
+        const ids = getSelectRows<AlarmLogItem>().map((item) => item.id);
+        if (!ids.length) return;
+        await doBatchClearAlarm(ids);
+        createMessage.success('操作成功');
+        clearSelectedRowKeys();
+        reload();
+      };
+
       return {
       return {
         registerTable,
         registerTable,
         registerDetailDrawer,
         registerDetailDrawer,
@@ -190,7 +247,9 @@
         handleSuccess,
         handleSuccess,
         handleViewAlarmDetails,
         handleViewAlarmDetails,
         handleBatchAck,
         handleBatchAck,
+        handleBatchClear,
         getCanBatchAck,
         getCanBatchAck,
+        getCanBatchClear,
       };
       };
     },
     },
   });
   });

@@ -56,7 +56,10 @@
           return unref(orgList);
           return unref(orgList);
         }
         }
       },
       },
-      params: { ...params, _t: unref(timespan) },
+      params: {
+        ...params,
+        _t: unref(timespan),
+      },
       onChange: (...args: any[]) => {
       onChange: (...args: any[]) => {
         emit('change', ...args);
         emit('change', ...args);
       },
       },

@@ -136,13 +136,19 @@
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getPreviewFlag)) return;
     if (!unref(getPreviewFlag)) return;
     window.open(
     window.open(
-      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}&lightbox=1`
+      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
+        record!.id
+      }&lightbox=1&organizationId=${record.organizationId}`
     );
     );
   };
   };
 
 
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getDesignFlag)) return;
     if (!unref(getDesignFlag)) return;
-    window.open(`${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`);
+    window.open(
+      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
+        record!.id
+      }&organizationId=${record.organizationId}`
+    );
   };
   };
 
 
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
@@ -165,6 +171,7 @@
     searchParams.set('configurationId', record.id);
     searchParams.set('configurationId', record.id);
     searchParams.set('publicId', record.publicId || '');
     searchParams.set('publicId', record.publicId || '');
     searchParams.set('lightbox', '1');
     searchParams.set('lightbox', '1');
+    searchParams.set('organizationId', record!.organizationId || '');
     return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
     return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
   };
   };
 
 

@@ -132,6 +132,9 @@
             @calendarChange="handleCalendarChange"
             @calendarChange="handleCalendarChange"
             size="small"
             size="small"
             v-model:value="customerDateValue"
             v-model:value="customerDateValue"
+            :showTime="{
+              defaultValue: [dateUtil('00:00:00', 'HH:mm:ss'), dateUtil('23:59:59', 'HH:mm:ss')],
+            }"
           >
           >
             <Button
             <Button
               type="link"
               type="link"
@@ -165,7 +168,7 @@
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
-  import { formatToDateTime } from '/@/utils/dateUtil';
+  import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
   import CustomerTrend from './CustomerTrend.vue';
   import CustomerTrend from './CustomerTrend.vue';
   // import TenantTrend from './TenantTrend.vue';
   // import TenantTrend from './TenantTrend.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
@@ -530,6 +533,7 @@
   };
   };
 
 
   const handleDisableDate = (current: moment.Moment) => {
   const handleDisableDate = (current: moment.Moment) => {
+    if (!current) return true;
     if (!unref(customerDateValue) || unref(customerDateValue).length === 0) {
     if (!unref(customerDateValue) || unref(customerDateValue).length === 0) {
       return false;
       return false;
     }
     }

@@ -117,6 +117,9 @@
             @calendarChange="handleCalendarChange"
             @calendarChange="handleCalendarChange"
             :disabledDate="handleDisableDate"
             :disabledDate="handleDisableDate"
             v-model:value="tenantDateValue"
             v-model:value="tenantDateValue"
+            :showTime="{
+              defaultValue: [dateUtil('00:00:00', 'HH:mm:ss'), dateUtil('23:59:59', 'HH:mm:ss')],
+            }"
           >
           >
             <Button
             <Button
               type="link"
               type="link"
@@ -175,7 +178,7 @@
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
-  import { formatToDateTime } from '/@/utils/dateUtil';
+  import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
   // import CustomerTrend from './CustomerTrend.vue';
   // import CustomerTrend from './CustomerTrend.vue';
   import TenantTrend from './TenantTrend.vue';
   import TenantTrend from './TenantTrend.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
@@ -548,6 +551,7 @@
   };
   };
 
 
   const handleDisableDate = (current: moment.Moment) => {
   const handleDisableDate = (current: moment.Moment) => {
+    if (!current) return true;
     if (!unref(tenantDateValue) || unref(tenantDateValue).length === 0) {
     if (!unref(tenantDateValue) || unref(tenantDateValue).length === 0) {
       return false;
       return false;
     }
     }

-import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
-import { ref } from 'vue';
+import { dateUtil } from '/@/utils/dateUtil';
+import { Ref, ref } from 'vue';
 import { getTrendData } from '/@/api/dashboard';
 import { getTrendData } from '/@/api/dashboard';
 import { RangePickerValue } from 'ant-design-vue/lib/date-picker/interface';
 import { RangePickerValue } from 'ant-design-vue/lib/date-picker/interface';
+import moment from 'moment';
 
 
 export enum ShortcutQueryKeyEnum {
 export enum ShortcutQueryKeyEnum {
   LATEST_1_MONTH = 'LATEST_1_MONTH',
   LATEST_1_MONTH = 'LATEST_1_MONTH',
@@ -42,8 +43,8 @@ export function getDateByShortcutQueryKey(value: ShortcutQueryKeyEnum) {
 export function useDate() {
 export function useDate() {
   const tenantDateValue = ref([]);
   const tenantDateValue = ref([]);
   const customerDateValue = ref<RangePickerValue>([]);
   const customerDateValue = ref<RangePickerValue>([]);
-  const tenantTrendList = ref([]);
-  const customerTrendList = ref([]);
+  const tenantTrendList = ref<[string, string][]>([]);
+  const customerTrendList = ref<[string, string][]>([]);
   const activeTenantIndex = ref(0);
   const activeTenantIndex = ref(0);
   const activeCustomerIndex = ref(0);
   const activeCustomerIndex = ref(0);
   const TenantOrCustomerDateList = ref([
   const TenantOrCustomerDateList = ref([
@@ -80,52 +81,39 @@ export function useDate() {
   }
   }
 
 
   // 获取选中的时间范围内的数据
   // 获取选中的时间范围内的数据
-  async function getDateData(startTs, endTs, trend: 'CUSTOMER_TREND' | 'TENANT_TREND', list) {
-    // 计算时间间隔
-    function computedInterval(startTs: number, endTs: number) {
-      /**
-       * 选择的时间间隔
-       * <=1 2h
-       * <=30 1day
-       *  >30<90 2day
-       *  >90 1month
-       */
-      let interval = 86400000;
-      if (endTs - startTs <= 86400000) {
-        interval = 7200000;
-      } else if (endTs - startTs <= 2592000000) {
-        interval = 86400000;
-      } else if (endTs - startTs > 2592000000 && endTs - startTs < 7776000000) {
-        interval = 172800000;
-      } else if (endTs - startTs > 7776000000) {
-        interval = 2592000000;
-      }
-      return interval;
-    }
-    startTs = parseInt(formatToDateTime(startTs, 'x')) - 86400000;
-    endTs = parseInt(formatToDateTime(endTs, 'x'));
+  async function getDateData(
+    startTs: moment.Moment,
+    endTs: moment.Moment,
+    trend: 'CUSTOMER_TREND' | 'TENANT_TREND',
+    list: Ref<[string, string][]>
+  ) {
     const res = await getTrendData({
     const res = await getTrendData({
-      startTs,
-      endTs,
-      interval: computedInterval(startTs, endTs),
+      startTs: startTs.valueOf(),
+      endTs: endTs.valueOf(),
+      interval: 24 * 60 * 60 * 1000,
       trend,
       trend,
     });
     });
-    list.value = res.map((item) => [item.ts, item.value]);
+    list.value = res.map((item) => [item.date, item.value]);
   }
   }
 
 
   // 租户选择日期
   // 租户选择日期
-  function onDateTenantChange(_, dateString) {
-    if (!_.length) return;
-    const [startTs, endTs] = dateString;
+  function onDateTenantChange(range: RangePickerValue) {
+    if (!range.length) return;
+    const [startTs, endTs] = range;
     activeTenantIndex.value = -1;
     activeTenantIndex.value = -1;
-    getDateData(startTs, endTs, 'TENANT_TREND', tenantTrendList);
+    getDateData(startTs as moment.Moment, endTs as moment.Moment, 'TENANT_TREND', tenantTrendList);
   }
   }
   // 客户趋势选择日期
   // 客户趋势选择日期
-  function onDateCustomerChange(_, dateString) {
-    if (!_.length) return;
-    const [startTs, endTs] = dateString;
+  function onDateCustomerChange(range: RangePickerValue) {
+    if (!range.length) return;
+    const [startTs, endTs] = range;
     activeCustomerIndex.value = -1;
     activeCustomerIndex.value = -1;
-    getDateData(startTs, endTs, 'CUSTOMER_TREND', customerTrendList);
+    getDateData(
+      startTs as moment.Moment,
+      endTs as moment.Moment,
+      'CUSTOMER_TREND',
+      customerTrendList
+    );
   }
   }
   return {
   return {
     tenantDateValue,
     tenantDateValue,

@@ -124,12 +124,16 @@
   const { largeDesignerPrefix } = useGlobSetting();
   const { largeDesignerPrefix } = useGlobSetting();
 
 
   const handlePreview = (record: BigScreenCenterItemsModel) => {
   const handlePreview = (record: BigScreenCenterItemsModel) => {
-    window.open(`${largeDesignerPrefix}/#/chart/preview/${record.id}`);
+    window.open(
+      `${largeDesignerPrefix}/#/chart/preview/${record.id}?organizationId=${record.organizationId}`
+    );
   };
   };
 
 
   const handleDesign = (record: BigScreenCenterItemsModel) => {
   const handleDesign = (record: BigScreenCenterItemsModel) => {
     if (record.state === 1) return;
     if (record.state === 1) return;
-    window.open(`${largeDesignerPrefix}/#/chart/home/${record.id}`);
+    window.open(
+      `${largeDesignerPrefix}/#/chart/home/${record.id}?organizationId=${record.organizationId}`
+    );
   };
   };
 
 
   const handleDelete = async (record: BigScreenCenterItemsModel) => {
   const handleDelete = async (record: BigScreenCenterItemsModel) => {

@@ -10,7 +10,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, nextTick, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { CommandFieldsEnum, CommandSchemas, CommandType, ValueType } from '../../config/data';
   import { CommandFieldsEnum, CommandSchemas, CommandType, ValueType } from '../../config/data';
   import { commandIssuanceApi } from '/@/api/device/deviceManager';
   import { commandIssuanceApi } from '/@/api/device/deviceManager';
@@ -35,7 +35,7 @@
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const loading = ref(false);
       const loading = ref(false);
 
 
-      const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
+      const [registerForm, { getFieldsValue, validate, resetFields, clearValidate }] = useForm({
         labelWidth: 120,
         labelWidth: 120,
         schemas: CommandSchemas(
         schemas: CommandSchemas(
           props.deviceDetail.deviceProfile.transportType as TransportTypeEnum,
           props.deviceDetail.deviceProfile.transportType as TransportTypeEnum,
@@ -47,8 +47,10 @@
         showResetButton: false,
         showResetButton: false,
       });
       });
 
 
-      const handleCancel = () => {
-        resetFields();
+      const handleCancel = async () => {
+        await resetFields();
+        await nextTick();
+        await clearValidate();
       };
       };
 
 
       const handleOk = async () => {
       const handleOk = async () => {

@@ -36,6 +36,7 @@
               <Authority value="api:yt:things_model:import">
               <Authority value="api:yt:things_model:import">
                 <Upload
                 <Upload
                   v-if="isShowBtn"
                   v-if="isShowBtn"
+                  accept=".json,"
                   :show-upload-list="false"
                   :show-upload-list="false"
                   :customRequest="handleImportModel"
                   :customRequest="handleImportModel"
                 >
                 >

@@ -22,7 +22,7 @@
         </Authority>
         </Authority>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority value="api:yt:message:status">
+        <Authority value="api:yt:message:update">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -32,7 +32,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission('api:yt:message:status')"
+          v-if="!hasPermission('api:yt:message:update')"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -22,7 +22,7 @@
         </a-button>
         </a-button>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority value="api:yt:template:status">
+        <Authority value="api:yt:template:update">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -32,7 +32,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission('api:yt:template:status')"
+          v-if="!hasPermission('api:yt:template:update')"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -4,12 +4,12 @@
     <div style="height: 30px"></div>
     <div style="height: 30px"></div>
     <BasicForm @register="registerForm" />
     <BasicForm @register="registerForm" />
     <div class="flex flex-end" style="float: right">
     <div class="flex flex-end" style="float: right">
-      <a-button type="primary" @click="handleDeviceState">处理</a-button>
+      <a-button v-if="!isHandler" type="primary" @click="handleDeviceState">处理</a-button>
     </div>
     </div>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formHandleSchema, formDetailSchema } from './config.data';
   import { formHandleSchema, formDetailSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -26,7 +26,7 @@
     obj: {},
     obj: {},
   });
   });
 
 
-  const [registerForm, { resetFields, getFieldsValue }] = useForm({
+  const [registerForm, { resetFields, getFieldsValue, setFieldsValue }] = useForm({
     schemas: formHandleSchema,
     schemas: formHandleSchema,
     showActionButtonGroup: false,
     showActionButtonGroup: false,
   });
   });
@@ -37,11 +37,15 @@
     layout: 'vertical',
     layout: 'vertical',
   });
   });
 
 
+  const isHandler = ref(false);
+
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     await resetFields();
     setDrawerProps({ confirmLoading: false });
     setDrawerProps({ confirmLoading: false });
     record.obj = data.record;
     record.obj = data.record;
     setDescProps({ data: data.record });
     setDescProps({ data: data.record });
+    isHandler.value = data?.record?.remark;
+    setFieldsValue(data.record);
   });
   });
 
 
   const handleDeviceState = async () => {
   const handleDeviceState = async () => {

@@ -194,6 +194,10 @@ export const formSchema: DescItem[] = [
     field: 'createTime',
     field: 'createTime',
     label: '时间',
     label: '时间',
   },
   },
+  {
+    field: 'remark',
+    label: '备注',
+  },
 ];
 ];
 
 
 export const formDetailSchema: DescItem[] = [
 export const formDetailSchema: DescItem[] = [
@@ -221,7 +225,7 @@ export const formDetailSchema: DescItem[] = [
 //处理表单
 //处理表单
 export const formHandleSchema: FormSchema[] = [
 export const formHandleSchema: FormSchema[] = [
   {
   {
-    field: 'description',
+    field: 'remark',
     label: '备注',
     label: '备注',
     colProps: { span: 24 },
     colProps: { span: 24 },
     component: 'InputTextArea',
     component: 'InputTextArea',

@@ -20,6 +20,7 @@
               label: '处理',
               label: '处理',
               auth: 'api:yt:device:state:log::post',
               auth: 'api:yt:device:state:log::post',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
+              ifShow: () => !record?.remark,
               onClick: handleView.bind(null, record),
               onClick: handleView.bind(null, record),
             },
             },
             {
             {

@@ -74,7 +74,7 @@
         />
         />
       </template>
       </template>
       <template #configStatus="{ record }">
       <template #configStatus="{ record }">
-        <Authority :value="PermissionReportConfigEnum.PERMISSION_STATUS">
+        <Authority :value="PermissionReportConfigEnum.PERMISSION_UPDATE">
           <Switch
           <Switch
             :disabled="disabledSwitch"
             :disabled="disabledSwitch"
             :checked="record.status === 1"
             :checked="record.status === 1"
@@ -85,7 +85,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission(PermissionReportConfigEnum.PERMISSION_STATUS)"
+          v-if="!hasPermission(PermissionReportConfigEnum.PERMISSION_UPDATE)"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -31,9 +31,9 @@
   import { CredentialsEnum } from '../mqtt/enum';
   import { CredentialsEnum } from '../mqtt/enum';
 
 
   const credentialsFile = reactive({
   const credentialsFile = reactive({
-    caCertFileName: '',
-    certFileName: '',
-    privateKeyFileName: '',
+    caCertFileName: undefined,
+    certFileName: undefined,
+    privateKeyFileName: undefined,
   });
   });
 
 
   const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
   const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
@@ -50,6 +50,11 @@
   const getValue = async () => {
   const getValue = async () => {
     const values = await validateFields();
     const values = await validateFields();
     if (!values) return;
     if (!values) return;
+    // if (values.type == 'anonymous' || values.type == 'basic') {
+    //   credentialsFile.caCertFileName = undefined;
+    //   credentialsFile.certFileName = undefined;
+    //   credentialsFile.privateKeyFileName = undefined;
+    // }
     const credentials = {
     const credentials = {
       type: values['type'],
       type: values['type'],
       ...credentialsFile,
       ...credentialsFile,

@@ -51,10 +51,16 @@
   const getValue = async () => {
   const getValue = async () => {
     const values = await validateFields();
     const values = await validateFields();
     if (!values) return;
     if (!values) return;
+    if (values.type == 'anonymous' || values.type == 'basic') {
+      credentialsFile.caCertFileName = undefined;
+      credentialsFile.certFileName = undefined;
+      credentialsFile.privateKeyFileName = undefined;
+    }
     const credentials = {
     const credentials = {
       type: values['type'],
       type: values['type'],
       ...credentialsFile,
       ...credentialsFile,
     };
     };
+
     const mergeValues = {
     const mergeValues = {
       ...values,
       ...values,
       ...{ credentials },
       ...{ credentials },
@@ -67,7 +73,12 @@
     if (credentials) {
     if (credentials) {
       for (let i in credentials) Reflect.set(credentialsFile, i, credentials[i]);
       for (let i in credentials) Reflect.set(credentialsFile, i, credentials[i]);
     }
     }
-    setFieldsValue({ ...value, type: credentials.type });
+    setFieldsValue({
+      ...value,
+      type: credentials.type,
+      username: credentials.username,
+      password: credentials.password,
+    });
   };
   };
 
 
   const resetValue = () => resetFields();
   const resetValue = () => resetFields();

@@ -18,7 +18,7 @@ class MqttFormPartialConfig {
     return [
     return [
       { label: 'Anonymous', value: 'anonymous' },
       { label: 'Anonymous', value: 'anonymous' },
       { label: 'Basic', value: 'basic' },
       { label: 'Basic', value: 'basic' },
-      { label: 'PEM', value: 'pem' },
+      { label: 'PEM', value: 'cert.PEM' },
     ];
     ];
   }
   }
 }
 }
@@ -138,9 +138,21 @@ export const modeMqttForm: FormSchema[] = [
     label: '凭据类型',
     label: '凭据类型',
     colProps: { span: 12 },
     colProps: { span: 12 },
     defaultValue: MqttFormPartialConfig.type,
     defaultValue: MqttFormPartialConfig.type,
-    componentProps: {
-      placeholder: '请选择Credentials',
-      options: MqttFormPartialConfig.getType(),
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择Credentials',
+        options: MqttFormPartialConfig.getType(),
+        onChange(e) {
+          if (e) {
+            console.log('执行');
+            setFieldsValue({
+              password: undefined,
+              username: undefined,
+            });
+          }
+        },
+      };
     },
     },
   },
   },
   {
   {

@@ -6,7 +6,7 @@
 export enum CredentialsEnum {
 export enum CredentialsEnum {
   IS_ANONYMOUS = 'anonymous',
   IS_ANONYMOUS = 'anonymous',
   IS_BASIC = 'basic',
   IS_BASIC = 'basic',
-  IS_PEM = 'pem',
+  IS_PEM = 'cert.PEM',
 }
 }
 
 
 export const isBasic = (type: string) => {
 export const isBasic = (type: string) => {

@@ -128,8 +128,9 @@
             : undefined,
             : undefined,
           appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix || undefined,
           appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix || undefined,
           type: undefined,
           type: undefined,
+          username: undefined,
+          password: undefined,
         };
         };
-
         const rest = isRabbitmq(getDataFlowMethod?.type)
         const rest = isRabbitmq(getDataFlowMethod?.type)
           ? await postAddConvertApi({ ...restData.data, ...data })
           ? await postAddConvertApi({ ...restData.data, ...data })
           : await postAddConvertApi({ ...restData.data, ...data, configuration });
           : await postAddConvertApi({ ...restData.data, ...data, configuration });

@@ -79,7 +79,7 @@
         />
         />
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority :value="PermissionDataFlowEnum.PERMISSION_STATUS">
+        <Authority :value="PermissionDataFlowEnum.PERMISSION_UPDATE">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -89,7 +89,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission(PermissionDataFlowEnum.PERMISSION_STATUS)"
+          v-if="!hasPermission(PermissionDataFlowEnum.PERMISSION_UPDATE)"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -755,6 +755,18 @@ export const actionSchema: FormSchema[] = [
     component: 'Select',
     component: 'Select',
     label: '',
     label: '',
     show: ({ values }) => isAlarmOut(values.outTarget),
     show: ({ values }) => isAlarmOut(values.outTarget),
+    // dynamicRules: (params) => {
+    //   const { outTarget } = params.values;
+    //   return [
+    //     {
+    //       required: outTarget == 'MSG_NOTIFY' ? true : false,
+    //       validator: (_, value) => {
+    //         if (!value) return Promise.reject('请选择告警配置');
+    //         Promise.resolve();
+    //       },
+    //     },
+    //   ];
+    // },
     componentProps: {
     componentProps: {
       placeholder: '请选择告警等级',
       placeholder: '请选择告警等级',
       options: [
       options: [

@@ -273,6 +273,10 @@
       if (validate.device == 'PART' && validate.deviceId == undefined)
       if (validate.device == 'PART' && validate.deviceId == undefined)
         return createMessage.error('请选择设备');
         return createMessage.error('请选择设备');
     }
     }
+    if (type === 'MSG_NOTIFY') {
+      if (!validate.alarm_config) return createMessage.error('请选择告警配置');
+      if (!validate.alarm_level) return createMessage.error('请选择告警等级');
+    }
     //ft-add-2022-11-22
     //ft-add-2022-11-22
     //TODO-fengtao-设备验证
     //TODO-fengtao-设备验证
     const value = getFieldsValue();
     const value = getFieldsValue();

@@ -50,7 +50,7 @@
       </template>
       </template>
 
 
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority value="api:yt:sceneLinkage:status">
+        <Authority value="api:yt:sceneLinkage:update">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -60,7 +60,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission('api:yt:sceneLinkage:status')"
+          v-if="!hasPermission('api:yt:sceneLinkage:update')"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -17,7 +17,7 @@
         </Authority>
         </Authority>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority value="api:yt:convert:js:status">
+        <Authority value="api:yt:convert:js:update">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -27,7 +27,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission('api:yt:convert:js:status')"
+          v-if="!hasPermission('api:yt:convert:js:update')"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -71,7 +71,7 @@
         />
         />
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority :value="PermissionConvertScriptEnum.PERMISSION_UPDATE_STATUS">
+        <Authority :value="PermissionConvertScriptEnum.PERMISSION_UPDATE">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -81,7 +81,7 @@
           />
           />
         </Authority>
         </Authority>
         <Tag
         <Tag
-          v-if="!hasPermission(PermissionConvertScriptEnum.PERMISSION_UPDATE_STATUS)"
+          v-if="!hasPermission(PermissionConvertScriptEnum.PERMISSION_UPDATE)"
           :color="record.status ? 'green' : 'red'"
           :color="record.status ? 'green' : 'red'"
         >
         >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}

@@ -21,7 +21,7 @@
         </Authority>
         </Authority>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Authority value="api:yt:role:status">
+        <Authority value="api:yt:role:saveOrUpdateRoleInfoWithMenu:update">
           <Switch
           <Switch
             :checked="record.status === 1"
             :checked="record.status === 1"
             :loading="record.pendingStatus"
             :loading="record.pendingStatus"
@@ -30,7 +30,10 @@
             @change="(checked:boolean)=>statusChange(checked,record)"
             @change="(checked:boolean)=>statusChange(checked,record)"
           />
           />
         </Authority>
         </Authority>
-        <Tag v-if="!hasPermission('api:yt:role:status')" :color="record.status ? 'green' : 'red'">
+        <Tag
+          v-if="!hasPermission('api:yt:role:saveOrUpdateRoleInfoWithMenu:update')"
+          :color="record.status ? 'green' : 'red'"
+        >
           {{ record.status ? '启用' : '禁用' }}
           {{ record.status ? '启用' : '禁用' }}
         </Tag>
         </Tag>
       </template>
       </template>

@@ -2,7 +2,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { formSchemas } from './config';
   import { formSchemas } from './config';
-  import { ref } from 'vue';
+  import { nextTick, ref } from 'vue';
   import { composeData, parseData } from './util';
   import { composeData, parseData } from './util';
   import { createTask, updateTask } from '/@/api/task';
   import { createTask, updateTask } from '/@/api/task';
   import { ModalParamsType } from '/#/utils';
   import { ModalParamsType } from '/#/utils';
@@ -33,7 +33,10 @@
       modalMode.value = mode;
       modalMode.value = mode;
       dataSource.value = record;
       dataSource.value = record;
       formMode.value = mode;
       formMode.value = mode;
-      resetFields();
+      resetFields().then(async () => {
+        await nextTick();
+        clearValidate();
+      });
       if (record && mode === DataActionModeEnum.UPDATE) {
       if (record && mode === DataActionModeEnum.UPDATE) {
         const res = parseData(record);
         const res = parseData(record);
         setFieldsValue({ ...res });
         setFieldsValue({ ...res });
@@ -41,13 +44,14 @@
     }
     }
   );
   );
 
 
-  const [registerForm, { getFieldsValue, validate, setFieldsValue, resetFields }] = useForm({
-    schemas: formSchemas,
-    showActionButtonGroup: false,
-    layout: 'inline',
-    baseColProps: { span: 24 },
-    labelWidth: 140,
-  });
+  const [registerForm, { getFieldsValue, validate, setFieldsValue, resetFields, clearValidate }] =
+    useForm({
+      schemas: formSchemas,
+      showActionButtonGroup: false,
+      layout: 'inline',
+      baseColProps: { span: 24 },
+      labelWidth: 140,
+    });
 
 
   const loading = ref(false);
   const loading = ref(false);
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();

@@ -124,7 +124,6 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
     TaskRecordType['executeTarget']
     TaskRecordType['executeTarget']
   >;
   >;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
-  console.log(pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand);
   return {
   return {
     name,
     name,
     targetType,
     targetType,

@@ -188,7 +188,9 @@
     if (hasDetailPermission) {
     if (hasDetailPermission) {
       const boardId = encode(record.id);
       const boardId = encode(record.id);
       const boardName = encode(record.name);
       const boardName = encode(record.name);
-      router.push(`/visual/board/detail/${boardId}/${boardName}`);
+      const organizationId = encode(record?.organizationId);
+
+      router.push(`/visual/board/detail/${boardId}/${boardName}/${organizationId}`);
     } else createMessage.warning('没有权限');
     } else createMessage.warning('没有权限');
   };
   };
 
 

@@ -12,10 +12,6 @@
     [PackagesCategoryEnum.MAP]: [
     [PackagesCategoryEnum.MAP]: [
       '地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为纬度，否则地图组件不能正常显示。',
       '地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为纬度，否则地图组件不能正常显示。',
     ],
     ],
-    [PackagesCategoryEnum.CONTROL]: [
-      '控制组件数据源为TCP产品,则其控制命令下发为TCP产品 物模型=>服务，且不具备状态显示功能.',
-      '控制组件数据源为非TCP产品,则其控制命令下发为产品 物模型=>属性，且具备状态显示功能.',
-    ],
   };
   };
 
 
   const getMessage = computed(() => {
   const getMessage = computed(() => {

@@ -90,6 +90,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
   const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   const selectWidgetKeys = useSelectWidgetKeys();
   const selectWidgetKeys = useSelectWidgetKeys();
   const category = unref(selectWidgetKeys).categoryKey;
   const category = unref(selectWidgetKeys).categoryKey;
+
   return [
   return [
     {
     {
       field: DataSourceField.IS_GATEWAY_DEVICE,
       field: DataSourceField.IS_GATEWAY_DEVICE,
@@ -191,6 +192,9 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             });
             });
           },
           },
           showCreate: false,
           showCreate: false,
+          apiTreeSelectProps: {
+            params: { organizationId: location?.pathname?.split('/')?.pop() || '' },
+          },
           getPopupContainer: () => document.body,
           getPopupContainer: () => document.body,
         };
         };
       },
       },