简柏林 / thingskit-front · Commits

Commit 076d2bc7f6389c0f341097b65f5341122ae4ae05

Authored by xp.Huang
2 parents c234b9ae 1b7c18f8

Merge branch 'ft' into 'main_dev' 

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

See merge request yunteng/thingskit-front!869
Inline Side-by-side
Showing 6 changed files with 33 additions and 8 deletions
  1 +<?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>
  1 +<?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>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <Divider orientation="left"> 19 <Divider orientation="left">
20 <a-tooltip> 20 <a-tooltip>
21 <template #title>触发器不可为空，消息只要满足触发条件中任意一个即可触发。</template> 21 <template #title>触发器不可为空，消息只要满足触发条件中任意一个即可触发。</template>
22 - 触发器 22 + <label class="validate-dot"></label> 触发器
23 <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" /> 23 <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
24 </a-tooltip> 24 </a-tooltip>
25 </Divider> 25 </Divider>
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <template #title 77 <template #title
78 >触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template 78 >触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template
79 > 79 >
80 - 执行动作 80 + <label class="validate-dot"></label> 执行动作
81 <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" /> 81 <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
82 </a-tooltip> 82 </a-tooltip>
83 </Divider> 83 </Divider>
@@ -781,4 +781,13 @@ @@ -781,4 +781,13 @@
781 } 781 }
782 782
783 //TODO-fengtao 783 //TODO-fengtao
  784 +
  785 + label.validate-dot::before {
  786 + display: inline-block;
  787 + color: #ff4d4f;
  788 + font-size: 14px;
  789 + font-family: SimSun, sans-serif;
  790 + line-height: 1;
  791 + content: '*';
  792 + }
784 </style> 793 </style>
@@ -119,6 +119,7 @@ @@ -119,6 +119,7 @@
119 } 119 }
120 if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式'); 120 if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
121 if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式'); 121 if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式');
  122 + if (!validate.deviceType) return createMessage.error('请选择设备类型');
122 if (validate.device == undefined) return createMessage.error('请选择设备'); 123 if (validate.device == undefined) return createMessage.error('请选择设备');
123 if (validate.device == 'PART') { 124 if (validate.device == 'PART') {
124 if (validate.entityId == undefined) return createMessage.error('请选择设备'); 125 if (validate.entityId == undefined) return createMessage.error('请选择设备');
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <Tooltip placement="bottom"> 71 <Tooltip placement="bottom">
72 <template #title>前往手机登录</template> 72 <template #title>前往手机登录</template>
73 <div @click="setLoginState(LoginStateEnum.MOBILE)" class="flex justify-center icon-button"> 73 <div @click="setLoginState(LoginStateEnum.MOBILE)" class="flex justify-center icon-button">
74 - <mobile-filled :style="{ fontSize: '18px' }" /> 74 + <img :src="mobildSvg" />
75 </div> 75 </div>
76 </Tooltip> 76 </Tooltip>
77 </Divider> 77 </Divider>
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin'; 87 import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
88 import { getPlatForm } from '/@/api/oem'; 88 import { getPlatForm } from '/@/api/oem';
89 import { createLocalStorage, createSessionStorage } from '/@/utils/cache'; 89 import { createLocalStorage, createSessionStorage } from '/@/utils/cache';
90 - import { MobileFilled } from '@ant-design/icons-vue'; 90 + import mobildSvg from '/@/assets/svg/mobile.svg';
91 91
92 const ACol = Col; 92 const ACol = Col;
93 const ARow = Row; 93 const ARow = Row;
@@ -165,10 +165,16 @@ @@ -165,10 +165,16 @@
165 165
166 <style lang="less" scoped> 166 <style lang="less" scoped>
167 .icon-button { 167 .icon-button {
  168 + cursor: pointer;
168 align-items: center; 169 align-items: center;
169 border-radius: 50%; 170 border-radius: 50%;
170 - background-color: #f7f7f7;  
171 width: 2.8rem; 171 width: 2.8rem;
172 height: 2.8rem; 172 height: 2.8rem;
  173 +
  174 + img {
  175 + border-radius: 50%;
  176 + width: 2rem;
  177 + height: 2rem;
  178 + }
173 } 179 }
174 </style> 180 </style>
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <template #title>前往账号登录</template> 33 <template #title>前往账号登录</template>
34 <div class="flex justify-center cursor-pointer"> 34 <div class="flex justify-center cursor-pointer">
35 <div @click="handleBackLogin" class="flex justify-center icon-button"> 35 <div @click="handleBackLogin" class="flex justify-center icon-button">
36 - <contacts-filled :style="{ fontSize: '18px' }" /> 36 + <img :src="accountSvg" />
37 </div> 37 </div>
38 </div> 38 </div>
39 </Tooltip> 39 </Tooltip>
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 import { SendLoginSmsCode } from '/@/api/sys/user'; 51 import { SendLoginSmsCode } from '/@/api/sys/user';
52 import { useUserStore } from '/@/store/modules/user'; 52 import { useUserStore } from '/@/store/modules/user';
53 import { useMessage } from '/@/hooks/web/useMessage'; 53 import { useMessage } from '/@/hooks/web/useMessage';
54 - import { ContactsFilled } from '@ant-design/icons-vue'; 54 + import accountSvg from '/@/assets/svg/account.svg';
55 const { notification } = useMessage(); 55 const { notification } = useMessage();
56 56
57 const FormItem = Form.Item; 57 const FormItem = Form.Item;
@@ -108,10 +108,17 @@ @@ -108,10 +108,17 @@
108 </script> 108 </script>
109 <style lang="less" scoped> 109 <style lang="less" scoped>
110 .icon-button { 110 .icon-button {
  111 + cursor: pointer;
111 align-items: center; 112 align-items: center;
112 border-radius: 50%; 113 border-radius: 50%;
113 - background-color: #f7f7f7; 114 + // background-color: #f7f7f7;
114 width: 2.8rem; 115 width: 2.8rem;
115 height: 2.8rem; 116 height: 2.8rem;
  117 +
  118 + img {
  119 + border-radius: 50%;
  120 + width: 2rem;
  121 + height: 2rem;
  122 + }
116 } 123 }
117 </style> 124 </style>