监控修改

monitorMobile/pages/earlyWarning/components/warningInfo.vue

@@ -42,7 +42,7 @@
 						<u-col span="7">
 							<view class="demo-layout" @click="toOpen">
 								<view class="left-layout">
-									<text>{{searchForm.alarmType}}</text>
+									<text>{{searchForm.$alarmType || '警告类型'}}</text>
 								</view>
 								<view class="right-layout">
 									<image style="width: 30rpx;height:30rpx;"
@@ -56,7 +56,7 @@
 						<u-col span="5">
 							<view class="demo-layout" @click="toOpenSelect">
 								<view class="left-layout">
-									<text>{{searchForm.warnHand}}</text>
+									<text>{{searchForm.warnHand || '处理状态'}}</text>
 								</view>
 								<view class="right-layout">
 									<image style="width: 30rpx;height:30rpx;"
@@ -70,11 +70,11 @@
 							<uni-datetime-picker v-model="searchForm.tick" type="datetimerange">
 								<view class="demo-layout">
 									<view class="startBox">
-										{{searchForm.StartTick}}
+										{{searchForm.StartTick || '开始时间'}}
 									</view>
 									<text>至</text>
 									<view class="endBox">
-										{{searchForm.EndTick}}
+										{{searchForm.EndTick || '结束时间'}}
 									</view>
 									<view class="timeIcon">
 										<image style="width: 30rpx;height:30rpx;"
@@ -86,10 +86,10 @@
 						</u-col>
 					</u-row>
 					<view class="btnBox">
-						<view class="leftBtn">
+						<view class="leftBtn" @click="clearform">
 							重置
 						</view>
-						<view class="rightBtn">
+						<view class="rightBtn" @click="onsubmit">
 							确认
 						</view>
 					</view>
@@ -174,10 +174,10 @@
 				<u-loadmore :status="status" />
 			</u-list>
 		</view>
-		<selectSearch ref="selectSearchBox" :cellVisible="false" :value.sync="searchForm.alarmType"
-			:options="warnOption" title="预警类型" search-place-holder="预警类型" />
+		<selectSearch ref="selectSearchBox" :cellVisible="false" :v-model="searchForm.alarmType"
+			:options="warnOption" :title.sync="searchForm.$alarmType" placeholder="预警类型" search-placeholder="预警类型" />
 		<selectRadio ref="selectRadioBox" :cellVisible="false" :value.sync="searchForm.warnHand"
-			:options="[{value:1,label:'loudong1'},{value:2,label:'loudong2'}]" title="楼栋" />
+			:options="handOption" title="处理状态" />
 	</view>
 </template>
 
@@ -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({

monitorMobile/pages/earlyWarning/detail.vue

@@ -17,7 +17,7 @@
 				班级：
 			</view>
 			<view class="valueBox">
-				暂无数据
+				班级
 			</view>
 		</view>
 		<view class="cli">
@@ -25,7 +25,7 @@
 				告警摄像头：
 			</view>
 			<view class="valueBox">
-				演示学校
+				摄像头
 			</view>
 		</view>
 		<view class="cli">
@@ -33,7 +33,7 @@
 				告警类型：
 			</view>
 			<view class="valueBox">
-				演示学校
+				类型
 			</view>
 		</view>
 		<view class="cli">
@@ -58,7 +58,7 @@
 				备注信息：
 			</view>
 			<view class="valueBox">
-				11111111111111111111111111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa撒大大飒飒水水水水水水顶顶顶顶顶反对
+				暂无数据
 			</view>
 		</view>
 
@@ -67,7 +67,7 @@
 				处理意见：
 			</view>
 			<view class="valueBox">
-				11111111111111111111111111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa撒大大飒飒水水水水水水顶顶顶顶顶反对
+				暂无数据
 			</view>
 		</view>
 		<u-popup :show="showVideo" :closeable="true" @close="close" @open="open" mode="center">
@@ -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;
 			}
 		}

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 {