update

pages/commercialBI/components/car/entryZone.vue

@@ -174,7 +174,7 @@ export default {
         drawCharts(id,data,config){
             const ctx = uni.createCanvasContext(id, this);
             let _this = this
-          let phoneInfo = uni.getStorageSync('phoneInfo')
+            let phoneInfo = uni.getStorageSync('phoneInfo')
             uChartsInstance[id] = new uCharts({
                 type: "ring",
                 context: ctx,

pages/commercialBI/specialCase.vue

@@ -18,7 +18,8 @@
           <div class="boxLeft" style="width: 100%">
             <div class="headerTitle">实时分析</div>
 <!--            注: 1个小时入区流量比5月同一时间流量增幅150%以上且每小时入区车辆超过100辆-->
-            <span class="notice"></span>
+              <span class="notice" v-if="selectTab===1">{{ `注: 1个小时入区流量比${showMonth}月同一时间流量增幅150%以上且每小时入区车辆超过100辆` }}</span>
+              <span class="notice" v-if="selectTab===2">注: 前20个从今日零时起至今流量与月均同时段增幅情况</span>
           </div>
           <div class="boxRight">
             <span class="day">{{showDay}}</span>
@@ -32,10 +33,9 @@
         <div :class="selectTab===1?'selectTab tabItem':'tabItem'" @click="handleTab(1)">{{`${startTime}时入区车流预警`}}</div>
         <div :class="selectTab===2?'selectTab tabItem':'tabItem'" @click="handleTab(2)">{{endTime===24?`${endTime - 1}-0时入区车流排行`:`0-${startTime}时入区车流排行`}}</div>
       </div>
-      <div class="noticeBox">
+<!--      <div class="noticeBox">-->
-        <span class="notice" v-if="selectTab===1">{{ `注: 1个小时入区流量比${showMonth}月同一时间流量增幅150%以上且每小时入区车辆超过100辆` }}</span>
+
-        <span class="notice" v-if="selectTab===2">注: 前20个从今日零时起至今流量与月均同时段增幅情况</span>
+<!--      </div>-->
-      </div>
 
       <div class="contentList" v-if="selectTab===1">
         <div class="contentItem" :style="{borderBottom:index + 1===tableList.length?'0px solid #EEEEEE':'1px solid #EEEEEE'}" v-for="(item,index) in tableList" :key="index">

pages/dataSummary/dayDetail.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="page-content">
-		
+
 		<scroll-view scroll-y="true" @scroll="showFixed" style="height:100%" @scrolltolower="reachBottom()" :style="{'overflow':showPopupMiddle ? 'hidden': 'scroll'}">
 			<div class="fixed-box" :style=" 'transform: translateY('+fixedY+'px);opacity:'+opacity+';'">
 				<view>
 					<view class="center-title">{{sMsg.SERVERPART_NAME}}</view>
-					
+
 					<view class="title-clock" style="color: #fff;text-align: center;">{{sMsg.ENDACCOUNT_DATE}}</view>
 				</view>
 				<view>
 					<view class="center-title">日结营收(元）</view>
 					<view class="tab-unit-num " style="color: #fff;text-align: center;">{{sMsg.CASHPAY ? $util.fmoney(sMsg.CASHPAY,2) : '0.00'}}</view>
 				</view>
-				<view>	
+				<view>
 					<view class="center-title">待我办理</view>
 					<view class="tab-unit-num " style="color: #fff;text-align: center;">{{sMsg.DEAL_COUNT}}</view>
 				</view>
@@ -32,7 +32,7 @@
 					</div>
 					<div class="box-bottom-tab">
 						<view class="tab-unit" style="flex: 3;">
-							
+
 							<span class="tab-icon2" v-if="sMsg.DIFFERENT_PRICE_LESS==0 && sMsg.DIFFERENT_PRICE_MORE!=0">长款金额</span>
 							<span class="tab-icon2" v-else-if="sMsg.DIFFERENT_PRICE_LESS!=0 && sMsg.DIFFERENT_PRICE_MORE==0">短款金额</span>
 							<span class="tab-icon2" v-else>长短款额</span>
@@ -44,35 +44,35 @@
 							<span class="tab-icon2">在营门店</span>
 						</view>
 					</div>
-					
+
 					<div class="box-bottom-tab">
 						<div class="tab-unit" style="flex: 3;">
-							
+
 							<span class="tab-unit-num priceRed" v-if="sMsg.DIFFERENT_PRICE_LESS!=0">{{sMsg.DIFFERENT_PRICE_LESS}}</span>
 							<span class="tab-unit-num priceGreen" v-if="sMsg.DIFFERENT_PRICE_MORE!=0">{{sMsg.DIFFERENT_PRICE_MORE}}</span>
 							<span class="tab-unit-num " v-if="sMsg.DIFFERENT_PRICE_LESS==0&& sMsg.DIFFERENT_PRICE_MORE==0">0.00</span>
 						</div>
 						<div class="tab-unit" style="flex: 2;">
-							
+
 							<span class="tab-unit-num">{{sMsg.DEAL_COUNT}}</span>
 						</div>
 						<div class="tab-unit" style="flex: 3;" @tap="showPop">
-							
+
 							<span class="weisc-ico" v-if="sMsg.SHOP_UPCOUNT>0">{{sMsg.SHOP_UPCOUNT}}</span>
 							<span class="tab-unit-num " :class="{'more-btn':sMsg.SHOP_UPCOUNT>0}">{{sMsg.SHOP_UPCOUNT>0 ? '/ '+sMsg.SHOP_TCOUNT : sMsg.SHOP_TCOUNT}}</span>
 						</div>
 					</div>
 				</view>
 			</div>
-			
+
 			<div v-if="pageList.length>0">
 				<div class="card" v-for="(item,i) in pageList" @tap="goDetail(item)" :key="i" :class="item.PENDSTATE == 0 ? 'conten-border' : ''">
-					
+
 					<div class="uni-flex jc-between" >
 						<p class="contentName">{{item.SHOPNAME}}</p>
 						<text class="typeText" :class="item.TREATMENT_MARKSTATE == '2'|| item.TREATMENT_MARKSTATE == '4'? 'typeText-color' : ''">{{item.TREATMENT_MARK}}</text>
 					</div>
-				
+
 					<div class="content-index">{{i+1}}</div>
 					<view class="uni-flex content-box-cashpay jc-end" >
 						<view>
@@ -88,12 +88,12 @@
 							<text class="content-span">账期：{{item.ENDACCOUNT_STARTDATE}} - {{item.ENDACCOUNT_DATE}}</text>
 						</view>
 						<image :src="cardIcoPath(item.SCAN_TYPE)" mode="aspectFit"></image>
-					
+
 					</view>
-					
+
 				</div>
 			</div>
-		
+
 		<view v-else-if="pageData.isLoading===false" >
 			<noFound :nodata="pageList.length>0 ? false : true"/>
 		</view>
@@ -110,7 +110,7 @@
 			</div>
 		</popUp>
 		</scroll-view>
-		
+
 	</view>
 </template>
 
@@ -132,7 +132,7 @@
 					endDate: nowTime,
 					startDate: startTime
 				},
-				
+
 				sMsg:{},
 				fixedY: -68,
 				opacity: 0,
@@ -140,19 +140,19 @@
 				pageHieght: uni.getSystemInfoSync().windowHeight,
 				pageList:[],
 				unUploadList:[],
-				
+
 			}
 		},
 		components:{
 			popUp
 		},
-		
+
 		methods: {
 			...mapMutations(['shouldReLoadingList']),
 			bindDateChange(e) {
 				let values = e.detail.value
-				
+
-				
+
 				this.pageData.pageIndex =1
 				this.pageData.isEnd = false
 				this.pageData.sDate = values.replace(/-/ig,'/')
@@ -163,24 +163,24 @@
 				this.getHeader()
 				this.getUnUpLoadShops()
 			},
-			
+
 			cardIcoPath(type) {
-				
+
 				switch (type){
 					case 3:
 						return '/static/images/effective/jkcs.png'
 					case 1:
-						return '/static/images/effective/ewm.png' 
+						return '/static/images/effective/ewm.png'
 					case 2:
 						return '/static/images/effective/scj.png'
-					
+
 				}
 			},
 			showFixed(e){
 				let options = e.detail
-				
+
 				if(options.scrollTop > 95 && options.scrollTop < 162){
-					
+
 					this.fixedY = -68+ (options.scrollTop -95)
 					this.opacity = (options.scrollTop -85)/68
 				}else if(options.scrollTop>162){
@@ -193,46 +193,46 @@
 					this.fixedY = -68
 					this.opacity = 0
 				}
-			
+
 			},
 			getList () {
 				let _this = this
-				
+
 				_this.$request.$get('GetEndaccountDetails',{
-					
+
 					statistical_Date: this.pageData.sDate,
 					Serverpart_Id: this.pageData.SERVERPART_ID,
 					page_Index: this.pageData.pageIndex,
 					page_Size: this.pageData.pageSize,
-					
+
 				}).then(res=>{
 					uni.hideLoading()
 					if(!res.Result_Code ||res.Result_Code!='100') return
-						
+
 					let list = res.Result_Data.List
-					
+
 					_this.pageList = _this.pageData.pageIndex===1 ? list  : [..._this.pageList,...list]
-				
+
 					if (list.length < _this.pageData.pageSize) {
-					
+
 						_this.pageData.isEnd = true
 					}
-					
+
 				})
 			},
 			getHeader () {
 				let _this = this
 				_this.$request.$get('GetEndaccountListByDate',{
 					statistical_Date: this.pageData.sDate,
-					Serverpart_Id: this.pageData.SERVERPART_ID 
+					Serverpart_Id: this.pageData.SERVERPART_ID
-				
+
 				}).then(res=>{
-					
+
 					if (res.Result_Data.List && res.Result_Code==100) {
 						let _data = res.Result_Data.List[0]
-					
+
 						_data.ENDACCOUNT_DATE = _this.$util.cutDate(_data.ENDACCOUNT_DATE,'MM月DD日')
-					
+
 						_data.DIFFERENT_PRICE_LESS = _this.$util.fmoney(_data.DIFFERENT_PRICE_LESS)
 						_data.DIFFERENT_PRICE_MORE = _this.$util.fmoney(_data.DIFFERENT_PRICE_MORE)
 						_this.sMsg = _data
@@ -240,8 +240,8 @@
 							_this.getUnUpLoadShops()
 						}
 					}
-						
+
-					
+
 				})
 			},
 			goDetail(item){
@@ -251,14 +251,14 @@
 			getUnUpLoadShops(){
 				let _this = this
 				_this.$request.$get('GetUnUpLoadShops',{
-				
+
 					action_record: _this.pageData.sDate,
 					Serverpart_Id: _this.pageData.SERVERPART_ID
 				}).then(res => {
 					let _data = res.Result_Data
-					
+
 					_this.unUploadList  = _data.List
-				
+
 				})
 			},
 			reachBottom () {
@@ -269,7 +269,7 @@
 				}
 			},
 			showPop(){
-				
+
 				if(this.sMsg.SHOP_UPCOUNT>0){
 					this.showPopupMiddle = true
 				}
@@ -290,7 +290,7 @@
 				uni.stopPullDownRefresh()
 			}, 1000)
 		},
-		
+
 		onReachBottom() {
 			this.reachBottom()
 		},
@@ -299,13 +299,13 @@
 			uni.showLoading({
 				title:'正在加载'
 			})
-			this.pageData.sDate = option.date //"2020/11/26 " 
+			this.pageData.sDate = option.date //"2020/11/26 "
 			this.pageData.SERVERPART_ID = option.seviceId
 			this.getList()
 			this.getHeader()
-			
+
 			uni.$on('datasummary', function (data){
-				
+
 				if(data) {
 					uni.showLoading({
 						title:'正在加载'
@@ -319,14 +319,14 @@
 			});
 		},
 		onShow() {
-			
+
 		},
 		onUnload() {
 			this.$util.addUserBehavior()
 			uni.$off('datasummary');
 		},
 		onHide() {
-			
+
 		}
 	}
 </script>
@@ -398,7 +398,7 @@
 	/* 头部卡片 */
 	.box-card {
 		padding: 24upx 24upx 0;
-	
+
 		background-color: #fff;
 		/* box-shadow: 0px 2upx 16upx 0.4upx #e2e2e2; */
 		/* position: fixed;
@@ -406,7 +406,7 @@
 		width: 100%;
 		box-sizing: border-box;
 		transition: all .2s;
-		background: url(../../static/images/effective/bg-top.png) no-repeat center;
+		background: url('https://eshangtech.com/ShopICO/ahyd-BID/effective/bg-top.png') no-repeat center;
 		background-size: contain;
 		background-repeat: no-repeat;
 		background-position: top center;
@@ -436,7 +436,7 @@
 		color: #A1A1A1;
 		display: flex;
 		align-items: center;
-	} 
+	}
 	.more-btn,.weisc-ico {
 		display: flex;
 		align-items: center;
@@ -453,7 +453,7 @@
 		background: url(../../static/images/effective/sj.png) no-repeat center;
 		background-size: contain;
 	}
-	
+
 	.box-center-title {
 		font-size: 24upx;
 		color: #010101;
@@ -461,7 +461,7 @@
 		padding: 0 16upx;
 		background-color: #DEDEDE;
 		text-align: center;
-		
+
 	}
 	.uni-icon-arrowdown {
 		font-size: 24rpx;
@@ -486,7 +486,7 @@
 		display: flex;
 		align-items: center;
 	}
-	
+
 	.tab-unit {
 		display: flex;
 		align-items: center;
@@ -501,13 +501,13 @@
 		color: #DEDEDE;
 		flex: 1;
 	}
-	
+
 	.tab-unit-num {
 		font-size: 30upx;
 		color: #fff;
 
 	}
-	
+
 	.tab-unit-num+.tab-unit-num:before {
 		content: '/';
 		margin: 0 8upx;
@@ -517,7 +517,7 @@
 		color: #7CB9A5;
 		font-size: 28upx;
 	}
-	
+
 	.priceRed,.tab-unit-num.priceRed {
 		color: #D13B3B;
 		font-size: 28upx;
@@ -554,7 +554,7 @@
 		padding: 24upx 0;
 		font-size: 24upx;
 		align-items: center;
-		
+
 	}
 	.pop-row + .pop-row  {
 		border-top: 1upx solid #eee;

pages/everdayRenven/AnhuiIndex.vue

@@ -740,7 +740,7 @@ export default {
 }
 
 .new-content {
-	background: url('/static/images/revenue/banner.png') no-repeat bottom left;
+	background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/banner.png') no-repeat bottom left;
 	height: 383rpx;
 	background-size: 100%;
 	color: #fff;

pages/everdayRenven/AnhuiServerpart.vue

@@ -894,7 +894,7 @@
 		width: 100%;
 		box-sizing: border-box;
 		transition: all .2s;
-		background: url(../../static/images/effective/bg-top.png) no-repeat center;
+		background: url('https://eshangtech.com/ShopICO/ahyd-BID/effective/bg-top.png') no-repeat center;
 		background-size: contain;
 		background-repeat: no-repeat;
 		background-position: top center;

pages/everdayRenven/detail.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="page-body" v-if="showPage">
 		<div class="box-card" v-if="!isBrandService">
-			
+
 			<div class="serverpart-name">{{pageMsg.Serverpart_Name}}</div>
 			<div class="analysis-box-title">
 				<div>
@@ -24,11 +24,11 @@
 		<!--服务区门店分析-->
 		<div style="margin-top: 0 20rpx;" v-if="!isBrandService">
 			<shopCell v-for="(item,i) in pageMsg.ShopEndaccountList" :key="i" :item='item' @toggleShow="toggleShow" :i='i'></shopCell>
-			
+
 		</div>
 		<div style="margin-top: 0 20rpx;" v-else>
 			<shopCell v-for="(item,i) in pageMsg.listBrandShopModel" :key="i" :item='item' @toggleShow="toggleShow" :i='i'></shopCell>
-			
+
 		</div>
 	</div>
 </template>
@@ -57,11 +57,11 @@
 		},
 		methods: {
 			toggleShow(i){
-				
+
 				let item = this.isBrandService ? this.pageMsg.listBrandShopModel[i] : this.pageMsg.ShopEndaccountList[i]
-				item.show = !item.show 
+				item.show = !item.show
 				this.$forceUpdate()
-			},			
+			},
 			getData(obj) {
 				let _this = this
 				this.$request.$webGet('CommercialApi/Revenue/GetServerpartEndAccountList', {
@@ -95,7 +95,7 @@
 						n.show = false
 						n.detail =  this.getDetail(n)
 					})
-				
+
 					_this.pageMsg.Revenue_Amount = res.Data.CASHPAY
 					_this.pageMsg.Serverpart_Name = res.Data.SERVERPART_NAME
 					_this.pageMsg.UploadShopCount = res.Data.UpLoadCount
@@ -109,9 +109,9 @@
 				let keyJson = this.keyJson
 				var keyCode =  ['SHOWABNORMAL_SIGN','SHOWCHECK_SIGN','SHOWMORE_SIGN','SHOWLESS_SIGN','SHOWSCAN_SIGN','SHOWSSUPPLY_SIGN','INTERFACE_SIGN']
 					 keyCode.map(n=>{
-						
+
 						if( keyJson[n][data[n]] ) arr.push( keyJson[n][data[n]])
-						
+
 					})
 					return arr
 			},
@@ -130,12 +130,12 @@
 						n.show = false
 						n.detail =  this.getDetail(n)
 					})
-					
+
 					_this.pageMsg = res.Result_Data
 					_this.showPage = true
 				})
 			},
-			
+
 		},
 		onUnload() {
 			this.$util.addUserBehavior()
@@ -144,7 +144,7 @@
 			uni.showLoading({
 				title:'正在加载...'
 			})
-		
+
 			if(option.bid) {
 				this.isBrandService = true
 				this.getBrandRevenue(option)
@@ -152,7 +152,7 @@
 				if(option.provinceId==450000 || option.provinceId==330300 || option.provinceId==140000 || option.provinceId==500000) { //这两个省份用的是老接口获取数据
 					this.getOtherData(option)
 				}else{ // 其余省份使用webapi接口获取数据
-					
+
 					this.getData(option)
 				}
 			}
@@ -168,12 +168,12 @@
 	/* 头部卡片 */
 	.box-card {
 		padding: 24upx 24upx 0;
-	
+
 		width: 100%;
 		box-sizing: border-box;
 		transition: all .2s;
-		background: url(/static/images/effective/bg-top.png) no-repeat center;
+		background: url('https://eshangtech.com/ShopICO/ahyd-BID/effective/bg-top.png') no-repeat center;
-		
+
 		background-repeat: no-repeat;
 		background-position: top center;
 	}
@@ -202,14 +202,14 @@
 		font-family: Bahnschrift Regular;
 		line-height: 1.2;
 	}
-	
+
 	.analysis-upload.defferent {
 		color: #D7565A;
 	}
-	
+
 	/* 服务区品牌详情 */
 	.service-brand-box {
-		
+
 		width: 693rpx;
 		height: 103rpx;
 		color: #fff;
@@ -219,7 +219,7 @@
 		display: flex;
 		align-items: center;
 		margin: 45rpx auto;
-		
+
 		padding: 0 25rpx;
 		justify-content: space-between;
 		box-sizing: border-box;

pages/everdayRenven/serviceIndex.vue

@@ -376,7 +376,7 @@
 							}else{
 								return [arg.name,(arg._proportion_ * 100).toFixed(2) + '%']
 							}
-							
+
 						}
 						list.push(n)
 					}
@@ -692,7 +692,7 @@
 
 				// 	if(res.Result_Code==100){
 				// 		let {SHOP_UPCOUNT,SHOP_TCOUNT} = res.Result_Data.List[0]
-				// 		let data = {SHOP_UPCOUNT,SHOP_TCOUNT} 
+				// 		let data = {SHOP_UPCOUNT,SHOP_TCOUNT}
 				// 		_this.upcouts = data
 
 				// 	}
@@ -704,7 +704,7 @@
 					action_record: theRequest.time,
 					Serverpart_Id: theRequest.ServerpartIds
 				}).then(res => {
-					// 
+					//
 					if (res.Result_Code != 100) {
 						return false
 					}
@@ -921,7 +921,7 @@
 		width: 100%;
 		box-sizing: border-box;
 		transition: all .2s;
-		background: url(../../static/images/effective/bg-top.png) no-repeat center;
+		background: url('https://eshangtech.com/ShopICO/ahyd-BID/effective/bg-top.png') no-repeat center;
 		background-size: contain;
 		background-repeat: no-repeat;
 		background-position: top center;
@@ -991,7 +991,7 @@
 		text-align: right;
 	}
 
-	/* 
+	/*
 	.more-btn,.weisc-ico {
 		display: flex;
 		align-items: center;

pages/examine/index.vue

@@ -369,10 +369,18 @@ export default {
             come:'',// 来自首页还是用户页
             examineList:[],
             showImgUrl:{},// 展示的图片地址
+            queryTime:'',// 传入的时间
         }
     },
     onLoad(query){
+      console.log('query',query)
       this.come = query.come
+      if (query.type){
+        this.selectTab = Number(query.type)
+      }
+      if (query.time){
+        this.queryTime = query.time
+      }
       //  获取手机参数对页面进行适配
       let systemInfo = uni.getSystemInfoSync()
       this.windowHeight = systemInfo.windowHeight
@@ -393,10 +401,9 @@ export default {
         })
       this.monthList = list
       // 日历数组
-      this.dateList = this.$util.getThisMonthDateList(date)
+      // this.dateList = this.$util.getThisMonthDateList(date)
       console.log('this.dateList',this.dateList)
-      // 获得片区列表
+
-      this.getAreaList()
     },
     onReady(){
       // 只有在页面已经渲染好了 才能把选中的日期 移到可视区域里面
@@ -409,7 +416,7 @@ export default {
         },
         // 拿到当前月份 用于页面一开始自动滚动到相对应的月份
         getThisMonth(){
-          const date = new Date()
+          const date = this.queryTime ? new Date(this.queryTime): new Date()
           let year = date.getFullYear()
           let month = date.getMonth() + 1
           if (month<10){
@@ -427,9 +434,21 @@ export default {
           if (day<10){
             day = '0' + day
           }
-          this.selectDate = `${year}-${month}-${day}`
+          const realDate = new Date(this.lastDay)
+          let realMonth = realDate.getMonth() + 1
+          if (realMonth>month){
+            // let d = this.$util.getThisMonthDay(`${year}-${month}`)
+            this.selectDate = `${year}-${month}-01`
+            this.dateList = this.$util.getThisMonthDateList(`${year}-${month}`)
+            this.currentDate = 'item'+`${year}-${month}-01`
+          }else{
+            this.selectDate = `${year}-${month}-${day}`
+            this.dateList = this.$util.getThisMonthDateList(`${year}-${month}`)
+          }
           console.log('this.selectDate',this.selectDate)
           this.currentDate = 'item'+`${year}-${month}-${showDay}`
+          // 获得片区列表
+          this.getAreaList(`${year}-${month}-${day}`)
         },
         // 是否显示弹出框
         handleShowPopup(value,obj){
@@ -493,7 +512,7 @@ export default {
             }
         },
         changeDetail(subItem){
-          this.showImgUrl=subItem
+          this.showImgUrl = subItem
           this.$forceUpdate()
         },
         previewImage(event,subItem){
@@ -653,7 +672,7 @@ export default {
           this.popupServiceShowList = this.popupServiceList[this.popupTabSelect]
         },
         // 片区列表
-        async getAreaList(){
+        async getAreaList(date){
           const total = await request.$webGet(`CommercialApi/BaseInfo/GetSPRegionList`,{Province_Code:Store.state.userData.ProvinceCode})
           uni.hideLoading()
           if (total.Result_Code===100){
@@ -667,7 +686,13 @@ export default {
             this.selectAreaName = this.areaList[0].label
             // 只能先拿到 selectAreaValue 再去请求列表
             // 获得考核管理列表 第一次进度肯定是考核管理
-            this.getManagerList()
+            if (this.selectTab===1){
+              // 考核管理列表
+              this.getManagerList(date)
+            }else if(this.selectTab===2){
+              // 日常巡检列表
+              this.getDailyInspectionList()
+            }
           }
         },
         // 修改当前选中的片区
@@ -693,22 +718,39 @@ export default {
           this.hidePopup()
         },
         // 考核管理列表
-        async getManagerList(){
+        async getManagerList(time){
+          console.log('time123',time)
           uni.showLoading({
             title: '正在加载...'
           })
-          const date = new Date(this.searchTime)
+          const realDate = new Date(this.lastDay)
+          let realMonth = realDate.getMonth() + 1
+
+          const date = time ? new Date(time) :new Date(this.searchTime)
           let y = date.getFullYear()
           let m = date.getMonth() + 1
-          if (m<10){
-            m = '0' + m
-          }
           let d = date.getDate()
           if (d<10){
             d = '0' + d
           }
-          let startTime = `${y}-${m}-01`
+          let startTime
-          let endTime = `${y}-${m}-${d}`
+          let endTime
+          console.log('realMonth',realMonth)
+          console.log('m',m)
+          if (realMonth>m){
+            if (m<10){
+              m = '0' + m
+            }
+            let day = this.$util.getThisMonthDay(`${y}-${m}`)
+            startTime=`${y}-${m}-01`
+            endTime=`${y}-${m}-${day}`
+          }else{
+            if (m<10){
+              m = '0' + m
+            }
+            startTime=`${y}-${m}-01`
+            endTime=`${y}-${m}-${d}`
+          }
 
           const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetExamineList`,{
             SearchStartDate: startTime,// 考核日期（开始时间）

pages/index/components/monthCharts.vue

@@ -0,0 +1,94 @@
+<template>
+  <view class="main">
+    <canvas class="month" canvas-id="month" id="month"/>
+  </view>
+</template>
+
+<script>
+import uCharts from '@/components/u-charts.js';
+var uChartsInstance = {};
+export default {
+  name: "monthCharts",
+  data(){
+    return {
+    }
+  },
+  props:{
+    success:{
+      type: Number,
+      default: 0
+    }
+  },
+  watch:{
+    success:{
+      handler(value){
+        console.log('value111',value)
+        let success = Number(value)>100?100:Number(value)
+        let error = Number(100 - value)<0?0:Number(100 - value)
+        let res = {
+          series:[{
+            data:[{name:'已完成',value:success},{name:'未完成',value:error}]
+          }]
+        }
+
+        this.drawCharts('month',res)
+      }
+    }
+  },
+  methods:{
+    drawCharts(id,data){
+      const ctx = uni.createCanvasContext(id, this);
+      let _this = this
+      uChartsInstance[id] = new uCharts({
+        type: "ring",
+        context: ctx,
+        width: 68,
+        height: 68,
+        series: data.series,
+        animation: true,
+        rotate: false,
+        rotateLock: false,
+        background: "#FFFFFF",
+        color: ["#576EFF","#EBEEF2"],
+        padding: [5,5,5,5],
+        dataLabel: false,
+        enableScroll: false,
+        legend: {
+          show: false,
+          position: "right",
+          lineHeight: 25
+        },
+        title: {
+          name: _this.success + '%',
+          fontSize: 10,
+          color: "#3D57FB"
+        },
+        extra: {
+          ring: {
+            ringWidth: 10,
+            activeOpacity: 0.5,
+            activeRadius: 10,
+            offsetAngle: -90,
+            labelWidth: 15,
+            border: false,
+            borderWidth: 3,
+            customRadius:34,
+            borderColor: "#FFFFFF"
+          }
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.main{
+  width: 100%;
+  height: 100%;
+  .month{
+    width: 136rpx;
+    height: 136rpx;
+  }
+}
+</style>

pages/operatingStatements/index.vue

@@ -175,7 +175,9 @@
 				noDataText: '抱歉，没有数据，请稍后重试',
 				regionType: 0, // 0 东南 1 西北
 				ServerpartList: [],
-				insideRegionList: [] // 省外
+				insideRegionList: [], // 省外
+        queryTime:'',// 传入的时间
+        lastDay:'',// 首页的实际时间
 			}
 		},
 		computed:{
@@ -214,6 +216,7 @@
 			getList(){
 				let _this = this
 				let searchTime = this.pageData.searchTime
+        console.log('searchTime',searchTime)
 				// _this.$request.$webGet('WeChat/GetRevenueReport',{
         request.$webGet('CommercialApi/Revenue/GetRevenueReport',{
 					startTime: searchTime[0],
@@ -247,12 +250,39 @@
 				})
 			}
 		},
-		onLoad() {
+		onLoad(query) {
 			uni.showLoading({
 				title:'正在加载...',
 				mask:true
 			})
-
+      console.log('query',query)
+      this.lastDay = uni.getStorageSync('lastDay')
+      if (query.time){
+        this.queryTime = query.time
+        const date = new Date(this.queryTime)
+        let y = date.getFullYear()
+        let m = date.getMonth() + 1
+        const realDate = new Date(this.lastDay)
+        let realMonth = realDate.getMonth() + 1
+        if (m<realMonth){
+          if (m<10){
+            m = '0'+ m
+          }
+          let day = this.$util.getThisMonthDay(`${y}-${m}`)
+          let time = [`${y}-${m}-01`,`${y}-${m}-${day}`]
+          this.pageData.searchTime = time
+        }else{
+          if (m<10){
+            m = '0'+ m
+          }
+          let d = realDate.getDate()
+          if (d<10){
+            d = '0'+d
+          }
+          let time = [`${y}-${m}-01`,`${y}-${m}-${d}`]
+          this.pageData.searchTime = time
+        }
+      }
 			this.getList()
 		}
 	}

pages/projectWarning/detail.vue

@@ -180,6 +180,7 @@ export default {
         },
         // 暂不切换比例
         handleNoChange(){
+          let _this = this
           uni.showModal({
             title: '是否暂不切换分润比例？',
             success: function (res) {
@@ -187,11 +188,11 @@ export default {
                 uni.showLoading({
                   title:'正在加载'
                 })
-                this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
+                _this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
-                  BusinessId: this.PROJECTWARNING_ID, // 预警记录内码
+                  BusinessId: _this.PROJECTWARNING_ID, // 预警记录内码
-                  StaffId:this.useDate.UserId,// 操作人内码
+                  StaffId:_this.useDate.UserId,// 操作人内码
-                  StaffName:this.useDate.UserName,// 操作人名称
+                  StaffName:_this.useDate.UserName,// 操作人名称
-                  SwitchRate:this.dataDetail.ROYALTY_RATE * 100,// 切换比例
+                  SwitchRate:_this.dataDetail.ROYALTY_RATE * 100,// 切换比例
                   ApproveState:'9999',// 审批状态
                 }).then(res=>{
                   uni.hideLoading()
@@ -199,7 +200,7 @@ export default {
                     title: res.Result_Desc,
                     icon: 'none'
                   })
-                  this.handleGetDetail()
+                  _this.handleGetDetail()
                   uni.navigateBack({
                     delta: 1
                   })
@@ -210,6 +211,7 @@ export default {
         },
         // 切换比例
         handleChange(){
+          let _this = this
           uni.showModal({
             title: '是否切换分润比例？',
             success: function (res) {
@@ -217,22 +219,22 @@ export default {
                 uni.showLoading({
                   title:'正在加载'
                 })
-                this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
+                _this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
-                  BusinessId: this.PROJECTWARNING_ID, // 预警记录内码
+                  BusinessId: _this.PROJECTWARNING_ID, // 预警记录内码
-                  StaffId:this.useDate.UserId,// 操作人内码
+                  StaffId:_this.useDate.UserId,// 操作人内码
-                  StaffName:this.useDate.UserName,// 操作人名称
+                  StaffName:_this.useDate.UserName,// 操作人名称
-                  SwitchRate:this.dataDetail.ROYALTY_CRATE,// 切换比例
+                  SwitchRate:_this.dataDetail.ROYALTY_CRATE,// 切换比例
-                  ApproveState:this.dataDetail.PROJECTWARNING_STATE===1000?'2000':'9000',// 审批状态
+                  ApproveState:_this.dataDetail.PROJECTWARNING_STATE===1000?'2000':'9000',// 审批状态
                 }).then(res=>{
                   uni.hideLoading()
-                  if (this.dataDetail.PROJECTWARNING_STATE===1000){
+                  if (_this.dataDetail.PROJECTWARNING_STATE===1000){
-                    this.handleBack()
+                    _this.handleBack()
                   }
                   uni.showToast({
                     title: res.Result_Desc,
                     icon: 'none'
                   })
-                  this.handleGetDetail()
+                  _this.handleGetDetail()
                 })
               }
             }

static/public/font2/stylesheet.css

@@ -0,0 +1,8 @@
+@font-face {
+    font-family: 'Alimama ShuHeiTi';
+    src:url("/static/public/font2/swmcfSKy9zYa.woff2");
+    font-weight: bold;
+    font-style: normal;
+    font-display: swap;
+}
+

util/dateTime/index.js

@@ -9,6 +9,17 @@ export function timestampToTime(timestamp) {
     return Y + M + D
 }
 
+export function timestampToTimeMonth(timestamp){
+    const date = new Date(timestamp) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+    const Y = date.getFullYear() + '-'
+    const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+    const D =date.getDate()<10?'0'+date.getDate():date.getDate()
+    // const h = date.getHours() + ':'
+    // const m = date.getMinutes() + ':'
+    // const s = date.getSeconds()
+    return Y + M
+}
+
 export function getThisDay(value) {
     switch (value) {
         case 1: