Merge branch 'main' into ft-dev

@@ -179,3 +179,9 @@ export const getGATEWAYdevice = async (params: { organization: string }) => {
     res.map((item) => ({ label: item.name, value: item.id }))
   );
 };
+
+export const getGATEWAY = (tbDeviceId: string) => {
+  return defHttp.get({
+    url: '/device/gateway/' + tbDeviceId,
+  });
+};

 <template>
-  <div class="wrapper123">
+  <div class="wrapper">
     <div ref="wrapRef" :style="{ height, width }"> </div>
     <div class="right-wrap">
       <BasicTable @register="registerTable" @rowClick="deviceRowClick">
@@ -25,21 +25,19 @@
         </template>
       </BasicTable>
     </div>
-    <DeviceDetailDrawer @register="registerDetailDrawer" />
     <BasicModal
-      v-bind="$attrs"
       @register="registerModal"
       title="历史数据"
       width="70%"
       :footer="null"
       @cancel="cancelHistoryModal"
       :canFullscreen="false"
-      destroyOnClose
     >
       <BasicForm @register="registerForm" />
       <Empty v-show="!isNull" />
       <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"></div>
     </BasicModal>
+    <DeviceDetailDrawer @register="registerDetailDrawer" />
   </div>
 </template>
 <script lang="ts">
@@ -91,24 +89,101 @@
       },
     },
     setup() {
+      let entityId = '';
+      let keys = [];
+      let globalRecord: any = {};
       const wrapRef = ref<HTMLDivElement | null>(null);
+      const chartRef = ref<HTMLDivElement | null>(null);
+      const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+      const isNull = ref(true);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
-
-      let entityId = '';
-      let globalRecord: any = {};
-      async function initMap() {
-        await toPromise();
-        await nextTick();
-        const wrapEl = unref(wrapRef);
-        const BMap = (window as any).BMap;
-        if (!wrapEl) return;
-        const map = new BMap.Map(wrapEl);
-        const point = new BMap.Point(104.04666605565338, 30.543516387560476);
-        map.centerAndZoom(point, 15);
-        map.enableScrollWheelZoom(true);
-      }
-
+      const [registerModal, { openModal }] = useModal();
+      const [
+        registerForm,
+        { resetFields, getFieldsValue, setFieldsValue, validate, updateSchema },
+      ] = useForm({
+        labelWidth: 120,
+        schemas,
+        async submitFunc() {
+          // 表单验证
+          await validate();
+          let { endTs, interval, agg } = getFieldsValue();
+          if (!endTs) return;
+          // 数据收集
+          const dataArray: any[] = [];
+          const startTs = Date.now() - endTs;
+          endTs = Date.now();
+          // 发送请求
+          const res = await getDeviceHistoryInfo({
+            entityId,
+            keys: keys.join(),
+            startTs,
+            endTs,
+            interval,
+            agg,
+          });
+          // 判断数据对象是否为空
+          if (!Object.keys(res).length) {
+            isNull.value = false;
+            return;
+          } else {
+            isNull.value = true;
+          }
+          // 处理数据
+          for (const key in res) {
+            for (const item1 of res[key]) {
+              let { ts, value } = item1;
+              const time = moment(ts).format('YYYY-MM-DD HH:mm:ss');
+              value = Number(value).toFixed(2);
+              dataArray.push([time, value, key]);
+            }
+          }
+          const series: any = keys.map((item) => {
+            return {
+              name: item,
+              type: 'line',
+              stack: 'Total',
+              data: dataArray.filter((item1) => item1[2] === item),
+            };
+          });
+          // 设置数据
+          setOptions({
+            tooltip: {
+              trigger: 'axis',
+            },
+            legend: {
+              data: keys,
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true,
+            },
+            dataZoom: [
+              {
+                type: 'inside',
+                start: 0,
+                end: 50,
+              },
+              {
+                start: 20,
+                end: 40,
+              },
+            ],
+            xAxis: {
+              type: 'time',
+              boundaryGap: false,
+            },
+            yAxis: {
+              type: 'value',
+              boundaryGap: [0, '100%'],
+            },
+            series,
+          });
+        },
+      });
       const [registerTable] = useTable({
         api: devicePage,
         columns,
@@ -122,6 +197,18 @@
           showSizeChanger: false,
         },
       });
+
+      async function initMap() {
+        await toPromise();
+        await nextTick();
+        const wrapEl = unref(wrapRef);
+        const BMap = (window as any).BMap;
+        if (!wrapEl) return;
+        const map = new BMap.Map(wrapEl);
+        const point = new BMap.Point(104.04666605565338, 30.543516387560476);
+        map.centerAndZoom(point, 15);
+        map.enableScrollWheelZoom(true);
+      }
       // 点击表格某一行触发
       const deviceRowClick = async (record) => {
         entityId = record.tbDeviceId;
@@ -130,6 +217,7 @@
         const wrapEl = unref(wrapRef);
         const map = new BMap.Map(wrapEl);
         if (record.deviceInfo.address) {
+          keys = await getDeviceDataKeys(entityId);
           const { name, organizationDTO, deviceState, deviceProfile } = record;
           const { longitude, latitude, address } = record.deviceInfo;
           const point = new BMap.Point(longitude, latitude);
@@ -191,99 +279,7 @@
           map.openInfoWindow(infoWindow, map.getCenter());
         }
       };
-      let keys = [];
-      const [registerModal, { openModal }] = useModal();
-      const [
-        registerForm,
-        { resetFields, getFieldsValue, setFieldsValue, validate, updateSchema },
-      ] = useForm({
-        labelWidth: 120,
-        schemas,
-        async submitFunc() {
-          // 表单验证
-          await validate();
-          let { endTs, interval, agg } = getFieldsValue();
-          if (!endTs) return;
-          // 数据收集
-          const dataArray: any[] = [];
-          const startTs = Date.now() - endTs;
-          endTs = Date.now();
-          // 判断对象是否为空
-          if (Object.keys(keys).length === 0) {
-            isNull.value = false;
-            return;
-          } else {
-            isNull.value = true;
-          }
-          // 发送请求
-          const res = await getDeviceHistoryInfo({
-            entityId,
-            keys: keys.join(),
-            startTs,
-            endTs,
-            interval,
-            agg,
-          });
 
-          // 处理数据
-          for (const key in res) {
-            for (const item1 of res[key]) {
-              let { ts, value } = item1;
-              const time = moment(ts).format('YYYY-MM-DD HH:mm:ss');
-              value = Number(value).toFixed(2);
-              dataArray.push([time, value, key]);
-            }
-          }
-
-          const series: any = keys.map((item) => {
-            return {
-              name: item,
-              type: 'line',
-              stack: 'Total',
-              data: dataArray.filter((item1) => item1[2] === item),
-            };
-          });
-          // 设置数据
-          setOptions({
-            tooltip: {
-              trigger: 'axis',
-            },
-            legend: {
-              data: keys,
-            },
-            grid: {
-              left: '3%',
-              right: '4%',
-              bottom: '3%',
-              containLabel: true,
-            },
-            dataZoom: [
-              {
-                type: 'inside',
-                start: 0,
-                end: 50,
-              },
-              {
-                start: 20,
-                end: 40,
-              },
-            ],
-            xAxis: {
-              type: 'time',
-              boundaryGap: false,
-            },
-            yAxis: {
-              type: 'value',
-              boundaryGap: [0, '100%'],
-            },
-            series,
-          });
-        },
-      });
-
-      const chartRef = ref<HTMLDivElement | null>(null);
-      const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
-      const isNull = ref(true);
       // 设备信息
       const openDeviceInfoDrawer = async () => {
         const { id, tbDeviceId } = globalRecord;
@@ -299,10 +295,7 @@
         const startTs = Date.now() - 86400000; //最近一天
         const endTs = Date.now();
         // 发送请求
-        keys = await getDeviceDataKeys(entityId);
-        // 判断keys是否为空
-        if (!Object.keys(keys).length) {
-          console.log(keys);
+        if (!keys.length) {
           isNull.value = false;
           return;
         } else {
@@ -316,7 +309,13 @@
           interval: 7200000, //间隔两小时
           agg: 'AVG',
         });
-
+        // 判断对象是否为空
+        if (!Object.keys(res).length) {
+          isNull.value = false;
+          return;
+        } else {
+          isNull.value = true;
+        }
         // 处理数据
         for (const key in res) {
           for (const item1 of res[key]) {
@@ -370,19 +369,16 @@
           },
           series,
         });
-
-        await setFieldsValue({
+        setFieldsValue({
           endTs: 86400000,
           interval: 7200000,
           agg: 'AVG',
         });
       };
-
       const cancelHistoryModal = () => {
         resetFields();
         updateSchema({
           field: 'interval',
-
           componentProps: {
             placeholder: '请选择分组间隔',
             options: [

@@ -27,7 +27,6 @@
 
     emits: ['select'],
     setup(_, { emit }) {
-      // const { proxy } = getCurrentInstance();
       const getTreeRef: any = ref(null);
       const treeData = ref<TreeItem[]>([]);
       const selectedKeys = ref<string[]>();

@@ -60,6 +60,7 @@
         租户消息量TOP10</h1
       >
       <Empty v-if="!tenantTop10.length" />
+
       <Descriptions :column="1">
         <template v-for="(item, index) in tenantTop10" :key="item.name">
           <DescriptionsItem>

@@ -53,12 +53,21 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     label: '所属组织',
     component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
+      return {
+        api: async () => {
+          const data = await getOrganizationList();
+          copyTransFun(data as any as any[]);
+          return data;
+        },
+
+        onChange() {
+          setFieldsValue({
+            gateWayDeviceId: null,
+          });
+        },
+      };
     },
   },
   {
@@ -69,9 +78,9 @@ export const step1Schemas: FormSchema[] = [
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
     componentProps: ({ formModel }) => {
       const { organizationId } = formModel;
-      console.log(formModel);
       return {
         api: getGATEWAYdevice,
+        showSearch: true,
         params: {
           organizationId,
         },

@@ -105,7 +105,12 @@
   import { columns, searchFormSchema } from './config/device.data';
   import { Tag } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { deleteDevice, devicePage, cancelDispatchCustomer } from '/@/api/device/deviceManager';
+  import {
+    deleteDevice,
+    devicePage,
+    cancelDispatchCustomer,
+    getGATEWAY,
+  } from '/@/api/device/deviceManager';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useGo } from '/@/hooks/web/usePage';
   import { PageWrapper } from '/@/components/Page';
@@ -191,7 +196,11 @@
         });
       }
 
-      function handleEdit(record: Recordable) {
+      async function handleEdit(record: Recordable) {
+        if (record.deviceType === 'SENSOR') {
+          const res = await getGATEWAY(record.tbDeviceId);
+          Reflect.set(record, 'gateWayDeviceId', res.id);
+        }
         openModal(true, {
           isUpdate: true,
           record,

@@ -92,7 +92,7 @@ export const accountFormSchema: FormSchema[] = [
     dynamicDisabled: false,
     componentProps: {
       maxLength: 36,
-      placeholder: '请输入账号',
+      placeholder: '请输入用户名',
     },
     dynamicRules: ({ values }) => {
       return [
@@ -110,7 +110,7 @@ export const accountFormSchema: FormSchema[] = [
                 if (values.username != undefined && values.id == undefined) {
                   isAccountExist(value).then((data) => {
                     if (data.data != null) {
-                      reject('用户已存在');
+                      reject('用户名已存在');
                     } else {
                       resolve();
                     }
@@ -205,7 +205,7 @@ export const accountFormSchema: FormSchema[] = [
   },
   {
     field: 'accountExpireTime',
-    label: '有效期: ',
+    label: '有效期',
     component: 'DatePicker',
     colProps: { span: 12 },
     componentProps: {
@@ -234,11 +234,9 @@ export const accountFormSchema: FormSchema[] = [
   },
   {
     field: 'organizationIds',
-    label: ' ',
+    label: '所属组织',
     component: 'Input',
     slot: 'organizationId',
-    componentProps: {
-      maxLength: 36,
-    },
+    required: true,
   },
 ];