Merge branch '西昌分支' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SmartEducation/record.vue

@@ -8,7 +8,7 @@
 					<!-- 单条记录 -->
 					<view class="customlist-item item" v-for="(item,index) of list" :key="item.ID">
 						<view class="time">
-							{{item.StudyTime}}
+							{{item.StudyTime?item.StudyTime.substring(0,16):''}}
 						</view>
 						<view class="textBox">
 							<view class="wrap2 text">

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SmartEducation/single.vue

@@ -8,7 +8,7 @@
 					{{detail.Subject}}·{{detail.ClassName}}
 				</view>
 				<view  v-if="isRecordDetail">
-					{{detail.time}}
+					{{form.StudyTime?form.StudyTime.substring(0,16):''}}
 				</view>
 			</view>
 		</view>
@@ -16,13 +16,13 @@
 			<view class="sectionTitle">
 				教学环节
 			</view>
-			<textarea class="textarea" v-model="form.TEACHSTEPS" :disabled="isRecordDetail" auto-height placeholder="请输入"></textarea>
+			<textarea class="textarea" v-model="form.TEACHSTEPS" :disabled="isRecordDetail" :maxlength="500" auto-height placeholder="请输入"></textarea>
 		</view>
 		<view class="section">
 			<view class="sectionTitle">
 				教学特色
 			</view>
-			<textarea class="textarea" v-model="form.FEATURE" :disabled="isRecordDetail" auto-height placeholder="请输入"></textarea>
+			<textarea class="textarea" v-model="form.FEATURE" :disabled="isRecordDetail"  :maxlength="500" auto-height placeholder="请输入"></textarea>
 		</view>
 		<!-- <view class="resText" v-if="isRecordDetail">
 			<view class="resTitle">
@@ -30,6 +30,7 @@
 			</view>
 			<textarea class="restextarea" disabled v-model="detail.AIContent" auto-height placeholder=""></textarea>
 		</view> -->
+		<view v-if="isRecordDetail" style="height:30rpx;"></view>
 		<view v-if="!isRecordDetail" class="blank"></view>
 		<view class="bottomFixed" v-if="!isRecordDetail">
 			<view class="left" @click="NAV_TO('./record')">
@@ -90,6 +91,7 @@
 					if(!res)return
 					this.form.FEATURE = res.Feature
 					this.form.TEACHSTEPS = res.TeachSteps
+					this.form.StudyTime = res.StudyTime
 					let res1 = await this.HTTP_GET('learun/adms/smartEducation/smartTeachCourseInfo',res.CourseId)
 					this.detail = res1
 					this.SET_TITLE('记录详情')

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/practiceCourse/AIres.vue

@@ -9,8 +9,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="title">
-			AI分析结果
+		<view class="fenxijieguo">
+			<text>AI分析</text>
 		</view>
 		<view class="section">
 			<view class="resText">
@@ -25,11 +25,11 @@
 		data() {
 			return {
 				form:{
-					AIContent:''
+					AIContent:'',
 				}
 			}
 		},
-		async mounted(){
+		async onLoad(){
 			this.init()
 		},
 		methods: {
@@ -41,7 +41,7 @@
 	}
 </script>
 
-<style>
+<style scoped>
 	uni-page-body{
 		height: 100%;
 		background: linear-gradient(to bottom,#0C86D8,#B0D7F2);
@@ -69,7 +69,7 @@
 			transform: rotate(45deg);
 		}
 	}
-	.title{
+	.fenxijieguo{
 		color: #fff;
 		font-size: 20px;
 		text-align: center;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/practiceCourse/detail.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view class="fromItemBox">
 			<view class="title wrap1">{{form.Name}}</view>
-			<view class="time">{{form.CreateTime}}</view>
+			<view class="time">{{form.CreateTime?form.CreateTime.substring(0,16):''}}</view>
 		</view>
 		<view class="resText">
 			<view class="resTitle">

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/practiceCourse/list.vue

@@ -15,7 +15,7 @@
 					{{item.Name}}
 				</view>
 				<view class="time">
-					{{item.CreateTime}}
+					{{item.CreateTime?item.CreateTime.substring(0,16):''}}
 				</view>
 			</view>
           </view>