站列表

README.md

@@ -1,6 +1,5 @@
 
-[](https://modao.cc/proto/0IatAHTQs9utzggeat2cRV/sharing?view_mode=inspect&screen=rbpU6730lGqv3KI4h)
-
+[](https://modao.cc/proto/P3JTbxRqsx9b1ixkHrUnG6/sharing?view_mode=inspect)
 
 [](https://zbyj.hbjp.com.cn/floorlock-portal)
 

assets/img/deviceTab/index2-1.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1092 1024" width="24" height="23" style="" filter="none">
-    
-    <g>
-    <path d="M546.133333 68.266667c306.449067 0 450.3552 235.383467 477.866667 443.733333h-84.650667a36.864 36.864 0 0 1-35.2256-26.112C848.6912 306.0736 729.361067 216.1664 546.133333 216.1664c-183.227733 0-302.557867 89.9072-357.9904 269.7216A36.864 36.864 0 0 1 152.917333 512H68.266667C95.778133 303.616 239.684267 68.266667 546.133333 68.266667z" fill="rgba(22,119,255,1)" p-id="3768" stroke="none"></path><path d="M546.133333 34.133333C227.771733 34.133333 34.133333 292.795733 34.133333 591.633067v150.9376C34.133333 822.613333 98.986667 887.466667 179.029333 887.466667h734.208C993.28 887.466667 1058.133333 822.613333 1058.133333 742.570667v-150.9376C1058.133333 292.795733 864.494933 34.133333 546.133333 34.133333z m0 68.266667c275.6608 0 443.733333 224.529067 443.733334 489.233067v150.9376A76.629333 76.629333 0 0 1 913.237333 819.2H179.029333A76.629333 76.629333 0 0 1 102.4 742.570667v-150.9376C102.4 326.929067 270.472533 102.4 546.133333 102.4z" fill="rgba(22,119,255,1)" p-id="3769" stroke="none"></path><path d="M170.666667 775.304533l0.170666-1.809066c6.075733-30.856533 165.410133-55.7056 363.383467-56.661334h23.620267c201.9328 0.955733 363.758933 26.760533 363.758933 58.4704v156.0576C921.6 963.652267 753.493333 989.866667 546.133333 989.866667s-375.466667-26.2144-375.466666-58.504534v-156.0576z" fill="rgba(22,119,255,1)" p-id="3770" stroke="none"></path>
-    </g>
-  </svg>

assets/img/station/index1.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="28" height="28" style="" filter="none">
+    <defs><linearGradient id="U67CDsmHUn1D098BOX4SHQ1" x1="0" x2="100%" y1="0" y2="0" gradientTransform="matrix(6.123233995736766e-17, 1, -1, 6.123233995736766e-17, 16, 0)" gradientUnits="userSpaceOnUse"><stop stop-color="#1f55ff" stop-opacity="1" offset="0"></stop><stop stop-color="#27abff" stop-opacity="1" offset="1"></stop></linearGradient></defs>
+    <g>
+    <path d="M21.472 13.504c0.96-0.992 1.888-1.504 3.264-1.248 1.344 0.224 2.624 0 3.68-1.056 1.312-1.312 2.016-3.456 1.312-5.184-0.832 0.928-1.6 1.728-2.336 2.56-0.352 0.384-0.672 0.448-1.152 0.32-2.4-0.64-2.368-0.608-3.008-2.944-0.192-0.608-0.064-0.992 0.384-1.376 0.768-0.736 1.504-1.504 2.336-2.336-3.552-0.768-6.272 1.504-6.112 4.896 0.032 0.352 0 0.736 0.032 1.088 0.128 0.736-0.16 1.216-0.672 1.76-3.168 3.104-6.304 6.272-9.44 9.44-0.384 0.384-0.8 0.512-1.344 0.512-1.088-0.064-2.272-0.288-3.264 0.032-2.528 0.864-3.776 4.128-2.848 6.144 0.832-0.896 1.568-1.728 2.336-2.56 0.224-0.256 0.416-0.448 0.832-0.416 2.336 0.352 2.624 0.64 3.296 2.912 0.224 0.736 0.064 1.184-0.48 1.632-0.8 0.64-1.536 1.312-2.304 1.984 3.552 1.088 6.464-1.312 6.24-4.64l-0.096-1.376c-0.064-0.512 0.096-0.864 0.48-1.248 2.976-2.944 5.952-5.856 8.864-8.896zM22.016 17.536c-0.608-0.64-0.992-0.768-1.504 0-0.093 0.131-0.211 0.238-0.347 0.317l-0.005 0.003c-0.576 0.416-0.512 0.736-0.032 1.184 1.888 1.824 3.712 3.68 5.6 5.536 0.448 0.448 0.896 0.96 0.288 1.504-0.544 0.512-1.024 0.128-1.44-0.32-1.76-1.76-3.584-3.456-5.28-5.28-0.672-0.704-1.12-0.896-1.728-0.032-0.102 0.134-0.218 0.25-0.348 0.349l-0.004 0.003c-0.416 0.32-0.416 0.576-0.032 0.96 2.4 2.368 4.768 4.8 7.232 7.168 0.96 0.96 2.208 1.184 3.488 0.608 1.216-0.544 1.76-1.568 1.888-2.688 0-1.184-0.448-1.984-1.152-2.72-2.277-2.202-4.435-4.351-6.563-6.529l-0.061-0.063zM3.808 6.88c0.64 0.64 1.28 1.344 2.304 1.184 0.576-0.064 0.896 0.16 1.28 0.512 1.504 1.536 3.072 3.040 4.576 4.576 0.48 0.512 0.704 0.32 1.12-0.064 0.416-0.416 0.448-0.672 0-1.088-1.472-1.408-2.88-2.848-4.32-4.288-0.48-0.48-1.152-0.896-0.736-1.664 0-1.12-0.768-1.728-1.44-2.336-1.44-1.344-1.44-1.312-2.816 0.064-1.568 1.536-1.568 1.568 0.032 3.104z" fill="url(#U67CDsmHUn1D098BOX4SHQ1)"></path>
+    </g>
+  </svg>

assets/img/station/index2.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="28" height="28" style="" filter="none">
+    <defs><linearGradient id="U67CDsmHUn1D098uRHArCa1" x1="0" x2="100%" y1="0" y2="0" gradientTransform="matrix(6.123233995736766e-17, 1, -1, 6.123233995736766e-17, 16, 0)" gradientUnits="userSpaceOnUse"><stop stop-color="#1f55ff" stop-opacity="1" offset="0"></stop><stop stop-color="#27abff" stop-opacity="1" offset="1"></stop></linearGradient></defs>
+    <g>
+    <path d="M28.192 4.032c-0.288-0.16-0.576-0.256-0.864-0.256-1.216-0.032-2.464-0.032-3.68-0.032-0.032 0-0.064 0.032-0.128 0.032v4.672c0 0.608-0.32 0.928-0.928 0.928h-13.024c-0.768 0-1.088-0.288-1.088-1.056v-4.576h-3.68c-1.088 0.032-1.952 0.864-1.952 1.952v24.512c0 0.96 0.768 1.728 1.728 1.76 0.128 0.032 0.256 0.032 0.384 0.032 7.328 0 14.656-0.032 21.984 0 1.088 0 1.856-0.384 2.208-1.44v-25.184c-0.192-0.544-0.416-1.088-0.96-1.344zM23.168 16.192c-2.24 2.24-4.48 4.512-6.752 6.784-0.448 0.448-0.928 0.928-1.376 1.408-0.48 0.48-0.928 0.448-1.408 0-1.568-1.504-3.136-3.008-4.704-4.48-0.544-0.544-0.576-0.992-0.064-1.536 0.32-0.288 0.608-0.608 0.928-0.896 0.48-0.512 0.896-0.512 1.408-0.032l2.976 2.752c0.032 0.032 0.096 0.064 0.128 0.096 1.024-1.024 2.048-2.016 3.040-3.008 1.152-1.12 2.272-2.272 3.424-3.424 0.512-0.544 0.96-0.544 1.472 0 0.32 0.32 0.608 0.608 0.896 0.928 0.48 0.448 0.48 0.928 0.032 1.408zM11.072 7.488c0.288 0.064 0.608 0.032 0.896 0.032 2.848 0.032 5.728 0.032 8.576 0h0.32c0.512-0.096 0.768-0.416 0.8-0.896v-2.88c-0.032-0.928-0.48-1.6-1.216-1.792-0.288-0.064-0.576-0.064-0.864-0.064-0.544-0.032-1.12-0.032-1.664-0.032-0.032-0.16-0.032-0.256-0.064-0.384-0.032-0.736-0.288-1.312-1.088-1.472h-1.536c-1.024 0.224-1.088 1.056-1.12 1.856h-1.792c-1.152 0-1.92 0.736-1.952 1.888-0.032 0.96-0.032 1.952 0 2.912 0 0.448 0.256 0.768 0.704 0.832z" fill="url(#U67CDsmHUn1D098uRHArCa1)"></path>
+    </g>
+  </svg>

assets/img/station/item1.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" fill="rgba(157,162,169,1)"></path>
+    </g>
+  </svg>

assets/img/station/item2.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <path d="M10.667 25.333h-6.667c-0.736 0-1.333-0.597-1.333-1.333v0-16c0-0.736 0.597-1.333 1.333-1.333v0h8.833l-1.556 2.667h-5.944v13.333h5.333v2.667zM16.5 25.333l1.556-2.667h5.944v-13.333h-5.333v-2.667h6.667c0.736 0 1.333 0.597 1.333 1.333v0 16c0 0.736-0.597 1.333-1.333 1.333v0h-8.833zM28 12h2.667v8h-2.667v-8zM16 14.667h4l-6.667 10.667v-8h-4l6.667-10.667v8z" fill="rgba(157,162,169,1)"></path>
+    </g>
+  </svg>

assets/img/station/item3.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <path d="M5.333 9.333v13.333h18.667v-13.333h-18.667zM4 6.667h21.333c0.736 0 1.333 0.597 1.333 1.333v0 16c0 0.736-0.597 1.333-1.333 1.333v0h-21.333c-0.736 0-1.333-0.597-1.333-1.333v0-16c0-0.736 0.597-1.333 1.333-1.333v0zM28 12h2.667v8h-2.667v-8z" fill="rgba(157,162,169,1)"></path>
+    </g>
+  </svg>

assets/img/station/item4.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <path d="M4.687 2.8l25.456 25.456-1.887 1.887-2.685-2.687c-0.859 0.344-1.854 0.544-2.896 0.544-0.003 0-0.006 0-0.009 0h-13.333c-0.002 0-0.003 0-0.005 0-4.418 0-8-3.582-8-8 0-3.468 2.207-6.421 5.293-7.53l0.056-0.018c-0.007-0.137-0.011-0.297-0.011-0.459 0-1.059 0.176-2.076 0.502-3.024l-0.020 0.066-4.348-4.349 1.887-1.885zM9.333 12c0 0.108 0.003 0.217 0.008 0.324l0.093 1.984-1.872 0.659c-2.090 0.755-3.557 2.721-3.557 5.031 0 2.944 2.384 5.331 5.327 5.336h13.334c0.248 0 0.492-0.017 0.731-0.049l-14.024-14.024c-0.027 0.243-0.040 0.489-0.040 0.74zM16 2.667c0 0 0 0 0 0 5.155 0 9.333 4.179 9.333 9.333 0 0.159-0.004 0.317-0.012 0.474l0.001-0.022c3.14 1.13 5.345 4.082 5.345 7.549 0 1.466-0.394 2.84-1.082 4.022l0.020-0.038-1.991-1.991c0.246-0.591 0.389-1.278 0.389-1.998 0-2.945-2.387-5.332-5.332-5.332-0.721 0-1.408 0.143-2.035 0.402l0.035-0.013-1.992-1.993c1.175-0.673 2.535-1.060 3.987-1.060-0-3.682-2.985-6.667-6.667-6.667-1.437 0-2.767 0.454-3.855 1.227l0.021-0.014-1.907-1.907c1.561-1.23 3.557-1.973 5.726-1.973 0.005 0 0.011 0 0.016 0h-0.001z" fill="rgba(157,162,169,1)"></path>
+    </g>
+  </svg>

components/Tabbar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-tabbar v-model="myCurrent" :list="tabbarList"  inactive-color="#ADB8C2" active-color="#5098FF">
+		<u-tabbar v-model="myCurrent" :list="tabbarList" :before-switch="beforeSwitch" mid-button-size="72" :mid-button="true" inactive-color="#ADB8C2" active-color="#5098FF">
 		</u-tabbar>
 
 	</view>
@@ -9,13 +9,13 @@
 <script>
 	var img1=require('@/assets/img/tabbarImg/item1a.svg')
 	var img2=require('@/assets/img/tabbarImg/item1b.svg')
-	var img3=require('@/assets/img/tabbarImg/item2a.svg') 
-	var img4=require('@/assets/img/tabbarImg/item2b.svg')
-	var img5=require('@/assets/img/tabbarImg/item3a.svg')
-	var img6=require('@/assets/img/tabbarImg/item3b.svg')
+
 	var img7=require('@/assets/img/tabbarImg/item4a.svg')
 	var img8=require('@/assets/img/tabbarImg/item4b.svg')
 	
+	var img0=require('@/assets/img/tabbarImg/item0.png')
+	
+	import * as WxJsApi from '@/apis/utils/wxJsApi.js'
 	
 	export default {
 		name: "Tabbar",
@@ -34,13 +34,14 @@
 						text: '主页 ',
 						pagePath: "/pages/index/index",
 					},
-					 // {
-					 // 	iconPath: img4,
-					 // 	selectedIconPath: img3,
-					 // 	text: '地锁',
-					 // 	pagePath: "/pages/deviceTab/index",
+					 {
+					 	iconPath: img0,
+					 	selectedIconPath: img0,
+					 	text: '',
+						midButton: true,
+					 	pagePath2: "",
 					 	
-					 // },
+					 },
 					// {
 					// 	iconPath: img6,
 					// 	selectedIconPath: img5,
@@ -61,12 +62,73 @@
 
 		},
 		methods: {
+			beforeSwitch(index){
+				var item=this.tabbarList[index]
+				if(item.pagePath){
+						return true;
+				}else{
+					console.log(111)
+					return false;
+				}
+				
+			},
+			//微信扫二维码
+			getScanCode() {
+				console.log("getScanCode")
+				if (this.userId) {
+					WxJsApi.scanQRCode(1).then(res => {
+						var url=res;
+						//("scanQRCode------" + res)
+						if(res&&this.branchParameterBl()&&url.indexOf('youdian.hbjp.com.cn')!=-1){
+							
+								if(url.indexOf('?code=')!=-1){
+									url=url.replace('?code=','?code1233=')
+								}
+								
+								
+								if(process.car.NODE_ENV=='test'){
+									url='https://youdian.hbjp.com.cn/charging-prod/mobile-charging-car-test/#/'
+									+url.split("#/")[1]
+								}else{
+									url='https://youdian.hbjp.com.cn/charging-prod/mobile-charging-car/#/'
+									+url.split("#/")[1]
+								}
+								console.log(url)
+								//window.location.href=url;
+								this.youdianurl=url
+								this.youdianshow=true
+							
+						}else if (res) {
+							
+							API.scanCode(res).then((response) => {
+			
+							}).catch(error => {
+								uni.showToast({
+									title: error,
+									icon: "none"
+								})
+							})
+						}
+					}).catch(error => {
 			
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
 			
 
 		},
 		mounted() {
-
+			console.log(111+"mounted")
+			WxJsApi.getWxConfig(['scanQRCode']).then((res) => {
+				// //(res)
+			}).catch(error => {
+				//(res)
+			})
+			
 		},
 		destroyed() {
 

config/.env.dev.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  
-	ProjectName :"智泊e家",
+	ProjectName :"优电联盟",
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
 	
@@ -17,7 +17,7 @@ const UNI_APP = {
 
 	openId:"oRGjz7GpSbld27nUK9Q6V6jvXMJo",
 	openId:"oRGjz7DZM-rK3MpkjV6_VnoUhLI0",
-	
+	
 	
 	//appid
 	VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",

config/.env.prod.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  	
-	ProjectName :"智泊e家",
+	ProjectName :"优电联盟",
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 	BASE_URL: 'https://youdian-test.hbjp.com.cn/floorlock-server/',
 	BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",

config/.env.test.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  
-	ProjectName :"智泊e家",
+	ProjectName :"优电联盟",
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 	BASE_URL: 'https://youdian-test.hbjp.com.cn/electric-manager-api/', //test
 	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',

pages.json

@@ -1,45 +1,38 @@
-{
-
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path" : "pages/task/addTask",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
-		},
-	
-	
-		{
-			"path" : "pages/task/maintenanceTaks",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
-		},
-	
-		{
-			"path" : "pages/lockTab/dataLock",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
-		},
-		
+{
+
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path" : "pages/task/addTask",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+	
+	
+		{
+			"path" : "pages/task/maintenanceTaks",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+	
+	 
 		
 		{
 			"path" : "pages/myTab/index",
@@ -138,31 +131,46 @@
 				"navigationBarTitleText" : ""
 			}
 		},
+		 
 		{
-			"path" : "pages/lockTab/listLock",
+			"path" : "pages/team/teamList",
 			"style" : 
 			{
 				"navigationBarTitleText" : ""
 			}
 		},
 		{
-			"path" : "pages/team/teamList",
+			"path" : "pages/team/teamAdd",
 			"style" : 
 			{
 				"navigationBarTitleText" : ""
 			}
 		},
 		{
-			"path" : "pages/team/teamAdd",
+			"path" : "pages/station/stationList",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/station/stationInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/station/stationGun",
 			"style" : 
 			{
 				"navigationBarTitleText" : ""
 			}
-		}
-	],
-
-
-
+		}
+	],
+
+
+
 "tabBar": {
 		
 		"list": [{
@@ -178,12 +186,12 @@
 			"pagePath": "pages/myTab/index"
 			
 		}]
-	},
-
-	"globalStyle": {
-		"navigationStyle": "custom", // 隐藏系统导航栏
-		"navigationBarTitleText": "智泊e家",
-		"enablePullDownRefresh": false
-	},
-	"uniIdRouter": {}
+	},
+
+	"globalStyle": {
+		"navigationStyle": "custom", // 隐藏系统导航栏
+		"navigationBarTitleText": "优电联盟",
+		"enablePullDownRefresh": false
+	},
+	"uniIdRouter": {}
 }

pages/index/demo.vue

@@ -1,2179 +0,0 @@
-<template>
-	<view>
-		<u-navbar v-show="false" title="首页" title-color="#101010"></u-navbar>
-
-		<u-picker v-model="body2data.vue.show" :params="body2data.vue.params" :default-time="body2data.query.startTime"
-			@confirm="body2dataconfirm" mode="time"></u-picker>
-
-		<!-- <u-picker v-model="body5data.vue.show" :default-time="body5data.query.queryDate" :params="body5data.vue.params"
-			@confirm="body5dataconfirm" mode="time"></u-picker> -->
-			
-			<u-calendar v-model="body5data.vue.show" mode="date" @change="body5dataconfirm"></u-calendar>
-
-
-		<view class="navbar">
-			智泊e家 运管端
-
-		</view>
-		<view class="tabs-box">
-
-			<u-picker-jp v-model="showselect1" range-key="name" :num="3" @confirm="showselect1confirm"
-				:range="companyList"></u-picker-jp>
-
-			<template v-if="companyListTabs.length>2">
-				<u-tabs ref="tabs" :list="companyListTabs" bg-color="#1677ff" :current="current1" inactive-color="#fff"
-					@change="utabsChange1" item-width="180" height="70" gutter="10" active-color="#fff"></u-tabs>
-				<view class="tabs-box-other" v-if="companyList.length>3" @click="utabsChange1other">
-					更多
-				</view>
-			</template>
-
-		</view>
-
-		<view class="main">
-
-			<u-picker-jp v-model="showselect2" range-key="name" :num='3' @confirm="showselect2confirm"
-				:range="parkingList"></u-picker-jp>
-
-			<view class="tabs-box2" v-show="parkingListTabs.length>2">
-				<u-tabs ref="tabs2" gutter="10" :list="parkingListTabs" :current="current2" @change="utabsChange2"
-					item-width="180" bg-color="#f2f4f6" height="70"></u-tabs>
-				<view v-if="parkingList.length>3" class="tabs-box-other" @click="utabsChange2other">
-					更多
-				</view>
-			</view>
-
-			<view class="statistics ">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						综合统计
-					</view>
-
-				</view>
-
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body1">
-						<view class="body1pie-table">
-							<view class="tr">
-								<view class="td td1">
-									<view id="body1pie1" class="body1pie">
-
-									</view>
-								</view>
-								<view class="td td2">
-									<view class="td td3">
-										<view class="td td4">空闲<span
-												class="body1pie-num color53B56B">{{body1data.data.idleNum}}</span>台
-										</view>
-										<view class="td td4">占用<span
-												class="body1pie-num colorAAAAAA">{{body1data.data.useNum}}</span>台
-										</view>
-									</view>
-									<view class="td td3">
-
-										<view class="td td4">公共地锁<span
-												class="body1pie-num colorEF8132">{{body1data.data.publicNum}}</span>台
-										</view>
-										<view class="td td4">私家地锁<span
-												class="body1pie-num colorDC4441">{{body1data.data.privateNum}}</span>台
-										</view>
-									</view>
-								</view>
-
-							</view>
-
-							<view class="tr">
-								<view class="td td1">
-									<view id="body1pie2" class="body1pie">
-
-									</view>
-								</view>
-								<view class="td td2">
-									<view class="td td3">
-
-										<view class="td td4">正常<span
-												class="body1pie-num color53B56B">{{body1data.data.normalNum}}</span>台
-										</view>
-										<view class="td td4">离线<span
-												class="body1pie-num colorAAAAAA">{{body1data.data.loseNum}}</span>台
-										</view>
-									</view>
-									<view class="td td3">
-
-										<view class="td td4">故障<span
-												class="body1pie-num colorEF8132">{{body1data.data.errorNum}}</span>台
-										</view>
-										<view class="td td4" v-if="0">低电量<span
-												class="body1pie-num colorDC4441">5</span>台</view>
-									</view>
-								</view>
-							</view>
-
-							<view class="tr" v-if="0">
-								<view class="td td1">
-									<view id="body1pie3" class="body1pie">
-
-									</view>
-								</view>
-								<view class="td td2">
-									<view class="td td3">
-
-										<view class="td td4">管理员<span class="body1pie-num color307AF6">5</span>人</view>
-										<view class="td td4">白名单<span class="body1pie-num color53B56B">5</span>人</view>
-									</view>
-									<view class="td td3">
-
-										<view class="td td4">游客<span class="body1pie-num colorEF8375">5</span>人次</view>
-										<view class="td td4"></view>
-									</view>
-								</view>
-
-							</view>
-
-
-						</view>
-					</jpContent>
-				</view>
-			</view>
-
-			<view class="statistics " v-show="1||companyId">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>地锁列表</view>
-			
-						<view class="check-all" @click="gotoDeviceList()">查看全部<u-icon name="arrow-right"></u-icon>
-						</view>
-			
-					</view>
-			
-				</view>
-			
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body7">
-						<view class="body7main">
-							<view class="line" v-for="(item,index) in equipmentList"
-								@click="gotoUrl('/pages/deviceTab/dataLock?id='+item.id)" :key="index">
-								<view class="item">
-									<!-- 
-								 -->
-									<view class="item-title">
-										
-										<view class="item-name">
-											{{item.name}}
-										</view>
-										<view class="item-tags">
-											<view class="tag  " :class="'tag'+item.type">
-												{{item.typeN}}
-													
-											</view>
-											
-											<view class="tag" :class="'lockStatus lockStatus'+item.lockStatus">
-												{{item.lockStatusN}}
-											</view>
-										</view>
-									</view>
-									<view class="item-body">
-										<span>编号：{{item.lockNo}}</span> <span v-if="item.batteryLevel" style="    margin-left: 16rpx;">电压：{{item.batteryLevel}}V</span>
-									</view>
-			
-								</view>
-								<view class="goto">
-									<view  :class="'statusN statusN'+item.status">
-										{{item.status==1?'在线':'离线'}}
-											
-									</view>
-									<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-								</view>
-								
-							</view>
-							<u-divider border-color="#CFD2D5" @click="gotoDeviceList()"
-								v-if="equipmentList.length==10">最多显示10条,点击查看更多</u-divider>
-			
-						</view>
-			
-			
-			
-					</jpContent>
-				</view>
-			</view>
-			
-			<view class="statistics " v-show="1||companyId">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>停车记录</view>
-			
-						<view class="check-all" @click="gotoUrl('/pages/record/parkingRecord?compamyId='+companyId+'&parkingId='+parkingId)">查看全部<u-icon name="arrow-right"></u-icon>
-						</view>
-			
-					</view>
-			
-				</view>
-			
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body8">
-						<view class="body8main">
-							<view class="line" v-for="(item,index) in parkingRecord"
-								@click="gotoUrl('/pages/record/parkingInfo?id='+item.id)" :key="index">
-								
-								<view class="data">
-									
-									<view class="view3">
-										<u-icon name="clock"></u-icon>
-										{{showTime(item.startTime)}}
-										<template v-if="item.status!=0">
-											{{item.endTime?'-'+showTime(item.endTime):'-当前'}}
-										</template>
-										
-									</view>
-									<view class="view1">
-										{{item.parkingName}} {{item.lockName}}
-									</view>
-								</view>
-								<view class="goto " :class="'status'+item.status">
-									{{item.status==2?getTime(item):''}}
-									{{item.status==1?'使用中':''}}
-									{{item.status==0?'启动中':''}}
-								
-									<u-icon name="arrow-right" size="24" style="margin-left: 8rpx;" color="#BBBBBB"></u-icon>
-								
-								</view>
-								
-								
-							</view>
-							<u-divider border-color="#CFD2D5" @click="gotoUrl('/pages/record/parkingRecord?compamyId='+companyId+'&parkingId='+parkingId)"
-								v-if="parkingRecord.length==5">最多显示5条,点击查看更多</u-divider>
-			
-						</view>
-			
-			
-			
-					</jpContent>
-				</view>
-			</view>
-
-			<view class="statistics ">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>时空矩阵图</view>
-
-						<view class="tag" @click="body5data.vue.show=true">{{body5data.vue.queryN}}<u-icon
-								name="arrow-down"></u-icon></view>
-
-					</view>
-
-				</view>
-
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body5">
-						<view class="body5main">
-
-							<view id="body5echart" class="body5class">
-
-							</view>
-
-						</view>
-
-
-
-					</jpContent>
-				</view>
-			</view>
-
-			<view class="statistics " v-show="companyId">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>地锁异常记录</view>
-
-						<view class="check-all" @click="gotoUrl('/pages/myTab/abnormalList?companyId='+companyId)">
-							查看全部<u-icon name="arrow-right"></u-icon></view>
-
-					</view>
-
-				</view>
-
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body6">
-						<view class="body6main">
-							<view class="line" v-for="(item,index) in abnormalRecordsList" :key="index">
-								<view class="abnormal-item">
-									<!-- @click="gotoUrl('/pages/abnormal/abnormalAlarmDetails?id='+item.id)"
-								 -->
-									<view class="item-title">
-
-										<view class="name">
-											<span v-if="item.level==1" class="level level1 ">一级</span>
-											<span v-if="item.level==2" class="level level2">二级</span>
-
-											{{item.content}}
-										</view>
-										<view class="date"
-											style="display: flex;    justify-content: space-between;margin-top: 4rpx;">
-											<view>{{item.title}}</view>
-											<view>{{item.createTime}}</view>
-
-										</view>
-									</view>
-
-								</view>
-								<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-							</view>
-
-						</view>
-
-
-
-					</jpContent>
-				</view>
-			</view>
-
-			<view class="statistics ">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>地锁平均占用率(%)</view>
-						<view class="tag" @click="body2data.vue.show=true">{{body2data.vue.queryN}}<u-icon
-								name="arrow-down"></u-icon></view>
-
-					</view>
-
-				</view>
-
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body2">
-						<view class="body2lineChart">
-
-							<view id="body2line1" class="body2line">
-
-							</view>
-
-						</view>
-
-
-
-					</jpContent>
-				</view>
-			</view>
-
-			<view class="statistics ">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>高频使用时段分布</view>
-
-					</view>
-
-				</view>
-
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body3">
-						<view class="body3barChart">
-
-							<view id="body3bar1" class="body3bar">
-
-							</view>
-
-						</view>
-
-
-
-					</jpContent>
-				</view>
-			</view>
-
-			<view class="statistics ">
-				<view class="title">
-					<view class="icon">
-						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
-					</view>
-					<view class="text">
-						<view>用户停留时长分群特征</view>
-
-					</view>
-
-				</view>
-
-				<view class="contentBody">
-					<jpContent :status="jpContentMap.body4">
-						<view class="body4pieChart">
-
-							<view id="body4pie1" class="body4pie">
-
-							</view>
-
-						</view>
-
-
-
-					</jpContent>
-				</view>
-			</view>
-
-
-			
-			<u-divider border-color="#CFD2D5">已经到底了</u-divider>
-
-		</view>
-		<tabbar :current="0"></tabbar>
-
-	</view>
-</template>
-
-<script>
-	import Tabbar from '@/components/Tabbar.vue'
-	import jpContent from '@/components/JPcontent.vue'
-	import * as echarts from 'echarts';
-
-	import * as API from '@/apis/pagejs/index.js'
-
-	import {
-		parseUnixTime,
-		beforeTimeStamp,
-		newDate
-	} from '@/apis/utils'
-
-
-	export default {
-		components: {
-			Tabbar,
-			jpContent
-		},
-		data() {
-			return {
-				current1: 0,
-				showselect1: false,
-				current2: 0,
-				showselect2: false,
-				isReady: false,
-				companyList: [],
-				parkingList: [],
-				//companyListIndex:0,
-				companyId: "",
-				parkingId: "",
-				echartsList: {},
-				parkingRecord:[],
-				equipmentList: [],
-				abnormalRecordsList: [{
-						level: 1,
-						content: "1111111",
-						title: "11",
-						createTime: "123:123"
-					},
-					{
-						level: 2,
-						content: "1111111",
-						title: "11",
-						createTime: "123:123"
-					}
-				],
-				body2data: {
-					query: {},
-					vue: {
-						queryN: "",
-						show: false,
-						params: {
-							year: true,
-							month: true,
-							day: false,
-							hour: false,
-							minute: false,
-							second: false
-						}
-					},
-					data: {}
-				},
-				body1data: {
-					query: {},
-					data: {},
-					data1: {}
-				},
-				body4data: {
-					query: {},
-					data: {}
-				},
-				body3data: {
-					query: {},
-					data: {}
-				},
-
-				body5data: {
-					query: {},
-					data: {},
-					vue: {
-						queryN: "",
-						show: false,
-						params: {
-							year: true,
-							month: true,
-							day: true,
-							hour: false,
-							minute: false,
-							second: false
-						}
-					},
-				},
-				jpContentMap: {
-					body1: 0,
-					body2: 0,
-					body3: 0,
-					body4: 0,
-					body5: 0,
-					body6: 1,
-					body7: 0,
-					body8: 0,
-					body9: 0,
-					body10: 0,
-				}
-			}
-		},
-		onLoad() {
-
-		},
-		onReady() {
-			this.getfindByOpenId();
-		},
-		computed: {
-			companyListTabs() {
-				var sz = []
-
-				if (this.companyList.length > 3) {
-					sz = [{
-						id: "",
-						name: '全部'
-					}]
-					sz.push(this.companyList[0])
-					sz.push(this.companyList[1])
-				} else {
-					sz = [{
-							id: "",
-							name: '全部'
-						},
-						...this.companyList
-					]
-				}
-
-				return sz
-			},
-			parkingListTabs() {
-				var sz = []
-				if (this.parkingList.length > 3) {
-					sz = [{
-						id: "",
-						name: '综合查询'
-					}]
-					sz.push(this.parkingList[0])
-					sz.push(this.parkingList[1])
-				} else {
-					sz = [{
-							id: "",
-							name: '综合查询'
-						},
-						...this.parkingList
-					]
-				}
-
-				return sz
-			},
-		},
-		methods: {
-			
-			showTime(time){
-					if(time){
-						return time.substr(5).replace('-','.')
-					}else{
-						return ''
-					}
-			},
-			getTime(item){
-				if(item.startTime&&item.endTime){
-					var stime=newDate(item.startTime)
-					var etime=newDate(item.endTime)
-					//etime=new Date()
-					var k=(etime.getTime()-stime.getTime())/1000/60
-					
-					var H=k/60
-					var fen=k%(60)
-					var str="";
-					if(k>60){
-						str+=parseInt(H)+'小时'
-					}
-					if(fen==0&&str!=''){
-						
-					}else{
-						str+=parseInt(fen)+'分钟'
-					}
-					return str
-				}else{
-					return '已完成'
-				}
-			},
-			
-			gotoDeviceList() {
-				if (this.parkingId) {
-					this.gotoUrl('/pages/deviceTab/deviceList?parkingId=' + this.parkingId)
-				} else {
-					
-					uni.switchTab({
-							url: '/pages/deviceTab/index'
-						})
-					
-				}
-			},
-			getfloorStatus() {
-				this.jpContentMap.body1 = 0
-
-				API.floorStatus({
-					companyId: this.companyId,
-					parkingId: this.parkingId
-				}).then((response) => {
-					this.body1data.data = response.data
-					uni.hideLoading();
-					this.jpContentMap.body1 = 2
-
-					this.getbody1pie1()
-					this.getbody1pie2()
-					this.getbody1pie3()
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-
-			},
-			getParkingRecordList() {
-				this.jpContentMap.body8 = 0
-			
-				API.parkingRecordList({
-					companyId: this.companyId,
-					parkingId: this.parkingId,
-					pageSize: 5
-				}).then((response) => {
-					
-					uni.hideLoading();
-					if (response.data.totalPage) {
-						this.jpContentMap.body8 = 2
-						this.parkingRecord = response.data.data
-					
-					} else {
-						this.jpContentMap.body8 = 1
-					}
-			
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-			
-				})
-			
-			},
-			getfloorlockList() {
-				this.jpContentMap.body7 = 0
-
-				API.floorlockList({
-					companyId: this.companyId,
-					parkingId: this.parkingId,
-					pageSize: 10
-				}).then((response) => {
-
-					uni.hideLoading();
-					if (response.data.totalPage) {
-						this.jpContentMap.body7 = 2
-						this.equipmentList = response.data.data
-					
-
-					} else {
-						this.jpContentMap.body7 = 1
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			getApi1() {
-
-				if (this.companyId == "") {
-
-					this.getApi2()
-				} else {
-					this.parkingInfoList()
-				}
-
-			},
-			getApi2() {
-				this.getfloorStatus()
-				this.getfloorlockList()
-				this.occupancyByTime(1);
-				this.occupancyByTimeBar(1);
-				this.occupancyByDay(1);
-				this.durationDistribution();
-				this.getParkingRecordList()
-				if (this.parkingId == "") {
-
-				} else {
-
-				}
-			},
-			change1companyList(i) {
-				//this.companyListIndex=i
-				var companyId = ""
-
-				if (i == -1) {
-					if (this.companyId == companyId) {
-
-					} else {
-						this.companyId = ""
-						this.parkingList = [];
-						this.getApi1()
-					}
-				} else {
-					var item = this.companyList[i]
-					companyId = item.id
-					if (this.companyId == companyId) {
-
-					} else {
-						this.companyId = companyId
-
-						this.parkingId = "";
-						this.current2 = 0;
-						this.$refs.tabs2.showBar = true
-
-						this.getApi1()
-					}
-				}
-
-			},
-			change2parkingList(i) {
-
-				var parkingId = ""
-
-				if (i == -1) {
-
-					if (this.parkingId == parkingId) {
-
-					} else {
-						this.parkingId = "";
-						this.getApi2()
-
-					}
-				} else {
-					var item = this.parkingList[i]
-					parkingId = item.id
-					if (this.parkingId == parkingId) {
-
-					} else {
-						this.parkingId = parkingId;
-						this.getApi2()
-					}
-				}
-
-			},
-			showselect2confirm(e) {
-
-				this.change2parkingList(e[0])
-			},
-			utabsChange2other() {
-				this.$refs.tabs2.showBar = false
-				this.current2 = -1;
-				this.showselect2 = true;
-			},
-			utabsChange2(index) {
-				this.current2 = index;
-				this.change2parkingList(index - 1)
-				this.$refs.tabs2.showBar = true
-			},
-
-			showselect1confirm(e) {
-
-				this.change1companyList(e[0])
-			},
-
-			utabsChange1other() {
-				this.$refs.tabs.showBar = false
-				this.current1 = -1;
-				this.showselect1 = true;
-			},
-			utabsChange1(index) {
-				this.current1 = index;
-				this.change1companyList(index - 1)
-				this.$refs.tabs.showBar = true
-			},
-			parkingInfoList() {
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.parkingList = [];
-
-				API.parkingList({
-					companyId: this.companyId,
-					pageSize: 999
-				}).then((response) => {
-
-					uni.hideLoading();
-					var parkingInfoList = response.data.parkingInfoList
-					this.parkingList = [
-						...parkingInfoList,
-					];
-
-					if (this.parkingList.length == 1) {
-
-						this.change2parkingList(0)
-
-					} else {
-						this.change2parkingList(-1)
-						this.getApi2()
-					}
-
-					this.getfloorlockList()
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			companyInfoList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.companyList = [];
-
-				API.companyInfoList({
-
-				}).then((response) => {
-
-					uni.hideLoading();
-					var companyInfoList = response.data.companyInfoList
-					this.companyList = [
-						...companyInfoList,
-
-					];
-
-					if (this.companyList.length == 1) {
-						this.change1companyList(0)
-					} else {
-						this.change1companyList(-1)
-						this.getApi1()
-					}
-
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			init() {
-				this.companyInfoList()
-
-				//this.occupancyByTime();
-
-				//this.getbody3()
-				//this.getbody4()
-
-				//this.getbody5()
-
-
-			},
-			body2dataconfirm(e) {
-
-				var date = new Date(e.year + "-" + e.month + "-1");
-				this.body2data.vue.queryN = date.getFullYear() + "年" + (date.getMonth() + 1) + '月';
-				this.body2data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
-
-				var endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0)
-				this.body2data.query.endTime = parseUnixTime(endOfMonth, '{y}-{m}-{d}')
-
-				this.occupancyByTime()
-			},
-			body5dataconfirm(e) {
-				console.log(e)
-				var date = new Date(e.year + "-" + e.month + "-" + e.day);
-				this.body5data.query.queryDate = parseUnixTime(date, '{y}-{m}-{d}')
-				this.body5data.vue.queryN = parseUnixTime(date, '{y}年{m}月{d}日');
-
-				this.occupancyByDay()
-			},
-			occupancyByTimeBar(init) {
-				if (init) {
-					var date = new Date();
-					//test
-					//this.body3data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
-
-					var endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0)
-					//this.body3data.query.endTime = parseUnixTime(endOfMonth, '{y}-{m}-{d}')
-
-				}
-				this.jpContentMap.body3 = 0
-				this.body3data.query.companyId = this.companyId
-				this.body3data.query.parkingId = this.parkingId
-				API.occupancyByTimeBar(
-					this.body3data.query
-				).then((response) => {
-					this.body3data.data = [
-						...response.data.locksTimeList,
-						//	...response.data.locksTimeList,
-					];
-
-					if (this.body3data.data.length == 0) {
-						this.jpContentMap.body3 = 1
-
-					} else {
-						this.jpContentMap.body3 = 2
-						this.getbody3()
-
-					}
-
-
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			durationDistribution() {
-				this.jpContentMap.body4 = 0
-
-				var date = new Date();
-				//test
-				//this.body4data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
-
-				var endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0)
-			//	this.body4data.query.endTime = parseUnixTime(endOfMonth, '{y}-{m}-{d}')
-
-
-
-				this.body4data.query.companyId = this.companyId
-				this.body4data.query.parkingId = this.parkingId
-				API.durationDistribution(
-					this.body4data.query
-				).then((response) => {
-					this.body4data.data = response.data.distribution;
-
-					if (this.body4data.data.length == 0) {
-						this.jpContentMap.body4 = 1
-
-					} else {
-						this.jpContentMap.body4 = 2
-						//this.getbody3()
-						this.getbody4()
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			occupancyByDay(init) {
-				if (init) {
-					var date = new Date();
-
-					this.body5data.query.queryDate = parseUnixTime(date, '{y}-{m}-{d}')
-					this.body5data.vue.queryN = parseUnixTime(date, '{y}年{m}月{d}日');
-
-				}
-				this.jpContentMap.body5 = 0
-				this.body5data.query.companyId = this.companyId
-				this.body5data.query.parkingId = this.parkingId
-				API.occupancyByDay(
-					this.body5data.query
-				).then((response) => {
-					this.body5data.data = [
-						...response.data.locksTimeList,
-
-					];
-
-					if (this.body5data.data.length == 0) {
-						this.jpContentMap.body5 = 1
-
-					} else {
-						this.jpContentMap.body5 = 2
-						//this.getbody3()
-						this.getbody5()
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			occupancyByTime(init) {
-				if (init) {
-					var date = new Date();
-
-					this.body2data.vue.queryN = date.getFullYear() + "年" + (date.getMonth() + 1) + '月';
-					this.body2data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
-
-					var endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0)
-					this.body2data.query.endTime = parseUnixTime(endOfMonth, '{y}-{m}-{d}')
-
-				}
-				this.jpContentMap.body2 = 0
-				this.body2data.query.companyId = this.companyId
-				this.body2data.query.parkingId = this.parkingId
-				API.occupancyByTime(
-					this.body2data.query
-				).then((response) => {
-					this.body2data.data = [
-						...response.data.locksTimeList,
-						//	...response.data.locksTimeList,
-					];
-
-					if (this.body2data.data.length == 0) {
-						this.jpContentMap.body2 = 1
-
-
-					} else {
-						this.jpContentMap.body2 = 2
-
-						this.getbody2()
-
-
-					}
-
-
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-
-				})
-			},
-			getbody5() {
-				// 颜色映射
-				var colorMap = [
-
-					'#FFA500',
-					'#00FF00',
-					'#F44336',
-					'#E91E63',
-					'#9C27B0',
-					'#673AB7',
-					'#3F51B5',
-					'#2196F3',
-					'#03A9F4',
-					'#00BCD4',
-					'#009688',
-					'#CDDC39',
-					'#FFEB3B',
-					'#FFC107',
-					'#FF9800',
-					'#FF5722',
-					'#795548',
-					'#607D8B'
-				];
-
-				var key = "body5echart"
-				var dataApi = this.body5data.data;
-
-				var head = 40 * (parseInt(dataApi.length / 4)) + 20
-				var body = 20 * (parseInt(dataApi.length))
-
-				var myChart = this.echartsList[key];
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(300 * 2),
-						height: uni.upx2px((170 + head) * 2 + body)
-					})
-
-				}
-				myChart.clear()
-				var dataName = []
-				var dataTime = []
-				var series = []
-				var i = 0;
-				var isPush=false
-				dataApi.forEach(item => {
-
-					dataName.push(item.lockName)
-					var itemList = []
-					var j = 0
-					item.timeUseList.forEach(item2 => {
-
-						Object.keys(item2).forEach(key1 => {
-							console.log(item2[key1])
-							if (item2[key1]) {
-								var ob = [j, i, i]
-								itemList.push(ob)
-								isPush=true
-							} else {
-								// var ob=[j,i,i]
-								// itemList.push(ob)
-							}
-						});
-						j += 1;
-
-					})
-
-
-					var obj = {
-						tooltip: {
-							trigger: 'item',
-							axisPointer: {
-								type: 'shadow'
-							},
-							formatter: function(params) {
-								console.log(params)
-								var result = params.marker+params.name +'点<br/>' + params.seriesName  + ' 占用 ';
-								
-								return result;
-							}
-						},
-						//silent: true,
-						type: 'custom',
-						"name": item.lockName,
-						// tooltip: {
-						// 	//trigger: 'none',
-						// 	show: false
-						// },
-						itemStyle: {
-							color: colorMap[i % colorMap.length]
-						},
-						renderItem: function(params, api) {
-							var xIndex = api.value(0); // x轴索引
-							var yIndex = api.value(1); // y轴索引
-							var value = api.value(2); // 值
-
-							// 获取颜色
-							var color = colorMap[value % colorMap.length] || '#ffffff';
-
-							// 计算矩形的位置和大小
-							var x = api.coord([xIndex, yIndex])[0];
-							var y = api.coord([xIndex, yIndex])[1];
-							var width = api.size([1, 0])[0];
-							var height = api.size([0, 1])[1];
-
-							return {
-								type: 'rect',
-
-								shape: {
-									x: x - uni.upx2px(25),
-									y: y - uni.upx2px(20),
-									width: width,
-									height: 20,
-								},
-								style: {
-									fill: color
-								}
-							};
-						},
-
-					}
-					obj.data = itemList
-					series.push(obj)
-					i += 1;
-
-				})
-				dataApi[0].timeUseList.forEach(item => {
-
-					Object.keys(item).forEach(key1 => {
-						dataTime.push(key1)
-					});
-
-				})
-
-				var option = {
-					tooltip: {
-						trigger: 'axis',
-						axisPointer: {
-							type: 'shadow'
-						}
-					},
-					grid: {
-						top: 30 + head,
-						left: -10+(isPush?0:20),
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					legend: {
-						data: dataName
-					},
-					xAxis: {
-						type: 'category',
-						data: dataTime
-					},
-					yAxis: {
-						type: 'category',
-
-					},
-					series: series
-				};
-
-
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-			getbody4() {
-				var key = "body4pie1"
-				var myChart = this.echartsList[key];
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(300 * 2),
-						height: uni.upx2px(170 * 2)
-					})
-
-				}
-				myChart.clear()
-				var dataApi = this.body4data.data;
-
-				var data = []
-				var num = 0
-				var sum = 0
-				Object.keys(dataApi).forEach(key1 => {
-					num += dataApi[key1]
-				});
-				var i = 0
-				Object.keys(dataApi).forEach(key1 => {
-					var value = dataApi[key1]
-					if(value!=0){
-						
-					
-						var obj = {
-							value: value,
-							name: key1
-						}
-
-						if (num != 0) {
-							var valueInt = parseInt(value / num * 100)
-							if (valueInt == 0 && value != 0) {
-								valueInt = 1
-							}
-							sum += valueInt;
-
-							if (i == Object.keys(dataApi).length - 1) {
-								if (sum != 100) {
-									valueInt += (100 - sum)
-								}
-							}
-							obj.name += '\n' + (valueInt) + '%'
-						}
-						data.push(obj)
-					}
-					i++;
-				});
-
-
-
-				var option = {
-					
-					grid: {
-						top: 20,
-						left: 0,
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					series: [{
-
-						type: 'pie',
-						radius: ['80%', '50%'],
-						radius: [45, 60],
-						data: data
-
-					}]
-				};
-				console.log(option)
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-			getbody3() {
-				var key = "body3bar1"
-				var myChart = this.echartsList[key];
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(300 * 2),
-						height: uni.upx2px(170 * 2)
-					})
-
-				}
-				var dataApi = this.body3data.data;
-
-				myChart.clear()
-
-				var data1 = []
-				var data2 = [] //useDays
-				var i = 0
-				dataApi[0].timeUseList.forEach(item => {
-
-					Object.keys(item).forEach(key1 => {
-
-						data1.push(key1 + '点')
-						var num = 0
-
-						dataApi.forEach(item2 => {
-							num += item2.timeUseList[i][key1].useDays
-
-						})
-						data2.push(num)
-					});
-					i += 1
-
-				})
-
-				var axisLabel = {
-					rotate: 40,
-					interval: 0,
-					textStyle: {
-						color: "#333"
-					}
-				}
-				if (data1.length < 7) {
-					axisLabel = {
-						interval: 0,
-						textStyle: {
-							color: "#333"
-						},
-					}
-				} else {
-					axisLabel.interval = 0;
-				}
-				var option = {
-					xAxis: {
-						type: 'category',
-						data: data1,
-						axisLabel: axisLabel,
-					},
-					tooltip: {
-						trigger: 'axis',
-						axisPointer: {
-							type: 'shadow'
-						},
-						formatter: function(params) {
-							var result = params[0].name + '<br/>';
-							for (var i = 0; i < params.length; i++) {
-								result += params[i].marker+ ' ' + params[i].value + '次<br/>';
-							}
-							return result;
-						}
-					},
-					yAxis: {
-						type: 'value'
-					},
-					grid: {
-						top: 20,
-						left: 0,
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					series: [{
-						itemStyle: {
-							color: "#5A88E5"
-						},
-						data: data2,
-						type: 'bar'
-					}]
-				};
-
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-			getbody2() {
-				var key = "body2line1"
-				var myChart = this.echartsList[key];
-				var dataApi = this.body2data.data;
-
-				var head = 20 * (parseInt(dataApi.length / 4)) + 20
-
-
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(300 * 2),
-						height: uni.upx2px((170 + head) * 2)
-					})
-
-				}
-				myChart.clear()
-
-				var data1 = []
-				var series = [];
-
-				dataApi.forEach(item => {
-
-					var obj = {
-						name: item.lockName,
-						//areaStyle: {},
-						// itemStyle: {
-						// 	color: "#BBD4FB"
-						// },
-						label: {
-							show: true,
-							position: 'top',
-							//	color: "#307AF6"
-						},
-						data: [],
-						type: 'line'
-					}
-					if (dataApi.length == 1) {
-						obj.label.color = "#307AF6"
-						obj.areaStyle = {}
-						obj.itemStyle = {
-							color: "#BBD4FB"
-						}
-					}
-
-					item.timeUseList.forEach(item2 => {
-						Object.keys(item2).forEach(key1 => {
-
-							obj.data.push(item2[key1].useRate)
-						});
-					})
-					series.push(obj)
-				})
-				dataApi[0].timeUseList.forEach(item => {
-
-					Object.keys(item).forEach(key1 => {
-						data1.push(key1)
-
-					});
-
-				})
-
-				var axisLabel = {
-					rotate: 40,
-					interval: 0,
-					textStyle: {
-						color: "#333"
-					}
-				}
-				if (data1.length < 7) {
-					axisLabel = {
-						interval: 0,
-						textStyle: {
-							color: "#333"
-						},
-					}
-				} else {
-					axisLabel.interval = 0;
-				}
-				var option = {
-					legend: {},
-					xAxis: {
-						type: 'category',
-						data: data1,
-						axisLabel: axisLabel,
-					},
-					tooltip: {
-						trigger: 'axis',
-						axisPointer: {
-							type: 'shadow'
-						},
-
-						formatter: function(params) {
-							var result = params[0].name + '点<br/>';
-							for (var i = 0; i < params.length; i++) {
-								result += params[i].marker+params[i].seriesName + ': ' + params[i].value + '%<br/>';
-							}
-							return result;
-						}
-					},
-					yAxis: {
-						type: 'value'
-					},
-					grid: {
-						top: (20 + head),
-						left: 0,
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					series: series
-				};
-
-
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-			getbody1pie1() {
-				var img = require("@/assets/img/index/pie1-1.svg")
-				var key = "body1pie1"
-				var myChart = this.echartsList[key];
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(88),
-						height: uni.upx2px(88)
-					})
-
-				}
-				myChart.clear()
-				var option = {
-
-					series: [{
-						silent: true,
-						type: 'pie',
-						radius: ['70%', '100%'],
-						label: {
-							show: false,
-						},
-
-						data: [{
-								value: this.body1data.data.useNum,
-								itemStyle: {
-									color: '#AAAAAA'
-								}
-							},
-							{
-								value: this.body1data.data.idleNum,
-								itemStyle: {
-									color: '#53B56B'
-								}
-							}
-						]
-					}],
-					grid: {
-						top: 0,
-						left: 0,
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					graphic: [{
-						type: 'image',
-						id: 'logo',
-						left: 'center',
-						top: 'center',
-						style: {
-							image: img, // 图片路径
-							width: uni.upx2px(40),
-							height: uni.upx2px(40)
-						}
-					}]
-				}
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-			getbody1pie2() {
-				var img = require("@/assets/img/index/pie1-2.svg")
-
-				var key = "body1pie2"
-				var myChart = this.echartsList[key];
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(88),
-						height: uni.upx2px(88)
-					})
-
-				}
-				myChart.clear()
-				var option = {
-
-					series: [{
-						silent: true,
-						type: 'pie',
-						radius: ['70%', '100%'],
-						label: {
-							show: false,
-						},
-
-						data: [{
-								value: this.body1data.data.loseNum,
-								itemStyle: {
-									color: '#AAAAAA'
-								}
-							},
-							{
-								value: this.body1data.data.normalNum,
-								itemStyle: {
-									color: '#53B56B'
-								}
-							},
-							{
-								value: this.body1data.data.errorNum,
-								itemStyle: {
-									color: '#EF8132'
-								}
-							}
-							//, {
-							// 	value: 735,
-							// 	itemStyle: {
-							// 		color: '#DC4441'
-							// 	}
-							// }
-						]
-					}],
-					grid: {
-						top: 0,
-						left: 0,
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					graphic: [{
-						type: 'image',
-						id: 'logo',
-						left: 'center',
-						top: 'center',
-						style: {
-							image: img, // 图片路径
-							width: uni.upx2px(40),
-							height: uni.upx2px(40)
-						}
-					}]
-				}
-
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-			getbody1pie3() {
-				var img = require("@/assets/img/index/pie1-3.svg")
-
-				var key = "body1pie3"
-				var myChart = this.echartsList[key];
-				if (!myChart) {
-					myChart = echarts.init(document.getElementById(key), null, {
-						width: uni.upx2px(88),
-						height: uni.upx2px(88)
-					})
-
-				}
-				myChart.clear()
-				var option = {
-
-					series: [{
-						type: 'pie',
-						silent: true, // 禁用交互效果
-
-						radius: ['70%', '100%'],
-						label: {
-							show: false,
-						},
-
-						data: [{
-								value: 735,
-								itemStyle: {
-									color: '#53B56B'
-								}
-							},
-							{
-								value: 735,
-								itemStyle: {
-									color: '#EF8375'
-								}
-							},
-							{
-								value: 735,
-								itemStyle: {
-									color: '#307AF6'
-								}
-							}
-						]
-					}],
-					grid: {
-						top: 0,
-						left: 0,
-						right: 0,
-						bottom: 0,
-						containLabel: true
-					},
-					graphic: [{
-						type: 'image',
-						id: 'logo',
-						left: 'center',
-						top: 'center',
-						style: {
-							image: img, // 图片路径
-							width: uni.upx2px(40),
-							height: uni.upx2px(40)
-						}
-					}]
-				}
-				myChart.setOption(option);
-				this.echartsList[key] = myChart;
-			},
-
-			getfindByOpenId() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.findByOpenId({
-					openId: this.jphelp.getOpenId(),
-				}).then((response) => {
-
-					uni.hideLoading();
-					this.isReady = true;
-					this.loginset(response)
-					try {
-						this.init()
-					} catch (e) {
-
-						uni.showToast({
-							title: e,
-							icon: "none"
-						})
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-					uni.redirectTo({
-						url: '/pages/login/login'
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.color307AF6 {
-		color: #307AF6
-	}
-
-	.color53B56B {
-		color: #53B56B
-	}
-
-	.colorAAAAAA {
-		color: #AAAAAA
-	}
-
-	.colorEF8132 {
-		color: #EF8132
-	}
-
-	.colorDC4441 {
-		color: #DC4441
-	}
-
-	.colorEF8375 {
-		color: #EF8375
-	}
-
-	.body1pie-table {
-		color: rgba(51, 51, 51, 1);
-		font-size: 32rpx;
-		font-weight: bold;
-
-		.tr {
-			.td1 {
-				padding-right: 24rpx;
-			}
-
-			display: flex;
-			margin-bottom: 40rpx;
-
-			.td2 {
-
-				width: 100%;
-
-				.td3 {
-					display: flex;
-
-					.td4 {
-						width: 120px;
-					}
-				}
-			}
-		}
-
-		// td{
-		// 	padding-right: 24rpx;
-
-		// }
-		.body1pie {}
-
-		.body1pie-num {
-			margin: 0 8rpx;
-		}
-	}
-
-	// 导航栏
-	.navbar {
-
-		box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.15);
-		background-color: rgba(22, 119, 255, 1);
-		color: #fff;
-		line-height: 88rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 0 32rpx;
-		color: rgba(255, 255, 255, 1);
-		font-size: 36rpx;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		z-index: 999999;
-		font-weight: bold;
-
-	}
-
-	.main {
-		border-radius: 16px 16px 0px 0px;
-		background: linear-gradient(180deg, rgba(242, 244, 246, 1) 61%, rgba(255, 255, 255, 0) 100%);
-		margin-top: -24rpx;
-		padding: 32rpx;
-
-		.statistics {
-			border-radius: 8px;
-			background-color: rgba(255, 255, 255, 1);
-			box-shadow: 0px 1px 6px 0px rgba(0, 59, 142, 0.05);
-			margin-bottom: 24rpx;
-			padding: 40rpx;
-
-			.title {
-				display: flex;
-				align-items: center;
-				margin-bottom: 32rpx;
-				font-weight: bold;
-
-				.img {
-					width: 36rpx;
-					height: 36rpx;
-					vertical-align: middle;
-					border-radius: 999px;
-
-				}
-
-				.change {
-					display: flex;
-					align-items: center;
-
-					.change-img {
-						width: 32rpx;
-						height: 32rpx;
-						vertical-align: middle;
-					}
-
-					text {
-
-						margin-left: 8rpx;
-					}
-				}
-
-
-				.text {
-					color: rgba(16, 16, 16, 1);
-					font-size: 36rpx;
-					margin-left: 16rpx;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					width: 100%;
-
-					.tag {
-						border-radius: 4px;
-						border: 1px solid rgba(187, 187, 187, 1);
-						color: rgba(51, 51, 51, 1);
-
-						font-size: 24rpx;
-						padding: 1px 8rpx;
-						margin-left: 8rpx;
-					}
-
-				}
-
-				.change {
-					margin-left: 16rpx;
-					font-size: 24rpx;
-					color: #838383;
-
-				}
-
-				.check-all {
-					margin-left: auto;
-					color: rgba(131, 131, 131, 1);
-					font-size: 24rpx;
-					font-weight: 400;
-				}
-			}
-		}
-
-		.statistics-end {
-			padding-bottom: 0;
-		}
-	}
-
-	.tabs-box2 {
-		margin-bottom: 8rpx;
-		padding-right: 16rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		.tabs-box-other {
-			padding-bottom: 12rpx;
-
-		}
-	}
-
-	.tabs-box {
-		padding: 42rpx 0;
-		margin-top: 66rpx;
-		padding-right: 32rpx;
-		background-color: rgba(22, 119, 255, 1);
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		.tabs {
-			width: 97%;
-		}
-
-		.more {
-			padding-right: 12rpx;
-		}
-
-		.tabs-box-other {
-			padding-bottom: 12rpx;
-			height: 80rpx;
-			line-height: 70rpx;
-			font-size: 30rpx;
-			color: rgb(255, 255, 255);
-		}
-
-	}
-
-	.body6main {
-		.line {
-			display: flex;
-			justify-content: space-between;
-		}
-
-		.abnormal-item:last-of-type {
-			border-bottom: none !important;
-			padding-bottom: 0;
-		}
-
-		.abnormal-item {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 16rpx;
-			border-bottom: 1px solid rgba(245, 245, 245, 1);
-
-
-			.item-title {
-				.level {
-					color: #fff;
-
-					border-radius: 8rpx;
-					font-weight: 400;
-					padding: 4rpx 8rpx;
-					font-size: 22rpx;
-					margin-right: 2px;
-				}
-
-				.level1 {
-					background: red;
-				}
-
-				.level2 {
-					background-color: rgba(255, 123, 0, 1);
-				}
-
-				color: rgba(51, 51, 51, 1);
-				width: 100%;
-
-				.img {
-					width: 32rpx;
-					height: 32rpx;
-					margin-right: 8rpx;
-				}
-
-				.name {
-					color: rgba(51, 51, 51, 1);
-					font-weight: bold;
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-				}
-
-				.date {
-					color: rgba(119, 119, 119, 1);
-					font-size: 24rpx;
-				}
-			}
-
-			.item-value {
-				text-align: right;
-				display: flex;
-				align-items: center;
-
-				.more {
-					margin-left: 8rpx;
-				}
-
-				.value1 {
-					font-weight: bold;
-					color: rgba(51, 51, 51, 1);
-				}
-
-				.value2 {
-					color: rgba(119, 119, 119, 1);
-					font-size: 24rpx;
-				}
-			}
-		}
-	}
-
-	.body7main {
-		border-radius: 4px;
-		background-color: rgba(245, 245, 245, 1);
-		padding: 32rpx;
-
-		.line {
-			display: flex;
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 24rpx;
-			.goto{
-				    display: flex;
-				    align-items: center;
-			}
-			.item-body{
-				font-size: 24rpx;
-			}
-			
-			.item-title {
-				color: rgba(51, 51, 51, 1);
-				font-size: 28rpx;
-				    display: flex;
-				    align-items: center;
-					.item-name{
-						margin-right: 8rpx;
-						font-size: 32rpx;
-						font-weight: bold;
-					}
-			}
-			.statusN{
-				border-radius: 4px;
-				font-size: 24rpx;
-				padding: 2rpx 8rpx;
-				margin-right: 8rpx;
-			}
-			.statusN1 {
-				
-				color: rgba(0,185,98,1);
-				border: 1px solid rgba(0,185,98,1);
-			
-			}
-			
-			.statusN0 {
-				color: rgba(51,51,51,1);
-				border: 1px solid rgba(119,119,119,1);
-			
-			}
-			.item-tags {
-				display: flex;
-
-				.tag {
-					border-radius: 4px;
-					white-space: pre;
-					background-color: rgba(39, 177, 72, 1);
-					color: rgba(255, 255, 255, 1);
-					font-size: 20rpx;
-					padding: 2rpx 8rpx;
-					margin-right: 8rpx;
-				}
-
-				.tag1 {
-					background-color: rgba(22, 119, 255, 1);
-				}
-
-				.tag2 {
-					background-color: rgba(129, 97, 255, 1);
-				}
-
-				
-
-				.lockStatus {
-
-					background-color: rgba(153, 153, 153, 1);
-				}
-
-				.lockStatus2 {
-					background-color: #03A9F4
-				}
-			}
-		}
-	}
-	
-	
-	.body8main{
-		
-		.line{
-			    display: flex;
-			    justify-content: space-between;
-			    align-items: center;
-				background: #fff;
-				padding:16rpx 0rpx;
-				border-top: 1px solid rgba(232,232,232,1);
-				.data{
-					.view1{
-						color: rgba(16,16,16,1);
-						font-size: 32rpx;
-						font-weight: bold;
-					}
-					.view3{
-						color: rgba(119,119,119,1);
-						font-size: 28rpx;
-					}
-				}
-				.goto{
-					display: flex;
-					font-size: 32rpx;
-	
-				}
-				.status1{
-					color:#FF5100 
-				}
-				.status2{
-					color: rgba(22,119,255,1);
-	 
-				}
-			
-		}
-		.line:first-child{
-			border-top: 0px ;
-			    padding-top: 0px;
-		}
-	}
-</style>

pages/index/index.vue

@@ -13,7 +13,7 @@
 				</view>
 				<view class="logo_text">
 					<view class="logo_text1">
-						智泊e家
+						优电联盟
 
 					</view>
 					<view class="logo_text2">
@@ -55,7 +55,7 @@
 					<image class="img" src="@/assets/img/index/na-2.png" mode=""></image>
 				</view>
 				<view class="na-text">
-					故障记录
+					巡检记录
 				</view>
 			</view>
 			
@@ -67,7 +67,7 @@
 					地锁状态
 
 				</view>
-				<view class="goto-main"  @click="gotoUrl('/pages/lockTab/listLock')">
+				<view class="goto-main"  @click="gotoUrl('/pages/station/stationList')">
 					查看详情
 					<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 				</view>
@@ -143,9 +143,15 @@
 		</view>
 		<view class="main_list1 ">
 			
+			<view class="top-main" style="    border-bottom: 1px solid #e8e8e8;" >
 			<u-tabs :list="tabslist"
-			 style="   width: 50%;"
+			
 			 :current="current" @change="change"></u-tabs>
+				<view class="goto-main"  @click="gotoUrl('/pages/lockTab/listLock')">
+					全部故障记录
+					<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
+				</view>
+			</view>
 			 
 			<view class="list"  >
 				<view class="item" 

pages/login/login.vue

@@ -5,7 +5,7 @@
 			
 		</view>
 		<view  class="logoText">
-			<view>智泊e家</view>
+			<view>优电联盟</view>
 			<view>巡检端</view>
 			
 			
@@ -165,7 +165,7 @@
 	
 	
 	page{
-		background-color: #fff;
+		background: linear-gradient(180deg, rgba(218,238,254,1) 40%,rgba(203,234,255,0) 100%);
 		padding-top: 160rpx;
 	}
 	.logoText{

pages/station/stationInfo.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/lockTab/listLock.vue → pages/station/stationList.vue

@@ -2,6 +2,16 @@
 	<view>
 		<u-navbar  title="地锁列表"  ></u-navbar>
 		<view class="main">
+			<view class="top">
+				<view class="search">
+					<view class="searchBox">
+						<u-search shape="square" placeholder="使用停车场名称/地锁编号搜索" maxlength="12" v-model="testName" :show-action="false"
+							:animation="true"></u-search>
+						<u-button type="primary" size="mini" @click="testBtn">搜素</u-button>
+					</view>
+				</view>
+			</view>
+			
 			<view class="tabs" v-if="0">
 				<u-picker  v-model="tabsFrom.show1"
 				  :default-selector="[tabsFrom.show1Index]"
@@ -21,24 +31,27 @@
 			
 			<view class="list">
 				<view class="line"   v-for="(item,i) in list" :key="i"
-				 @click="gotoUrl('/pages/lockTab/dataLock?id='+item.id)" >
+				 @click="gotoUrl('/pages/station/stationInfo?id='+item.id)" >
 					<view class="body">
 						<view class="imgclass">
-							<image class="img" src="@/assets/img/deviceTab/index2-1.svg" mode=""></image>
+							<image class="img" src="@/assets/img/station/index0.svg" mode=""></image>
 						</view>
 						<view class="item">
 							<view class="name">
-								<view class="text">{{item.name}}</view>
-								<view class="tag" :class="'type'+item.type">{{item.typeN}}</view>
+								<view class="text">{{item.parkingName}}</view>
+								
 							</view>
 							<view class="value">
-								{{item.parkingName}}
+								<span class="span span1">在用8</span> / 
+								<span class="span span2">空闲18</span>/ 
+								<span class="span span3">故障8</span>/ 
+								<span class="span span4">离线8</span>/ 
+								<span class="span span5">共9台</span> 
 							</view>
 						</view>
 					</view>
 					<view class="goto">
-						<view class="dian" :class="'status'+item.status"></view>
-						<view  class="text" :class="'statusText'+item.status" >{{item.status==1?'在线':'离线'}}</view>
+					
 						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 					</view>
 				</view>
@@ -73,6 +86,8 @@
 		
 		data() {
 			return {
+				testName: "",
+				queryName: "",
 				list:[],
 				listForm:{
 					pageIndex: 1,
@@ -120,6 +135,12 @@
 			}
 		},
 		methods: {
+			testBtn() {
+			
+				this.list = []
+				//this.listForm.pageIndex=1
+				this.getList()
+			},
 			gotoBind(){
 				uni.navigateTo({
 				  url: '/pages/deviceTab/bindLock?parkingId='+this.listForm.parkingId,
@@ -179,6 +200,21 @@
 </script>
 
 <style scoped lang="scss">
+	
+	.search {
+	
+		padding: 16rpx 32rpx;
+		background: #fff;
+	
+		.searchBox {
+			display: flex;
+			align-items: center;
+			background: #F2F2F2;
+			padding: 1px 16rpx;
+			border-radius: 8px;
+			justify-content: space-between;
+		}
+	}
 	.main{
 		background-color: #fff;
 		.line{
@@ -245,8 +281,29 @@
 															 }
 						 								 }
 						 								 .value{
-						 								 	color: rgba(119,119,119,1);
+						 								 	color: #777777;
 						 								 	font-size: 24rpx;
+															
+															.span{
+																margin:0 8rpx ;
+															}
+															.span1{
+																color:#00B962;
+																margin-left: 0px;
+																
+															}
+															.span2{
+																color:#777777
+															}
+															.span3{
+																color:#FF3D00
+															}
+															.span4{
+																color:#FF9600
+															}
+															.span5{
+																
+															}
 						 											
 						 								 }
 						 }

pages/task/maintenanceTaks.vue

@@ -68,7 +68,7 @@
 			
 			
 			<view class="list" >
-				<view class="item"  @click="gotoUrl('/pages/lockTab/dataLock?id='+floorlockInfo.id)" >
+				<view class="item"  @click="gotoUrl('/pages/station/stationInfo?id='+floorlockInfo.id)" >
 					<view class="name">
 						地锁编号
 				

uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue

@@ -349,8 +349,8 @@
 
 				&__button {
 					
-					width: 85px;
-					height: 65px;
+					width: 112rpx;
+					height: 112rpx;
 					border-radius: 100%;
 					@include vue-flex;
 					justify-content: center;
@@ -361,6 +361,8 @@
 					left: 50%;
 					z-index: 6;
 					transform: translateX(-50%);
+					background: linear-gradient(134.43deg, rgba(22,119,255,1) 1.39%,rgba(39,171,255,1) 102.4%);
+					box-shadow: 0px 2px 6px 0px rgba(22,119,255,0.3);
 				}
 			}
 		}