From a1c2b81c714b37a0b5d654da2881d7b1022d03f8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 16 Mar 2023 11:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=89=93=E5=8D=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BB=A5=E5=8F=8A=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=9A=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                   |  4 +-
 pages/comm/userSelect/index.vue |  2 +-
 pages/my/clock_in.vue           | 81 +++++++++++++++++++++++++++------
 3 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index 05bce13..f959987 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "曲阳金隅EHS",
     "appid" : "__UNI__B00D419",
     "description" : "曲阳金隅EHS",
-    "versionName" : "1.01.25",
-    "versionCode" : 101025,
+    "versionName" : "1.01.27",
+    "versionCode" : 101027,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/comm/userSelect/index.vue b/pages/comm/userSelect/index.vue
index 4c76702..bb0fbd6 100644
--- a/pages/comm/userSelect/index.vue
+++ b/pages/comm/userSelect/index.vue
@@ -90,7 +90,7 @@ export default {
 			let showDepts = [];
 			let params = {
 				page: 0,
-				belong_dept: dept.id,
+				depts: dept.id,
 				is_active: true,
 				query: '{id, name, belong_dept}'
 			};
diff --git a/pages/my/clock_in.vue b/pages/my/clock_in.vue
index b256223..dcefa32 100644
--- a/pages/my/clock_in.vue
+++ b/pages/my/clock_in.vue
@@ -16,10 +16,21 @@
 			<view class="item-wrap" v-for="(val,index) in lists" :key="val.id">
 				<view class="clock_in_-item">
 					<view class="center-info">
-						<view class="info-details">触发模式：{{val.detail.openTypeStr}}</view>
-						<view class="info-details">打卡类型：<text v-if="val.type==10">上班打卡</text><text v-else>下班打卡</text></view>
-						<view class="info-details">其他信息：{{val.detail.deviceName}}</view>
+						<view class="info-details">
+							触发设备：
+							 {{trigger_[val.trigger]}}
+						</view>
+						<view class="info-details">触发地点：{{val.detail.deviceName}}</view>
 						<view class="info-details">打卡时间：{{val.create_time}}</view>
+						<view class="info-details">考勤推测：
+							<text v-if="val.type==10" class="nomalState type01">上班打卡</text>
+							<text v-else-if="val.type==20" class="nomalState type02">下班打卡</text>
+							<span v-if="(val.type==10 || val.type==20)&&val.exception_type!==null">-</span>
+							<text v-if="val.exception_type==10" class="nomalState type1">在岗时间短</text>
+							<text v-else-if="val.exception_type==20" class="nomalState type2">在岗时间长</text>
+							<text v-else-if="val.exception_type==30" class="nomalState type3">缺卡</text>
+							<text v-else-if="val.exception_type==40" class="nomalState type4">加班</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -35,11 +46,16 @@
 			return {
 				params: {
 					employee: '',
-					pageSize: 10,
-					pageNum: 1,
+					page_size: 10,
+					page: 1,
 					month: '',
 					year:''
 				},
+				trigger_:{
+				  "door": "门禁",
+				  "location": "定位",
+				  "panel":"面板机"
+				},
 				totalNum: 0,
 				activeIndex:true,//本月
 				lists: [],
@@ -50,10 +66,10 @@
 		},
 		//上拉加载
 		onReachBottom() {
-			const totalPage = Math.ceil(this.totalNum / this.params.pageSize);
-			if (this.params.pageNum < totalPage) {
-				this.params.pageNum += 1;
-
+			const totalPage = Math.ceil(this.totalNum / this.params.page_size);
+			if (this.params.page < totalPage) {
+				this.params.page += 1;
+				this.getLists();
 			} else {
 				uni.showToast({
 					title: "已全部加载",
@@ -82,7 +98,7 @@
 		},
 		//下拉刷新
 		onPullDownRefresh() {
-			this.params.pageNum = 1;
+			this.params.page = 1;
 			this.lists = [];
 			this.getLists();
 		},
@@ -98,7 +114,7 @@
 				}else{
 					that.activeIndex=false;
 				}
-				that.params.pageNum = 1;
+				that.params.page = 1;
 				that.lists = [];
 				that.getLists();
 			},
@@ -114,7 +130,7 @@
 				that.activeIndex = index;
 				that.params.month = that.currentMonth;
 				that.params.year = that.currentYear;
-				that.params.pageNum = 1;
+				that.params.page = 1;
 				that.lists = [];
 				that.getLists();
 			},
@@ -180,5 +196,44 @@
 		line-height: 40rpx;
 		color: #5b5b5b;
 	}
-
+	.nomalState {
+		font-size: 12px;
+		padding: 0 9px;
+		height: 24px;
+		line-height: 23px;
+		border-radius: 5px;
+		vertical-align: top;
+		display: inline-block;
+		
+	}
+	.nomalState.type1{
+	  color: #F8DD4E;
+	  background-color: #f9f7e6;
+	  border: 1px solid #f3f0d5;
+	}
+	.nomalState.type2{
+	  color: #FF0000;
+	  background-color: #f7e7e7;
+	  border: 1px solid #fbe0e0;
+	}
+	.nomalState.type3{
+	  color: #FA8435;
+	  background-color: #fef6ed;
+	  border: 1px solid #fde9cc;
+	}
+	.nomalState.type4{
+	  color: #44CEF6;
+	  background-color: #f0f9fb;
+	  border: 1px solid #d2f9ff;
+	}
+	.nomalState.type01{
+	  color: #536dfe;
+	  background-color: #edf0fe;
+	  border: 1px solid #dce1fe;
+	}
+	.nomalState.type02{
+	  color: #67c23a;
+	  background-color: #f0f9eb;
+	  border: 1px solid #e1f3d8;
+	}
 </style>