From d7fc0b6136f1ee72203b9363e26f6326978b596d Mon Sep 17 00:00:00 2001
From: wwp <782568523@qq.com>
Date: Wed, 28 Aug 2024 17:32:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/inspectionCenter.vue           | 100 +++++++++++-------
 .../earlyWarning/components/warningInfo.vue   |  79 ++++++++------
 .../static/image/earlyWarning/group.png       | Bin 0 -> 717 bytes
 .../static/image/earlyWarning/group2.png      | Bin 0 -> 736 bytes
 4 files changed, 109 insertions(+), 70 deletions(-)
 create mode 100644 monitorMobile/static/image/earlyWarning/group.png
 create mode 100644 monitorMobile/static/image/earlyWarning/group2.png

diff --git a/monitorMobile/pages/earlyWarning/components/inspectionCenter.vue b/monitorMobile/pages/earlyWarning/components/inspectionCenter.vue
index c62ce7d..3540de3 100644
--- a/monitorMobile/pages/earlyWarning/components/inspectionCenter.vue
+++ b/monitorMobile/pages/earlyWarning/components/inspectionCenter.vue
@@ -1,23 +1,23 @@
 <template>
 	<view class="inspectionCenter">
 		<view class="searchBox">
-			<view class="searchLine">
-				<view class="leftSearchBox">
-					<view class="searchLabel">
-						筛选条件:
-					</view>
-					<view class="searchValue">
-
-					</view>
-				</view>
-				<view class="searchShow" @click="openSearch">
-					<image v-show="isShowSearch==false" style="width:20px;height:20px;"
-						src="@/static/image/earlyWarning/screen.png" mode="">
+			<view class="searchLine" @click="openSearch">
+				<!-- <view class="searchShow"> -->
+				<view class="searchLabels">
+					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/group.png" mode="">
 					</image>
-					<image v-show="isShowSearch" style="width:20px;height:20px;"
-						src="@/static/image/earlyWarning/screenActive.png" mode="">
+					<image v-show="isShowSearch" src="@/static/image/earlyWarning/group2.png" mode="">
 					</image>
+					<text class="labels">选择分组</text>
+					<view class="values">一号楼/厨房</view>
 				</view>
+
+				<view class="arrow">
+					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/arrow1.png" mode="">
+					</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">
@@ -346,11 +346,56 @@
 		.searchLine {
 			height: 88rpx;
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
+			justify-content: space-between;
 			padding: 0 15px;
 			box-sizing: border-box;
 			background: #fff;
+			font-size: 28rpx;
+
+			.searchLabels {
+				display: flex;
+				align-items: center;
+				width: calc(100% - 34rpx);
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					flex-shrink: 1;
+				}
+
+				.labels {
+					width: 120rpx;
+					display: block;
+					color: #333333;
+					margin-left: 10rpx;
+					flex-shrink: 1;
+				}
+
+				.values {
+					width: calc(100% - 40rpx - 120rpx);
+					color: #2388FF;
+					font-weight: 700;
+					margin-left: 18rpx;
+					overflow: hidden;
+					word-wrap: break-word;
+					white-space: pre-wrap;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+				}
+			}
+
+
+			.arrow {
+				// text-align: right;
+				// flex-shrink: 1;
+
+				image {
+					width: 34rpx;
+					height: 34rpx;
+				}
+			}
 
 			.leftSearchBox {
 				display: flex;
@@ -370,7 +415,6 @@
 					overflow: hidden;
 					word-wrap: break-word;
 					white-space: pre-wrap;
-					// font-size: 14px;
 					display: -webkit-box;
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 1;
@@ -391,6 +435,7 @@
 				background: #FFFFFF;
 				padding: 15px;
 				box-sizing: border-box;
+				border-top: 1px solid rgba(0, 0, 0, 0.1);
 
 				.demo-layout {
 					height: 80rpx;
@@ -477,7 +522,7 @@
 					position: relative;
 
 					image {
-						width: 310rpx;
+						width: 300rpx;
 						height: 220rpx;
 						border-radius: 4px;
 					}
@@ -517,27 +562,6 @@
 							-webkit-box-orient: vertical;
 							-webkit-line-clamp: 1;
 						}
-
-						.statusBox {
-							width: 140rpx;
-							flex-shrink: 1;
-							text-align: center;
-							height: 50rpx;
-							line-height: 50rpx;
-							font-size: 28rpx;
-							border-radius: 8rpx;
-							color: #fff;
-						}
-
-						.handle {
-							background: rgba(15, 175, 118, 0.1);
-							color: #0FAF76;
-						}
-
-						.nohandle {
-							background: rgba(239, 45, 45, 0.1);
-							color: rgba(239, 45, 45, 1);
-						}
 					}
 
 					.secondCard,
diff --git a/monitorMobile/pages/earlyWarning/components/warningInfo.vue b/monitorMobile/pages/earlyWarning/components/warningInfo.vue
index 7425049..38ac2da 100644
--- a/monitorMobile/pages/earlyWarning/components/warningInfo.vue
+++ b/monitorMobile/pages/earlyWarning/components/warningInfo.vue
@@ -1,15 +1,7 @@
 <template>
 	<view class="warningInfo">
 		<view class="searchBox">
-			<view class="searchLine">
-				<!-- <view class="leftSearchBox">
-					<view class="searchLabel">
-						筛选条件:
-					</view>
-					<view class="searchValue">
-
-					</view>
-				</view> -->
+			<!-- <view class="searchLine">
 				<view class="searchShow" @click="openSearch">
 					<image v-show="isShowSearch==false" style="width:20px;height:20px;"
 						src="@/static/image/earlyWarning/screen.png" mode="">
@@ -25,6 +17,24 @@
 						<image v-show="isShowSearch" src="@/static/image/earlyWarning/arrow2.png" mode=""></image>
 					</view>
 				</view>
+			</view> -->
+			<view class="searchLine" @click="openSearch">
+				<!-- <view class="searchShow"> -->
+				<view class="searchLabels">
+					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/screen.png" mode="">
+					</image>
+					<image v-show="isShowSearch" src="@/static/image/earlyWarning/screenActive.png" mode="">
+					</image>
+					<text class="labels">筛选</text>
+					<view class="values">周界入侵，未处理，2024-8-24 18:06:12 - 2024-8-24 18:06:12</view>
+				</view>
+			
+				<view class="arrow">
+					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/arrow1.png" mode="">
+					</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">
@@ -352,28 +362,34 @@
 		.searchLine {
 			height: 88rpx;
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
+			justify-content: space-between;
 			padding: 0 15px;
 			box-sizing: border-box;
 			background: #fff;
-
-			.searchShow {
+			font-size: 28rpx;
+		
+			.searchLabels {
 				display: flex;
 				align-items: center;
-				font-size: 28rpx;
-				width: 100%;
-
+				width: calc(100% - 34rpx);
+		
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					flex-shrink: 1;
+				}
+		
 				.labels {
-					width: 90rpx;
+					width: 70rpx;
 					display: block;
 					color: #333333;
 					margin-left: 10rpx;
 					flex-shrink: 1;
 				}
-
+		
 				.values {
-					// width: calc(100% - 30rpx - 34rpx);
+					width: calc(100% - 40rpx - 50rpx);
 					color: #2388FF;
 					font-weight: 700;
 					margin-left: 18rpx;
@@ -384,28 +400,30 @@
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 1;
 				}
-
-				.arrow {
-					text-align: right;
-
-					image {
-						width: 34rpx;
-						height: 34rpx;
-					}
+			}
+		
+		
+			.arrow {
+				// text-align: right;
+				// flex-shrink: 1;
+		
+				image {
+					width: 34rpx;
+					height: 34rpx;
 				}
 			}
-
+		
 			.leftSearchBox {
 				display: flex;
 				align-items: center;
 				width: calc(100% - 40px);
-
+		
 				.searchLabel {
 					flex-shrink: 1;
 					color: #333333;
 					width: 80px;
 				}
-
+		
 				.searchValue {
 					width: calc(100% - 60px);
 					margin-left: 10px;
@@ -413,7 +431,6 @@
 					overflow: hidden;
 					word-wrap: break-word;
 					white-space: pre-wrap;
-					// font-size: 14px;
 					display: -webkit-box;
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 1;
@@ -429,8 +446,6 @@
 			height: calc(100vh - 375rpx - 60rpx);
 			font-size: 26rpx;
 			background: rgba(0, 0, 0, 0.2);
-
-
 			.content {
 				background: #FFFFFF;
 				padding: 15px;
diff --git a/monitorMobile/static/image/earlyWarning/group.png b/monitorMobile/static/image/earlyWarning/group.png
new file mode 100644
index 0000000000000000000000000000000000000000..41a83388a888be19be2bfca2c4bedcf959408a34
GIT binary patch
literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0%A!-K~#7F?Uu`p
z+b|G@DZeiEVN*d|LQ=u%X!xlPqz+c8z}gDp?Z9rpQ2e^a>A<NVP6xgk@FV{pNB~z$
zT9mk_g$EEQP!#9WaQ+zyaksmDFmr^34F-e9>-8Erj^kq7;hL=1>zS~yQb00@;_?1+
zxkP2b3IX+cJ-<?^M7V8B(_6s30B(f)Kv;t10=cgH&}y}OI1Do&Q-I7?tJOB0@I0@5
zKA*=nU``ImQv&iJgVgKwXg;6+)xB#2rUdHu`{Obo?*aA(2nqWgLudnH0tP55@|!RK
zx^hH*#EnKHv;on8@q;~FhvjnlDZ8ekc<=C^)N#Dy@fdZx-Ou73j5&EaoqXQPezI1}
zPB3>6ohk1j@c=^rxl>WmX0s_AEsZz`6ROrLlUkFEJa=O-9SEy=tyX)9<M?0<qyTe;
zRD*7Tl?BlPQSx*sJ0lp+A5H=tSP>Am9=z+Bs_Z8}l+LjE1eN%=42Jm;oV=>qRAkcE
zazW%~jJ>~_0I?^<lCv!~h#=8l^19)0=yP-Nx}7LN*aI0kTwkQM9`^i^3nWCb3Y&nr
zaJGXgXIT(MGrn19O_Msv1553O%n35dE3~R3d(0k>30RS&=GtbnIZ}O;3g{0<RTMO3
zV9x|KNopAy&-X@2jhuMmW|Fh1X&KOgbUK|j=6pGN6a;{tbAb}5tb%wv+iWpR$^fP8
zF-j_sYPC8}T2N|xs&=thnEig_fEl%qr0@krK#YKjf@yyK8QEv~SJxWI04zo{LK~1$
zK&heMu@I(e%UUTAE1=XQFt&u94anW@_F?TG#l1~f-GOW|00000NkvXXu0mjf#K=4!

literal 0
HcmV?d00001

diff --git a/monitorMobile/static/image/earlyWarning/group2.png b/monitorMobile/static/image/earlyWarning/group2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f63cb00a685b9a6116da3d35278680447df72e03
GIT binary patch
literal 736
zcmV<60w4W}P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0(D75K~#7F?Uzkb
z8bK7t-<xqmR^|jDngb*!kQ=}am>YytrJ}AJS89?f#}fo@Ku!>H1G0}Y-hh>EWZHiZ
z476>J-E_0EcvVz&HLv^qc%Kc?R<`oWgegFp-^D>(P>N+s2pSg=W%(fwC_ub`R1p0;
zL6jFvsV~@CK>HV>3yY~_Qnp99<qG?4tdmeMD^N2PyU`o!azQ;61P1$&puzuR9xZjx
zL^EbO2?665K^pWK3O(GqtAdCfN+)0Ww)SiQm=S32LY(-3Yyyl8FqbUK@OXnbfiYz_
zhy29~w118Qp3AV<p<W1x5iFuh{K^hK)9Yh?tLsGc9C5l>b@+kO_dmru+60Wu$%wkN
zXcb~*#{xvFaKU{^^g#LEx%lM^CP8FQ#toXVY#A~y0aGY;R52#CDdtkv$tPo#0t9zt
z#XVi+DNmh&3}7wNdQcshFGwwrbgzi1uNsqJGX8LRQU|sUh#Wm=svXxV`y)M48pCCi
zBmVaUET*>JwIM^?)N%n?4r8V<fIeA)nm<H4p25IMMzaWw>>K}m0&bdXH6T(K`#pI0
zW3@L!73W9%+X_^9!nMPe#ss_*;rVe#106(%wiSkJQYSXB<(ax%5+z7xtI+2mL!9;S
zxPYyd)X=2{wM{?Dl++VBJ4{|MwE+o+OU6z~tw76jPDzcfEDvOrF=+H%+dwTyrLTAo
zRh9zi)CyF3NlV5O4ArJ5<6>AIVA+Ar*aQ;%{CEj$aiRTzHt#nHZR&yM3s&>^A0f1-
z>Qgru$OeYVJ&fnmyX6bw1ysq0Ga*}lRc*R>fdm1O4#pS>_@fvCvX!m8T6qMZRo-ev
SDup=!0000<MNUMnLSTZRi86)&

literal 0
HcmV?d00001


From 4839bebed6400813afb6809d265f68fdde3cfa7e Mon Sep 17 00:00:00 2001
From: wwp <782568523@qq.com>
Date: Wed, 28 Aug 2024 17:38:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 monitorMobile/pages.json              |  20 +++---
 monitorMobile/pages/monitor/index.vue | 100 ++++++++++++++++----------
 monitorMobile/pages/work/index.vue    |   2 +-
 3 files changed, 74 insertions(+), 48 deletions(-)

diff --git a/monitorMobile/pages.json b/monitorMobile/pages.json
index 71d6c30..879c869 100644
--- a/monitorMobile/pages.json
+++ b/monitorMobile/pages.json
@@ -30,6 +30,13 @@
 		]
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		// 预警
+		{
+			"path": "pages/earlyWarning/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		// 工作台
 		{
 			"path": "pages/work/index",
@@ -100,11 +107,11 @@
 		        "enablePullDownRefresh": false
 		    }
 		},
-		// 预警巡警
+		// 巡警
 		{
-			"path": "pages/earlyWarning/index",
+			"path": "pages/monitor/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "监控管理"
 			}
 		},
 		{
@@ -125,12 +132,7 @@
 				"navigationBarTitleText": "处理结果"
 			}
 		},
-		{
-			"path": "pages/monitor/index",
-			"style": {
-				"navigationBarTitleText": "监控管理"
-			}
-		},
+
 		// 我的
 		{
 			"path": "pages/my/index",
diff --git a/monitorMobile/pages/monitor/index.vue b/monitorMobile/pages/monitor/index.vue
index c62ce7d..3540de3 100644
--- a/monitorMobile/pages/monitor/index.vue
+++ b/monitorMobile/pages/monitor/index.vue
@@ -1,23 +1,23 @@
 <template>
 	<view class="inspectionCenter">
 		<view class="searchBox">
-			<view class="searchLine">
-				<view class="leftSearchBox">
-					<view class="searchLabel">
-						筛选条件:
-					</view>
-					<view class="searchValue">
-
-					</view>
-				</view>
-				<view class="searchShow" @click="openSearch">
-					<image v-show="isShowSearch==false" style="width:20px;height:20px;"
-						src="@/static/image/earlyWarning/screen.png" mode="">
+			<view class="searchLine" @click="openSearch">
+				<!-- <view class="searchShow"> -->
+				<view class="searchLabels">
+					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/group.png" mode="">
 					</image>
-					<image v-show="isShowSearch" style="width:20px;height:20px;"
-						src="@/static/image/earlyWarning/screenActive.png" mode="">
+					<image v-show="isShowSearch" src="@/static/image/earlyWarning/group2.png" mode="">
 					</image>
+					<text class="labels">选择分组</text>
+					<view class="values">一号楼/厨房</view>
 				</view>
+
+				<view class="arrow">
+					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/arrow1.png" mode="">
+					</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">
@@ -346,11 +346,56 @@
 		.searchLine {
 			height: 88rpx;
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
+			justify-content: space-between;
 			padding: 0 15px;
 			box-sizing: border-box;
 			background: #fff;
+			font-size: 28rpx;
+
+			.searchLabels {
+				display: flex;
+				align-items: center;
+				width: calc(100% - 34rpx);
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					flex-shrink: 1;
+				}
+
+				.labels {
+					width: 120rpx;
+					display: block;
+					color: #333333;
+					margin-left: 10rpx;
+					flex-shrink: 1;
+				}
+
+				.values {
+					width: calc(100% - 40rpx - 120rpx);
+					color: #2388FF;
+					font-weight: 700;
+					margin-left: 18rpx;
+					overflow: hidden;
+					word-wrap: break-word;
+					white-space: pre-wrap;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+				}
+			}
+
+
+			.arrow {
+				// text-align: right;
+				// flex-shrink: 1;
+
+				image {
+					width: 34rpx;
+					height: 34rpx;
+				}
+			}
 
 			.leftSearchBox {
 				display: flex;
@@ -370,7 +415,6 @@
 					overflow: hidden;
 					word-wrap: break-word;
 					white-space: pre-wrap;
-					// font-size: 14px;
 					display: -webkit-box;
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 1;
@@ -391,6 +435,7 @@
 				background: #FFFFFF;
 				padding: 15px;
 				box-sizing: border-box;
+				border-top: 1px solid rgba(0, 0, 0, 0.1);
 
 				.demo-layout {
 					height: 80rpx;
@@ -477,7 +522,7 @@
 					position: relative;
 
 					image {
-						width: 310rpx;
+						width: 300rpx;
 						height: 220rpx;
 						border-radius: 4px;
 					}
@@ -517,27 +562,6 @@
 							-webkit-box-orient: vertical;
 							-webkit-line-clamp: 1;
 						}
-
-						.statusBox {
-							width: 140rpx;
-							flex-shrink: 1;
-							text-align: center;
-							height: 50rpx;
-							line-height: 50rpx;
-							font-size: 28rpx;
-							border-radius: 8rpx;
-							color: #fff;
-						}
-
-						.handle {
-							background: rgba(15, 175, 118, 0.1);
-							color: #0FAF76;
-						}
-
-						.nohandle {
-							background: rgba(239, 45, 45, 0.1);
-							color: rgba(239, 45, 45, 1);
-						}
 					}
 
 					.secondCard,
diff --git a/monitorMobile/pages/work/index.vue b/monitorMobile/pages/work/index.vue
index 1e1316b..8aa3f46 100644
--- a/monitorMobile/pages/work/index.vue
+++ b/monitorMobile/pages/work/index.vue
@@ -28,7 +28,7 @@
 				</view>
 				<image src="/static/image/work/passengerFlow.png" class="modeLogo" mode=""></image>
 			</view>
-			<view class="card" @click="NAV_TO('/pages/work/rollCall/index')">
+			<view class="card" @click="NAV_TO('/pages/monitor/index')">
 				<view class="title">监控管理</view>
 				<view class="des">查看监控管理情况</view>
 				<view class="imgBox">