Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

monitorMobile/components/tki-tree/style.css

@@ -108,16 +108,16 @@
 }
 .tki-tree-check-yes,
 .tki-tree-check-no {
-  width: 20px;
-  height: 20px;
+  width: 18px;
+  height: 18px;
   border-top-left-radius: 20%;
   border-top-right-radius: 20%;
   border-bottom-right-radius: 20%;
   border-bottom-left-radius: 20%;
-  border-top-width: 1rpx;
-  border-left-width: 1rpx;
-  border-bottom-width: 1rpx;
-  border-right-width: 1rpx;
+  border-top-width: 1px;
+  border-left-width: 1px;
+  border-bottom-width: 1px;
+  border-right-width: 1px;
   border-style: solid;
   border-color: #2388FF;
   display: flex;
@@ -126,8 +126,8 @@
   box-sizing: border-box;
 }
 .tki-tree-check-yes-b {
-  width: 12px;
-  height: 12px;
+  width: 18px;
+  height: 18px;
   border-top-left-radius: 20%;
   border-top-right-radius: 20%;
   border-bottom-right-radius: 20%;
@@ -145,6 +145,10 @@
   border-top-right-radius: 50%;
   border-bottom-right-radius: 50%;
   border-bottom-left-radius: 50%;
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .hover-c {
   opacity: 0.6;

monitorMobile/components/tki-tree/tki-tree.vue

@@ -27,7 +27,7 @@
 							</view>
 							<view class="tki-tree-check" @tap.stop="_treeItemSelect(item, index)" v-if="selectParent?true:item.lastRank">
 								<view class="tki-tree-check-yes" v-if="item.checked" :class="{'radio':!multiple}" :style="{'border-color':confirmColor}">
-									<view class="tki-tree-check-yes-b" :style="{'background-color':confirmColor}"></view>
+									<view class="tki-tree-check-yes-b" :style="{'background-color':confirmColor}"><u-icon name="checkbox-mark" color="#ffffff" size="16"></u-icon></view>
 								</view>
 								<view class="tki-tree-check-no" v-else :class="{'radio':!multiple}" :style="{'border-color':confirmColor}"></view>
 							</view>

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="[{value:1,label:'qinshi1'},{value:2,label:'qinshi2'}]" 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,12 +193,40 @@
 			return {
 				isShowSearch: false,
 				searchForm: {
-					alarmType: '警告类型',
-					warnHand: '处理状态',
+					alarmType: '',
+					warnHand: '',
 					tick: [],
-					StartTick: '开始时间',
-					EndTick: '结束时间',
+					StartTick: '',
+					EndTick: '',
 				},
+				warnOption: [
+					{
+						label: '人群聚集',
+						value: 1
+					},
+					{
+						label: '烟火警告',
+						value: 2
+					},
+					{
+						label: '未佩戴口罩检查',
+						value: 3
+					},
+					{
+						label: '周界入侵',
+						value: 4
+					},
+				],
+				handOption: [
+					{
+						label: '已处理',
+						value: 1
+					},
+					{
+						label: '未处理',
+						value: 2
+					},
+				],
 				warnList: [{
 					warnHand: 1
 				}, {
@@ -299,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

@@ -3,7 +3,7 @@
 		<view class="title cli">
 			周界入侵-2024-08-20 18:01:41
 		</view>
-		<image style="width: 100%;height:176rpx;" src="../../static/image/add.png" mode="aspectFit"></image>
+		<image style="width: 100%;height:422rpx;" src="../../static/image/add.png" mode="aspectFit"></image>
 		<view class="cli">
 			<view class="labelBox">
 				所属学校：
@@ -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

@@ -1,9 +1,7 @@
 <template>
 	<view @touchmove.stop@touch.stop class="inspectionCenter">
-		<!-- <web-view v-if="showVideo" :webview-styles="styles" src="/hybrid/html/players.html"></web-view> -->
 		<view v-show="showVideo" class="poupBox">
 			<view class="contentBox">
-				<!-- <web-view :webview-styles="styles" src="/hybrid/html/players.html"></web-view> -->
 				<view id="url-player-test"></view>
 			</view>
 			<view class="bottom-content" @click="closeDialog">
@@ -12,7 +10,7 @@
 		</view>
 		<view class="searchBox">
 			<view class="searchLine" @click="showTree">
-				<!-- <view class="searchShow"> -->
+
 				<view class="searchLabels">
 					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/group.png" mode="">
 					</image>
@@ -27,68 +25,7 @@
 					</image>
 					<image v-show="isShowSearch" src="@/static/image/earlyWarning/arrow2.png" mode=""></image>
 				</view>
-				<!-- </view> -->
 			</view>
-			<view @click="isShowSearch=false" class="searchDialog" v-if="isShowSearch">
-				<view class="content" @click.stop="isSelect">
-					<u-row justify="space-between" gutter="10">
-						<u-col span="7">
-							<view class="demo-layout" @click="toOpen">
-								<view class="left-layout">
-									<text>{{searchForm.alarmType}}</text>
-								</view>
-								<view class="right-layout">
-									<image style="width: 30rpx;height:30rpx;"
-										src="@/static/image/earlyWarning/arrowRight.png" mode=""></image>
-								</view>
-							</view>
-
-							<!-- <jp-select-plus ref="selectPlus" :isShow="false" color="#2388FF" placeholder="请选择"
-									isSearch v-model="va3" :list="listc"></jp-select-plus> -->
-						</u-col>
-						<u-col span="5">
-							<view class="demo-layout" @click="toOpenSelect">
-								<view class="left-layout">
-									<text>{{searchForm.warnHand}}</text>
-								</view>
-								<view class="right-layout">
-									<image style="width: 30rpx;height:30rpx;"
-										src="@/static/image/earlyWarning/arrowRight.png" mode=""></image>
-								</view>
-							</view>
-						</u-col>
-					</u-row>
-					<u-row style="margin-top:10px;" justify="space-between" gutter="10">
-						<u-col span="12">
-							<uni-datetime-picker v-model="searchForm.tick" type="datetimerange">
-								<view class="demo-layout">
-									<view class="startBox">
-										{{searchForm.StartTick}}
-									</view>
-									<text>至</text>
-									<view class="endBox">
-										{{searchForm.EndTick}}
-									</view>
-									<view class="timeIcon">
-										<image style="width: 30rpx;height:30rpx;"
-											src="@/static/image/earlyWarning/calendar.png" mode=""></image>
-									</view>
-								</view>
-							</uni-datetime-picker>
-
-						</u-col>
-					</u-row>
-					<view class="btnBox">
-						<view class="leftBtn">
-							重置
-						</view>
-						<view class="rightBtn">
-							确认
-						</view>
-					</view>
-				</view>
-			</view>
-
 		</view>
 		<view class="tableBox">
 			<u-empty marginTop="100rpx" :show="false" mode="warnList" text="暂无数据"></u-empty>
@@ -448,7 +385,7 @@
 	// 	height: calc(100% - 375rpx);
 	.inspectionCenter {
 		width: 100%;
-		height: 100%;
+		height: calc(100% - 88rpx);
 		position: relative;
 
 		.u-modal__title {
@@ -645,6 +582,7 @@
 		height: 100%;
 		padding: 0 30rpx;
 		box-sizing: border-box;
+
 		.liBox {
 			background: #fff;
 			padding: 24rpx 30rpx;

monitorMobile/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -6,9 +6,13 @@
 
 		<view v-if="insert || show" class="uni-calendar__content"
 			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
-			<!-- <view style="height: 66px;line-height: 66px;text-align: center;font-size: 17px;">
+			<view style="height: 40px;line-height: 55px;text-align: center;font-size: 17px;font-weight: 700;">
 				时间段选择
-			</view> -->
+				<view v-if="!insert" class="dialog-close" @click="maskClick">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
 			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
 
 				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('pre')">
@@ -24,10 +28,10 @@
 					<view class="uni-calendar__header-btn uni-calendar--right"></view>
 				</view>
 
-				<view v-if="!insert" class="dialog-close" @click="maskClick">
+				<!-- <view v-if="!insert" class="dialog-close" @click="maskClick">
 					<view class="dialog-close-plus" data-id="close"></view>
 					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
-				</view>
+				</view> -->
 			</view>
 			<view class="uni-calendar__box">
 
@@ -104,16 +108,16 @@
 				<view class="uni-date-changed--time-start" style="width:40%;">
 					<!-- <view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
 					</view> -->
-					<time-picker type="time" :start="timepickerStartTime" rangeName="开始时间" v-model="timeRange.startTime" :border="false"
+					<time-picker type="time" :start="timepickerStartTime" rangeName="选择开始时间" v-model="timeRange.startTime" :border="false"
 						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
 					</time-picker>
 				</view>
 				<view style="line-height: 50px;color: #777;">
 					-
 				</view>
-				<view class="uni-date-changed--time-end" style="width:40%;">
+				<view class="uni-date-changed--time-end" style="width:40%;margin-left: 20rpx;">
 					<!-- <view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view> -->
-					<time-picker type="time" :end="timepickerEndTime" rangeName="结束时间" v-model="timeRange.endTime" :border="false"
+					<time-picker type="time" :end="timepickerEndTime" rangeName="选择结束时间" v-model="timeRange.endTime" :border="false"
 						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
 					</time-picker>
 				</view>
@@ -744,9 +748,9 @@
 		display: flex;
 		/* #endif */
 		flex-direction: row;
-		justify-content: center;
+		justify-content: space-between;
 		align-items: center;
-		height: 50px;
+		height: 40px;
 	}
 
 	.uni-calendar__header-mobile {
@@ -788,7 +792,7 @@
 		text-align: center;
 		width: 100px;
 		font-size: 15px;
-		color: #666;
+		color: #000;
 	}
 
 	.uni-calendar__button-text {
@@ -815,10 +819,10 @@
 	.uni-calendar__header-btn {
 		width: 9px;
 		height: 9px;
-		border-left-color: #808080;
+		border-left-color: #000;
 		border-left-style: solid;
 		border-left-width: 1px;
-		border-top-color: #555555;
+		border-top-color: #000;
 		border-top-style: solid;
 		border-top-width: 1px;
 	}
@@ -947,6 +951,7 @@
 	}
 
 	.dialog-close {
+		height: 55px;
 		position: absolute;
 		top: 0;
 		right: 0;
@@ -957,7 +962,7 @@
 		flex-direction: row;
 		align-items: center;
 		padding: 0 25px;
-		margin-top: 10px;
+		// margin-top: 10px;
 	}
 
 	.dialog-close-plus {