Merge branch 'ft' into 'main_dev'

perf: 优化登录页手机登录和账号登录更换为图标形式

See merge request yunteng/thingskit-front!853

@@ -126,6 +126,12 @@ export const alarmColumns: BasicColumn[] = [
     format: (text) => alarmLevel(text),
   },
   {
+    title: '告警详情',
+    dataIndex: 'details',
+    slots: { customRender: 'details' },
+    width: 160,
+  },
+  {
     title: '状态',
     dataIndex: 'status',
     format: (text) => statusType(text),

@@ -13,17 +13,31 @@
           ]"
         />
       </template>
+      <template #details="{ record }">
+        <a-button type="link" class="ml-2" @click="handleViewAlarmDetails(record)">
+          查看告警详情
+        </a-button>
+      </template>
     </BasicTable>
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, nextTick, h } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { alarmColumns, alarmSearchSchemas } from './config/detail.config';
   import { getDeviceAlarm } from '/@/api/device/deviceManager';
   import { useDrawer } from '/@/components/Drawer';
   import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue';
+  import { Modal } from 'ant-design-vue';
+  import { JsonPreview } from '/@/components/CodeEditor';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    operationNumber_OR_TIME,
+    operationString,
+    operationBoolean,
+  } from '/@/views/rule/linkedge/config/formatData';
 
   export default defineComponent({
     name: 'AlarmCenter',
@@ -61,11 +75,85 @@
       const handleSuccess = () => {
         reload();
       };
+      const handleViewAlarmDetails = async (record: Recordable) => {
+        await nextTick();
+        const { details } = record;
+        const deviceIdKeys = Object.keys(details);
+        const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
+        const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
+        const dataFormats = detailObject.reduce((acc: any, curr: any) => {
+          dataFormat.forEach((item) => {
+            if (item.tbDeviceId === curr.label) {
+              const findName = item.attribute.find(
+                (item) => item.identifier === curr.value.key
+              )?.name;
+              const findLogin = [
+                ...operationNumber_OR_TIME,
+                ...operationString,
+                ...operationBoolean,
+              ].find((item) => item.value === curr.value.logic)?.symbol;
+              const findAttribute = item.attribute.find(
+                (findItem) => findItem.identifier === curr.value.key
+              );
+              const value = {
+                ['触发属性']: findName,
+                ['触发条件']: `${findLogin}${curr.value.logicValue}`,
+                ['触发值']: `${curr.value.realValue}${findAttribute.detail?.dataType?.specs?.unit?.key}`,
+              };
+              const data = {
+                [item.name]: value,
+              };
+              acc.push(data);
+            }
+          });
+          return [...acc];
+        }, []);
+        const objectFormat = dataFormats.reduce((acc: any, curr: any) => {
+          return {
+            ...acc,
+            ...curr,
+          };
+        }, {});
+        Modal.info({
+          title: '告警详情',
+          width: 600,
+          centered: true,
+          maskClosable: true,
+          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(objectFormat)) }),
+        });
+      };
+      const handleAlarmDetailFormat = async (keys: string[]) => {
+        const temp: any = [];
+        for (let item of keys) {
+          if (item === 'key' || item === 'data') return []; //旧数据则终止
+          const deviceDetailRes = await getDeviceDetail(item);
+          const { deviceProfileId } = deviceDetailRes;
+          if (!deviceProfileId) return [];
+          const attributeRes = await getAttribute(deviceProfileId);
+          const dataFormat: any = handleDataFormat(deviceDetailRes, attributeRes);
+          temp.push(dataFormat);
+        }
+        return temp;
+      };
+      const handleDataFormat = (deviceDetail: any, attributes: any) => {
+        const { name, tbDeviceId } = deviceDetail;
+        const attribute = attributes.map((item) => ({
+          identifier: item.identifier,
+          name: item.name,
+          detail: item.detail,
+        }));
+        return {
+          name,
+          tbDeviceId,
+          attribute,
+        };
+      };
       return {
         registerTable,
         registerDetailDrawer,
         handleDetail,
         handleSuccess,
+        handleViewAlarmDetails,
       };
     },
   });

@@ -86,7 +86,6 @@
         const deviceIdKeys = Object.keys(details);
         const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
         const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
-        console.log(detailObject, dataFormat, 'dataFormat');
         const dataFormats = detailObject.reduce((acc: any, curr: any) => {
           dataFormat.forEach((item) => {
             if (item.tbDeviceId === curr.label) {

@@ -283,6 +283,7 @@
                       popconfirm: {
                         title: '是否确认删除操作?',
                         onConfirm: handleDelete.bind(null, [item.id]),
+                        disabled: item.default,
                       },
                       disabled: item.default,
                     },

@@ -47,32 +47,44 @@
         {{ t('sys.login.loginButton') }}
       </Button>
     </FormItem>
-    <ARow class="enter-x flex justify-center">
-      <!-- <ACol :md="11" :xs="24">
+    <!-- <ARow class="enter-x flex justify-center"> -->
+    <!-- <ACol :md="11" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.LOGIN)">
           {{ t('sys.login.userNameInFormTitle') }}
         </Button>
       </ACol> -->
-      <ACol :md="11" :xs="24">
-        <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
+    <!-- <ACol :md="11" :xs="24"> -->
+    <!-- <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
           {{ t('sys.login.mobileSignInFormTitle') }}
-        </Button>
-      </ACol>
-    </ARow>
+        </Button> -->
+    <!-- <div class="flex justify-center cursor-pointer">
+          <div
+            @click="setLoginState(LoginStateEnum.MOBILE)"
+            class="flex justify-center icon-button"
+          >
+            <phone-filled :style="{ fontSize: '18px' }" />
+          </div>
+        </div> -->
+    <!-- </ACol> -->
+    <!-- </ARow> -->
+    <Divider class="enter-x">
+      <div @click="setLoginState(LoginStateEnum.MOBILE)" class="flex justify-center icon-button">
+        <mobile-filled :style="{ fontSize: '18px' }" />
+      </div>
+    </Divider>
   </Form>
 </template>
 <script lang="ts" setup>
   import { reactive, ref, unref, computed } from 'vue';
-  import { Checkbox, Form, Input, Row, Col, Button } from 'ant-design-vue';
+  import { Checkbox, Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
-
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useMessage } from '/@/hooks/web/useMessage';
-
   import { useUserStore } from '/@/store/modules/user';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { getPlatForm } from '/@/api/oem';
   import { createLocalStorage, createSessionStorage } from '/@/utils/cache';
+  import { MobileFilled } from '@ant-design/icons-vue';
 
   const ACol = Col;
   const ARow = Row;
@@ -147,3 +159,13 @@
     loading.value = false;
   }
 </script>
+
+<style lang="less" scoped>
+  .icon-button {
+    align-items: center;
+    border-radius: 50%;
+    background-color: #f7f7f7;
+    width: 2.8rem;
+    height: 2.8rem;
+  }
+</style>

@@ -24,16 +24,23 @@
         <Button type="primary" size="large" block @click="handleLogin" :loading="loading">
           {{ t('sys.login.loginButton') }}
         </Button>
-        <Button size="large" block class="mt-4" @click="handleBackLogin">
+        <!-- <Button size="large" block class="mt-4" @click="handleBackLogin">
           {{ t('sys.login.backSignIn') }}
-        </Button>
+        </Button> -->
       </FormItem>
+      <Divider class="enter-x">
+        <div class="flex justify-center cursor-pointer">
+          <div @click="handleBackLogin" class="flex justify-center icon-button">
+            <contacts-filled :style="{ fontSize: '18px' }" />
+          </div>
+        </div>
+      </Divider>
     </Form>
   </template>
 </template>
 <script lang="ts" setup>
   import { reactive, ref, computed, unref, toRaw } from 'vue';
-  import { Form, Input, Button, message } from 'ant-design-vue';
+  import { Form, Input, Button, message, Divider } from 'ant-design-vue';
   import { CountdownInput } from '/@/components/CountDown';
   import LoginFormTitle from './LoginFormTitle.vue';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -41,6 +48,7 @@
   import { SendLoginSmsCode } from '/@/api/sys/user';
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { ContactsFilled } from '@ant-design/icons-vue';
   const { notification } = useMessage();
 
   const FormItem = Form.Item;
@@ -95,3 +103,12 @@
     }
   }
 </script>
+<style lang="less" scoped>
+  .icon-button {
+    align-items: center;
+    border-radius: 50%;
+    background-color: #f7f7f7;
+    width: 2.8rem;
+    height: 2.8rem;
+  }
+</style>