From 3357e9f4c78558f371170775ce2a763633c94dee Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 14 Dec 2023 16:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=AE=A1=E7=90=86=E5=91=BC?=
 =?UTF-8?q?=E5=8F=AB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/callmanage.vue  | 36 ++++++++++++++++++++++++++++-------
 pages/modules/pointmanage.vue | 12 +++++++-----
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pages/modules/callmanage.vue b/pages/modules/callmanage.vue
index 479ad6a..4c90af3 100644
--- a/pages/modules/callmanage.vue
+++ b/pages/modules/callmanage.vue
@@ -2,6 +2,12 @@
 	<view class="zd_container">
 		<nav-bar title="呼叫管理"></nav-bar>
 		<view class="zd_content">
+			<view class="state-wrap">
+				<view class="state-item-wrap" v-for="e in state">
+					<view class="state-color" :class="e.color"></view>
+					<view class="state-name">{{e.name}}</view>
+				</view>
+			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="locate_block" v-for="e in areaArr" :key="e.region_code">
 					<view class="locate_name" @click="getPonit (e)">
@@ -10,9 +16,9 @@
 					</view>
 					<view v-show="e.checked === true" class="site_block" ref="liCon">
 						<view class="site_item" v-for="(el, i) in e.pointArr" :key="i">
-							<view class="site_item_box" @click="setcode(el)">
+							<view class="site_item_box" :class="['bggray', 'bggreen'][Number(el.status)]" @click="setcode(el)">
 								<text class="title_1">{{el.device_name}}</text>
-								<text class="title_2">{{el.source_device}}</text>
+								<text class="title_2">来源:{{el.source_device}}</text>
 							</view>
 						</view>
 					</view>
@@ -47,6 +53,7 @@
 			return {
 				// interTime: this.$store.getters.setTime,
 				// timer: null,
+				state: [{color: 'bggray', name: '空位'}, {color: 'bggreen', name: '有货'}],
 				areaArr: [],
 				pointArr: [],
 				regobj: {},
@@ -150,6 +157,8 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
+.zd_wrapper
+	padding 0 7rpx
 .zd_content
 	padding-bottom 152rpx
 .locate_block
@@ -157,8 +166,6 @@
 .locate_name
 	position relative
 	_wh(100%,48rpx)
-.title_1
-	_font(32rpx,48rpx,#000,500)
 .open_icon
 	position absolute
 	right 0
@@ -179,12 +186,12 @@
 	padding-bottom 10rpx
 .site_item
 	_wh(calc(100% / 3),110rpx)
-	padding 5rpx 10rpx
+	padding 5rpx 5rpx
 	overflow hidden
 	_fj(center)
 .site_item_box
 	_wh(100%, 100%)
-	padding 10rpx 0
+	padding 10rpx
 	background-color rgb(220, 223, 230)
 	border-radius 10rpx
 .title_locate
@@ -200,8 +207,9 @@
 	_wh(100%, 40%)
 	_fj(center)
 	overflow hidden
-	_font(24rpx,24rpx,#303133,500, center)
+	_font(24rpx,25rpx,#303133,500, center)
 	opacity .69
+	white-space: nowrap
 .submit-bar
 	justify-content space-between
 	padding 10rpx
@@ -229,4 +237,18 @@
 	margin 0
 	&:nth-child(1)
 		margin-bottom 10rpx
+.state-wrap
+	_wh(100%, 60rpx)
+	margin-bottom 10rpx
+	_fj(flex-start)
+.state-item-wrap
+	height 60rpx
+	margin-right 20rpx
+	_fj()
+.state-color
+	_wh(30rpx, 30rpx)
+	border-radius 50%
+	margin-right 10rpx
+.state-name
+	_font(28rpx, 60rpx, #333)
 </style>
diff --git a/pages/modules/pointmanage.vue b/pages/modules/pointmanage.vue
index 1090d3c..13ded4c 100644
--- a/pages/modules/pointmanage.vue
+++ b/pages/modules/pointmanage.vue
@@ -18,6 +18,7 @@
 						<view class="site_item" v-for="(el, i) in e.pointArr" :key="i">
 							<view class="site_item_box" :class="['bggray', 'bggreen'][Number(el.status)]" @click="setcode(el)">
 								<text class="title_1">{{el.device_name}}</text>
+								<text class="title_2">来源:{{el.source_device}}</text>
 							</view>
 						</view>
 					</view>
@@ -158,6 +159,8 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
+.zd_wrapper
+	padding 0 7rpx
 .zd_content
 	padding-bottom 152rpx
 .locate_block
@@ -165,8 +168,6 @@
 .locate_name
 	position relative
 	_wh(100%,48rpx)
-.title_1
-	_font(32rpx,48rpx,#000,500)
 .open_icon
 	position absolute
 	right 0
@@ -186,13 +187,13 @@
 	_fj(flex-start,,,wrap)
 	padding-bottom 10rpx
 .site_item
-	_wh(calc(100% / 3),70rpx)
+	_wh(calc(100% / 3),110rpx)
 	padding 5rpx 10rpx
 	overflow hidden
 	_fj(center)
 .site_item_box
 	_wh(100%, 100%)
-	padding 10rpx 0
+	padding 10rpx
 	background-color rgb(220, 223, 230)
 	border-radius 10rpx
 .title_locate
@@ -200,7 +201,7 @@
 	_font(30rpx,40rpx,#333,bold)
 	font-style italic
 .title_1
-	_wh(100%, 100%)
+	_wh(100%, 60%)
 	_fj(center)
 	overflow hidden
 	_font(28rpx,28rpx,#303133,500, center)
@@ -210,6 +211,7 @@
 	overflow hidden
 	_font(24rpx,24rpx,#303133,500, center)
 	opacity .69
+	white-space: nowrap
 .submit-bar
 	justify-content space-between
 	padding 10rpx