简柏林 / thingskit-front · Commits

Commit 27604ed8e33cf828b1eec66ec770b11451e296bf

Authored by xp.Huang
2 parents 9580973a 2690a752

Merge branch 'ft-dev' into 'main' 

style:微调设备配置样式

See merge request huang/yun-teng-iot-front!96
Inline Side-by-side
Showing 4 changed files with 63 additions and 40 deletions
... ... @@ -34,34 +34,46 @@
34 34 <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
35 35 <div class="aic" style="border: 1px solid #bfbfbf">
36 36 <div class="w-3/4" style="margin-left: 40px">
37   - <div style="margin-left: -33px; margin-top: 20px"
  37 + <div style="margin-left: 10px; margin-top: 20px"
38 38 ><BasicForm @register="registerFormCreateAlarm" />
39 39 </div>
40 40 <div style="margin-left: 5px; margin-top: -50px">
41 41 <div style="color: #f5594e" class="ml-4"
42 42 >报警规则条件：
43   - <Button size="small" type="primary" @click="handleOpenAlaramRuleConditions"
  43 + <Button
  44 + style="margin-left: 4px"
  45 + size="small"
  46 + type="primary"
  47 + @click="handleOpenAlaramRuleConditions"
44 48 >添加</Button
45 49 >
46 50 <p>{{ ruleTemplateData }}</p>
47 51 </div>
48 52 <div style="white-space: wrap; margin-top: 25px" class="mt-4 ml-4"
49   - >启用规则：
50   - <Button size="small" type="primary" @click="handleOpenEnableRule">添加</Button>
  53 + >报警启用规则：
  54 + <Button
  55 + style="margin-left: 4px"
  56 + size="small"
  57 + type="primary"
  58 + @click="handleOpenEnableRule"
  59 + >添加</Button
  60 + >
51 61 <p>{{ enableTemplateData }}</p>
52 62 <div
53 63 class="mt-4 ml-4"
54 64 style="margin-left: 0px; position: relative; margin-top: 25px"
55   - >详情模板：
56   - <div style="position: absolute; top: -5px; left: 80px; width: 571px">
  65 + >报警详情模板：
  66 + <div style="position: absolute; top: -5px; left: 106px; width: 581px">
57 67 <BasicForm @register="registerFormChangeDetail" />
58 68 </div>
59 69 <!-- <Button size="small" type="primary" @click="handleOpenDetailTemplate"
60 70 >添加</Button
61 71 > -->
62 72 </div>
63   - <div style="margin-left: 0px; margin-top: 25px; position: relative">
64   - <BasicForm @register="dashboardForm" />
  73 + <div style="margin-top: 25px; position: relative">
  74 + <div style="margin-left: -14px">
  75 + <BasicForm @register="dashboardForm" />
  76 + </div>
65 77 </div>
66 78 </div>
67 79 </div>
... ... @@ -95,22 +107,30 @@
95 107 <div style="margin-left: 5px">
96 108 <div style="color: #f5594e" class="mt-4 ml-4"
97 109 >报警规则条件：
98   - <Button size="small" type="primary" @click="handleOpenClearAlaramRuleConditions"
  110 + <Button
  111 + style="margin-left: 2px"
  112 + size="small"
  113 + type="primary"
  114 + @click="handleOpenClearAlaramRuleConditions"
99 115 >添加</Button
100 116 >
101 117 <p>{{ ruleClearTemplateData }}</p>
102 118 </div>
103 119 <div style="white-space: wrap; margin-top: 25px" class="mt-4 ml-4"
104   - >启用规则：
105   - <Button size="small" type="primary" @click="handleOpenClearEnableRule"
  120 + >报警启用规则：
  121 + <Button
  122 + style="margin-left: 2px"
  123 + size="small"
  124 + type="primary"
  125 + @click="handleOpenClearEnableRule"
106 126 >添加</Button
107 127 >
108 128 <p>{{ enableClearTemplateData }}</p>
109 129 <div
110 130 class="mt-4 ml-4"
111 131 style="margin-left: 0px; position: relative; margin-top: 25px"
112   - >详情模板：
113   - <div style="position: absolute; top: -5px; left: 80px; width: 571px">
  132 + >报警详情模板：
  133 + <div style="position: absolute; top: -5px; left: 106px; width: 581px">
114 134 <BasicForm @register="registerFormChangeClearDetail" />
115 135 </div>
116 136 <!-- <Button size="small" type="primary" @click="handleOpenClearDetailTemplate"
... ... @@ -119,7 +139,9 @@
119 139 <p>{{ detailClearTemplateData }}</p> -->
120 140 </div>
121 141 <div style="margin-left: 0px; margin-top: 25px">
122   - <BasicForm @register="dashboardForm" />
  142 + <div style="margin-left: -14px">
  143 + <BasicForm @register="dashboardForm" />
  144 + </div>
123 145 </div>
124 146 </div>
125 147 </div>
... ... @@ -1152,6 +1174,7 @@
1152 1174 display: flex;
1153 1175 align-items: center;
1154 1176 border-radius: 10px;
  1177 + margin-top: 15px;
1155 1178 }
1156 1179
1157 1180 :deep(.vben-collapse-container__header) {
... ...
... ... @@ -4,7 +4,7 @@ export const formSchema: FormSchema[] = [
4 4 {
5 5 field: 'alarmDetails',
6 6 label: '报警详细信息',
7   - colProps: { span: 13 },
  7 + colProps: { span: 17 },
8 8 required: true,
9 9 component: 'Input',
10 10 componentProps: {
... ...
... ... @@ -158,9 +158,9 @@ export const step3CreateAlarm: FormSchema[] = [
158 158 {
159 159 field: 'default',
160 160 component: 'Select',
161   - label: '严重程度',
  161 + label: '报警严重程度：',
162 162 colProps: {
163   - span: 16,
  163 + span: 17,
164 164 },
165 165 componentProps() {
166 166 return {
... ... @@ -210,9 +210,9 @@ export const dashboardFormScheme: FormSchema[] = [
210 210 {
211 211 field: 'dashboardId',
212 212 component: 'Select',
213   - label: 'Mobile dashboard:',
  213 + label: 'Mobile ：',
214 214 colProps: {
215   - span: 15,
  215 + span: 17,
216 216 },
217 217 componentProps: {
218 218 placeholder: '请选择Mobile dashboard',
... ...
1 1 import { FormSchema } from '/@/components/Table';
2   -import { numberRule } from '/@/utils/rules';
  2 +// import { numberRule } from '/@/utils/rules';
3 3
4 4 export const formSchema: FormSchema[] = [
5 5 {
... ... @@ -23,7 +23,7 @@ export const formSchema: FormSchema[] = [
23 23 componentProps: {
24 24 placeholder: '请输入最大设备数（请输入数字）',
25 25 },
26   - rules: numberRule,
  26 + // rules: numberRule,
27 27 },
28 28 {
29 29 field: 'maxAssets',
... ... @@ -35,7 +35,7 @@ export const formSchema: FormSchema[] = [
35 35 componentProps: {
36 36 placeholder: '请输入最大资产（请输入数字）',
37 37 },
38   - rules: numberRule,
  38 + // rules: numberRule,
39 39 },
40 40 {
41 41 field: 'maxCustomers',
... ... @@ -47,7 +47,7 @@ export const formSchema: FormSchema[] = [
47 47 componentProps: {
48 48 placeholder: '请输入最大客户数（请输入数字）',
49 49 },
50   - rules: numberRule,
  50 + // rules: numberRule,
51 51 },
52 52 {
53 53 field: 'maxUsers',
... ... @@ -59,7 +59,7 @@ export const formSchema: FormSchema[] = [
59 59 componentProps: {
60 60 placeholder: '请输入最大用户数（请输入数字）',
61 61 },
62   - rules: numberRule,
  62 + // rules: numberRule,
63 63 },
64 64 {
65 65 field: 'maxDashboards',
... ... @@ -71,7 +71,7 @@ export const formSchema: FormSchema[] = [
71 71 componentProps: {
72 72 placeholder: '请输入仪表板的最大数量（请输入数字）',
73 73 },
74   - rules: numberRule,
  74 + // rules: numberRule,
75 75 },
76 76 {
77 77 field: 'maxRuleChains',
... ... @@ -83,7 +83,7 @@ export const formSchema: FormSchema[] = [
83 83 componentProps: {
84 84 placeholder: '请输入最大规则链数（请输入数字）',
85 85 },
86   - rules: numberRule,
  86 + // rules: numberRule,
87 87 },
88 88 {
89 89 field: 'maxResourcesInBytes',
... ... @@ -95,7 +95,7 @@ export const formSchema: FormSchema[] = [
95 95 componentProps: {
96 96 placeholder: '请输入（请输入数字）',
97 97 },
98   - rules: numberRule,
  98 + // rules: numberRule,
99 99 },
100 100 {
101 101 field: 'maxOtaPackagesInBytes',
... ... @@ -107,7 +107,7 @@ export const formSchema: FormSchema[] = [
107 107 componentProps: {
108 108 placeholder: '请输入（请输入数字）',
109 109 },
110   - rules: numberRule,
  110 + // rules: numberRule,
111 111 },
112 112 {
113 113 field: 'maxTransportMessages',
... ... @@ -119,7 +119,7 @@ export const formSchema: FormSchema[] = [
119 119 componentProps: {
120 120 placeholder: '请输入最大传输消息数（请输入数字）',
121 121 },
122   - rules: numberRule,
  122 + // rules: numberRule,
123 123 },
124 124 {
125 125 field: 'maxTransportDataPoints',
... ... @@ -131,7 +131,7 @@ export const formSchema: FormSchema[] = [
131 131 componentProps: {
132 132 placeholder: '请输入传输数据点的最大数量（请输入数字）',
133 133 },
134   - rules: numberRule,
  134 + // rules: numberRule,
135 135 },
136 136 {
137 137 field: 'maxREExecutions',
... ... @@ -143,7 +143,7 @@ export const formSchema: FormSchema[] = [
143 143 componentProps: {
144 144 placeholder: '请输入最大规则引擎数（请输入数字）',
145 145 },
146   - rules: numberRule,
  146 + // rules: numberRule,
147 147 },
148 148
149 149 {
... ... @@ -156,7 +156,7 @@ export const formSchema: FormSchema[] = [
156 156 componentProps: {
157 157 placeholder: '请输入最大JavaScript执行数（请输入数字）',
158 158 },
159   - rules: numberRule,
  159 + // rules: numberRule,
160 160 },
161 161 {
162 162 field: 'maxDPStorageDays',
... ... @@ -168,7 +168,7 @@ export const formSchema: FormSchema[] = [
168 168 componentProps: {
169 169 placeholder: '请输入最大日存储数据点数（请输入数字）',
170 170 },
171   - rules: numberRule,
  171 + // rules: numberRule,
172 172 },
173 173 {
174 174 field: 'defaultStorageTtlDays',
... ... @@ -180,7 +180,7 @@ export const formSchema: FormSchema[] = [
180 180 componentProps: {
181 181 placeholder: '请输入默认存储 TTL 天数（请输入数字）',
182 182 },
183   - rules: numberRule,
  183 + // rules: numberRule,
184 184 },
185 185 {
186 186 field: 'alarmsTtlDays',
... ... @@ -192,7 +192,7 @@ export const formSchema: FormSchema[] = [
192 192 componentProps: {
193 193 placeholder: '请输入Alams TTL days（请输入数字）',
194 194 },
195   - rules: numberRule,
  195 + // rules: numberRule,
196 196 },
197 197 {
198 198 field: 'rpcTtlDays',
... ... @@ -204,7 +204,7 @@ export const formSchema: FormSchema[] = [
204 204 componentProps: {
205 205 placeholder: '请输入RPC TTL days（请输入数字）',
206 206 },
207   - rules: numberRule,
  207 + // rules: numberRule,
208 208 },
209 209 {
210 210 field: 'maxRuleNodeExecutionsPerMessage',
... ... @@ -216,7 +216,7 @@ export const formSchema: FormSchema[] = [
216 216 componentProps: {
217 217 placeholder: '请输入每条消息的最大规则节点执行数（请输入数字）',
218 218 },
219   - rules: numberRule,
  219 + // rules: numberRule,
220 220 },
221 221 {
222 222 field: 'maxEmails',
... ... @@ -227,7 +227,7 @@ export const formSchema: FormSchema[] = [
227 227 componentProps: {
228 228 placeholder: '请输入发送的最大电子邮件数（请输入数字）',
229 229 },
230   - rules: numberRule,
  230 + // rules: numberRule,
231 231 },
232 232 {
233 233 field: 'maxSms',
... ... @@ -239,7 +239,7 @@ export const formSchema: FormSchema[] = [
239 239 componentProps: {
240 240 placeholder: '请输入发送的最大短信数（请输入数字）',
241 241 },
242   - rules: numberRule,
  242 + // rules: numberRule,
243 243 },
244 244 {
245 245 field: 'maxCreatedAlarms',
... ... @@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [
251 251 componentProps: {
252 252 placeholder: '请输入maxCreatedAlarms（请输入数字）',
253 253 },
254   - rules: numberRule,
  254 + // rules: numberRule,
255 255 },
256 256 {
257 257 field: 'transportTenantMsgRateLimit',
... ...