diff --git a/monitorMobile/pages/earlyWarning/components/warningInfo.vue b/monitorMobile/pages/earlyWarning/components/warningInfo.vue index 9c1efec..8ff035c 100644 --- a/monitorMobile/pages/earlyWarning/components/warningInfo.vue +++ b/monitorMobile/pages/earlyWarning/components/warningInfo.vue @@ -42,7 +42,7 @@ - {{searchForm.alarmType}} + {{searchForm.$alarmType || '警告类型'}} - {{searchForm.warnHand}} + {{searchForm.warnHand || '处理状态'}} - {{searchForm.StartTick}} + {{searchForm.StartTick || '开始时间'}} - {{searchForm.EndTick}} + {{searchForm.EndTick || '结束时间'}} - + 重置 - + 确认 @@ -174,10 +174,10 @@ - + + :options="handOption" title="处理状态" /> @@ -193,11 +193,11 @@ return { isShowSearch: false, searchForm: { - alarmType: '警告类型', - warnHand: '处理状态', + alarmType: '', + warnHand: '', tick: [], - StartTick: '开始时间', - EndTick: '结束时间', + StartTick: '', + EndTick: '', }, warnOption: [ { @@ -217,6 +217,16 @@ value: 4 }, ], + handOption: [ + { + label: '已处理', + value: 1 + }, + { + label: '未处理', + value: 2 + }, + ], warnList: [{ warnHand: 1 }, { @@ -317,6 +327,13 @@ this.loadmore() }, methods: { + clearform() { + this.searchForm = {} + this.isShowSearch = false; + }, + onsubmit() { + console.log(this.searchForm) + }, // 跳转详情页面 toDetail(row) { uni.navigateTo({ diff --git a/monitorMobile/pages/earlyWarning/detail.vue b/monitorMobile/pages/earlyWarning/detail.vue index c806832..909ee27 100644 --- a/monitorMobile/pages/earlyWarning/detail.vue +++ b/monitorMobile/pages/earlyWarning/detail.vue @@ -17,7 +17,7 @@ 班级: - 暂无数据 + 班级 @@ -25,7 +25,7 @@ 告警摄像头: - 演示学校 + 摄像头 @@ -33,7 +33,7 @@ 告警类型: - 演示学校 + 类型 @@ -58,7 +58,7 @@ 备注信息: - 11111111111111111111111111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa撒大大飒飒水水水水水水顶顶顶顶顶反对 + 暂无数据 @@ -67,7 +67,7 @@ 处理意见: - 11111111111111111111111111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa撒大大飒飒水水水水水水顶顶顶顶顶反对 + 暂无数据 @@ -267,6 +267,7 @@ .valueBox { color: #333333; font-weight: 700; + } } @@ -282,7 +283,7 @@ margin-top: 20rpx; color: #333333; font-weight: 700; - min-height: 100rpx; + min-height: 50rpx; word-break: break-all; } } diff --git a/monitorMobile/pages/monitor/index.vue b/monitorMobile/pages/monitor/index.vue index a754c50..d2fc90d 100644 --- a/monitorMobile/pages/monitor/index.vue +++ b/monitorMobile/pages/monitor/index.vue @@ -385,7 +385,7 @@ // height: calc(100% - 375rpx); .inspectionCenter { width: 100%; - height: calc(100% - 44rpx); + height: calc(100% - 88rpx); position: relative; .u-modal__title {