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

monitorMobile/pages/earlyWarning/components/radioPopup.vue

@@ -1,35 +0,0 @@
-<template>
-	<view class="radioPopup">
-		<u-popup :show="show" @close="close" @open="open">
-			<view>
-				<text>出淤泥而不染，濯清涟而不妖</text>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'radioPopup',
-		data() {
-			return {
-				show: false
-			}
-		},
-		props: {
-
-		},
-		methods: {
-			open() {
-				// console.log('open');
-			},
-			close() {
-				this.show = false
-				// console.log('close');
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-</style>

monitorMobile/pages/earlyWarning/index.vue

@@ -42,11 +42,9 @@
 					<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>11111111111</text>
+										<text>{{searchForm.alarmType}}</text>
 									</view>
 									<view class="right-layout">
 										<image style="width: 30rpx;height:30rpx;"
@@ -54,13 +52,13 @@
 									</view>
 								</view>
 
-								<jp-select-plus ref="selectPlus" :isShow="false" color="#2388FF" placeholder="请选择"
-									isSearch v-model="va3" :list="listc"></jp-select-plus>
+								<!-- <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">
 									<view class="left-layout">
-										<text>11111111111</text>
+										<text>{{searchForm.warnHand}}</text>
 									</view>
 									<view class="right-layout">
 										<image style="width: 30rpx;height:30rpx;"
@@ -71,19 +69,22 @@
 						</u-row>
 						<u-row style="margin-top:10px;" justify="space-between" gutter="10">
 							<u-col span="12">
-								<view class="demo-layout">
-									<view class="startBox">
-										2024-08-19 24:20:54
-									</view>
-									<text>至</text>
-									<view class="endBox">
-										2024-08-19 24:20:54
-									</view>
-									<view class="timeIcon">
-										<image style="width: 30rpx;height:30rpx;"
-											src="@/static/image/earlyWarning/calendar.png" mode=""></image>
+								<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>
-								</view>
+								</uni-datetime-picker>
+
 							</u-col>
 						</u-row>
 						<view class="btnBox">
@@ -194,19 +195,20 @@
 				</u-list>
 			</view>
 		</view>
-
-		<radioPopup></radioPopup>
 	</view>
 </template>
 
 <script>
-	import radioPopup from './components/radioPopup.vue'
 	export default {
-		components: {
-			radioPopup
-		},
 		data() {
 			return {
+				searchForm: {
+					alarmType: '警告类型',
+					warnHand: '处理状态',
+					tick: [],
+					StartTick: '开始时间',
+					EndTick: '结束时间',
+				},
 				showSelectModel: false,
 				modelObj: {
 					name: '预警信息',
@@ -231,81 +233,93 @@
 				isLoading: false,
 				status: 'loadmore', //loading正在加载 loadmore加载更多 nomore没有更多了
 				listc: [{
-					code: 1,
-					name: 'dasda'
-				},{
-					code: 2,
-					name: 'dasda'
-				},
-				{
-					code: 3,
-					name: 'dasda'
-				},
-				{
-					code: 4,
-					name: 'dasda'
-				},
-				{
-					code: 5,
-					name: 'dasda'
-				},
-				{
-					code: 6,
-					name: 'dasda'
-				},
-				{
-					code: 7,
-					name: 'dasda'
-				},
-				{
-					code: 8,
-					name: 'dasda'
-				},
-				{
-					code: 9,
-					name: 'dasda'
-				},
-				{
-					code: 10,
-					name: 'dasda'
-				},
-				{
-					code: 11,
-					name: 'dasda'
-				},
-				{
-					code: 12,
-					name: 'dasda'
-				},
-				{
-					code: 13,
-					name: '你好'
-				}]
+						code: 1,
+						name: 'dasda'
+					}, {
+						code: 2,
+						name: 'dasda'
+					},
+					{
+						code: 3,
+						name: 'dasda'
+					},
+					{
+						code: 4,
+						name: 'dasda'
+					},
+					{
+						code: 5,
+						name: 'dasda'
+					},
+					{
+						code: 6,
+						name: 'dasda'
+					},
+					{
+						code: 7,
+						name: 'dasda'
+					},
+					{
+						code: 8,
+						name: 'dasda'
+					},
+					{
+						code: 9,
+						name: 'dasda'
+					},
+					{
+						code: 10,
+						name: 'dasda'
+					},
+					{
+						code: 11,
+						name: 'dasda'
+					},
+					{
+						code: 12,
+						name: 'dasda'
+					},
+					{
+						code: 13,
+						name: '你好'
+					}
+				]
 			}
 		},
-		filters: {
-			statusChange(val) {
-				switch (val) {
-					case 'todo':
-						return '我的待办'
-						break;
-					case 'send':
-						return '由我发起'
-						break;
-					case 'done':
-						return '我的已办'
-						break;
-					default:
-
+		watch: {
+			"searchForm.tick"() {
+				console.log('日期时间:', this.searchForm.tick);
+				
+				if(this.searchForm.tick && this.searchForm.tick.length>0) {
+					this.searchForm.StartTick = this.searchForm.tick[0]
+					this.searchForm.EndTick = this.searchForm.tick[1]
 				}
+				
 			},
 		},
+		filters: {
+			// statusChange(val) {
+			// 	switch (val) {
+			// 		case 'todo':
+			// 			return '我的待办'
+			// 			break;
+			// 		case 'send':
+			// 			return '由我发起'
+			// 			break;
+			// 		case 'done':
+			// 			return '我的已办'
+			// 			break;
+			// 		default:
+
+			// 	}
+			// },
+		},
 		onLoad() {
 			// 隐藏导航栏
 			this.loadmore()
 		},
 		methods: {
-toOpen(){
+			toOpen() {
 				this.$refs.selectPlus.open()
 			},
 			open() {