考核考评

common/utils.js

@@ -179,7 +179,7 @@ function addUserBehavior(obj) {
 	}
 	obj.visitChannels = store.state.visitChannels
 	let userDate = store.state.userData
-	console.log('userDate',userDate)
+	console.log('userDate123',userDate)
 	let req = {
 		userName:userDate.UserName,
 		phoneNumber:userDate.Membership_Phone,
@@ -336,15 +336,11 @@ function handleReduceAMonth(nowTime,newTime){
 
 	let howDay = this.getThisMonthDay(`${y}-${m}`)
 	let newHowDay = this.getThisMonthDay(`${newY}-${newM}`)
-	console.log('d',d)
-	console.log('newHowDay',newHowDay)
 	const nowDate = new Date()
 	let nowM =nowDate.getMonth() + 1
 	let nowD = nowDate.getDate()
-	console.log('nowD',nowD)
 		if (d === newHowDay){
 			if (d<nowD){
-				console.log('111',`${y}-${newM}-${newHowDay}`)
 				return `${newY}-${newM}-${newHowDay}`
 			}else{
 				if (newM===nowM){
@@ -356,31 +352,23 @@ function handleReduceAMonth(nowTime,newTime){
 		}else{
 			if (newM===2){
 				if (d>newHowDay){
-					console.log('222',`${newY}-${newM}-${newHowDay}`)
 					return `${newY}-${newM}-${newHowDay}`
 				}else{
-					console.log('222',`${newY}-${newM}-${d}`)
 					return `${newY}-${newM}-${d}`
 				}
 			}else{
-				console.log('nowD',nowD)
-				console.log('d',d)
 				if (nowD<d){
 					if (nowM===newM){
-						console.log('3333',`${y}-${newM}-${nowD}`)
 						return `${newY}-${newM}-${nowD}`
 					}else{
 						if (d<newHowDay){
-							console.log('333',`${y}-${newM}-${d}`)
 							return `${newY}-${newM}-${d}`
 						}else{
-							console.log('333',`${y}-${newM}-${newHowDay}`)
 							return `${newY}-${newM}-${newHowDay}`
 						}
 
 					}
 				}else {
-					console.log('333',`${y}-${newM}-${d}`)
 					return `${newY}-${newM}-${d}`
 				}
 			}

pages/examine/index.vue

@@ -19,12 +19,11 @@
                         <div class="selectService" @click="handleShowPopup(1)">
                             <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/fixed.svg"></image>
                             <view class="select">
-                                <view class="selectContent">
                                     <view class="name">{{selectAreaName}}</view>
                                     <p class="area">片区</p>
+                                    <div style="width: 24px;height: 12px"></div>
                                     <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/headMore.svg"></image>
                             </view>
-                            </view>
                         </div>
                     </div>
                     <!--  选择月份  -->
@@ -48,6 +47,7 @@
                     </view>
                 </view>
                 <view v-if="selectTab===1" class="serviceList" :style="{height:scrollTop<1?'calc(100vh - 256px)':'calc(100vh - 150px)',overflow:scrollTop<95?'hidden':'scroll'}">
+                  <view v-if="serviceList.length>0">
                     <view class="serviceItem" v-for="(item,index) in serviceList" :key="index">
                       <view class="itemTitle">
                         <span class="title">{{item.SERVERPART_NAME}}</span>
@@ -77,6 +77,14 @@
                       </view>
                     </view>
                   </view>
+                  <view v-if="serviceList.length>0" class="load-more" style="height: 20px">
+                    <text>{{'——— 我是有底线的 ———'}}</text>
+                  </view>
+                  <view class="noData" v-else>
+                    <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
+                    <p class="text">暂无数据</p>
+                  </view>
+                </view>
                 <view v-if="selectTab===2" class="serviceList" :style="{height:scrollTop<1?'calc(100vh - 256px)':'calc(100vh - 210px)',overflow:scrollTop<95?'hidden':'scroll'}">
                   <view v-if="inspectionList.length>0">
                     <view class="dailyInspection" v-for="(item,index) in inspectionList" :key="index">
@@ -117,6 +125,9 @@
                       </view>
                     </view>
                   </view>
+                  <view v-if="inspectionList.length>0" class="load-more" style="height: 20px">
+                    <text>{{'——— 我是有底线的 ———'}}</text>
+                  </view>
                   <view class="noData" v-else>
                     <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
                     <p class="text">暂无数据</p>
@@ -163,6 +174,9 @@
 
                     </view>
                   </view>
+                  <view v-if="meetDetailList.length>0" class="load-more" style="height: 20px">
+                    <text>{{'——— 我是有底线的 ———'}}</text>
+                  </view>
                   <view class="noData" v-else>
                     <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
                     <p class="text">暂无数据</p>
@@ -262,8 +276,6 @@ export default {
             popupServiceShowList:[],// 显示的表单内容
             popupServiceName:'',// 点击更多记录的表单名称
             popupMeetDetail:{},// 弹出框的会议详情内容
-            str1:'陈佳、赵卓雅、张三、陈佳、赵卓雅、陈佳、赵卓雅、张三、里斯、李青青',
-            str2:'这里是会议内容,这里是会议内容,这里是会议内容,这里是会议内容,这里是是会议内容,这里是会议内容,这里是会议内容,这里是会议内容这里是会议内容,这里是会议内容,这里是会议内容,这里是会议内容,这里是是会议内容'
         }
     },
     onLoad(){
@@ -272,6 +284,7 @@ export default {
       this.windowHeight = systemInfo.windowHeight
       this.statusBarHeight = Number(systemInfo.statusBarHeight)
       this.menu = uni.getMenuButtonBoundingClientRect()
+      // 先拿到首页的时间 作为调用接口的统一时间  存的lastDay存当前月份的具体日期切换回本月的日期判断有用
       this.searchTime = uni.getStorageSync('lastDay')
       this.lastDay = uni.getStorageSync('lastDay')
       // 拿到当前时间
@@ -285,6 +298,7 @@ export default {
       this.getAreaList()
     },
     onReady(){
+      // 只有在页面已经渲染好了 才能把选中的日期 移到可视区域里面
         var _this = this;
         _this.getThisMonth()
     },
@@ -313,7 +327,6 @@ export default {
             this.popupServiceList = obj.list
             // 页面上展示的数组
             this.popupServiceShowList = this.popupServiceList[0]
-            console.log('this.popupServiceShowList',this.popupServiceShowList)
             // 方位选项卡的数组判断
             let  list = []
             obj.list.forEach((item,index)=>{
@@ -322,7 +335,6 @@ export default {
             this.popupTab = list
           }else if (value===3){
             this.popupMeetDetail = obj.list[0].SERVERPARTList[0]
-            console.log('this.popupMeetDetail',this.popupMeetDetail)
           }
           // 弹出框显示
           this.showPop = true
@@ -338,13 +350,10 @@ export default {
           this.selectMonth = value
           // 当前时间
           const nowDate = new Date()
-          let nowYear = nowDate.getFullYear()
           let nowMonth = nowDate.getMonth() + 1
-          let nowDay = nowDate.getDate()
           // 搜索时间
           const date = new Date(this.searchTime)
           let y = date.getFullYear()
-          let m = date.getMonth() + 1
           // 如果当前的时间 和 选中的时间一样 那么 搜索的时间就是当前时间的前一天 否则就是当前月份的最后一天
           if (nowMonth === this.selectMonth){
             this.searchTime = this.lastDay
@@ -361,9 +370,9 @@ export default {
           const selectTime = new Date(this.selectDate)
           let selectY = selectTime.getFullYear()
           let selectM = selectTime.getMonth() + 1
-          let selectD = selectTime.getDate() - 4>0?selectTime.getDate() - 4:1
+          // 要让选中的日期展示在最右边 不展示最左边
+          let selectD = selectTime.getDate() - 4 > 0?selectTime.getDate() - 4:1
           this.currentDate = 'item' + `${selectY}-${selectM}-${selectD}`
-
           if (this.selectTab===1){
             // 选中的是考核管理 调用拿到考核管理的列表
             this.getManagerList()
@@ -409,8 +418,8 @@ export default {
           let d = date.getDate()
           const selectDay = new Date(time)
           let selectM = selectDay.getMonth() +1
-          let selectd = selectDay.getDate()
+          let selectD = selectDay.getDate()
-          if (d<selectd && m<=selectM){
+          if (d < selectD && m <= selectM){
             uni.showModal({
               title: `日常巡检仅支持查看${m}月${d}号及之前的数据`,
               icon:'none',
@@ -447,6 +456,7 @@ export default {
               list.push({label:item.name.split('片区')[0],value:item.value})
             })
             this.areaList = list
+            // 默认选中第一个片区
             this.selectAreaValue = this.areaList[0].value
             this.selectAreaName = this.areaList[0].label
             // 只能先拿到 selectAreaValue 再去请求列表
@@ -456,6 +466,7 @@ export default {
         },
         // 修改当前选中的片区
         handleChangeArea(item){
+          // 选择的片区名称和片区id
           this.selectAreaValue = item.value
           this.selectAreaName = item.label
           if (this.selectTab===1){
@@ -468,6 +479,7 @@ export default {
             // 晨会管理列表
             this.getMeetingDetail()
           }
+          // 关闭弹出框方法
           this.hidePopup()
         },
         // 考核管理列表
@@ -492,7 +504,6 @@ export default {
         },
         // 日常巡检列表
         async getDailyInspectionList(){
-          console.log('this.selectDate',this.selectDate)
           const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetPatrolList`,{
             SearchStartDate:this.selectDate,// 巡检日期（开始时间）
             SearchEndDate:this.selectDate,// 巡检日期（结束时间）
@@ -510,22 +521,12 @@ export default {
             Serverpart_ID:'',// 服务区内码，多个服务区用","隔开
           })
           this.meetDetailList = res.Result_Data
-          console.log('this.meetDetailList',this.meetDetailList)
         }
     }
 }
 
 </script>
 <style scoped lang="scss">
-//@font-face {
-//  font-family: 'Alimama ShuHeiTi';
-//  src: url("https://eshangtech.com/ShopICO/ahyd-BID/style/Alimama_ShuHeiTi_Bold.ttf");
-//  font-weight: normal;
-//  font-style: normal;
-//  font-display: swap;
-//}
-
-
 .main{
     width: 100%;
     height: calc(100vh + 105px);
@@ -590,9 +591,7 @@ export default {
                         display: flex;
                         align-items: center;
                         position: relative;
-                        .selectContent{
+
-                            display: flex;
-                            align-items: center;
                             .name{
                                 font-size: 14px;
                                 font-family: PingFangSC-Semibold, PingFang SC;
@@ -612,7 +611,6 @@ export default {
                                 width: 24px;
                                 height: 12px;
                             }
-                        }
 
                     }
                 }