Merge branch 'ft' into 'main_dev'

perf: 优化首页登录图标显示

See merge request yunteng/thingskit-front!869

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694516709762" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18843" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M515.1 513.6m-429 0a429 429 0 1 0 858 0 429 429 0 1 0-858 0Z" fill="#0B6AE2" p-id="18844"></path><path d="M794.8 773.8C745.7 674.6 670.7 562.3 581 556.7c64.7-25.5 110.5-88.5 110.5-162.3 0-96.3-78.1-174.4-174.4-174.4s-174.4 78.1-174.4 174.4c0 73.7 45.8 136.8 110.5 162.3-90.6 5.7-166.1 120-215.2 220 69.6 73.3 168 119 277 119 110.5-0.1 210-46.9 279.8-121.9z" fill="#ffffff" p-id="18845"></path></svg>
\ No newline at end of file

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694516489379" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6077" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024Q0 1024 0 512T512 0q512 0 512 512T512 1024z" fill="#0B6AE2" p-id="6078"></path><path d="M672.814545 802.909091H350.72a81.454545 81.454545 0 0 1-81.454545-81.454546V302.545455a81.454545 81.454545 0 0 1 81.454545-81.454546h322.094545a81.454545 81.454545 0 0 1 81.454546 81.454546v418.90909a81.454545 81.454545 0 0 1-81.454546 81.454546z m-322.094545-512a11.636364 11.636364 0 0 0-11.636364 11.636364v418.90909a11.636364 11.636364 0 0 0 11.636364 11.636364h322.094545a11.636364 11.636364 0 0 0 11.636364-11.636364V302.545455a11.636364 11.636364 0 0 0-11.636364-11.636364z" fill="#FFFFFF" p-id="6079"></path><path d="M376.785455 560.407273m29.090909 0l212.247272 0q29.090909 0 29.090909 29.090909l0-0.232727q0 29.090909-29.090909 29.090909l-212.247272 0q-29.090909 0-29.090909-29.090909l0 0.232727q0-29.090909 29.090909-29.090909Z" fill="#FFFFFF" p-id="6080"></path><path d="M512 676.305455m-29.090909 0a29.090909 29.090909 0 1 0 58.181818 0 29.090909 29.090909 0 1 0-58.181818 0Z" fill="#FFFFFF" p-id="6081"></path></svg>
\ No newline at end of file

@@ -19,7 +19,7 @@
         <Divider orientation="left">
           <a-tooltip>
             <template #title>触发器不可为空，消息只要满足触发条件中任意一个即可触发。</template>
-            触发器
+            <label class="validate-dot"></label> 触发器
             <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
           </a-tooltip>
         </Divider>
@@ -77,7 +77,7 @@
             <template #title
               >触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template
             >
-            执行动作
+            <label class="validate-dot"></label> 执行动作
             <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
           </a-tooltip>
         </Divider>
@@ -781,4 +781,13 @@
   }
 
   //TODO-fengtao
+
+  label.validate-dot::before {
+    display: inline-block;
+    color: #ff4d4f;
+    font-size: 14px;
+    font-family: SimSun, sans-serif;
+    line-height: 1;
+    content: '*';
+  }
 </style>

@@ -119,6 +119,7 @@
     }
     if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
     if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式');
+    if (!validate.deviceType) return createMessage.error('请选择设备类型');
     if (validate.device == undefined) return createMessage.error('请选择设备');
     if (validate.device == 'PART') {
       if (validate.entityId == undefined) return createMessage.error('请选择设备');

@@ -71,7 +71,7 @@
       <Tooltip placement="bottom">
         <template #title>前往手机登录</template>
         <div @click="setLoginState(LoginStateEnum.MOBILE)" class="flex justify-center icon-button">
-          <mobile-filled :style="{ fontSize: '18px' }" />
+          <img :src="mobildSvg" />
         </div>
       </Tooltip>
     </Divider>
@@ -87,7 +87,7 @@
   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';
+  import mobildSvg from '/@/assets/svg/mobile.svg';
 
   const ACol = Col;
   const ARow = Row;
@@ -165,10 +165,16 @@
 
 <style lang="less" scoped>
   .icon-button {
+    cursor: pointer;
     align-items: center;
     border-radius: 50%;
-    background-color: #f7f7f7;
     width: 2.8rem;
     height: 2.8rem;
+
+    img {
+      border-radius: 50%;
+      width: 2rem;
+      height: 2rem;
+    }
   }
 </style>

@@ -33,7 +33,7 @@
           <template #title>前往账号登录</template>
           <div class="flex justify-center cursor-pointer">
             <div @click="handleBackLogin" class="flex justify-center icon-button">
-              <contacts-filled :style="{ fontSize: '18px' }" />
+              <img :src="accountSvg" />
             </div>
           </div>
         </Tooltip>
@@ -51,7 +51,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';
+  import accountSvg from '/@/assets/svg/account.svg';
   const { notification } = useMessage();
 
   const FormItem = Form.Item;
@@ -108,10 +108,17 @@
 </script>
 <style lang="less" scoped>
   .icon-button {
+    cursor: pointer;
     align-items: center;
     border-radius: 50%;
-    background-color: #f7f7f7;
+    // background-color: #f7f7f7;
     width: 2.8rem;
     height: 2.8rem;
+
+    img {
+      border-radius: 50%;
+      width: 2rem;
+      height: 2rem;
+    }
   }
 </style>