From 6e0c2b372ddd15267da31eb777db9d5c60063b2d Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Wed, 5 Jun 2024 22:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  2 +-
 pages/projectEnd/carManage/queryStaff.vue     |  2 +-
 .../carManage/searchTeam/personDetail.vue     | 27 +++++++------------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/main.js b/main.js
index 135d2b28..640fb490 100644
--- a/main.js
+++ b/main.js
@@ -41,7 +41,7 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
 	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
 	// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
-	Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
+	Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
 	// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
 	// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
 	// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
diff --git a/pages/projectEnd/carManage/queryStaff.vue b/pages/projectEnd/carManage/queryStaff.vue
index c0def637..7feead5d 100644
--- a/pages/projectEnd/carManage/queryStaff.vue
+++ b/pages/projectEnd/carManage/queryStaff.vue
@@ -17,7 +17,7 @@
 					<text v-else>{{item.workerName+'-'+item.departmentName+'-'}}<text class="font_weight">{{item.idCard}}</text></text> -->
 					<!-- <text v-if="item.personType==1">{{item.workerName+'-'+item.teamName+'-'}}<text class="font_weight">{{item.idCard}}</text></text>
 					<text v-else-if="item.personType==3">{{item.workerName+'-'+'临时人员-'}}<text class="font_weight">{{item.idCard}}</text></text> -->
-					<text>{{item.driverWorkerName+'-'+item.carTypeName+'-'}}<text class="font_weight">{{item.carNumber}}</text></text>
+					<text>{{item.driverWorkerName+'-'+ (item.carModuleType == 1 ? '固定车' : item.carModuleType == 2 ? '长期车' :'临时车') +'-'}}<text class="font_weight">{{item.carNumber}}</text></text>
 					<uni-icons class="arrowright" type="arrowright"></uni-icons>
 				</view>
 				<view v-if="listData.length==0" class="noData">暂无数据</view>
diff --git a/pages/projectEnd/carManage/searchTeam/personDetail.vue b/pages/projectEnd/carManage/searchTeam/personDetail.vue
index 75886a28..58c0ec71 100644
--- a/pages/projectEnd/carManage/searchTeam/personDetail.vue
+++ b/pages/projectEnd/carManage/searchTeam/personDetail.vue
@@ -34,7 +34,7 @@
 					</view>
 				</view>
 				<view class="projectName">{{workerInfo.projectName}}</view>
-				<view class="details-content">
+				<view class="details-content" v-if="codeShow">
 					<view class="left-content">
 						<view class="project_info">
 							<text class="name">企业名称：</text>
@@ -52,7 +52,7 @@
 							<text class="name">司机身份证号：</text>
 							<text>{{workerInfo.outsideDriverIdCard}}</text>
 						</view>
-						<view class="project_info">
+						<view class="project_info" v-if="workerInfo.carModuleType != 1">
 							<text class="name">允许进出次数：</text>
 							<text>{{workerInfo.entryAndExitPermit == 0 ? '单次':'多次'}}</text>
 						</view>
@@ -149,10 +149,6 @@
 				if (fenshu == 0) {
 					this.foregroundColor = "green";
 					this.pdgroundColor = "green";
-				} else if (fenshu >= 80 && fenshu < 90) {
-					// this.fontColor = "rgb(255, 230, 0)";
-					this.foregroundColor = "#F7C409";
-					this.pdgroundColor = "#F7C409";
 				} else if (fenshu == 1) {
 					// this.fontColor = "red";
 					this.foregroundColor = "#F0212A";
@@ -174,11 +170,7 @@
 						if (res.code == 200) {
 							console.log("333333333333333",res)
 							this.workerInfo = res.result;
-							if (this.workerInfo) {
-								this.setCodeColor(this.workerInfo.isBlack)
-							} else {
-								this.setCodeColor(1)
-							}
+							this.setCodeColor(this.workerInfo.isBlack)
 						}
 					}
 				})
@@ -331,11 +323,11 @@
 
 	.item_wraps {
 		width: 100%;
-		margin: 10px 0;
-		box-shadow: 0 4px 13px 0 rgba(212, 220, 236, 0.67);
-		padding: 10px 0 10px 28rpx;
+		margin: 20rpx 0;
+		box-shadow: 0 8rpx 26rpx 0 rgba(212, 220, 236, 0.67);
+		padding: 20rpx 20rpx 20rpx 28rpx;
 		box-sizing: border-box;
-		border-radius: 8px;
+		border-radius: 16rpx;
 	}
 	
 	.item_wraps .item_title {
@@ -343,16 +335,16 @@
 		font-family: PingFangSC-Medium, PingFang SC;
 		font-weight: 700;
 		color: #2A2B5B;
-		margin-bottom: 14rpx;
 	}
 
 	.item_wrap {
 		width: 100%;
 		flex-wrap: wrap;
+		justify-content: space-between;
 	}
 
 	.item_wrap .item {
-		width: 33%;
+		width: 32%;
 		font-size: 30rpx;
 		height: 121rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
@@ -360,6 +352,7 @@
 		color: #372D66;
 		line-height: 84rpx;
 		position: relative;
+		margin-top: 14rpx;
 	}
 
 	.item_wrap .item .state1 {