Commit fed9285fd06a1bcfd2627e87bf884225c3919100

Authored by fengwotao
2 parents 1941d5c4 3c631aec

Merge branch 'main_dev' into ft

@@ -279,20 +279,20 @@ @@ -279,20 +279,20 @@
279 ref="listEl" 279 ref="listEl"
280 :loading="loading" 280 :loading="loading"
281 :data-source="cameraList" 281 :data-source="cameraList"
282 - class="bg-light-50 w-full h-full dark:bg-dark-900 split-mode-list" 282 + class="bg-light-50 w-full !h-full dark:bg-dark-900 split-mode-list"
283 :grid="(gridLayout as any)" 283 :grid="(gridLayout as any)"
284 :style="{ '--height': `${100 / pagination.colNumber}%` }" 284 :style="{ '--height': `${100 / pagination.colNumber}%` }"
285 > 285 >
286 <template #renderItem="{ item }"> 286 <template #renderItem="{ item }">
287 <List.Item> 287 <List.Item>
288 - <div class="box-border w-full h-full p-1px"> 288 + <div class="box-border w-full !h-full p-1px">
289 <div 289 <div
290 v-if="item.placeholder" 290 v-if="item.placeholder"
291 - class="bg-black w-full h-full overflow-hidden relative" 291 + class="bg-black w-full !h-full overflow-hidden relative"
292 ></div> 292 ></div>
293 <div 293 <div
294 v-if="!item.placeholder" 294 v-if="!item.placeholder"
295 - class="bg-black w-full h-full overflow-hidden relative video-container" 295 + class="bg-black w-full !h-full overflow-hidden relative video-container"
296 > 296 >
297 <Spin 297 <Spin
298 class="!absolute top-1/2 left-1/2 transform -translate-1/2" 298 class="!absolute top-1/2 left-1/2 transform -translate-1/2"
@@ -333,7 +333,7 @@ @@ -333,7 +333,7 @@
333 } 333 }
334 334
335 .split-screen-mode:deep(.ant-spin-container) { 335 .split-screen-mode:deep(.ant-spin-container) {
336 - height: 100%; 336 + height: 100% !important;
337 } 337 }
338 338
339 .video-container { 339 .video-container {
@@ -223,47 +223,33 @@ export const formSchema: FormSchema[] = [ @@ -223,47 +223,33 @@ export const formSchema: FormSchema[] = [
223 helpMessage: [], 223 helpMessage: [],
224 componentProps({ formActionType }) { 224 componentProps({ formActionType }) {
225 const { updateSchema } = formActionType; 225 const { updateSchema } = formActionType;
  226 + updateSchema({
  227 + field: 'templatePurpose',
  228 + helpMessage: [
  229 + `登录模板平台提供如下参数:
  230 + {
  231 + "code":"验证码"
  232 + }。`,
  233 + `忘记密码模板平台提供如下参数:
  234 + {
  235 + "code":"验证码"
  236 + }。`,
  237 + `告警通知模板平台提供如下参数:
  238 + {
  239 + "organization":"设备所属组织",
  240 + "deviceName":"设备名称",
  241 + "severity":"告警等级",
  242 + "type":"告警类型",
  243 + "triggerValue":"触发值",
  244 + "createTime":"告警时间"
  245 + }。`,
  246 + `清除密码模板平台提供如下参数:
  247 + {
  248 + "code":"验证码"
  249 + }。`,
  250 + ],
  251 + });
226 return { 252 return {
227 - onChange(value) {  
228 - if (value === 'FOR_LOGIN') {  
229 - updateSchema({  
230 - field: 'templatePurpose',  
231 - helpMessage: `登录模板平台提供如下参数:  
232 - {  
233 - "code":"验证码"  
234 - }`,  
235 - });  
236 - } else if (value === 'FOR_FORGET_PASSWORD') {  
237 - updateSchema({  
238 - field: 'templatePurpose',  
239 - helpMessage: `忘记密码模板平台提供如下参数:  
240 - {  
241 - "code":"验证码"  
242 - }`,  
243 - });  
244 - } else if (value === 'FOR_ALARM_NOTICE') {  
245 - updateSchema({  
246 - field: 'templatePurpose',  
247 - helpMessage: `告警通知模板平台提供如下参数:  
248 - {  
249 - "type":"告警类型",  
250 - "deviceName":"设备名称",  
251 - "severity":"告警等级",  
252 - "organization":"设备所属组织",  
253 - "createTime":"告警时间",  
254 - "triggerValue":"触发值",  
255 - }`,  
256 - });  
257 - } else if (value === 'FOR_SET_PASSWORD') {  
258 - updateSchema({  
259 - field: 'templatePurpose',  
260 - helpMessage: `清除密码模板平台提供如下参数:  
261 - {  
262 - "code":"验证码"  
263 - }`,  
264 - });  
265 - }  
266 - },  
267 api: findDictItemByCode, 253 api: findDictItemByCode,
268 params: { 254 params: {
269 dictCode: 'template_purpose', 255 dictCode: 'template_purpose',