Merge branch 'sqy_dev' into 'main'

调整bug，修复

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

@@ -7,11 +7,11 @@ dist
 tests/server/static
 tests/server/static/upload
 
+.env.development
 .local
 # local env files
 .env.local
 .env.*.local
-.env.*development
 .env.*test
 .env.*production
 .eslintcache

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

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

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

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

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

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

@@ -18,8 +18,8 @@
       <div ref="wrapRef" style="height: 400px; width: 90%" class="ml-6"></div>
     </div>
     <div class="mt-4">
-      <a-button type="primary" class="mr-4">复制设备ID</a-button>
-      <a-button type="primary">复制访问令牌</a-button>
+      <a-button type="primary" class="mr-4" @click="copyDeviceId">复制设备ID</a-button>
+      <a-button type="primary" @click="copyToken">复制访问令牌</a-button>
     </div>
   </div>
 </template>
@@ -28,6 +28,8 @@
   import { Image, Table } from 'ant-design-vue';
   import { columns } from '../../config/detail.config';
   import { useScript } from '/@/hooks/web/useScript';
+  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
+  import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     components: {
       Image,
@@ -39,7 +41,7 @@
         required: true,
       },
     },
-    setup() {
+    setup(props) {
       const BAI_DU_MAP_URL =
         'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
       const wrapRef = ref<HTMLDivElement | null>(null);
@@ -79,10 +81,26 @@
         map.enableScrollWheelZoom(true);
         map.addOverlay(marker);
       }
+      const { createMessage } = useMessage();
+      const { clipboardRef } = useCopyToClipboard();
+      const copyDeviceId = () => {
+        clipboardRef.value = props.deviceDetail.id;
+        if (unref(clipboardRef)) {
+          createMessage.success('复制成功~');
+        }
+      };
+      const copyToken = () => {
+        clipboardRef.value = props.deviceDetail.deviceToken;
+        if (unref(clipboardRef)) {
+          createMessage.success('复制成功~');
+        }
+      };
 
       return {
         columns,
         wrapRef,
+        copyDeviceId,
+        copyToken,
         initMap,
       };
     },

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

@@ -112,8 +112,6 @@
             codeTown: fieldsValue.nameTown,
             qrCode: qrcodePic.value,
           };
-          console.log(fieldsValue);
-          console.log(newFieldValue);
           await updateEnterPriseDetail(newFieldValue);
           compState.value.loading = false;
           createMessage.success('更新信息成功');
@@ -261,10 +259,10 @@
 
       onMounted(async () => {
         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);
         qrcodePic.value = res.qrCode;
-        console.log(res);
       });
 
       return {