解决冲突

pages/index/index.vue

@@ -111,35 +111,35 @@
 
 		
 
-		<view class="title" v-if="permissions.shishinum">实时统计</view>
+		<view class="title" v-if="permissions.shishinum">今日工作</view>
 		<view class="real-timebox" v-if="permissions.shishinum">
 			<view class="timebox">
 				<view class="real" @click="tapjumpreception('1')">
 					<view class="realnum">{{realtimeobj.receptionCount || 0}}</view>
 					<view class="realtext">接待量</view>
 				</view>
+				<view class="real" @click="tapjumpreception('2')">
+					<view class="realnum">{{realtimeobj.receivingCustomer || 0}}</view>
+					<view class="realtext">正在接待</view>
+				</view>
 				<view class="real" @click="tapjumpreception('6')">
 					<view class="realnum">{{realtimeobj.activeCustomer|| 0}}</view>
 					<view class="realtext">有效接待</view>
 				</view>
-				<view class="real" @click="tapjumpreception('2')">
-					<view class="realnum">{{realtimeobj.receivingCustomer || 0}}</view>
-					<view class="realtext">正在接待</view>
+				<view class="real" @click="tapjumpreception('1')">
+					<view class="realnum">{{realtimeobj.fraction || 0}}%</view>
+					<view class="realtext">平均执行率</view>
 				</view>
+			</view>
+			<view class="timebox">
 				<view class="real" @click="tapjumpreception('4')">
 					<view class="realnum">{{realtimeobj.tagCustomer || 0}}</view>
 					<view class="realtext">未标顾问</view>
 				</view>
-			</view>
-			<view class="timebox">
 				<view class="real" @click="tapjumpreception('1')">
 					<view class="realnum">{{realtimeobj.avgDuration|| 0}}</view>
 					<view class="realtext">平均接待时长</view>
 				</view>
-				<view class="real" @click="tapjumpreception('1')">
-					<view class="realnum">{{realtimeobj.fraction || 0}}%</view>
-					<view class="realtext">平均执行率</view>
-				</view>
 				<view class="real">
 					<view @click="prohibitedtap(1)" v-if="methodsisshow==true" class="realnum" style="color: red;">
 						{{realtimeobj.prohibitedCustomer || 0}}</view>
@@ -156,15 +156,18 @@
 
 
 		<view class="title" v-if="permissions.jileinum" style="display: flex;">
-			<view style="width: 55%;">概览</view>
-			<view class="cet" style="display: flex;">
+			<view style="width: 70%;"  @click="taptimeisshow">
+				<!-- 概览 -->
+				{{choiceIndex}}累计<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+			</view>
+<!-- 			<view class="cet" style="display: flex;">
 				<view class="cetview" :class="{ activecllasscet: zhixingcenterindex == 2 }" @click="tabtimeclick(2)">近7天
 				</view>
 				<view class="cetview" :class="{ activecllasscet: zhixingcenterindex == 6 }" @click="tabtimeclick(6)">
 					近30天</view>
 				<view class="cetview" :class="{ activecllasscet: zhixingcenterindex == 7 }" @click="tabtimeclick(7)">自定义
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="real-timebox" v-if="permissions.jileinum">
 			<view class="timebox">
@@ -263,7 +266,11 @@
 		</view>
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
 
-
+		<u-popup v-model="timeshow" mode="bottom">
+			<view class="timeview" :style="{ color: zhixingcenterindex == 2 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(2,'近7天')">近7天</view>
+			<view class="timeview" :style="{ color: zhixingcenterindex == 6 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(6,'近30天')">近30天</view>
+			<view class="timeview" :style="{ color: zhixingcenterindex == 7 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(7,'自定义')">自定义</view>
+		</u-popup>
 
 		<!-- 底部导航栏 -->
 		<u-tabbar :mid-button="true" activeColor="#1296db" inactiveColor="#999999" v-model="current" :list="tabbarList"></u-tabbar>
@@ -294,8 +301,10 @@
 				signalDevicetext: "",
 				imeiCode:'',//设备号
 				openFlag:'',//接待是否
+				choiceIndex:'近7天',
 				audioStatus: false,
 				equipmentisshow: false,
+				timeshow:false,
 				equipmentobj: {
 					totalNum: '',
 					onlineNum: '',
@@ -385,6 +394,20 @@
 			this.initrealTimeStatistics()
 		},
 		methods: {
+			//时间选择
+			tabtimetap(index,str){
+				this.timeshow=false;
+				if (index == 7) {
+					this.totalTimeShow = true;
+				} else {
+					this.choiceIndex=str
+					this.zhixingcenterindex = index;
+					this.initworkThisWeek()
+				}
+			},
+			taptimeisshow(){
+				this.timeshow=true;
+			},
 			//获取权限
 			getMenu() {
 				uni.request({
@@ -419,6 +442,7 @@
 			totalTimeChange(e) {
 				this.statDateStart = e.startDate;
 				this.statDateEnd = e.endDate;
+				this.choiceIndex=e.startDate+'-'+e.endDate
 				this.zhixingcenterindex = 7;
 				this.initworkThisWeek()
 			},
@@ -955,4 +979,11 @@
 			}
 		}
 	}
+	.timeview{
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		text-align: center;
+		border-bottom: 1px solid #F8F8F8;
+	}
 </style>