Merge branch 'ft-dev' into 'main'

fix:修改账号管理点击编辑时，没修改手机号和邮箱，手机号为空字符串，邮箱为空字符问题 See merge request huang/yun-teng-iot-front!139

Merge branch 'ft-dev' into 'main'
fix:修改账号管理点击编辑时，没修改手机号和邮箱，手机号为空字符串，邮箱为空字符问题 See merge request huang/yun-teng-iot-front!139
xp.Huang
2 parents 6808b942 2e024266
Showing 4 changed files with 36 additions and 18 deletions
src/router/guard/permissionGuard.ts
src/views/device/profile/step/DeviceProfileStep3.vue
src/views/rule/linkedge/useDrawer.vue
src/views/system/account/AccountModal.vue
--- a/src/router/guard/permissionGuard.ts
View file @bab8d8b
+++ b/src/router/guard/permissionGuard.ts
View file @bab8d8b
@@ -75,7 +75,7 @@ export function createPermissionGuard(router: Router) {
           router.push('/dashboard/workbench');
         }, 1);
       } else {
-        const routeF = getMenuListData[0]?.children[0]?.path || getMenuListData[0].path;
+        const routeF = getMenuListData[0]?.children[0]?.path || getMenuListData[0]?.path;
         setTimeout(() => {
           router.push(routeF);
         }, 1);
--- a/src/views/device/profile/step/DeviceProfileStep3.vue
View file @bab8d8b
+++ b/src/views/device/profile/step/DeviceProfileStep3.vue
View file @bab8d8b
@@ -918,11 +918,11 @@
         fliterTempRuleConditionTempArr.value.push({
           condition: addNewRuleTem.condition.condition,
         });
-        if (isEditDataAndValue.value == true) {
-          getEditDataAndValue.value.push({
-            condition: addNewRuleTem.condition.condition,
-          });
-        }
+
+        getEditDataAndValue.value.push({
+          condition: addNewRuleTem.condition.condition,
+        });
+        console.log(getEditDataAndValue.value);
       };
       //格式化编辑
       const isEditDataAndValueFunc = (v) => {
--- a/src/views/rule/linkedge/useDrawer.vue
View file @bab8d8b
+++ b/src/views/rule/linkedge/useDrawer.vue
View file @bab8d8b
@@ -340,7 +340,7 @@
                   newFilterMap.value.push({
                     value: f2.tbDeviceId,
                     label: f2.name,
-                  });
+                  } as never);
                 }
               });
             });
@@ -350,7 +350,7 @@
                   newConditionFilterMap.value.push({
                     value: f2.tbDeviceId,
                     label: f2.name,
-                  });
+                  } as never);
                 }
               });
             });
@@ -360,7 +360,7 @@
                   newActionFilterMap.value.push({
                     value: f2.tbDeviceId,
                     label: f2.name,
-                  });
+                  } as never);
                 }
               });
             });
@@ -407,7 +407,7 @@
           return e;
         }
       };
-      watch(getData, async (newV) => {
+      watch(getData, async (newV: string) => {
         const options = await screenLinkPageByDeptIdGetDevice({ organizationId: newV });
         options.items.forEach((v) => {
           return (v.value = v.tbDeviceId), (v.label = v.name);
@@ -464,7 +464,7 @@
           let newTriggerArray = addTriggerPushData.value.concat(refTriggerChildData);
           let newConditionArray = addConditionPushData.value.concat(refConditionChildData);
           let newActionArray = addActionPushData.value.concat(refActionChildData);
-          newTriggerArray = newTriggerArray.map((m) => {
+          (newTriggerArray as any) = newTriggerArray.map((m) => {
             return {
               triggerType: m?.triggerType,
               entityId: m?.entityId || m?.entityId1 || m?.entityId2,
@@ -492,7 +492,7 @@
               },
             };
           });
-          newConditionArray = newConditionArray.map((m) => {
+          (newConditionArray as any) = newConditionArray.map((m) => {
             return {
               triggerType: m?.triggerType,
               entityId: m?.entityId,
@@ -626,7 +626,7 @@
         if (!unref(isUpdate)) {
           refTriggerChildDataFunc();
           unref(addTriggerPushData).push(refTriggerChildData as never);
-          addTriggerPushData.value = addTriggerPushData.value.map((m) => {
+          (addTriggerPushData.value as any) = addTriggerPushData.value.map((m) => {
             return {
               triggerType: m?.triggerType,
               entityId: m?.entityId || m?.entityId1 || m?.entityId2,
@@ -725,7 +725,7 @@
         if (!unref(isUpdate)) {
           refConditionChildDataFunc();
           unref(addConditionPushData).push(refConditionChildData as never);
-          addConditionPushData.value = addConditionPushData.value.map((m) => {
+          (addConditionPushData.value as any) = addConditionPushData.value.map((m) => {
             return {
               triggerType: m?.triggerType,
               entityId: m?.entityId,
--- a/src/views/system/account/AccountModal.vue
View file @bab8d8b
+++ b/src/views/system/account/AccountModal.vue
View file @bab8d8b
@@ -25,7 +25,7 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { accountFormSchema } from './account.data';
@@ -35,6 +35,7 @@
   import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { copyTransTreeFun } from '/@/utils/fnUtils';
+
   export default defineComponent({
     name: 'AccountModal',
     components: { BasicModal, BasicForm, BasicTree },
@@ -46,6 +47,11 @@
       const basicTreeRef = ref();
       const checkGroup = ref<string[]>([]);
       const olderPhoneNumber = ref();
+      const postData = reactive({});
+      const singleEditPostPhoneNumber = reactive({
+        phoneNumber: '',
+      });
+
       const [
         registerForm,
         { setFieldsValue, updateSchema, resetFields, validate, getFieldsValue },
@@ -67,11 +73,11 @@
           copyTransTreeFun(groupListModel);
           organizationTreeData.value = groupListModel;
         }
-
         if (unref(isUpdate)) {
           rowId.value = data.record.id;
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           olderPhoneNumber.value = data.record.phoneNumber;
+          singleEditPostPhoneNumber.phoneNumber = data.record.phoneNumber;
           findCurrentUserRelation(roleParams).then((result) => {
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'password', '******');
@@ -92,6 +98,9 @@
       async function handleSubmit() {
         try {
           const { createMessage } = useMessage();
+          if (unref(isUpdate)) {
+            Object.assign(postData, singleEditPostPhoneNumber);
+          }
           const values = await validate([
             'id',
             'username',
@@ -105,13 +114,22 @@
             'organizationIds',
             olderPhoneNumber.value === getFieldsValue().phoneNumber ? '' : 'phoneNumber',
           ]);
-          console.log(values);
           values.accountExpireTime =
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')
               : null;
           setModalProps({ confirmLoading: true });
-          await SaveOrUpdateUserInfo(values, unref(isUpdate));
+          Object.assign(postData, values);
+          if (unref(isUpdate)) {
+            if (values.email == '') {
+              delete postData.email;
+            }
+          } else {
+            if (values.email == '') {
+              delete postData.email;
+            }
+          }
+          await SaveOrUpdateUserInfo(postData as any, unref(isUpdate));
           closeModal();
           emit('success');
           createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');