Commit 68faed325f417611f11214bd1c1d687408304111

Authored by xp.Huang
2 parents bc461d34 45457a24

Merge branch 'f-dev' into 'main'

fix:修复teambition上的前端问题

See merge request huang/yun-teng-iot-front!229
1 import { FormSchema } from '/@/components/Table'; 1 import { FormSchema } from '/@/components/Table';
2 -import { phoneRule, emailRule, ChineseRegVerify } from '/@/utils/rules'; 2 +import { phoneRule, emailRule } from '/@/utils/rules';
3 3
4 export const formSchema: FormSchema[] = [ 4 export const formSchema: FormSchema[] = [
5 { 5 {
@@ -12,7 +12,6 @@ export const formSchema: FormSchema[] = [ @@ -12,7 +12,6 @@ export const formSchema: FormSchema[] = [
12 maxLength: 10, 12 maxLength: 10,
13 placeholder: '请输入用户昵称', 13 placeholder: '请输入用户昵称',
14 }, 14 },
15 - rules: ChineseRegVerify,  
16 }, 15 },
17 { 16 {
18 field: 'phoneNumber', 17 field: 'phoneNumber',
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 alt="avatar" 41 alt="avatar"
42 /> 42 />
43 <div v-else> 43 <div v-else>
44 - <div style="margin-top: 5.2vh; margin-left: 3.21vw"> 44 + <div style="">
45 <PlusOutlined style="font-size: 30px" /> 45 <PlusOutlined style="font-size: 30px" />
46 </div> 46 </div>
47 </div> 47 </div>
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 box-shadow: 0 0 5px -5px; 67 box-shadow: 0 0 5px -5px;
68 " 68 "
69 > 69 >
70 - <div style="width: 90vw; height: 4vh; border: 1px solid #e9edf6" 70 + <div style="height: 4vh; border: 1px solid #e9edf6"
71 ><p style="font-size: 17px; margin-top: 7px; margin-left: 20px">基本资料</p></div 71 ><p style="font-size: 17px; margin-top: 7px; margin-left: 20px">基本资料</p></div
72 > 72 >
73 <div style="margin-left: 20px"> 73 <div style="margin-left: 20px">
@@ -248,6 +248,7 @@ @@ -248,6 +248,7 @@
248 :deep .ant-upload-select-picture-card { 248 :deep .ant-upload-select-picture-card {
249 border-radius: 50%; 249 border-radius: 50%;
250 width: 10rem; 250 width: 10rem;
  251 + height: 10rem;
251 overflow: hidden; 252 overflow: hidden;
252 cursor: pointer; 253 cursor: pointer;
253 transition: border-color 0.3s ease; 254 transition: border-color 0.3s ease;
@@ -280,7 +280,7 @@ export const childDeviceColumns: BasicColumn[] = [ @@ -280,7 +280,7 @@ export const childDeviceColumns: BasicColumn[] = [
280 280
281 export const alarmLevel = (type: string): string => { 281 export const alarmLevel = (type: string): string => {
282 if (type === 'CRITICAL') { 282 if (type === 'CRITICAL') {
283 - return '危险'; 283 + return '紧急';
284 } else if (type === 'MAJOR') { 284 } else if (type === 'MAJOR') {
285 return '重要'; 285 return '重要';
286 } else if (type === 'MINOR') { 286 } else if (type === 'MINOR') {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <BasicTable @register="registerTable"> 3 <BasicTable @register="registerTable">
4 <template #toolbar> 4 <template #toolbar>
5 <a-button type="primary" @click="handleCreate"> 导出 </a-button> 5 <a-button type="primary" @click="handleCreate"> 导出 </a-button>
6 - <Authority value="api:yt:admin:deleteMessageLog"> 6 + <Authority value="api:yt:smsLog:export">
7 <a-button 7 <a-button
8 type="primary" 8 type="primary"
9 color="error" 9 color="error"
@@ -19,13 +19,13 @@ @@ -19,13 +19,13 @@
19 :actions="[ 19 :actions="[
20 { 20 {
21 label: '查看', 21 label: '查看',
22 - auth: 'api:yt:admin:viewMessageLog', 22 + auth: 'api:yt:smsLog:get',
23 icon: 'ant-design:fund-view-outlined', 23 icon: 'ant-design:fund-view-outlined',
24 onClick: handleModal.bind(null, record), 24 onClick: handleModal.bind(null, record),
25 }, 25 },
26 { 26 {
27 label: '删除', 27 label: '删除',
28 - auth: 'api:yt:admin:deleteMessageLog', 28 + auth: 'api:yt:smsLog:delete',
29 icon: 'ant-design:delete-outlined', 29 icon: 'ant-design:delete-outlined',
30 color: 'error', 30 color: 'error',
31 popConfirm: { 31 popConfirm: {