简柏林 / thingskit-front · Commits

Commit 0f3c8e865f4ccff75ecfe6bdbc56547abbb70140

Authored by fengtao
1 parent 50d99b45

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

Inline Side-by-side
Showing 10 changed files with 233 additions and 79 deletions
@@ -2,7 +2,7 @@ import { FormSchema } from '/@/components/Table'; @@ -2,7 +2,7 @@ import { FormSchema } from '/@/components/Table';
2 2
3 export const formSchema: FormSchema[] = [ 3 export const formSchema: FormSchema[] = [
4 { 4 {
5 - field: 'nickName', 5 + field: 'realName',
6 label: '用户昵称', 6 label: '用户昵称',
7 colProps: { span: 13 }, 7 colProps: { span: 13 },
8 required: true, 8 required: true,
1 <template> 1 <template>
2 <BasicModal 2 <BasicModal
3 :useWrapper="true" 3 :useWrapper="true"
4 - width="80vw" 4 + width="82vw"
5 :height="compHeight" 5 :height="compHeight"
6 v-bind="$attrs" 6 v-bind="$attrs"
7 @register="registerModal" 7 @register="registerModal"
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </BasicModal> 61 </BasicModal>
62 </template> 62 </template>
63 <script lang="ts"> 63 <script lang="ts">
64 - import { defineComponent, ref, computed, onMounted } from 'vue'; 64 + import { defineComponent, ref, computed } from 'vue';
65 import { BasicModal, useModalInner } from '/@/components/Modal/index'; 65 import { BasicModal, useModalInner } from '/@/components/Modal/index';
66 import { BasicForm, useForm } from '/@/components/Form/index'; 66 import { BasicForm, useForm } from '/@/components/Form/index';
67 import { formSchema } from './config'; 67 import { formSchema } from './config';
@@ -111,24 +111,46 @@ @@ -111,24 +111,46 @@
111 const getPersonalDetailValue: any = ref({}); 111 const getPersonalDetailValue: any = ref({});
112 const avatarUrl: any = ref(''); 112 const avatarUrl: any = ref('');
113 const getBackendV: any = ref({}); 113 const getBackendV: any = ref({});
  114 + const retryFormData: any = ref({});
  115 + // const retryDefaultData: any = ref({});
114 const [registerDesc] = useDescription({ 116 const [registerDesc] = useDescription({
115 title: '个人详情', 117 title: '个人详情',
116 schema: schema, 118 schema: schema,
117 }); 119 });
118 120
119 const [registerModal, { closeModal }] = useModalInner(); 121 const [registerModal, { closeModal }] = useModalInner();
120 - const [registerForm, { validate, resetFields }] = useForm({  
121 - showActionButtonGroup: false,  
122 - schemas: formSchema,  
123 - });  
124 const avatar = computed(() => { 122 const avatar = computed(() => {
125 const { avatar } = userStore.getUserInfo; 123 const { avatar } = userStore.getUserInfo;
126 - return avatar || defaultImage; 124 + return avatarUrl.value || avatar || defaultImage;
127 }); 125 });
  126 + const updateAvatar = async (v) => {
  127 + avatarUrl.value = v.data.fileStaticUri;
  128 + };
  129 + const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
  130 + showActionButtonGroup: false,
  131 + schemas: formSchema,
  132 + });
  133 + //回显数据
  134 + const retryFieldsValue = async () => {
  135 + try {
  136 + // retryDefaultData.value = await personalGet(getUserInfo.userId);
  137 + const getUserInfo = await userInfo;
  138 + // const getUserInfo = userStore.getUserInfo;
  139 + retryFormData.value = getUserInfo;
  140 + setFieldsValue({
  141 + realName: retryFormData.value.realName,
  142 + phoneNumber: retryFormData.value.phoneNumber,
  143 + email: retryFormData.value.email,
  144 + });
  145 + } catch (e) {
  146 + return e;
  147 + }
  148 + };
  149 + // setTimeout(() => {
  150 + // retryFieldsValue();
  151 + // }, 3000);
128 const handleSubmit = async () => { 152 const handleSubmit = async () => {
129 - // console.log(userStore.getUserInfo);  
130 const getUserInfo = await userInfo; 153 const getUserInfo = await userInfo;
131 - // console.log(getUserInfo);  
132 getPersonalValue.value = await validate(); 154 getPersonalValue.value = await validate();
133 getPersonalValue.value.id = getUserInfo.userId; 155 getPersonalValue.value.id = getUserInfo.userId;
134 getPersonalValue.value.username = getBackendV.value.username; 156 getPersonalValue.value.username = getBackendV.value.username;
@@ -138,26 +160,29 @@ @@ -138,26 +160,29 @@
138 closeModal(); 160 closeModal();
139 resetFields(); 161 resetFields();
140 }; 162 };
141 - const updateAvatar = async (v) => {  
142 - avatarUrl.value = v.data.fileStaticUri;  
143 - console.log(avatarUrl.value);  
144 - // await personalPut({ avatar: v });  
145 - }; 163 +
146 const getPersonalDetail = async () => { 164 const getPersonalDetail = async () => {
147 try { 165 try {
148 const getUserInfo = await userInfo; 166 const getUserInfo = await userInfo;
149 getPersonalDetailValue.value = getUserInfo; 167 getPersonalDetailValue.value = getUserInfo;
  168 + setTimeout(() => {
  169 + setFieldsValue({
  170 + realName: getPersonalDetailValue.value.realName,
  171 + phoneNumber: getPersonalDetailValue.value.phoneNumber,
  172 + email: getPersonalDetailValue.value.email,
  173 + });
  174 + }, 1000);
150 } catch (e) { 175 } catch (e) {
151 return e; 176 return e;
152 } 177 }
153 }; 178 };
154 - onMounted(async () => {  
155 - getPersonalDetail();  
156 - }); 179 + getPersonalDetail();
  180 +
157 const compHeight = computed(() => { 181 const compHeight = computed(() => {
158 return 1000; 182 return 1000;
159 }); 183 });
160 return { 184 return {
  185 + retryFieldsValue,
161 uploadApi, 186 uploadApi,
162 compHeight, 187 compHeight,
163 updateAvatar, 188 updateAvatar,
@@ -11,13 +11,18 @@ @@ -11,13 +11,18 @@
11 11
12 <template #overlay> 12 <template #overlay>
13 <Menu @click="handleMenuClick"> 13 <Menu @click="handleMenuClick">
14 - <MenuItem 14 + <!-- <MenuItem
15 key="doc" 15 key="doc"
16 :text="t('layout.header.dropdownItemDoc')" 16 :text="t('layout.header.dropdownItemDoc')"
17 icon="ion:document-text-outline" 17 icon="ion:document-text-outline"
18 v-if="getShowDoc" 18 v-if="getShowDoc"
19 /> 19 />
20 - <MenuDivider v-if="getShowDoc" /> 20 + <MenuDivider v-if="getShowDoc" /> -->
  21 + <MenuItem
  22 + key="personal"
  23 + :text="t('layout.header.dropdownItemPersonal')"
  24 + icon="ion:document-text-outline"
  25 + />
21 <MenuItem 26 <MenuItem
22 v-if="getUseLockPage" 27 v-if="getUseLockPage"
23 key="lock" 28 key="lock"
@@ -29,22 +34,17 @@ @@ -29,22 +34,17 @@
29 :text="t('layout.header.dropdownItemLoginOut')" 34 :text="t('layout.header.dropdownItemLoginOut')"
30 icon="ion:power-outline" 35 icon="ion:power-outline"
31 /> 36 />
32 - <MenuItem  
33 - key="personal"  
34 - :text="t('layout.header.dropdownItemPersonal')"  
35 - icon="ion:build-outlined"  
36 - />  
37 </Menu> 37 </Menu>
38 </template> 38 </template>
39 </Dropdown> 39 </Dropdown>
40 <LockAction @register="register" /> 40 <LockAction @register="register" />
41 - <PersonalChild @register="registerPersonal" /> 41 + <PersonalChild ref="personalRef" @register="registerPersonal" />
42 </template> 42 </template>
43 <script lang="ts"> 43 <script lang="ts">
44 // components 44 // components
45 import { Dropdown, Menu } from 'ant-design-vue'; 45 import { Dropdown, Menu } from 'ant-design-vue';
46 46
47 - import { defineComponent, computed } from 'vue'; 47 + import { defineComponent, computed, getCurrentInstance, ref } from 'vue';
48 48
49 import { DOC_URL } from '/@/settings/siteSetting'; 49 import { DOC_URL } from '/@/settings/siteSetting';
50 50
@@ -68,7 +68,6 @@ @@ -68,7 +68,6 @@
68 Dropdown, 68 Dropdown,
69 Menu, 69 Menu,
70 MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')), 70 MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
71 - MenuDivider: Menu.Divider,  
72 LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')), 71 LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
73 PersonalChild: createAsyncComponent(() => import('../personal/index.vue')), 72 PersonalChild: createAsyncComponent(() => import('../personal/index.vue')),
74 }, 73 },
@@ -76,6 +75,8 @@ @@ -76,6 +75,8 @@
76 theme: propTypes.oneOf(['dark', 'light']), 75 theme: propTypes.oneOf(['dark', 'light']),
77 }, 76 },
78 setup() { 77 setup() {
  78 + const { proxy } = getCurrentInstance();
  79 + const personalRef = ref(null);
79 const { prefixCls } = useDesign('header-user-dropdown'); 80 const { prefixCls } = useDesign('header-user-dropdown');
80 const { t } = useI18n(); 81 const { t } = useI18n();
81 const { getShowDoc, getUseLockPage } = useHeaderSetting(); 82 const { getShowDoc, getUseLockPage } = useHeaderSetting();
@@ -123,10 +124,12 @@ @@ -123,10 +124,12 @@
123 const openPersonalFunc = () => { 124 const openPersonalFunc = () => {
124 setTimeout(() => { 125 setTimeout(() => {
125 openModalPersonal(true); 126 openModalPersonal(true);
  127 + proxy.$refs.personalRef.retryFieldsValue();
126 }, 10); 128 }, 10);
127 }; 129 };
128 130
129 return { 131 return {
  132 + personalRef,
130 registerPersonal, 133 registerPersonal,
131 openPersonalFunc, 134 openPersonalFunc,
132 prefixCls, 135 prefixCls,
@@ -129,7 +129,6 @@ export const useUserStore = defineStore({ @@ -129,7 +129,6 @@ export const useUserStore = defineStore({
129 try { 129 try {
130 const { goHome = true, mode, ...loginParams } = params; 130 const { goHome = true, mode, ...loginParams } = params;
131 const data = await loginApi(loginParams, mode); 131 const data = await loginApi(loginParams, mode);
132 - console.log(data);  
133 return this.process(data, goHome); 132 return this.process(data, goHome);
134 } catch (error) { 133 } catch (error) {
135 return Promise.reject(error); 134 return Promise.reject(error);
@@ -164,23 +164,35 @@ const transform: AxiosTransform = { @@ -164,23 +164,35 @@ const transform: AxiosTransform = {
164 let errMessage = ''; 164 let errMessage = '';
165 165
166 try { 166 try {
167 - if (response.data.code === '401' || response.data.msg === 'tenant has expired') {  
168 - if (expireTime < nowTime) {  
169 - // console.log('过期');  
170 - createMessage.error('token已经过期,请退回登录');  
171 - } else {  
172 - // console.log('未过期');  
173 - }  
174 - if (getJwtTokenInfo) {  
175 - if (PageEnum.BASE_LOGIN) {  
176 - router.push(PageEnum.BASE_LOGIN);  
177 - }  
178 - } 167 + console.log(response.data);
  168 + if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
  169 + // window.localStorage.removeItem('UNDEFINED__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__');
  170 + // window.localStorage.removeItem('UNDEFINED__DEVELOPMENT__2.7.1__LOCALE__');
  171 + window.localStorage.clear();
  172 + window.sessionStorage.clear();
  173 + router.push(PageEnum.BASE_HOME);
  174 + // doRefresh();
  175 +
  176 + // console.log(router);
  177 + // router.push('/other');
  178 + // if (expireTime < nowTime) {
  179 + // // console.log('过期');
  180 + // createMessage.error('token已经过期,请退回登录');
  181 + // } else {
  182 + // // console.log('未过期');
  183 + // }
  184 + // router.push(PageEnum.BASE_LOGIN);
  185 + // if (getJwtTokenInfo) {
  186 + // if (PageEnum.BASE_LOGIN) {
  187 + // router.push(PageEnum.BASE_LOGIN);
  188 + // }
  189 + // }
179 // router.beforeEach((to, from, next) => { 190 // router.beforeEach((to, from, next) => {
  191 + // console.log(to);
180 // if (getJwtTokenInfo) { 192 // if (getJwtTokenInfo) {
181 // if (to.path !== '/login') { 193 // if (to.path !== '/login') {
182 // // doRefresh(); 194 // // doRefresh();
183 - // next({ path: '/' }); 195 + // next({ path: '/adass' });
184 // } 196 // }
185 // } 197 // }
186 // }); 198 // });
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 messageMode: editEchoData.value.alarmProfile.messageMode, 240 messageMode: editEchoData.value.alarmProfile.messageMode,
241 }); 241 });
242 } else { 242 } else {
243 - // proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc(); 243 + proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
244 } 244 }
245 } 245 }
246 function handleRedo() { 246 function handleRedo() {
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
127 const isUpdate = ref(true); 127 const isUpdate = ref(true);
128 const descInfo: any = ref(null); 128 const descInfo: any = ref(null);
129 const dataInfo: any = ref(''); 129 const dataInfo: any = ref('');
130 - const [registerDetail, { setFieldsValue: setRegisterDetail }] = useForm({ 130 + const [registerDetail, { resetFields, setFieldsValue: setRegisterDetail }] = useForm({
131 schemas: step1Schemas, 131 schemas: step1Schemas,
132 actionColOptions: { 132 actionColOptions: {
133 span: 24, 133 span: 24,
@@ -225,6 +225,7 @@ @@ -225,6 +225,7 @@
225 isUpdate.value = !!data?.isUpdate; 225 isUpdate.value = !!data?.isUpdate;
226 descInfo.value = await deviceConfigGetDetail(data.record.id); 226 descInfo.value = await deviceConfigGetDetail(data.record.id);
227 try { 227 try {
  228 + resetFields();
228 await setRegisterDetail({ ...descInfo.value }); 229 await setRegisterDetail({ ...descInfo.value });
229 } catch (e) { 230 } catch (e) {
230 return e; 231 return e;
@@ -233,9 +234,9 @@ @@ -233,9 +234,9 @@
233 const handleChange = (v) => { 234 const handleChange = (v) => {
234 try { 235 try {
235 switch (v) { 236 switch (v) {
236 - case '1':  
237 - setRegisterDetail({ ...descInfo.value });  
238 - break; 237 + // case '1':
  238 + // setRegisterDetail({ ...descInfo.value });
  239 + // break;
239 case '2': 240 case '2':
240 setRegisterTrans({ 241 setRegisterTrans({
241 transportType: descInfo.value.profileData?.transportConfiguration.type, 242 transportType: descInfo.value.profileData?.transportConfiguration.type,
@@ -223,8 +223,10 @@ @@ -223,8 +223,10 @@
223 const enableClearTemplateData: any = ref(null); 223 const enableClearTemplateData: any = ref(null);
224 const detailClearTemplateData: any = ref(null); 224 const detailClearTemplateData: any = ref(null);
225 const scheduleCustomValue: any = ref({}); 225 const scheduleCustomValue: any = ref({});
  226 + const scheduleCustomClearValue: any = ref({});
226 const clearIndex = ref(-1); 227 const clearIndex = ref(-1);
227 const getSchduleCustomValue: any = ref([]); 228 const getSchduleCustomValue: any = ref([]);
  229 + const getSchduleClearCustomValue: any = ref([]);
228 //告警列表 230 //告警列表
229 let profileData = ref<IProfileData[]>([]); 231 let profileData = ref<IProfileData[]>([]);
230 const log = (e) => { 232 const log = (e) => {
@@ -530,12 +532,23 @@ @@ -530,12 +532,23 @@
530 console.log(e); 532 console.log(e);
531 } 533 }
532 }); 534 });
  535 + const findDayCustomByValue = findDay.map((f, i) => {
  536 + try {
  537 + if (f.value == v.daysOfWeek1[i]) {
  538 + return f.label;
  539 + }
  540 + } catch (e) {
  541 + console.log(e);
  542 + }
  543 + });
533 enableTemplateData.value = 544 enableTemplateData.value =
534 - v.startsOn == undefined 545 + v.schedule == 'ANY_TIME'
535 ? `始终启用` 546 ? `始终启用`
536 - : ` 547 + : v.schedule == 'SPECIFIC_TIME'
  548 + ? `
537 开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue} 549 开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
538 - `; 550 + `
  551 + : `天数:${findDayCustomByValue},开始时间: ${v.startsOn1},结束时间:${v.endsOn1}`;
539 }; 552 };
540 //规则条件 553 //规则条件
541 const getAllFieldsRuleFunc = (v, v1) => { 554 const getAllFieldsRuleFunc = (v, v1) => {
@@ -651,11 +664,23 @@ @@ -651,11 +664,23 @@
651 console.log(e); 664 console.log(e);
652 } 665 }
653 }); 666 });
  667 + const findDayCustomByValue = findDay.map((f, i) => {
  668 + try {
  669 + if (f.value == v.daysOfWeek1[i]) {
  670 + return f.label;
  671 + }
  672 + } catch (e) {
  673 + console.log(e);
  674 + }
  675 + });
654 enableClearTemplateData.value = 676 enableClearTemplateData.value =
655 - v.startsOn == undefined 677 + v.schedule == 'ANY_TIME'
656 ? `始终启用` 678 ? `始终启用`
657 - : `开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}  
658 - `; 679 + : v.schedule == 'SPECIFIC_TIME'
  680 + ? `
  681 + 开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
  682 + `
  683 + : `天数:${findDayCustomByValue},开始时间: ${v.startsOn1},结束时间:${v.endsOn1}`;
659 }; 684 };
660 //规则条件 685 //规则条件
661 const getAllClearFieldsRuleFunc = (v, v1) => { 686 const getAllClearFieldsRuleFunc = (v, v1) => {
@@ -735,39 +760,83 @@ @@ -735,39 +760,83 @@
735 return uuid; 760 return uuid;
736 } 761 }
737 const handleFormStep3toStep4Next = async () => { 762 const handleFormStep3toStep4Next = async () => {
  763 + console.log(enableObj.value);
738 try { 764 try {
739 if (enableObj.value.schedule == 'CUSTOM') { 765 if (enableObj.value.schedule == 'CUSTOM') {
740 - console.log(enableObj.value);  
741 - switch (enableObj.value.daysOfWeek1[0]) { 766 + for (let i in enableObj.value) {
  767 + console.log(enableObj.value[i]);
  768 + console.log(i);
  769 + // let o = {};
  770 + // if(enableObj.value[i]=='1')
  771 + // o[i] = enableObj.value[i];
  772 + // getSchduleCustomValue.value.push(o);
  773 + // getSchduleCustomValue.value.push(enableObj.value[i]);
  774 + }
  775 + console.log(getSchduleCustomValue.value);
  776 + // switch (enableObj.value.daysOfWeek1[0]) {
  777 + // case '1':
  778 + // getSchduleCustomValue.value.push({
  779 + // enabled: true,
  780 + // dayOfWeek: enableObj.value.daysOfWeek1[0],
  781 + // startsOn: enableObj.value.startsOn1,
  782 + // endsOn: enableObj.value.endsOn1,
  783 + // });
  784 + // break;
  785 + // case '2':
  786 + // getSchduleCustomValue.value.push({
  787 + // enabled: true,
  788 + // dayOfWeek: enableObj.value.daysOfWeek2[0],
  789 + // startsOn: enableObj.value.startsOn2,
  790 + // endsOn: enableObj.value.endsOn2,
  791 + // });
  792 + // break;
  793 + // case '3':
  794 + // getSchduleCustomValue.value.push({
  795 + // enabled: true,
  796 + // dayOfWeek: enableObj.value.daysOfWeek3[0],
  797 + // startsOn: enableObj.value.startsOn3,
  798 + // endsOn: enableObj.value.endsOn3,
  799 + // });
  800 + // break;
  801 + // }
  802 + scheduleCustomValue.value = {
  803 + type: enableObj.value.schedule,
  804 + timezone: enableObj.value.timezone,
  805 + items: getSchduleCustomValue.value,
  806 + };
  807 + }
  808 + //清除报警规则---报警日程表
  809 + if (enableClearObj.value.schedule == 'CUSTOM') {
  810 + switch (enableClearObj.value.daysOfWeek1[0]) {
742 case '1': 811 case '1':
743 - getSchduleCustomValue.value.push({ 812 + getSchduleClearCustomValue.value.push({
744 enabled: true, 813 enabled: true,
745 - dayOfWeek: enableObj.value.daysOfWeek1[0],  
746 - startsOn: enableObj.value.startsOn1,  
747 - endsOn: enableObj.value.endsOn1, 814 + dayOfWeek: enableClearObj.value.daysOfWeek1[0],
  815 + startsOn: enableClearObj.value.startsOn1,
  816 + endsOn: enableClearObj.value.endsOn1,
748 }); 817 });
749 break; 818 break;
750 case '2': 819 case '2':
751 - getSchduleCustomValue.value.push({ 820 + getSchduleClearCustomValue.value.push({
752 enabled: true, 821 enabled: true,
753 - dayOfWeek: enableObj.value.daysOfWeek2[0],  
754 - startsOn: enableObj.value.startsOn2,  
755 - endsOn: enableObj.value.endsOn2, 822 + dayOfWeek: enableClearObj.value.daysOfWeek2[0],
  823 + startsOn: enableClearObj.value.startsOn2,
  824 + endsOn: enableClearObj.value.endsOn2,
756 }); 825 });
757 break; 826 break;
758 case '3': 827 case '3':
759 - getSchduleCustomValue.value.push({ 828 + getSchduleClearCustomValue.value.push({
760 enabled: true, 829 enabled: true,
761 - dayOfWeek: enableObj.value.daysOfWeek3[0],  
762 - startsOn: enableObj.value.startsOn3,  
763 - endsOn: enableObj.value.endsOn3, 830 + dayOfWeek: enableClearObj.value.daysOfWeek3[0],
  831 + startsOn: enableClearObj.value.startsOn3,
  832 + endsOn: enableClearObj.value.endsOn3,
764 }); 833 });
765 break; 834 break;
766 } 835 }
767 - scheduleCustomValue.value = {  
768 - type: enableObj.value.schedule,  
769 - timezone: enableObj.value.timezone,  
770 - items: getSchduleCustomValue.value, 836 + scheduleCustomClearValue.value = {
  837 + type: enableClearObj.value.schedule,
  838 + timezone: enableClearObj.value.timezone,
  839 + items: getSchduleClearCustomValue.value,
771 }; 840 };
772 } 841 }
773 const scheduleClearValue = { 842 const scheduleClearValue = {
@@ -778,7 +847,10 @@ @@ -778,7 +847,10 @@
778 timezone: enableClearObj.value.timezone, 847 timezone: enableClearObj.value.timezone,
779 }; 848 };
780 const getClearSchedule = { 849 const getClearSchedule = {
781 - schedule: scheduleClearValue, 850 + schedule:
  851 + enableClearObj.value.schedule == 'CUSTOM'
  852 + ? scheduleCustomClearValue.value
  853 + : scheduleClearValue,
782 }; 854 };
783 const getClearAdditionalProp = Object.assign({}, detailClearObj.value, getClearSchedule); 855 const getClearAdditionalProp = Object.assign({}, detailClearObj.value, getClearSchedule);
784 const scheduleValue = { 856 const scheduleValue = {
@@ -826,7 +898,7 @@ @@ -826,7 +898,7 @@
826 console.log(valueRegisterFormCreateAlarm); 898 console.log(valueRegisterFormCreateAlarm);
827 const getValueRegisterFormHighSetting = { 899 const getValueRegisterFormHighSetting = {
828 propagate: valueRegisterFormHighSetting?.propagate, 900 propagate: valueRegisterFormHighSetting?.propagate,
829 - propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes], 901 + propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes].flat(1),
830 }; 902 };
831 Object.assign( 903 Object.assign(
832 emptyObj.value, 904 emptyObj.value,
@@ -42,16 +42,16 @@ export const formSchema: FormSchema[] = [ @@ -42,16 +42,16 @@ export const formSchema: FormSchema[] = [
42 field: 'timezone', 42 field: 'timezone',
43 label: '时区', 43 label: '时区',
44 colProps: { span: 12 }, 44 colProps: { span: 12 },
45 -  
46 required: true, 45 required: true,
47 component: 'Select', 46 component: 'Select',
  47 + defaultValue: 'Asia/Shanghai (UTC+08:00)',
48 componentProps: { 48 componentProps: {
49 placeholder: '请选择时区', 49 placeholder: '请选择时区',
50 options: [ 50 options: [
51 - { label: 'Africa/Abidjan (UTC+00:00)', value: 'Africa/Abidjan (UTC+00:00)' },  
52 - { label: 'Africa/Accra (UTC+00:00)', value: 'Africa/Accra (UTC+00:00)' },  
53 - { label: 'Africa/Addis Ababa (UTC+03:00)', value: 'Africa/Addis Ababa (UTC+03:00)' },  
54 - { label: 'Africa/Asmara (UTC+03:00)', value: 'Africa/Asmara (UTC+03:00)' }, 51 + { label: 'Asia/Shanghai (UTC+08:00)', value: 'Asia/Shanghai' },
  52 + { label: 'Africa/Accra (UTC+00:00)', value: 'Africa/Accra' },
  53 + { label: 'Africa/Addis Ababa (UTC+03:00)', value: 'Africa/Addis Ababa' },
  54 + { label: 'Africa/Asmara (UTC+03:00)', value: 'Africa/Asmara' },
55 ], 55 ],
56 }, 56 },
57 ifShow: ({ values }) => 57 ifShow: ({ values }) =>
@@ -79,6 +79,9 @@ export const formSchema: FormSchema[] = [ @@ -79,6 +79,9 @@ export const formSchema: FormSchema[] = [
79 field: 'startsOn1', 79 field: 'startsOn1',
80 component: 'TimePicker', 80 component: 'TimePicker',
81 label: '开始时间选择', 81 label: '开始时间选择',
  82 + componentProps: {
  83 + valueFormat: 'HH:mm:ss',
  84 + },
82 colProps: { 85 colProps: {
83 span: 8, 86 span: 8,
84 }, 87 },
@@ -88,6 +91,9 @@ export const formSchema: FormSchema[] = [ @@ -88,6 +91,9 @@ export const formSchema: FormSchema[] = [
88 field: 'endsOn1', 91 field: 'endsOn1',
89 component: 'TimePicker', 92 component: 'TimePicker',
90 label: '结束时间选择', 93 label: '结束时间选择',
  94 + componentProps: {
  95 + valueFormat: 'HH:mm:ss',
  96 + },
91 colProps: { 97 colProps: {
92 span: 8, 98 span: 8,
93 }, 99 },
@@ -115,6 +121,9 @@ export const formSchema: FormSchema[] = [ @@ -115,6 +121,9 @@ export const formSchema: FormSchema[] = [
115 field: 'startsOn2', 121 field: 'startsOn2',
116 component: 'TimePicker', 122 component: 'TimePicker',
117 label: '开始时间选择', 123 label: '开始时间选择',
  124 + componentProps: {
  125 + valueFormat: 'HH:mm:ss',
  126 + },
118 colProps: { 127 colProps: {
119 span: 8, 128 span: 8,
120 }, 129 },
@@ -124,6 +133,9 @@ export const formSchema: FormSchema[] = [ @@ -124,6 +133,9 @@ export const formSchema: FormSchema[] = [
124 field: 'endsOn2', 133 field: 'endsOn2',
125 component: 'TimePicker', 134 component: 'TimePicker',
126 label: '结束时间选择', 135 label: '结束时间选择',
  136 + componentProps: {
  137 + valueFormat: 'HH:mm:ss',
  138 + },
127 colProps: { 139 colProps: {
128 span: 8, 140 span: 8,
129 }, 141 },
@@ -150,6 +162,9 @@ export const formSchema: FormSchema[] = [ @@ -150,6 +162,9 @@ export const formSchema: FormSchema[] = [
150 field: 'startsOn3', 162 field: 'startsOn3',
151 component: 'TimePicker', 163 component: 'TimePicker',
152 label: '开始时间选择', 164 label: '开始时间选择',
  165 + componentProps: {
  166 + valueFormat: 'HH:mm:ss',
  167 + },
153 colProps: { 168 colProps: {
154 span: 8, 169 span: 8,
155 }, 170 },
@@ -159,6 +174,9 @@ export const formSchema: FormSchema[] = [ @@ -159,6 +174,9 @@ export const formSchema: FormSchema[] = [
159 field: 'endsOn3', 174 field: 'endsOn3',
160 component: 'TimePicker', 175 component: 'TimePicker',
161 label: '结束时间选择', 176 label: '结束时间选择',
  177 + componentProps: {
  178 + valueFormat: 'HH:mm:ss',
  179 + },
162 colProps: { 180 colProps: {
163 span: 8, 181 span: 8,
164 }, 182 },
@@ -185,6 +203,9 @@ export const formSchema: FormSchema[] = [ @@ -185,6 +203,9 @@ export const formSchema: FormSchema[] = [
185 field: 'startsOn4', 203 field: 'startsOn4',
186 component: 'TimePicker', 204 component: 'TimePicker',
187 label: '开始时间选择', 205 label: '开始时间选择',
  206 + componentProps: {
  207 + valueFormat: 'HH:mm:ss',
  208 + },
188 colProps: { 209 colProps: {
189 span: 8, 210 span: 8,
190 }, 211 },
@@ -194,6 +215,9 @@ export const formSchema: FormSchema[] = [ @@ -194,6 +215,9 @@ export const formSchema: FormSchema[] = [
194 field: 'endsOn4', 215 field: 'endsOn4',
195 component: 'TimePicker', 216 component: 'TimePicker',
196 label: '结束时间选择', 217 label: '结束时间选择',
  218 + componentProps: {
  219 + valueFormat: 'HH:mm:ss',
  220 + },
197 colProps: { 221 colProps: {
198 span: 8, 222 span: 8,
199 }, 223 },
@@ -220,6 +244,9 @@ export const formSchema: FormSchema[] = [ @@ -220,6 +244,9 @@ export const formSchema: FormSchema[] = [
220 field: 'startsOn5', 244 field: 'startsOn5',
221 component: 'TimePicker', 245 component: 'TimePicker',
222 label: '开始时间选择', 246 label: '开始时间选择',
  247 + componentProps: {
  248 + valueFormat: 'HH:mm:ss',
  249 + },
223 colProps: { 250 colProps: {
224 span: 8, 251 span: 8,
225 }, 252 },
@@ -229,6 +256,9 @@ export const formSchema: FormSchema[] = [ @@ -229,6 +256,9 @@ export const formSchema: FormSchema[] = [
229 field: 'endsOn5', 256 field: 'endsOn5',
230 component: 'TimePicker', 257 component: 'TimePicker',
231 label: '结束时间选择', 258 label: '结束时间选择',
  259 + componentProps: {
  260 + valueFormat: 'HH:mm:ss',
  261 + },
232 colProps: { 262 colProps: {
233 span: 8, 263 span: 8,
234 }, 264 },
@@ -255,6 +285,9 @@ export const formSchema: FormSchema[] = [ @@ -255,6 +285,9 @@ export const formSchema: FormSchema[] = [
255 field: 'startsOn6', 285 field: 'startsOn6',
256 component: 'TimePicker', 286 component: 'TimePicker',
257 label: '开始时间选择', 287 label: '开始时间选择',
  288 + componentProps: {
  289 + valueFormat: 'HH:mm:ss',
  290 + },
258 colProps: { 291 colProps: {
259 span: 8, 292 span: 8,
260 }, 293 },
@@ -264,6 +297,9 @@ export const formSchema: FormSchema[] = [ @@ -264,6 +297,9 @@ export const formSchema: FormSchema[] = [
264 field: 'endsOn6', 297 field: 'endsOn6',
265 component: 'TimePicker', 298 component: 'TimePicker',
266 label: '结束时间选择', 299 label: '结束时间选择',
  300 + componentProps: {
  301 + valueFormat: 'HH:mm:ss',
  302 + },
267 colProps: { 303 colProps: {
268 span: 8, 304 span: 8,
269 }, 305 },
@@ -290,6 +326,9 @@ export const formSchema: FormSchema[] = [ @@ -290,6 +326,9 @@ export const formSchema: FormSchema[] = [
290 field: 'startsOn7', 326 field: 'startsOn7',
291 component: 'TimePicker', 327 component: 'TimePicker',
292 label: '开始时间选择', 328 label: '开始时间选择',
  329 + componentProps: {
  330 + valueFormat: 'HH:mm:ss',
  331 + },
293 colProps: { 332 colProps: {
294 span: 8, 333 span: 8,
295 }, 334 },
@@ -299,6 +338,9 @@ export const formSchema: FormSchema[] = [ @@ -299,6 +338,9 @@ export const formSchema: FormSchema[] = [
299 field: 'endsOn7', 338 field: 'endsOn7',
300 component: 'TimePicker', 339 component: 'TimePicker',
301 label: '结束时间选择', 340 label: '结束时间选择',
  341 + componentProps: {
  342 + valueFormat: 'HH:mm:ss',
  343 + },
302 colProps: { 344 colProps: {
303 span: 8, 345 span: 8,
304 }, 346 },
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 await updateSchema({ field: 'title', componentProps: { disabled: false } }); 94 await updateSchema({ field: 'title', componentProps: { disabled: false } });
95 //如果是编辑操作，设置页面数据 95 //如果是编辑操作，设置页面数据
96 if (unref(isUpdate)) { 96 if (unref(isUpdate)) {
97 - console.log(data.record); 97 + // console.log(data.record);
98 getTenantRoles(data.record.tenantId).then((result) => { 98 getTenantRoles(data.record.tenantId).then((result) => {
99 Reflect.set(data.record, 'roleIds', result); 99 Reflect.set(data.record, 'roleIds', result);
100 //为表单赋值 100 //为表单赋值