From 303a080d30e4823beea173bb2e8bd4fc0d459a30 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 01 Jun 2021 18:00:24 +0800
Subject: [PATCH] 业务管理样式微调,修改选择字体颜色,边框线透明度降低,巡逻路线名称修改

---
 pages/infoRegistration/infoCheck.vue        |   24 ++++++++---
 pages/infoRegistration/infoRegistration.vue |   14 ++++--
 xcxjingqingmap_patrol/xcxmap.html           |    2 
 pages/riskReporting/riskReporting.vue       |   20 ++++++---
 pages/equipment/equipment.vue               |    2 
 pages/visitRecord/visitRecord.vue           |   19 +++++++--
 6 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/pages/equipment/equipment.vue b/pages/equipment/equipment.vue
index d20d90f..f191571 100644
--- a/pages/equipment/equipment.vue
+++ b/pages/equipment/equipment.vue
@@ -251,7 +251,7 @@
 	.b-b {
 		margin: 20px 15px 0;
 		height: 35px;
-		border-bottom: #999999 1px solid;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.image-upload{
diff --git a/pages/infoRegistration/infoCheck.vue b/pages/infoRegistration/infoCheck.vue
index c8d8776..7fb8056 100644
--- a/pages/infoRegistration/infoCheck.vue
+++ b/pages/infoRegistration/infoCheck.vue
@@ -3,7 +3,7 @@
 	        <view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>客户名称: </text>
 				<picker @change="tenantNameSelect" :range="tenantNameArray" class="tenant-select">
-					  <label class="" v-model="tenantName">{{ tenantNameArrayType }}</label>
+					  <label :style="{color:tenantNameColor}" v-model="tenantName">{{ tenantNameArrayType }}</label>
 				</picker>
 	            <!-- <input class="input" type="text"  v-model="tenantName" placeholder="请输入客户名称" placeholder-class="placeholder" /> -->
 			</view>
@@ -22,7 +22,7 @@
 			<view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>客户类型: </text>
 				<picker @change="typeSelect" :range="typeArray" class="type-select">
-					  <label class="" v-model="typeArrayType">{{ typeArrayType }}</label>
+					  <label :style="{color:typeArrayTypeColor}" v-model="typeArrayType">{{ typeArrayType }}</label>
 				</picker>
 			    <!-- <input class="input" type="text"  v-model="type" placeholder="请输入客户类型" placeholder-class="placeholder" /> -->
 			</view>
@@ -40,6 +40,8 @@
 	export default{
 		data () {
 			return {
+				typeArrayTypeColor:"#808080",
+				tenantNameColor:"#808080",
 				id:"",
 				tenantName:"",
 				linkman:"",
@@ -54,10 +56,10 @@
 				tenantArr:[],
 				tenantNameArray:[],
 				tenantNameArrayIndex:0,
-				tenantNameArrayType:'---请选择---',
+				tenantNameArrayType:'--- 请选择 ---',
 				typeArray:["学校","医院","小区"],
 				typeArrayIndex:0,
-				typeArrayType:'---请选择---',
+				typeArrayType:'--- 请选择 ---',
 				pathUrl:"https://web.byisf.com/api/blade-system",
 				// pathUrl: "http://localhost:8106"
 			}
@@ -105,16 +107,22 @@
 						that.type = that.tenantArr[i].type;
 						if(that.tenantArr[i].type=="1"){
 							that.typeArrayType = '学校';
+							this.typeArrayTypeColor = "#000000";
 						}
 						if(that.tenantArr[i].type=="2"){
 							that.typeArrayType = '医院';
+							this.typeArrayTypeColor = "#000000";
 						}
 						if(that.tenantArr[i].type=="3"){
 							that.typeArrayType = '小区';
+							this.typeArrayTypeColor = "#000000";
 						}
 						that.domain = that.tenantArr[i].domain;
 					}
 				}
+				
+				//修改样式
+				this.tenantNameColor = "#000000";
 				
 			},
 			
@@ -132,6 +140,8 @@
 				if(that.typeArrayType =='小区'){
 					that.type = 3;
 				}
+				//修改样式
+				this.typeArrayTypeColor = "#000000";
 			},
 			
 			//提交修改
@@ -169,7 +179,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-desc {
@@ -191,7 +201,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-linkman input{
@@ -229,7 +239,7 @@
 	
 	.tenant-select{
 		position: relative;
-		left: 35rpx;
+		left: 45rpx;
 		top: 28rpx;
 	}
 	
diff --git a/pages/infoRegistration/infoRegistration.vue b/pages/infoRegistration/infoRegistration.vue
index d91d640..6178a51 100644
--- a/pages/infoRegistration/infoRegistration.vue
+++ b/pages/infoRegistration/infoRegistration.vue
@@ -22,7 +22,7 @@
 			<view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>客户类型: </text>
 				<picker @change="typeSelect" :range="typeArray" class="type-select">
-					  <label class="" v-model="typeArrayType">{{ typeArrayType }}</label>
+					  <label :style="{color:typeArrayTypeColor}" v-model="typeArrayType">{{ typeArrayType }}</label>
 				</picker>
 			    <!-- <input class="input" type="text"  v-model="type" placeholder="请输入客户类型" placeholder-class="placeholder" /> -->
 			</view>
@@ -41,6 +41,7 @@
 		data () {
 			return {
 				// id:"",
+				typeArrayTypeColor:"#808080",
 				tenantName:"",
 				linkman:"",
 				contactNumber:"",
@@ -54,10 +55,10 @@
 				tenantArr:[],
 				tenantNameArray:[],
 				tenantNameArrayIndex:0,
-				tenantNameArrayType:'---请选择---',
+				tenantNameArrayType:'--- 请选择 ---',
 				typeArray:["学校","医院","小区"],
 				typeArrayIndex:0,
-				typeArrayType:'---请选择---',
+				typeArrayType:'--- 请选择 ---',
 				pathUrl:"https://web.byisf.com/api/blade-system",
 				// pathUrl: "http://localhost:8106",
 			}
@@ -81,6 +82,9 @@
 				if(that.typeArrayType =='小区'){
 					that.type = 3;
 				}
+				
+				//修改样式
+				this.typeArrayTypeColor = "#000000";
 			},
 			
 			//提交修改
@@ -118,7 +122,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-desc {
@@ -140,7 +144,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-linkman input{
diff --git a/pages/riskReporting/riskReporting.vue b/pages/riskReporting/riskReporting.vue
index 42aa41d..bf7f71c 100644
--- a/pages/riskReporting/riskReporting.vue
+++ b/pages/riskReporting/riskReporting.vue
@@ -7,14 +7,14 @@
 			<view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>客户名称: </text>
 				<picker @change="tenantNameSelect" :range="tenantNameArray" class="tenant-select">
-					  <label class="" v-model="tenantName">{{ tenantNameArrayType }}</label>
+					  <label :style="{color:tenantNameColor}" v-model="tenantName">{{ tenantNameArrayType }}</label>
 				</picker>
 				<!-- <input class="input" type="text" v-model="tenantName" placeholder="请选择客户" placeholder-class="placeholder" /> -->
 			</view>
 	        <view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>风险等级: </text>
 				<picker @change="riskClassSelect" :range="riskClassArray" class="riskClass-select">
-					  <label class="" v-model="riskClassArrayType">{{ riskClassArrayType }}</label>
+					  <label :style="{color:riskClassArrayTypeColor}" v-model="riskClassArrayType">{{ riskClassArrayType }}</label>
 				</picker>
 	            <!-- <input class="input" type="text" v-model="riskClass" placeholder="请选择风险等级" placeholder-class="placeholder" /> -->
 			</view>
@@ -39,6 +39,8 @@
 	export default{
 		data () {
 			return {
+				riskClassArrayTypeColor:"#808080",
+				tenantNameColor:"#808080",
 				riskTime:"",
 				tenantId:"",
 				tenantName:"",
@@ -54,11 +56,11 @@
 				// pathUrl: "http://localhost:89",
 				riskClassArray:["一级","二级","三级","四级"],
 				riskClassArrayIndex:0,
-				riskClassArrayType:'---请选择---',
+				riskClassArrayType:'--- 请选择 ---',
 				tenantArr:[],
 				tenantNameArray:[],
 				tenantNameArrayIndex:0,
-				tenantNameArrayType:'---请选择---'
+				tenantNameArrayType:'--- 请选择 ---'
 			}
 		},
 		onLoad() {
@@ -69,7 +71,7 @@
 			getTenantList(){
 				var that = this;
 				uni.request({
-					url: this.pathUrl + '/tenant/page',
+					url: 'https://web.byisf.com/api/blade-system/tenant/page',
 					method:'GET',
 					success: (res) => {
 						that.tenantArr = res.data.data.records;
@@ -97,6 +99,8 @@
 					}
 				}
 				
+				//修改样式
+				this.tenantNameColor = "#000000";
 			},
 			
 			//风险等级下拉改变事件
@@ -104,6 +108,8 @@
 				var that = this;
 				this.riskClassArrayIndex = e.target.value;
 				this.riskClassArrayType=this.riskClassArray[this.riskClassArrayIndex];
+				//修改样式
+				this.riskClassArrayTypeColor ="#000000";
 			},
 			
 			
@@ -142,7 +148,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-desc {
@@ -164,7 +170,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-addr input{
diff --git a/pages/visitRecord/visitRecord.vue b/pages/visitRecord/visitRecord.vue
index 366bb61..6710762 100644
--- a/pages/visitRecord/visitRecord.vue
+++ b/pages/visitRecord/visitRecord.vue
@@ -10,14 +10,14 @@
 			<view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>客户名称: </text>
 				<picker @change="ynameSelect" :range="ynameArray" class="yname-select">
-					  <label class="" v-model="yname">{{ ynameArrayType }}</label>
+					  <label :style="{color:ynameArrayTypeColor}" v-model="yname">{{ ynameArrayType }}</label>
 				</picker>
 			    <!-- <input class="input" type="text"  v-model="yname" placeholder="请输客户名称" placeholder-class="placeholder" /> -->
 			</view>
 			<view class="row regis-info">
 				<text class="info-title"><!-- <span style="color: red;">* --></span>客户类型: </text>
 				<picker @change="typeSelect" :range="typeArray" class="type-select">
-					  <label class="" v-model="typeArrayType">{{ typeArrayType }}</label>
+					  <label :style="{color:typeArrayTypeColor}" v-model="typeArrayType">{{ typeArrayType }}</label>
 				</picker>
 			    <!-- <input class="input" type="text"  v-model="type" placeholder="请输客户类型" placeholder-class="placeholder" /> -->
 			</view>
@@ -46,6 +46,8 @@
 	export default{
 		data () {
 			return {
+				ynameArrayTypeColor:"#808080",
+				typeArrayTypeColor:"#808080",
 				vistime:"",
 				ynumber:"",
 				yname:"",
@@ -63,10 +65,10 @@
 				tenantArr:[],
 				ynameArray:[],
 				ynameArrayIndex:0,
-				ynameArrayType:'---请选择---',
+				ynameArrayType:'--- 请选择 ---',
 				typeArray:["学校","医院","小区"],
 				typeArrayIndex:0,
-				typeArrayType:'---请选择---'
+				typeArrayType:'--- 请选择 ---'
 			}
 		},
 		onLoad() {
@@ -109,15 +111,20 @@
 						that.type = that.tenantArr[i].type;
 						if(that.tenantArr[i].type=="1"){
 							that.typeArrayType = '学校';
+							this.typeArrayTypeColor = "#000000";
 						}
 						if(that.tenantArr[i].type=="2"){
 							that.typeArrayType = '医院';
+							this.typeArrayTypeColor = "#000000";
 						}
 						if(that.tenantArr[i].type=="3"){
 							that.typeArrayType = '小区';
+							this.typeArrayTypeColor = "#000000";
 						}
 					}
 				}
+				//修改样式
+				this.ynameArrayTypeColor = "#000000";
 				
 			},
 			
@@ -135,6 +142,8 @@
 				if(that.typeArrayType =='小区'){
 					that.type = 3;
 				}
+				//修改样式
+				this.typeArrayTypeColor = "#000000";
 			},
 			
 			
@@ -177,7 +186,7 @@
 		height: 100rpx;
 		position: relative;
 		left: 20rpx;
-		border-bottom: 0.05px solid #B4BCCC;
+		border-bottom: 1px solid rgba(128,128,128,0.1);
 	}
 	
 	.regis-info-desc {
diff --git a/xcxjingqingmap_patrol/xcxmap.html b/xcxjingqingmap_patrol/xcxmap.html
index 4786a41..e6ab63e 100644
--- a/xcxjingqingmap_patrol/xcxmap.html
+++ b/xcxjingqingmap_patrol/xcxmap.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>map</title>
+    <title>巡逻路线</title>
     <!-- vue -->
     <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
 

--
Gitblit v1.9.3