Merge branch 'ft-dev' into 'main'

fix:修复个人中心表单数据回显，feat:新提租户问题

See merge request huang/yun-teng-iot-front!67

@@ -2,7 +2,7 @@ import { FormSchema } from '/@/components/Table';
 
 export const formSchema: FormSchema[] = [
   {
-    field: 'nickName',
+    field: 'realName',
     label: '用户昵称',
     colProps: { span: 13 },
     required: true,

 <template>
   <BasicModal
     :useWrapper="true"
-    width="80vw"
+    width="82vw"
     :height="compHeight"
     v-bind="$attrs"
     @register="registerModal"
@@ -61,7 +61,7 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, onMounted } from 'vue';
+  import { defineComponent, ref, computed } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './config';
@@ -111,24 +111,46 @@
       const getPersonalDetailValue: any = ref({});
       const avatarUrl: any = ref('');
       const getBackendV: any = ref({});
+      const retryFormData: any = ref({});
+      // const retryDefaultData: any = ref({});
       const [registerDesc] = useDescription({
         title: '个人详情',
         schema: schema,
       });
 
       const [registerModal, { closeModal }] = useModalInner();
-      const [registerForm, { validate, resetFields }] = useForm({
-        showActionButtonGroup: false,
-        schemas: formSchema,
-      });
       const avatar = computed(() => {
         const { avatar } = userStore.getUserInfo;
-        return avatar || defaultImage;
+        return avatarUrl.value || avatar || defaultImage;
       });
+      const updateAvatar = async (v) => {
+        avatarUrl.value = v.data.fileStaticUri;
+      };
+      const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
+        showActionButtonGroup: false,
+        schemas: formSchema,
+      });
+      //回显数据
+      const retryFieldsValue = async () => {
+        try {
+          // retryDefaultData.value = await personalGet(getUserInfo.userId);
+          const getUserInfo = await userInfo;
+          // const getUserInfo = userStore.getUserInfo;
+          retryFormData.value = getUserInfo;
+          setFieldsValue({
+            realName: retryFormData.value.realName,
+            phoneNumber: retryFormData.value.phoneNumber,
+            email: retryFormData.value.email,
+          });
+        } catch (e) {
+          return e;
+        }
+      };
+      // setTimeout(() => {
+      //   retryFieldsValue();
+      // }, 3000);
       const handleSubmit = async () => {
-        // console.log(userStore.getUserInfo);
         const getUserInfo = await userInfo;
-        // console.log(getUserInfo);
         getPersonalValue.value = await validate();
         getPersonalValue.value.id = getUserInfo.userId;
         getPersonalValue.value.username = getBackendV.value.username;
@@ -138,26 +160,29 @@
         closeModal();
         resetFields();
       };
-      const updateAvatar = async (v) => {
-        avatarUrl.value = v.data.fileStaticUri;
-        console.log(avatarUrl.value);
-        // await personalPut({ avatar: v });
-      };
+
       const getPersonalDetail = async () => {
         try {
           const getUserInfo = await userInfo;
           getPersonalDetailValue.value = getUserInfo;
+          setTimeout(() => {
+            setFieldsValue({
+              realName: getPersonalDetailValue.value.realName,
+              phoneNumber: getPersonalDetailValue.value.phoneNumber,
+              email: getPersonalDetailValue.value.email,
+            });
+          }, 1000);
         } catch (e) {
           return e;
         }
       };
-      onMounted(async () => {
-        getPersonalDetail();
-      });
+      getPersonalDetail();
+
       const compHeight = computed(() => {
         return 1000;
       });
       return {
+        retryFieldsValue,
         uploadApi,
         compHeight,
         updateAvatar,

@@ -11,13 +11,18 @@
 
     <template #overlay>
       <Menu @click="handleMenuClick">
-        <MenuItem
+        <!-- <MenuItem
           key="doc"
           :text="t('layout.header.dropdownItemDoc')"
           icon="ion:document-text-outline"
           v-if="getShowDoc"
         />
-        <MenuDivider v-if="getShowDoc" />
+        <MenuDivider v-if="getShowDoc" /> -->
+        <MenuItem
+          key="personal"
+          :text="t('layout.header.dropdownItemPersonal')"
+          icon="ion:document-text-outline"
+        />
         <MenuItem
           v-if="getUseLockPage"
           key="lock"
@@ -29,22 +34,17 @@
           :text="t('layout.header.dropdownItemLoginOut')"
           icon="ion:power-outline"
         />
-        <MenuItem
-          key="personal"
-          :text="t('layout.header.dropdownItemPersonal')"
-          icon="ion:build-outlined"
-        />
       </Menu>
     </template>
   </Dropdown>
   <LockAction @register="register" />
-  <PersonalChild @register="registerPersonal" />
+  <PersonalChild ref="personalRef" @register="registerPersonal" />
 </template>
 <script lang="ts">
   // components
   import { Dropdown, Menu } from 'ant-design-vue';
 
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, getCurrentInstance, ref } from 'vue';
 
   import { DOC_URL } from '/@/settings/siteSetting';
 
@@ -68,7 +68,6 @@
       Dropdown,
       Menu,
       MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
-      MenuDivider: Menu.Divider,
       LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
       PersonalChild: createAsyncComponent(() => import('../personal/index.vue')),
     },
@@ -76,6 +75,8 @@
       theme: propTypes.oneOf(['dark', 'light']),
     },
     setup() {
+      const { proxy } = getCurrentInstance();
+      const personalRef = ref(null);
       const { prefixCls } = useDesign('header-user-dropdown');
       const { t } = useI18n();
       const { getShowDoc, getUseLockPage } = useHeaderSetting();
@@ -123,10 +124,12 @@
       const openPersonalFunc = () => {
         setTimeout(() => {
           openModalPersonal(true);
+          proxy.$refs.personalRef.retryFieldsValue();
         }, 10);
       };
 
       return {
+        personalRef,
         registerPersonal,
         openPersonalFunc,
         prefixCls,

@@ -129,7 +129,6 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
-        console.log(data);
         return this.process(data, goHome);
       } catch (error) {
         return Promise.reject(error);

@@ -164,23 +164,35 @@ const transform: AxiosTransform = {
     let errMessage = '';
 
     try {
-      if (response.data.code === '401' || response.data.msg === 'tenant has expired') {
-        if (expireTime < nowTime) {
-          // console.log('过期');
-          createMessage.error('token已经过期,请退回登录');
-        } else {
-          // console.log('未过期');
-        }
-        if (getJwtTokenInfo) {
-          if (PageEnum.BASE_LOGIN) {
-            router.push(PageEnum.BASE_LOGIN);
-          }
-        }
+      console.log(response.data);
+      if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
+        // window.localStorage.removeItem('UNDEFINED__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__');
+        // window.localStorage.removeItem('UNDEFINED__DEVELOPMENT__2.7.1__LOCALE__');
+        window.localStorage.clear();
+        window.sessionStorage.clear();
+        router.push(PageEnum.BASE_HOME);
+        // doRefresh();
+
+        // console.log(router);
+        // router.push('/other');
+        // if (expireTime < nowTime) {
+        //   // console.log('过期');
+        //   createMessage.error('token已经过期,请退回登录');
+        // } else {
+        //   // console.log('未过期');
+        // }
+        // router.push(PageEnum.BASE_LOGIN);
+        // if (getJwtTokenInfo) {
+        //   if (PageEnum.BASE_LOGIN) {
+        //     router.push(PageEnum.BASE_LOGIN);
+        //   }
+        // }
         // router.beforeEach((to, from, next) => {
+        //   console.log(to);
         //   if (getJwtTokenInfo) {
         //     if (to.path !== '/login') {
         //       // doRefresh();
-        //       next({ path: '/' });
+        //       next({ path: '/adass' });
         //     }
         //   }
         // });

@@ -240,7 +240,7 @@
             messageMode: editEchoData.value.alarmProfile.messageMode,
           });
         } else {
-          // proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+          proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
         }
       }
       function handleRedo() {

@@ -127,7 +127,7 @@
       const isUpdate = ref(true);
       const descInfo: any = ref(null);
       const dataInfo: any = ref('');
-      const [registerDetail, { setFieldsValue: setRegisterDetail }] = useForm({
+      const [registerDetail, { resetFields, setFieldsValue: setRegisterDetail }] = useForm({
         schemas: step1Schemas,
         actionColOptions: {
           span: 24,
@@ -225,6 +225,7 @@
         isUpdate.value = !!data?.isUpdate;
         descInfo.value = await deviceConfigGetDetail(data.record.id);
         try {
+          resetFields();
           await setRegisterDetail({ ...descInfo.value });
         } catch (e) {
           return e;
@@ -233,9 +234,9 @@
       const handleChange = (v) => {
         try {
           switch (v) {
-            case '1':
-              setRegisterDetail({ ...descInfo.value });
-              break;
+            // case '1':
+            //   setRegisterDetail({ ...descInfo.value });
+            //   break;
             case '2':
               setRegisterTrans({
                 transportType: descInfo.value.profileData?.transportConfiguration.type,

@@ -223,8 +223,10 @@
       const enableClearTemplateData: any = ref(null);
       const detailClearTemplateData: any = ref(null);
       const scheduleCustomValue: any = ref({});
+      const scheduleCustomClearValue: any = ref({});
       const clearIndex = ref(-1);
       const getSchduleCustomValue: any = ref([]);
+      const getSchduleClearCustomValue: any = ref([]);
       //告警列表
       let profileData = ref<IProfileData[]>([]);
       const log = (e) => {
@@ -530,12 +532,23 @@
             console.log(e);
           }
         });
+        const findDayCustomByValue = findDay.map((f, i) => {
+          try {
+            if (f.value == v.daysOfWeek1[i]) {
+              return f.label;
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        });
         enableTemplateData.value =
-          v.startsOn == undefined
+          v.schedule == 'ANY_TIME'
             ? `始终启用`
-            : `
+            : v.schedule == 'SPECIFIC_TIME'
+            ? `
            开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
-           `;
+           `
+            : `天数:${findDayCustomByValue},开始时间: ${v.startsOn1},结束时间:${v.endsOn1}`;
       };
       //规则条件
       const getAllFieldsRuleFunc = (v, v1) => {
@@ -651,11 +664,23 @@
             console.log(e);
           }
         });
+        const findDayCustomByValue = findDay.map((f, i) => {
+          try {
+            if (f.value == v.daysOfWeek1[i]) {
+              return f.label;
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        });
         enableClearTemplateData.value =
-          v.startsOn == undefined
+          v.schedule == 'ANY_TIME'
             ? `始终启用`
-            : `开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
-           `;
+            : v.schedule == 'SPECIFIC_TIME'
+            ? `
+           开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
+           `
+            : `天数:${findDayCustomByValue},开始时间: ${v.startsOn1},结束时间:${v.endsOn1}`;
       };
       //规则条件
       const getAllClearFieldsRuleFunc = (v, v1) => {
@@ -735,39 +760,83 @@
         return uuid;
       }
       const handleFormStep3toStep4Next = async () => {
+        console.log(enableObj.value);
         try {
           if (enableObj.value.schedule == 'CUSTOM') {
-            console.log(enableObj.value);
-            switch (enableObj.value.daysOfWeek1[0]) {
+            for (let i in enableObj.value) {
+              console.log(enableObj.value[i]);
+              console.log(i);
+              // let o = {};
+              // if(enableObj.value[i]=='1')
+              // o[i] = enableObj.value[i];
+              // getSchduleCustomValue.value.push(o);
+              // getSchduleCustomValue.value.push(enableObj.value[i]);
+            }
+            console.log(getSchduleCustomValue.value);
+            // switch (enableObj.value.daysOfWeek1[0]) {
+            //   case '1':
+            //     getSchduleCustomValue.value.push({
+            //       enabled: true,
+            //       dayOfWeek: enableObj.value.daysOfWeek1[0],
+            //       startsOn: enableObj.value.startsOn1,
+            //       endsOn: enableObj.value.endsOn1,
+            //     });
+            //     break;
+            //   case '2':
+            //     getSchduleCustomValue.value.push({
+            //       enabled: true,
+            //       dayOfWeek: enableObj.value.daysOfWeek2[0],
+            //       startsOn: enableObj.value.startsOn2,
+            //       endsOn: enableObj.value.endsOn2,
+            //     });
+            //     break;
+            //   case '3':
+            //     getSchduleCustomValue.value.push({
+            //       enabled: true,
+            //       dayOfWeek: enableObj.value.daysOfWeek3[0],
+            //       startsOn: enableObj.value.startsOn3,
+            //       endsOn: enableObj.value.endsOn3,
+            //     });
+            //     break;
+            // }
+            scheduleCustomValue.value = {
+              type: enableObj.value.schedule,
+              timezone: enableObj.value.timezone,
+              items: getSchduleCustomValue.value,
+            };
+          }
+          //清除报警规则---报警日程表
+          if (enableClearObj.value.schedule == 'CUSTOM') {
+            switch (enableClearObj.value.daysOfWeek1[0]) {
               case '1':
-                getSchduleCustomValue.value.push({
+                getSchduleClearCustomValue.value.push({
                   enabled: true,
-                  dayOfWeek: enableObj.value.daysOfWeek1[0],
-                  startsOn: enableObj.value.startsOn1,
-                  endsOn: enableObj.value.endsOn1,
+                  dayOfWeek: enableClearObj.value.daysOfWeek1[0],
+                  startsOn: enableClearObj.value.startsOn1,
+                  endsOn: enableClearObj.value.endsOn1,
                 });
                 break;
               case '2':
-                getSchduleCustomValue.value.push({
+                getSchduleClearCustomValue.value.push({
                   enabled: true,
-                  dayOfWeek: enableObj.value.daysOfWeek2[0],
-                  startsOn: enableObj.value.startsOn2,
-                  endsOn: enableObj.value.endsOn2,
+                  dayOfWeek: enableClearObj.value.daysOfWeek2[0],
+                  startsOn: enableClearObj.value.startsOn2,
+                  endsOn: enableClearObj.value.endsOn2,
                 });
                 break;
               case '3':
-                getSchduleCustomValue.value.push({
+                getSchduleClearCustomValue.value.push({
                   enabled: true,
-                  dayOfWeek: enableObj.value.daysOfWeek3[0],
-                  startsOn: enableObj.value.startsOn3,
-                  endsOn: enableObj.value.endsOn3,
+                  dayOfWeek: enableClearObj.value.daysOfWeek3[0],
+                  startsOn: enableClearObj.value.startsOn3,
+                  endsOn: enableClearObj.value.endsOn3,
                 });
                 break;
             }
-            scheduleCustomValue.value = {
-              type: enableObj.value.schedule,
-              timezone: enableObj.value.timezone,
-              items: getSchduleCustomValue.value,
+            scheduleCustomClearValue.value = {
+              type: enableClearObj.value.schedule,
+              timezone: enableClearObj.value.timezone,
+              items: getSchduleClearCustomValue.value,
             };
           }
           const scheduleClearValue = {
@@ -778,7 +847,10 @@
             timezone: enableClearObj.value.timezone,
           };
           const getClearSchedule = {
-            schedule: scheduleClearValue,
+            schedule:
+              enableClearObj.value.schedule == 'CUSTOM'
+                ? scheduleCustomClearValue.value
+                : scheduleClearValue,
           };
           const getClearAdditionalProp = Object.assign({}, detailClearObj.value, getClearSchedule);
           const scheduleValue = {
@@ -826,7 +898,7 @@
           console.log(valueRegisterFormCreateAlarm);
           const getValueRegisterFormHighSetting = {
             propagate: valueRegisterFormHighSetting?.propagate,
-            propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes],
+            propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes].flat(1),
           };
           Object.assign(
             emptyObj.value,

@@ -42,16 +42,16 @@ export const formSchema: FormSchema[] = [
     field: 'timezone',
     label: '时区',
     colProps: { span: 12 },
-
     required: true,
     component: 'Select',
+    defaultValue: 'Asia/Shanghai (UTC+08:00)',
     componentProps: {
       placeholder: '请选择时区',
       options: [
-        { label: 'Africa/Abidjan (UTC+00:00)', value: 'Africa/Abidjan (UTC+00:00)' },
-        { label: 'Africa/Accra (UTC+00:00)', value: 'Africa/Accra (UTC+00:00)' },
-        { label: 'Africa/Addis Ababa (UTC+03:00)', value: 'Africa/Addis Ababa (UTC+03:00)' },
-        { label: 'Africa/Asmara (UTC+03:00)', value: 'Africa/Asmara (UTC+03:00)' },
+        { label: 'Asia/Shanghai (UTC+08:00)', value: 'Asia/Shanghai' },
+        { label: 'Africa/Accra (UTC+00:00)', value: 'Africa/Accra' },
+        { label: 'Africa/Addis Ababa (UTC+03:00)', value: 'Africa/Addis Ababa' },
+        { label: 'Africa/Asmara (UTC+03:00)', value: 'Africa/Asmara' },
       ],
     },
     ifShow: ({ values }) =>
@@ -79,6 +79,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn1',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -88,6 +91,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn1',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -115,6 +121,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn2',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -124,6 +133,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn2',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -150,6 +162,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn3',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -159,6 +174,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn3',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -185,6 +203,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn4',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -194,6 +215,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn4',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -220,6 +244,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn5',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -229,6 +256,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn5',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -255,6 +285,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn6',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -264,6 +297,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn6',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -290,6 +326,9 @@ export const formSchema: FormSchema[] = [
     field: 'startsOn7',
     component: 'TimePicker',
     label: '开始时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },
@@ -299,6 +338,9 @@ export const formSchema: FormSchema[] = [
     field: 'endsOn7',
     component: 'TimePicker',
     label: '结束时间选择',
+    componentProps: {
+      valueFormat: 'HH:mm:ss',
+    },
     colProps: {
       span: 8,
     },

@@ -94,7 +94,7 @@
         await updateSchema({ field: 'title', componentProps: { disabled: false } });
         //如果是编辑操作，设置页面数据
         if (unref(isUpdate)) {
-          console.log(data.record);
+          // console.log(data.record);
           getTenantRoles(data.record.tenantId).then((result) => {
             Reflect.set(data.record, 'roleIds', result);
             //为表单赋值