Merge branch 'ft_local_dev' into 'main'

fix:修改teambition上的几个问题

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

@@ -85,7 +85,7 @@
   import { useNow } from './useNow';
   import { useNow } from './useNow';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { LockOutlined } from '@ant-design/icons-vue';
   import { LockOutlined } from '@ant-design/icons-vue';
-  import headerImg from '/@/assets/images/header.jpg';
+  import headerImg from '/@/assets/images/logo.png';
 
 
   const InputPassword = Input.Password;
   const InputPassword = Input.Password;
 
 

@@ -11,7 +11,7 @@ export enum AlarmStatus {
 }
 }
 
 
 export enum AlarmStatusMean {
 export enum AlarmStatusMean {
-  CLEARED_UNACK = '清楚未确认',
+  CLEARED_UNACK = '清除未确认',
   ACTIVE_UNACK = '激活未确认',
   ACTIVE_UNACK = '激活未确认',
   CLEARED_ACK = '清除已确认',
   CLEARED_ACK = '清除已确认',
   ACTIVE_ACK = '激活已确认',
   ACTIVE_ACK = '激活已确认',

@@ -100,6 +100,7 @@
     organizationDTO: { name: string };
     organizationDTO: { name: string };
     deviceProfile: { default: boolean; enabled: boolean; name: string; transportType: string };
     deviceProfile: { default: boolean; enabled: boolean; name: string; transportType: string };
     deviceInfo: { longitude: string; latitude: string; address: string };
     deviceInfo: { longitude: string; latitude: string; address: string };
+    deviceType?: string;
   }
   }
   type MarkerList = DeviceInfo & { marker: any; label: any };
   type MarkerList = DeviceInfo & { marker: any; label: any };
 
 
@@ -232,7 +233,7 @@
           width: 330, // 信息窗口宽度
           width: 330, // 信息窗口宽度
           height: 0, // 信息窗口高度
           height: 0, // 信息窗口高度
         };
         };
-        const { name, organizationDTO, deviceState, deviceProfile } = record;
+        const { name, organizationDTO, deviceState, deviceProfile, deviceType } = record;
         const { address, longitude, latitude } = record.deviceInfo;
         const { address, longitude, latitude } = record.deviceInfo;
         // 创建信息窗口对象
         // 创建信息窗口对象
         const res = await getDeviceActiveTime(entityId);
         const res = await getDeviceActiveTime(entityId);
@@ -264,7 +265,11 @@
             </div>
             </div>
           <div style="display:flex;justify-content:end; margin-top:10px">
           <div style="display:flex;justify-content:end; margin-top:10px">
             <button onclick="openDeviceInfoDrawer()" style="margin-right:10px;color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">设备信息</button>
             <button onclick="openDeviceInfoDrawer()" style="margin-right:10px;color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">设备信息</button>
-            <button onclick="openHistoryModal()" style="color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">历史数据</button>
+            <button onclick="openHistoryModal()" style="display:${
+              deviceType !== 'GATEWAY' ? 'block' : 'none'
+            };color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">${
+            deviceType !== 'GATEWAY' ? '历史数据' : ''
+          }</button>
           </div>
           </div>
           `,
           `,
           options
           options

@@ -139,21 +139,23 @@
           if (e) {
           if (e) {
             //fengtao
             //fengtao
             if (e == 'ALL') {
             if (e == 'ALL') {
-              const data = await getAttribute(orgId, null);
-              //fengtao
-              const options = data.map((m) => {
-                return {
-                  label: m,
-                  value: m,
-                };
-              });
-              updateSchema({
-                field: 'type2',
-                componentProps: {
-                  placeholder: '请选择属性',
-                  options,
-                },
-              });
+              if (orgId) {
+                const data = await getAttribute(orgId, null);
+                //fengtao
+                const options = data.map((m) => {
+                  return {
+                    label: m,
+                    value: m,
+                  };
+                });
+                updateSchema({
+                  field: 'type2',
+                  componentProps: {
+                    placeholder: '请选择属性',
+                    options,
+                  },
+                });
+              }
             } else {
             } else {
               const getT = getFieldsValue();
               const getT = getFieldsValue();
               const entityId = getT.entityId;
               const entityId = getT.entityId;

@@ -179,21 +179,23 @@
           if (e) {
           if (e) {
             //fengtao
             //fengtao
             if (e == 'ALL') {
             if (e == 'ALL') {
-              const data = await getAttribute(props.provideOrgid || orgId.value, null);
-              //fengtao
-              const options = data.map((m) => {
-                return {
-                  label: m,
-                  value: m,
-                };
-              });
-              updateSchema({
-                field: 'type2',
-                componentProps: {
-                  placeholder: '请选择属性',
-                  options,
-                },
-              });
+              if (props.provideOrgid || orgId.value) {
+                const data = await getAttribute(props.provideOrgid || orgId.value, null);
+                //fengtao
+                const options = data.map((m) => {
+                  return {
+                    label: m,
+                    value: m,
+                  };
+                });
+                updateSchema({
+                  field: 'type2',
+                  componentProps: {
+                    placeholder: '请选择属性',
+                    options,
+                  },
+                });
+              }
             } else {
             } else {
               const getT = getFieldsValue();
               const getT = getFieldsValue();
               const entityId = getT.entityId;
               const entityId = getT.entityId;

@@ -85,7 +85,7 @@
   import { useNow } from './useNow';
   import { useNow } from './useNow';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { LockOutlined } from '@ant-design/icons-vue';
   import { LockOutlined } from '@ant-design/icons-vue';
-  import headerImg from '/@/assets/images/header.jpg';
+  import headerImg from '/@/assets/images/logo.png';
 
 
   const InputPassword = Input.Password;
   const InputPassword = Input.Password;