ソースを参照

Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-manage

zkx 1 年間 前
コミット
41e3a1a738

+ 2 - 2
components/tree/tree-body.vue

@@ -77,8 +77,8 @@ export default {
 </script>
 <style   lang="scss" scoped>
 	.meter-statistic-node {
-			margin-top: 32rpx;
-			padding-top: 12rpx;
+			//margin-top: 32rpx;
+			//padding-top: 12rpx;
 			padding-bottom: 20px;
 			margin: 0 32rpx;
 			 background-color: #fcfafa;

+ 9 - 8
components/tree/tree-node.vue

@@ -81,8 +81,8 @@
 				
 				<view class="meter-state"
 				 :style="{
-					 borderColor:colorList[node.type%7],
-				 	background:colorList[node.type%7],
+					 borderColor:colorList[node.type%colorList.length],
+				 	background:colorList[node.type%colorList.length],
 				 	color:'#fff',
 				 }"
 				 
@@ -154,15 +154,15 @@ export default {
     return {
       isOpen: false,
 	   isInit: false,
-	   colorList:['',"#52b8aa","#53b56b","#ef8132",
-	   "#307af6","#52b8aa","#777777"],
+	   colorList:['#9C27B0',"#52b8aa","#53b56b","#ef8132",
+	   "#307af6","#52b8aa","#777777",'#f44336','#e91e63','#009688','#607d8b','#795548'],
 	   
 	  
 	   
     };
   },
   mounted() {
-	console.log("mountedmountedmounted")
+	//console.log("mountedmountedmounted")
 	if(this.level==0){
 		this.toggle()
 	}
@@ -183,7 +183,7 @@ export default {
 					  
 					 sz.push({
 					 				  name:str2[0],
-					 				  color:this.colorList[num%7]
+					 				  color:this.colorList[num%this.colorList.length]
 					 }) 
 				  }else{
 					 sz.push({
@@ -231,8 +231,8 @@ export default {
  ;
 }
 .meter-statistic-node {
-		margin-top: 32rpx;
-		padding-top: 12rpx;
+		//margin-top: 32rpx;
+		//padding-top: 12rpx;
 		padding-bottom: 20px;
 		 background-color: #fcfafa;
 		.meter-statistic-main{
@@ -434,4 +434,5 @@ export default {
 			padding-left: 16rpx;
 		}
 	}
+	
 </style>

+ 4 - 4
config/.env.dev.js

@@ -13,12 +13,12 @@ const UNI_APP = {
 	// openId:"55555",//测试人员 开发环境
 	openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
-	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
+	 //openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
+	openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	
-	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //老板
+	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //老板
 	//openId:"oLowyuFTU3SzpvU4pGNzWk7NC9y0", //wky
-	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",
+	
 	//openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//杨所
 	//openId:"oLowyuMxAACLlFRDYcM9-w6v0b6o",
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//fjj

+ 1 - 1
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -500,7 +500,7 @@
 		beforeDestroy() {
 			this.clearTimer(); // 组件销毁前清除定时器
 			this.intervalReady = false;
-			console.log("组件销毁前清除定时器")
+			//console.log("组件销毁前清除定时器")
 		},
 		methods: {
 			init(op){

+ 2 - 2
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -221,7 +221,7 @@
 					
 				},
 				utabsone:true,
-				companyType:0,
+				//companyType:0,
 				incomeExpenditureObj:{},
 				opCompanyId: '',
 				childList:[],
@@ -353,7 +353,7 @@
 			companyChange(item, index) {
 				this.current = index + 1;
 				this.companyId = item.id;
-				this.companyIdSet(this.companyId)
+				//this.companyIdSet(this.companyId)
 				this.getList(true);
 			},
 			

+ 352 - 73
pages/statistics/statistics.vue

@@ -111,10 +111,30 @@
 			<view class="electronicMonitoring-title"
 			 @click="titleCk"
 			 v-else-if="childList&&childList.length>0" >
-				<view>
+				
+				<view class="view">
+					<template v-if="kWhList&&kWhList.length==1">
+						<view class="state view" v-if="!kWhList[0].online">
+							<!-- <view class="dot off-line"></view> -->
+							<view class="text">离线</view>
+						</view>
+						
+						<view class="state state2 view" v-else>
+							<!-- <view class="dot on-line"></view> -->
+							<view class="text">在线</view>
+						</view>
+					</template>
+					<template v-if="kWhList&&kWhList.length>1">
+						
+						
+						<view class="state  view" >
+							<!-- <view class="dot on-line"></view> -->
+							<view class="text">多表</view>
+						</view>
+					</template>
 					{{childListName}}
 				</view>
-				<view v-show="childList.length>1">
+				<view v-show="childList.length>1" class="view">
 					<u-icon name="arrow-down"></u-icon>
 				</view>
 			</view>
@@ -130,10 +150,20 @@
 			 @click="titleCk" 
 			 v-if="companyType==1"
 			 v-show="childList&&childList.length>0" >
-				<view>
+			
+			
+				<view class="view">
+					<template v-if="kWhList&&kWhList.length>1">
+						
+						
+						<view class="state  view" >
+							<!-- <view class="dot on-line"></view> -->
+							<view class="text">多表</view>
+						</view>
+					</template>
 					{{childListName}}
 				</view>
-				<view v-show="childList.length>1">
+				<view v-show="childList.length>1" class="view">
 					<u-icon name="arrow-down"></u-icon>
 				</view>
 			</view>
@@ -149,7 +179,7 @@
 			
 			
 			<!-- 电表运行情况 -->
-			<view class="statistics-1 statistics">
+			<view class="statistics-1 statistics point-meteroperation" v-show="anchorpointShow('point-meteroperation')">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -163,13 +193,7 @@
 				</view>
 
 				<view class="item">
-					<view class="item-progess">
-						<view class="img-box">
-							<u-circle-progress active-color="#2979ff" :percent="alarmsPercent" width="88">
-							</u-circle-progress>
-						</view>
-
-					</view>
+					
 					<!-- 累计 -->
 					<view class="total">
 						<view class="total1">
@@ -269,7 +293,7 @@
 			
 			<view class="">
 				<!-- 电表运行情况 -->
-				<view class="statistics-1 statistics"  v-show="companyId&&codes&&codes.indexOf('property')!=-1&&(tenantListNum0)">
+				<view class="statistics-1 statistics point-TenantManagement"   v-show="anchorpointShow('point-TenantManagement')">
 					<view class="title">
 						<view class="icon">
 							<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -316,7 +340,7 @@
 			</view>
 			
 			<!-- 统计2 异常告警记录 -->
-			<view class="statistics-2 statistics"   v-show="companyId&&codes&&codes.indexOf('property')!=-1&&(tenantListNum0)" >
+			<view class="statistics-2 statistics point-Poweroutagereminder"   v-show="anchorpointShow('point-Poweroutagereminder')" >
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -396,11 +420,22 @@
 								指定时间:{{tabsFrom.show2Text}}
 							</view>
 					</view>
-					<view class="incomeExpenditureClass" v-show="incomeExpenditureBl" >
-						<view class="incomeRow" >
+					<view class="incomeExpenditureClass point-Accountant" v-show="anchorpointShow('point-Accountant')" >
+						<view class="incomeRow"  >
+							<view class="isOpenClass" @click="isOpen1=!isOpen1">
+								<view class="isOpenClass1">收支统计</view>
+								<view class="isOpenClass2">
+								<span class="span">{{isOpen1?'收起':'展开'}}</span> 
+								<u-icon name="arrow-up" color="rgb(164 156 156)" v-show="isOpen1" size="24"></u-icon>
+								<u-icon name="arrow-down" color="rgb(164 156 156)"  v-show="!isOpen1" size="24"></u-icon>
+								
+								</view>
+							</view>
+						</view>
+						<view class="incomeRow" v-show="isOpen1" >
 							<view class="income1">
 								<view  class="income11">
-									电费收入 (元)
+									收入(元)
 								</view>
 								<view   class="income12">
 									{{incomeExpenditureObj.incomeFee}}
@@ -409,27 +444,57 @@
 							</view>
 							<view class="income1">
 								<view  class="income11">
-									电费支出 (元)
+									支出(元)
 								</view>
 								<view   class="income12">
 									{{incomeExpenditureObj.expenditureFee}}
 									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
 								</view>
 							</view>
+							<view class="income1">
+								<view  class="income11">
+									营收(元)
+								</view>
+								<view   class="income12" :style="incomeExpenditureObj.differenceFee>=0?'color:red':'color:#52b8aa'">
+									{{incomeExpenditureObj.differenceFee>0?'+':''}}{{incomeExpenditureObj.differenceFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
+							</view>
 						</view>
-						<view class="incomeRow" >
-							<view class="income1">
-								<view  class="income11">
-									收支情况 (元)
-								</view>
-								<view   class="income12" :style="incomeExpenditureObj.differenceFee>=0?'color:red':'color:#52b8aa'">
-									{{incomeExpenditureObj.differenceFee>0?'+':''}}{{incomeExpenditureObj.differenceFee}}
-									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
-								</view>
+						<view class="incomeRow" v-show="isOpen1&&false" >
+							<view class="income1">
+								<view  class="income11">
+									增收电量(度)
+								</view>
+								<view   class="income12">
+									{{incomeExpenditureObj.incomeFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
+							</view>
+							<view class="income1">
+								<view  class="income11">
+									减支电量(度)
+								</view>
+								<view   class="income12">
+									{{incomeExpenditureObj.expenditureFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
+							</view>
+							<view class="income1">
+								<view  class="income11">
+									增收减支电量(度)
+								</view>
+								<view   class="income12" :style="incomeExpenditureObj.differenceFee>=0?'color:red':'color:#52b8aa'">
+									{{incomeExpenditureObj.differenceFee>0?'+':''}}{{incomeExpenditureObj.differenceFee}}
+									<span class="income121" v-if="!incomeExpenditureObj.id">加载中...</span>
+								</view>
 							</view>
+						</view>
+						<view class="incomeRow" v-show="isOpen1"  >
+							
 							<view class="income1">
 								<view  class="income11">
-									节约电费 (元)
+									营增收入(元)
 								</view>
 								<view   class="income12" style="color:#52b8aa">
 									{{incomeExpenditureObj.saveFee}}
@@ -438,8 +503,19 @@
 							</view>
 						</view>
 					
+					</view>
+					<view class="incomeRow"   v-show="anchorpointShow('point-Electricityconsumptiontype')"  >
+						<view class="isOpenClass point-Electricityconsumptiontype" @click="isOpen2=!isOpen2">
+							<view class="isOpenClass1">用电类型</view>
+							<view class="isOpenClass2">
+							<span class="span">{{isOpen2?'收起':'展开'}}</span> 
+							<u-icon name="arrow-up" color="rgb(164 156 156)" v-show="isOpen2" size="24"></u-icon>
+							<u-icon name="arrow-down" color="rgb(164 156 156)"  v-show="!isOpen2" size="24"></u-icon>
+							
+							</view>
+						</view>
 					</view>
-					<view class="chat-box" id="barEcharts-statistics" v-show="incomeExpenditureBl">
+					<view class="chat-box " v-show="isOpen2" id="barEcharts-statistics"  >
 
 					</view>
 				</view>
@@ -455,10 +531,24 @@
 						</view>
 					</view>
 
-				</view>
+				</view>
+				<view class="incomeExpenditureClass">
+					
 				
+				 <view class="incomeRow"  >
+				<view class="isOpenClass point-devices" style="padding: 0 16px;"  v-if="getHomePageManageReady" @click="isOpen3=!isOpen3">
+					<view class="isOpenClass1">设备列表</view>
+					<view class="isOpenClass2"><span class="span">{{isOpen3?'收起':'展开'}}</span> 
+					<u-icon name="arrow-up" color="rgb(164 156 156)" v-show="isOpen3" size="24"></u-icon>
+					<u-icon name="arrow-down" color="rgb(164 156 156)"  v-show="!isOpen3" size="24"></u-icon>
+					
+					</view>
+				</view>
+				</view>
+				</view>
 				<!-- 电表统计 -->
-				<Tree-Body :meterList="meterList" ref="mytree"
+				<Tree-Body :meterList="meterList" ref="mytree"
+				class="" v-show="isOpen3"
 				:showPark="homePageManageObj.showPark"
 				:childInfo="childInfo"
 				 @query="getHomePageManageChildMeter"
@@ -629,7 +719,14 @@
 			
 		</view>
 
-
+		<view class="anchorpoint" v-show="anchorpointListNum>3">
+			<view class="point" 
+			 v-for="(item,i) in anchorpointList" :key="i"
+			  @click="anchorpointCk(item)" v-show="anchorpointShow(item.key)"
+			  :class="{ 	index: anchorpointIndex==item.key }" v-html="anchorpointHtml(item.name)" >
+				
+			</view>
+		</view>	
 		<energyCenterTabbar :current="0"></energyCenterTabbar>
 	</view>
 </template>
@@ -777,7 +874,30 @@
 				companyInfo:{},
 				month:0,
 				platformRevenueList:[],
-				getPlatformRevenueReady:false,
+				getPlatformRevenueReady:false,
+				anchorpointIndex:"",
+				anchorpointNum:0,
+				isOpen1:true,
+				isOpen2:true,
+				isOpen3:true,
+				anchorpointList:[
+					{
+						key:"point-meteroperation",name:"电表运行"
+					},
+					{
+						key:"point-TenantManagement",name:"租户管理"
+					},
+					{
+						key:"point-Poweroutagereminder",name:"断电提醒"
+					},
+					{
+						key:"point-Accountant",name:"收支统计"
+					},{
+						key:"point-Electricityconsumptiontype",name:"用电类型"
+					},{
+						key:"point-devices",name:"设备列表"
+					}
+				]
 			}
 		},
 		onLoad() {
@@ -791,7 +911,6 @@
 			this.getfindByOpenId();
 			this.getCompanyInfoList();
 			
-			
 		},
 		onReady() {
 			
@@ -800,13 +919,13 @@
 		onUnload(){
 			this.clearTimer(); // 组件销毁前清除定时器
 			
-			console.log("组件销毁前清除定时器")
+			//console.log("组件销毁前清除定时器")
 		},
 		
 		beforeDestroy() {
 			this.clearTimer(); // 组件销毁前清除定时器
 			
-			console.log("组件销毁前清除定时器")
+			//console.log("组件销毁前清除定时器")
 		},
 		
 		
@@ -820,6 +939,15 @@
 			}
 		},
 		computed:{
+			anchorpointListNum(){
+				var num=0;
+				this.anchorpointList.forEach((item)=>{
+					if(this.anchorpointShow(item.key)){
+						num+=1;
+					}
+				})
+				return num
+			},
 			incomeExpenditureBl(){
 				return this.childInfo.type!=4&&(this.childInfo.styleTemplate==1)
 			},
@@ -831,8 +959,54 @@
 				
 				return this.companyInfo.type;
 			}
+		},
+		onPageScroll(e) {
+			this.anchorpointNum=e.scrollTop
+			
 		},
 		methods: {
+			anchorpointShow(key){
+				
+				if(this.companyId&&(this.kWhList.length!=1)){
+					if(key=='point-meteroperation'||key=='point-devices'){
+						return true
+					}
+					if(key=='point-TenantManagement'||key=='point-Poweroutagereminder'){
+						return this.companyId&&this.codes&&this.codes.indexOf('property')!=-1&&(this.tenantListNum0)
+					}
+					if(key=='point-Accountant'||key=='point-Electricityconsumptiontype'){
+						return this.incomeExpenditureBl
+					}
+				}
+				
+				
+				return false
+			},
+			anchorpointHtml(str){
+				 if (!str || str.length === 0) {  
+				        return str; // 如果字符串为空或未定义,则直接返回  
+				    }  
+				  
+				    let result = '';  
+				    for (let i = 0; i < str.length; i += 2) {  
+				        result += str.substr(i, 2) + (i < str.length - 2 ? '<br/>' : '');  
+				    }  
+				  
+				    return result;  
+			},
+			anchorpointCk(item){
+				this.anchorpointIndex=item.key
+				//const info = uni.getSystemInfoSync();
+				let that = this;
+				    uni.createSelectorQuery().select("."+item.key).boundingClientRect(function(res){//定位到你要的class的位置
+				      //  console.log("标签获取====>",item.key+JSON.stringify(res),info.windowHeight)
+						var  num=that.anchorpointNum+res.top-70
+				        uni.pageScrollTo({
+				            scrollTop:num,
+				            duration: 300
+				        });
+				    }).exec()
+			},
 			titleCk() {
 				if(this.childList.length>1){
 					this.tabsFrom.show1 = true
@@ -849,7 +1023,7 @@
 					
 					var get2=newDate(timekey)
 					get2.setDate(get2.getDate() - day)
-					console.log(timekey)
+					//console.log(timekey)
 					return get2<time&&get>time;
 				}
 			},
@@ -868,7 +1042,7 @@
 						
 						
 						var tenant1=tenant.tenantContractList[j]
-						//console.log(tenant1.autoDeductFee)
+						////console.log(tenant1.autoDeductFee)
 						if(tenant1.autoDeductFee!=true){
 							continue; 
 						}
@@ -881,7 +1055,7 @@
 						for(var k in tenant1.contractItemList){
 							
 							var item=tenant1.contractItemList[k]
-							//console.log(item.prepaidEndTime)
+							////console.log(item.prepaidEndTime)
 							
 							if(item.paymentMethod==1&&item.name!='电费'){
 								
@@ -1029,7 +1203,7 @@
 						}
 					}
 				})
-				console.log(node,key)
+				//console.log(node,key)
 			},
 			getIncomeExpenditure(companyId){
 				
@@ -1119,12 +1293,12 @@
 				var key=this.meterListShow[item.id];
 				
 				this.$set(this.meterListShow,item.id,!key)
-				console.log("showBtn,",key)
+				//console.log("showBtn,",key)
 				
 				this.$forceUpdate()
 			},
 			selector2reset(e) {
-				console.log(e)
+				//console.log(e)
 				this.tabsFrom.show2Text = '全部时间'
 				this.tabsFrom.show2Index = '';
 			
@@ -1424,7 +1598,7 @@
 					
 					
 					this.meterList = response.data.meterList;
-					//console.log(this.meterList)
+					////console.log(this.meterList)
 					this.homePageManageObj = response.data;
 					//this.$forceUpdate()
 					if(this.incomeExpenditureBl){
@@ -1476,7 +1650,7 @@
 			selector1confirm(e) {
 				//this.getHomePageKwh()
 				
-				console.log(e)
+				//console.log(e)
 				this.companyId=e[0].value
 			
 				this.current2=e[0].i
@@ -1598,9 +1772,10 @@
 					 },200)
 					this.alarmsForm = response.data;
 					if (this.alarmsForm.okNum != 0) {
-						this.alarmsPercent = this.alarmsForm.okNum / (this.alarmsForm.okNum + this.alarmsForm
-							.errorNum) * 100;
-					}
+						
+					}
+					this.alarmsPercent = this.alarmsForm.okNum / (this.alarmsForm.okNum + this.alarmsForm
+						.errorNum) * 100;
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -1712,7 +1887,7 @@
 					
 					series: dataSeries
 				};
-				console.log(option)
+				//console.log(option)
 				this.myBarChart.setOption(option);
 			},
 
@@ -1754,7 +1929,7 @@
 	.incomeExpenditureClass{
 		   
 		    width: 100%;
-			padding:16rpx 0;
+			//padding:16rpx 0;
 			.incomeRow{
 				display: flex;
 				justify-content: space-evenly;
@@ -1771,24 +1946,27 @@
 				font-size: 24rpx;
 					color:#c5c3c3;
 			}
-			    width: 50%;
+			    width: 100%;
 			 text-align: center;
 			.income11{
-				padding:12rpx 0;
+				padding:6rpx 0;
 				background-color: #1677FF ;
 				color:#fff;
-				font-size: 32rpx;
+				font-size: 26rpx;
+				white-space: pre;
 				border-top: 1px solid #c5c3c3;
 				border-left: 1px solid #c5c3c3;
 
 			}
 			
 			.income12{
-				padding:12rpx 0;
+				padding:6rpx 0;
 				border-top: 1px solid #c5c3c3;
 				border-bottom: 1px solid #c5c3c3;
 				border-left: 1px solid #c5c3c3;
-				font-size: 40rpx;
+				font-size: 40rpx;
+				line-height: 56rpx;
+
 			}
 			
 		}
@@ -1927,13 +2105,13 @@
 			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;
+			margin-bottom: 16rpx;
 			padding: 40rpx;
 
 			.title {
 				display: flex;
 				align-items: center;
-				margin-bottom: 20rpx;
+				margin-bottom: 16rpx;
 
 				.img {
 					width: 36rpx;
@@ -2120,22 +2298,13 @@
 
 			.item {
 
-				margin-top: 32rpx;
+				margin-top: 24rpx;
 				display: flex;
 				align-items: center;
 
 				.item-progess {
-					display: flex;
-					align-items: center;
-
-					.img {
-						width: 88rpx;
-						height: 88rpx;
-						margin-right: 24rpx;
-						vertical-align: middle;
-					}
-
-
+					
+				
 				}
 
 
@@ -2192,7 +2361,7 @@
 
 
 					color: rgba(51, 51, 51, 1);
-
+					    width: 100%;
 					.img {
 						width: 32rpx;
 						height: 32rpx;
@@ -2201,7 +2370,10 @@
 
 					.name {
 						color: rgba(51, 51, 51, 1);
-						font-weight: bold;
+						font-weight: bold;
+						    overflow: hidden;
+						    white-space: nowrap;
+						    text-overflow: ellipsis;
 					}
 
 					.date {
@@ -2535,7 +2707,7 @@
 		    font-weight: bold;
 		.contractListClass{
 			display: flex;
-			  margin-top:24rpx;
+			  margin-top:16rpx;
 			    justify-content: space-between;
 				color: rgba(51,51,51,1);
 
@@ -2597,7 +2769,51 @@
 	.electronicMonitoring-title{
 		display: flex;
 		margin: 0px 32rpx;
-		    justify-content: space-between;
+		// background: #fff;
+		// border: 1px solid #bbbbbb;
+		border-radius: 4px;
+		padding: 4px;
+		//background: linear-gradient(180deg, #bbd8ff 0%, white 63%);
+		   justify-content: space-between;
+		 font-size:32rpx;
+		 font-weight: bold;
+		 .view{
+			display: flex;
+			 justify-content: space-between;
+			 	margin-right: 12rpx;
+		 }
+		 // 状态
+		 .state {
+		 	white-space: pre;
+		 	//width: 64rpx;
+		 	//height: 36rpx;
+		 	padding: 0 4rpx;
+		 	line-height: 36rpx;
+		 	border-radius: 8rpx;
+		 	font-size: 22rpx;
+		 	text-align: center;
+		 	border: 1px solid rgba(255, 123, 0, 1);
+		 	color: rgba(255, 123, 0, 1);
+		 
+		 
+		 	// .dot {
+		 	// 	margin-right: 8rpx;
+		 
+		 	// 	width: 16rpx;
+		 	// 	height: 16rpx;
+		 	// 	background-color: rgba(255, 123, 0, 1);
+		 	// 	border-radius: 999px;
+		 	// 	margin-left: auto;
+		 
+		 	// }
+		 
+		 
+		 }
+		 
+		 .state2 {
+		 	border: 1px solid rgba(0, 185, 98, 1);
+		 	color: rgba(0, 185, 98, 1);
+		 }
 	}
 	.current-123{
 		.electronicMonitoring-title{
@@ -2606,5 +2822,68 @@
 	}
 	.electronicMonitoring-123{
 		
-	}
+	}
+	
+	.anchorpoint{
+		.index{
+			color: rgba(22,119,255,1);
+
+		}
+		background-color: rgba(0,0,0,0.25);
+		margin-top: 20rpx;
+		display: flex;
+		
+		/* text-decoration: underline; */
+		//	z-index: 999;
+			
+		text-align: center;
+		position: fixed;
+		/* top: 40px; */
+		top: 200rpx;
+		right: 0px;
+			
+		
+		font-size: 24rpx;
+		//background: linear-gradient(95deg, #FF9800, #FF5722);
+		//box-shadow: 0 4rpx 24rpx 0 #FF5722;
+		//padding-top: 8px;
+		color: #fff;
+		border-radius: 25px;
+		
+		    flex-direction: column;
+		    align-items: flex-end;
+			.point{
+				padding: 16rpx;
+			}
+			.point:last-child{
+				padding-bottom:  36rpx;;
+				
+			}
+			.point:first-child{
+				padding-top:  36rpx;
+			}
+	}
+	
+	.isOpenClass{
+		display: flex;
+		    width: 100%;
+			    justify-content: space-between;
+				margin: 12rpx 0;
+				align-items: center;
+		.isOpenClass1{
+			font-size: 28rpx;
+			font-weight: bold;
+			padding-bottom:  8rpx;
+			color: rgba(51,51,51,1);
+
+		}
+		.isOpenClass2{
+			font-size: 24rpx;
+			color: rgba(131,131,131,1);
+			.span{
+				margin-right: 8rpx;
+			}
+		}
+	}
+	
 </style>

+ 3 - 2
uni_modules/uview-ui/components/u-circle-progress/u-circle-progress.vue

@@ -8,10 +8,10 @@
 		}"
 	>
 		<!-- 支付宝小程序不支持canvas-id属性,必须用id属性 -->
-		<canvas
+		<canvas v-show="test"
 			class="u-canvas-bg"
 			:canvas-id="elBgId"
-			:id="elBgId"
+			:id="elBgId" 
 			:style="{
 				width: widthPx + 'px',
 				height: widthPx + 'px'
@@ -57,6 +57,7 @@ export default {
 				return val >= 0 && val <= 100;
 			}
 		},
+		test:true,
 		// 底部圆环的颜色(灰色的圆环)
 		inactiveColor: {
 			type: String,

+ 1 - 1
uni_modules/uview-ui/components/u-tabs-one/u-tabs-one.vue

@@ -326,7 +326,7 @@
 				// 当前活动item的中点点到左边的距离减去滑块宽度的一半,即可得到滑块所需的移动距离
 				let left = tabInfo.left + tabInfo.width / 2 - this.parentLeft;
 				
-				console.log(tabWidth,uni.upx2px(this.barWidth),tabInfo.left)
+				
 				
 				// 计算当前活跃item到组件左边的距离
 				//this.scrollBarLeft = left - uni.upx2px(this.barWidth) / 2;