From b81d7ed2cc89e51ab803f301d29a0ec7adede3bb Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Wed, 23 Aug 2023 11:46:50 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E5=AD=A6=E7=94=9F=20=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/pages/ADRRecord/list.vue  | 57 ++++++-----
 .../pages/AttendanceCardStudent/list.vue      | 10 +-
 .../LearunApp-2.2.0/pages/timeTable/list.vue  | 98 ++++++++++++++-----
 3 files changed, 108 insertions(+), 57 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue
index 570cf7b36..ea7de6271 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ADRRecord/list.vue	
@@ -35,7 +35,7 @@
 					<text>备注：</text>
 					{{ item.ARemark }}
 				</view>
-				<uploadImage :value="item.ADPhoto" readonly title="照片"/>
+				<uploadImage :value="item.ADPhoto" readonly title="照片："/>
 			</view>
 			
 		</view>
@@ -336,33 +336,23 @@ export default {
 		
 	},
 	async uploadCo(val){
-		if (!val) {
-			return []
+		if (!val) { return [] }
+		const uidList_ = val.split(',')
+		const fileList_ = []
+				   
+		for (const uid of uidList_ || []) {
+		  const fileInfo = await this.FETCH_FILEINFO(uid)
+		  if (!fileInfo) { continue }
+				   
+		  const fileType = fileInfo.F_FileType
+		  const fileSize = fileInfo.F_FileSize
+		  const fileName = fileInfo.F_FileName
+				   
+		  const path = this.API + 'learun/adms/annexes/wxdown?' + this.URL_QUERY(uid, true)
+				   
+		  fileList_.push({ path, type: fileType, uid, size: fileSize, name:fileName })
 		}
-		const uidList = val;
-		const fileList = []
-		const wxlist = await this.FETCH_FILEList(uidList);
-		for (const wxfile of wxlist) {
-			const fileInfo = await this.FETCH_FILEINFO(wxfile.F_Id)
-			if (!fileInfo) {
-				continue
-			}
-	
-			const fileType = fileInfo.F_FileType
-			const fileSize = fileInfo.F_FileSize
-			const fileName = fileInfo.F_FileName
-	
-			const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
-			fileList.push({
-				path,
-				type: fileType,
-				uid:wxfile.F_Id,
-				folderId:wxfile.F_FolderId,
-				size: fileSize,
-				name: fileName
-			})
-		}
-		return fileList
+		return fileList_
 	},
 	
 	async chooseEntireCard(e){
@@ -371,7 +361,10 @@ export default {
 		for (let s in this.record[e.date]) {
 			let e1 = this.record[e.date]
 			for (let s1 in e1) {
-				if(e1[s1].AIsOut) e1[s1].ADPhoto = await this.uploadCo(e1[s1].ADPhoto)
+				if(e1[s1].AIsOut && !e1[s1].photoLoad) {
+					e1[s1].ADPhoto = await this.uploadCo(e1[s1].ADPhoto)
+					e1[s1].photoLoad = true
+				}
 			}
 		}
 		this.status = {}
@@ -393,4 +386,10 @@ export default {
 	border-radius: 50%;
 	margin-right: 4px;
 }
-</style> 
\ No newline at end of file
+
+	/deep/.cu-form-group{
+		padding-left: 0;
+		min-height: unset;
+	}
+
+</style>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue
index aaf9d8eb5..2a4c8d309 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardStudent/list.vue	
@@ -263,15 +263,15 @@
 			// 获取当前位置
 			local() {
 				return new Promise(async (resolve) => {
-					// let res = await this.getLocation()
+					let res = await this.getLocation()
 					// let res = {
 					// 	lng: 112.57205562051,
 					// 	lat: 37.742374280962
 					// }
-					let res = {
-						lng: 112.55981419,
-						lat: 37.80890166
-					}
+					// let res = {
+					// 	lng: 112.55981419,
+					// 	lat: 37.80890166
+					// }
 					if (!res) {
 						this.$set(this.postData, 'ALon', '')
 						this.$set(this.postData, 'ALat', '')
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue
index c32784ae8..456d7de47 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue	
@@ -35,28 +35,41 @@
 					<view class="tSec2List">
 						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi"><view class="noHtml">该时间段没有课表</view></view>
 						<view v-if="items.lessonData.length > 0">
-							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j" @click="classTap(k)">
-								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
-								<view class="tSec2ListR">
-									<view class="tSec2ListBox">
-										<view class="tSec2ListT">{{ k.LessonName }}</view>
-										<view class="tSec2ListTxt">{{ k.ClassName }}</view>
-										<view class="tSec2ListTxt">
-											<text class="text-xxl cuIcon cuIcon-profile"></text>
-											{{ k.EmpName }}
+							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j">
+								<div style="overflow: hidden;" @click="classTap(k)">
+									<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+									<view class="tSec2ListR">
+										<view class="tSec2ListBox">
+											<view class="tSec2ListT">{{ k.LessonName }}</view>
+											<view class="tSec2ListTxt">{{ k.ClassName }}</view>
+											<view class="tSec2ListTxt">
+												<text class="text-xxl cuIcon cuIcon-profile"></text>
+												{{ k.EmpName }}
+											</view>
 										</view>
-									</view>
-									<view class="tSec2Location">
-										<view class="tSec2ListTxt">
-											<text class="text-xxl cuIcon cuIcon-location"></text>
-											{{ k.ClassroomName }}
-										</view>
-										<view class="tSec2ListTxt">
-											<view v-if="k.Sort == '准时' " class="text-blue">{{ k.Sort }}</view>
-											<view v-if="k.Sort == '迟到' " class="text-green">{{ k.Sort }}</view>
-											<view v-if="k.Sort == '请假' " class="text-yellow">{{ k.Sort }}</view>
+										<view class="tSec2Location">
+											<view class="tSec2ListTxt">
+												<text class="text-xxl cuIcon cuIcon-location"></text>
+												{{ k.ClassroomName }}
+											</view>
+											<view class="tSec2ListTxt">
+												<view v-if="k.Sort == '准时' " class="text-blue">{{ k.Sort }}</view>
+												<view v-if="k.Sort == '迟到' " class="text-green">{{ k.Sort }}</view>
+												<view v-if="k.Sort == '请假' " class="text-yellow">{{ k.Sort }}</view>
+											</view>
 										</view>
 									</view>
+								</div>
+								<view v-if="k.AIsOut" class="AisOutBox pageBox customlist-item">
+									<view>
+										<text>地址：</text>
+										{{ k.ClockPlace }}
+									</view>
+									<view>
+										<text>备注：</text>
+										{{ k.ARemark }}
+									</view>
+									<uploadImage :value="k.ADPhoto" readonly title="照片："/>
 								</view>
 							</view>
 						</view>
@@ -69,7 +82,11 @@
 
 <script>
 import common from '@/common/js/common.js'
+import uploadImage from '@/components/uploadImage.vue'
 export default {
+	components:{
+		uploadImage
+	},
 	data() {
 		return {
 			timeValue:'',
@@ -166,13 +183,19 @@ export default {
 				this.timeValue = obj.startdate + '~' + obj.enddate
 			}
 			let param = { StartDate: this.timeValue.split('~')[0], EndDate: this.timeValue.split('~')[1] };
-			_this.HTTP_GET('learun/adms/timetable/list', param, '加载数据时出错').then(res => {
+			_this.HTTP_GET('learun/adms/timetable/list', param, '加载数据时出错').then(async (res) => {
 				this.HIDE_LOADING();
+				for (let s in res) {
+					if(res[s].AIsOut){
+						res[s].ADPhoto = await this.uploadCo(res[s].ADPhoto)
+						console.log(res[s].ADPhoto)
+					}
+				}
 				_this.ProcessingData(res);
 			});
 			
 		},
-		ProcessingData(data) {
+		async ProcessingData(data) {
 			let dataM = [
 				{
 					weekTime: 1,
@@ -244,6 +267,26 @@ export default {
 			    }
 			}
 		},
+		async uploadCo(val){
+			if (!val) { return [] }
+			const uidList_ = val.split(',')
+			const fileList_ = []
+					   
+			for (const uid of uidList_ || []) {
+			  const fileInfo = await this.FETCH_FILEINFO(uid)
+			  if (!fileInfo) { continue }
+					   
+			  const fileType = fileInfo.F_FileType
+			  const fileSize = fileInfo.F_FileSize
+			  const fileName = fileInfo.F_FileName
+					   
+			  const path = this.API + 'learun/adms/annexes/wxdown?' + this.URL_QUERY(uid, true)
+					   
+			  fileList_.push({ path, type: fileType, uid, size: fileSize, name:fileName })
+			}
+			return fileList_
+			
+		},
 		onfun(obj){
 			this.init(obj);
 		},
@@ -368,7 +411,7 @@ export default {
 .tSec2ListLi {
 	border-bottom: 1px solid #d5eaf7;
 	overflow: hidden;
-	height: 64px;
+	// height: 64px;
 }
 .tSec2ListL {
 	float: left;
@@ -377,7 +420,7 @@ export default {
 	width: 25%;
 	text-align: center;
 	line-height: 36px;
-	padding: 11px 0;
+	padding: 16px 0;
 	font-size: 14px;
 	color: #646464;
 }
@@ -425,4 +468,13 @@ export default {
 	width: calc(100% - 80px);
 	margin: 0 auto;
 }
+
+.AisOutBox{
+	padding: 4px;
+}
+
+/deep/.cu-form-group{
+	padding-left: 0;
+	min-height: unset;
+}
 </style>