'调整bug'

@@ -45,7 +45,7 @@ export const deleteAlarmContact = (ids: string[]) => {
 // 新增或者编辑
 // 新增或者编辑
 export const saveOrEditAlarmContact = (params: ContactInfo, isUpdate: boolean) => {
 export const saveOrEditAlarmContact = (params: ContactInfo, isUpdate: boolean) => {
   if (isUpdate) return updateAlarmContact(params);
   if (isUpdate) return updateAlarmContact(params);
-  addAlarmContact(params);
+  return addAlarmContact(params);
 };
 };
 
 
 // 查询设备分页数据
 // 查询设备分页数据

@@ -16,7 +16,7 @@ enum DeviceManagerApi {
    */
    */
   DEVICE_PROFILE_URL = '/deviceProfile',
   DEVICE_PROFILE_URL = '/deviceProfile',
 
 
-  DEVICE_PROFILE_URL_ME = '/deviceProfile/me',
+  DEVICE_PROFILE_URL_ME = '/deviceProfile/me/list',
 }
 }
 
 
 export const devicePage = (params: DeviceQueryParam) => {
 export const devicePage = (params: DeviceQueryParam) => {

@@ -42,7 +42,7 @@ export const getAccountList = (params: AccountParams) =>
  */
  */
 export const getOrganizationList = (params?: OrganizationListItem) =>
 export const getOrganizationList = (params?: OrganizationListItem) =>
   defHttp.get<OrganizationListGetResultModel>({
   defHttp.get<OrganizationListGetResultModel>({
-    url: Api.BaseOrganization + '/me/organizations',
+    url: Api.BaseOrganization + '/me/list',
     params,
     params,
   });
   });
 
 

@@ -7,7 +7,7 @@ import { copyTransFun } from '/@/utils/fnUtils';
 export const step1Schemas: FormSchema[] = [
 export const step1Schemas: FormSchema[] = [
   {
   {
     field: 'icon',
     field: 'icon',
-    label: '设备图片: ',
+    label: '设备图片',
     slot: 'iconSelect',
     slot: 'iconSelect',
     component: 'Input',
     component: 'Input',
   },
   },
@@ -84,14 +84,14 @@ export const step1Schemas: FormSchema[] = [
     show: false,
     show: false,
   },
   },
   {
   {
-    field: 'profileId',
-    label: '设备配置id',
+    field: 'deviceToken',
+    label: '设备唯一token',
     component: 'Input',
     component: 'Input',
     show: false,
     show: false,
   },
   },
   {
   {
-    field: 'deviceToken',
-    label: '设备唯一token',
+    field: 'tenantId',
+    label: '租户Code',
     component: 'Input',
     component: 'Input',
     show: false,
     show: false,
   },
   },

@@ -111,8 +111,8 @@
         } else {
         } else {
           if (!DeviceStep2Ref?.value?.creaentialsPassword.isCreaentials) {
           if (!DeviceStep2Ref?.value?.creaentialsPassword.isCreaentials) {
             const valid = await DeviceStep2Ref?.value?.validate();
             const valid = await DeviceStep2Ref?.value?.validate();
-            if (!valid) return;
             // 第二页验证通过情况
             // 第二页验证通过情况
+            if (!valid) return;
             handleCancel();
             handleCancel();
             closeModal();
             closeModal();
           }
           }

@@ -13,7 +13,6 @@
           >
           >
             <img v-if="devicePic" :src="devicePic" alt="avatar" />
             <img v-if="devicePic" :src="devicePic" alt="avatar" />
             <div v-else>
             <div v-else>
-              <!-- <LoadingOutlined v-if="loading" /> -->
               <PlusOutlined />
               <PlusOutlined />
               <div class="ant-upload-text">图片上传</div>
               <div class="ant-upload-text">图片上传</div>
             </div>
             </div>

@@ -90,7 +90,7 @@
         }
         }
       };
       };
       const copyToken = () => {
       const copyToken = () => {
-        clipboardRef.value = props.deviceDetail.token;
+        clipboardRef.value = props.deviceDetail.deviceToken;
         if (unref(clipboardRef)) {
         if (unref(clipboardRef)) {
           createMessage.success('复制成功~');
           createMessage.success('复制成功~');
         }
         }

@@ -6,9 +6,9 @@
         <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
         <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
       </template>
       </template>
       <template #deviceProfile="{ record }">
       <template #deviceProfile="{ record }">
-        <a-button type="link" class="ml-2" @click="goDeviceProfile">
+        <!-- <a-button type="link" class="ml-2" @click="goDeviceProfile">
           {{ record.deviceProfile.name }}
           {{ record.deviceProfile.name }}
-        </a-button>
+        </a-button> -->
       </template>
       </template>
       <template #organizationId="{ record }">
       <template #organizationId="{ record }">
         {{ record.organizationDTO.name }}
         {{ record.organizationDTO.name }}
@@ -127,7 +127,7 @@
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
-          fixed: undefined,
+          fixed: 'right',
         },
         },
       });
       });
       const handleReload = () => {
       const handleReload = () => {

@@ -112,8 +112,6 @@
             codeTown: fieldsValue.nameTown,
             codeTown: fieldsValue.nameTown,
             qrCode: qrcodePic.value,
             qrCode: qrcodePic.value,
           };
           };
-          console.log(fieldsValue);
-          console.log(newFieldValue);
           await updateEnterPriseDetail(newFieldValue);
           await updateEnterPriseDetail(newFieldValue);
           compState.value.loading = false;
           compState.value.loading = false;
           createMessage.success('更新信息成功');
           createMessage.success('更新信息成功');
@@ -261,10 +259,10 @@
 
 
       onMounted(async () => {
       onMounted(async () => {
         const res = await getEnterPriseDetail();
         const res = await getEnterPriseDetail();
-        updateCityData(res.codeProv, res.codeCity, res.codeCoun, res.codeTown);
+        const { codeProv, codeCity, codeCoun, codeTown } = res.sysTown;
+        updateCityData(codeProv, codeCity, codeCoun, codeTown);
         setFieldsValue(res);
         setFieldsValue(res);
         qrcodePic.value = res.qrCode;
         qrcodePic.value = res.qrCode;
-        console.log(res);
       });
       });
 
 
       return {
       return {