Merge branch 'feat/account-role-manage' of http://git.yunteng.com/yunteng/things…

…kit-front into feat/account-role-manage

@@ -8,22 +8,26 @@
       '清除未确认: 只可处理，已经清除',
       '清除未确认: 只可处理，已经清除',
       '清除已确认: 不需要做处理和清除',
       '清除已确认: 不需要做处理和清除',
     ] -->
     ] -->
-      <a-button
-        type="primary"
-        class="mr-4"
-        @click="handleAlarm"
-        v-if="alarmStatus !== AlarmStatus.ACTIVE_ACK && alarmStatus !== AlarmStatus.CLEARED_ACK"
-      >
-        处理
-      </a-button>
-      <a-button
-        danger
-        type="primary"
-        @click="clearAlarm"
-        v-if="alarmStatus === AlarmStatus.ACTIVE_ACK"
-      >
-        清除
-      </a-button>
+      <Authority value="api:yt:alarm:single:handle">
+        <a-button
+          type="primary"
+          class="mr-4"
+          @click="handleAlarm"
+          v-if="alarmStatus !== AlarmStatus.ACTIVE_ACK && alarmStatus !== AlarmStatus.CLEARED_ACK"
+        >
+          处理
+        </a-button>
+      </Authority>
+      <Authority value="api:yt:alarm:single:clear">
+        <a-button
+          danger
+          type="primary"
+          @click="clearAlarm"
+          v-if="alarmStatus === AlarmStatus.ACTIVE_ACK"
+        >
+          清除
+        </a-button>
+      </Authority>
     </div>
     </div>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
@@ -36,11 +40,13 @@
   import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config';
   import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { AlarmStatus } from '/@/enums/alarmEnum';
+  import { Authority } from '/@/components/Authority';
   export default defineComponent({
   export default defineComponent({
     name: 'AlarmDetailDrawer',
     name: 'AlarmDetailDrawer',
     components: {
     components: {
       BasicForm,
       BasicForm,
       BasicDrawer,
       BasicDrawer,
+      Authority,
     },
     },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {

@@ -19,12 +19,16 @@
         </Button>
         </Button>
       </template>
       </template>
       <template #toolbar>
       <template #toolbar>
-        <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear">
-          <span>批量清除</span>
-        </Button>
-        <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">
-          <span>批量处理</span>
-        </Button>
+        <Authority value="	api:yt:alarm:batch:clear">
+          <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear">
+            <span>批量清除</span>
+          </Button>
+        </Authority>
+        <Authority value="api:yt:alarm:batch:handle">
+          <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">
+            <span>批量处理</span>
+          </Button>
+        </Authority>
       </template>
       </template>
     </BasicTable>
     </BasicTable>
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
@@ -49,6 +53,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 { Authority } from '/@/components/Authority';
 
 
   const props = defineProps<{
   const props = defineProps<{
     deviceId?: string;
     deviceId?: string;

@@ -181,6 +181,7 @@ export const accountFormSchema: FormSchema[] = [
     componentProps({ formActionType }) {
     componentProps({ formActionType }) {
       const { clearValidate } = formActionType;
       const { clearValidate } = formActionType;
       return {
       return {
+        maxlength: 11,
         onChange(value) {
         onChange(value) {
           if (value == olderPhoneNumber) {
           if (value == olderPhoneNumber) {
             clearValidate('phoneNumber');
             clearValidate('phoneNumber');

@@ -260,8 +260,11 @@
       async function handleSubmit() {
       async function handleSubmit() {
         setModalProps({ confirmLoading: true });
         setModalProps({ confirmLoading: true });
         try {
         try {
-          await validate();
           const values = getFieldsValue();
           const values = getFieldsValue();
+          if (!('organizationIds' in values)) {
+            createMessage.error('组织必选');
+          }
+          await validate();
           await addTenantList({ ...values, level: 4, tenantId: userInfo.getUserInfo.tenantId! });
           await addTenantList({ ...values, level: 4, tenantId: userInfo.getUserInfo.tenantId! });
           createMessage.success(unref(isAdd) ? '新增成功' : '编辑成功');
           createMessage.success(unref(isAdd) ? '新增成功' : '编辑成功');
           closeModal();
           closeModal();

@@ -162,6 +162,7 @@ export const accountFormSchema: FormSchema[] = [
     componentProps({ formActionType }) {
     componentProps({ formActionType }) {
       const { clearValidate } = formActionType;
       const { clearValidate } = formActionType;
       return {
       return {
+        maxlength: 11,
         onChange(value) {
         onChange(value) {
           if (value == olderPhoneNumber) {
           if (value == olderPhoneNumber) {
             clearValidate('phoneNumber');
             clearValidate('phoneNumber');