Showing
3 changed files
with
7 additions
and
11 deletions
| @@ -40,7 +40,7 @@ export const CoapSchemas: FormSchema[] = [ | @@ -40,7 +40,7 @@ export const CoapSchemas: FormSchema[] = [ | ||
| 40 | { label: 'Efento NB-IoT', value: 'EFENTO' }, | 40 | { label: 'Efento NB-IoT', value: 'EFENTO' }, |
| 41 | ], | 41 | ], |
| 42 | }, | 42 | }, |
| 43 | - colProps: { span: 11 }, | 43 | + colProps: { span: 22}, |
| 44 | }, | 44 | }, |
| 45 | { | 45 | { |
| 46 | field: 'transportPayloadType', | 46 | field: 'transportPayloadType', |
| @@ -53,7 +53,7 @@ export const CoapSchemas: FormSchema[] = [ | @@ -53,7 +53,7 @@ export const CoapSchemas: FormSchema[] = [ | ||
| 53 | { label: 'PROTOBUF', value: 'PROTOBUF' }, | 53 | { label: 'PROTOBUF', value: 'PROTOBUF' }, |
| 54 | ], | 54 | ], |
| 55 | }, | 55 | }, |
| 56 | - colProps: { span: 11 }, | 56 | + colProps: { span: 22 }, |
| 57 | ifShow: ({ values }) => !isEfentoNb(values.coapDeviceType), | 57 | ifShow: ({ values }) => !isEfentoNb(values.coapDeviceType), |
| 58 | }, | 58 | }, |
| 59 | { | 59 | { |
| 1 | <template> | 1 | <template> |
| 2 | - <div | ||
| 3 | - style=" | ||
| 4 | - margin-top: -5vh; | ||
| 5 | - padding-left: 1.5vw; | ||
| 6 | - border: 1px solid gray; | ||
| 7 | - margin-left: 0.1vw; | ||
| 8 | - border-radius: 5px; | ||
| 9 | - " | ||
| 10 | - > | 2 | + <div style="margin-top: -5vh; border: 1px solid gray; border-radius: 5px"> |
| 11 | <div style="margin-top: 1.2vh"> | 3 | <div style="margin-top: 1.2vh"> |
| 12 | <BasicForm :showResetButton="false" :showSubmitButton="false" @register="register" /> | 4 | <BasicForm :showResetButton="false" :showSubmitButton="false" @register="register" /> |
| 13 | </div> | 5 | </div> |
| @@ -80,6 +80,7 @@ export enum TypeEnum { | @@ -80,6 +80,7 @@ export enum TypeEnum { | ||
| 80 | IS_MONTH = 'month', | 80 | IS_MONTH = 'month', |
| 81 | IS_EMPTY = 'NONE', | 81 | IS_EMPTY = 'NONE', |
| 82 | IS_DEFAULT_WEEK = 'defaultIsWeek', | 82 | IS_DEFAULT_WEEK = 'defaultIsWeek', |
| 83 | + IS_FIXED_WEEK = '2', | ||
| 83 | IS_MIN = 'MIN', | 84 | IS_MIN = 'MIN', |
| 84 | IS_MAX = 'MAX', | 85 | IS_MAX = 'MAX', |
| 85 | IS_AVG = 'AVG', | 86 | IS_AVG = 'AVG', |
| @@ -115,6 +116,9 @@ export const isEmpty = (type: string) => { | @@ -115,6 +116,9 @@ export const isEmpty = (type: string) => { | ||
| 115 | export const isDefultWeek = (type: string) => { | 116 | export const isDefultWeek = (type: string) => { |
| 116 | return type === TypeEnum.IS_DEFAULT_WEEK; | 117 | return type === TypeEnum.IS_DEFAULT_WEEK; |
| 117 | }; | 118 | }; |
| 119 | +export const isFixedWeek = (type: string) => { | ||
| 120 | + return type === TypeEnum.IS_FIXED_WEEK; | ||
| 121 | +}; | ||
| 118 | 122 | ||
| 119 | export const isMin = (type: string) => { | 123 | export const isMin = (type: string) => { |
| 120 | return type === TypeEnum.IS_MIN; | 124 | return type === TypeEnum.IS_MIN; |