Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

src/components/index/JobComponents.vue

@@ -308,6 +308,6 @@
 	}
 
 	.JobComponents-box {
-		/* background: #FFFFFF; */
+		
 	}
 </style>

src/components/index/commentsComponents.vue

@@ -157,6 +157,6 @@
 	}
 
 	.CommentsComponents-box {
-		background: #FFFFFF;
+		
 	}
 </style>

src/components/index/examComponents.vue

@@ -228,7 +228,7 @@
 
 	.examComponents-center-box::after {   /* div是你需要添加背景图片的盒子*/
 	    content: "";
-		background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654062518000_33.png);
+		/* background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654062518000_33.png); */
 		background-position: right 20rpx top 43rpx;
 		background-size: 74rpx auto;
 		background-repeat: no-repeat;
@@ -265,7 +265,6 @@
 	}
 
 	.examComponents-box {
-		background: #FFFFFF;
 		margin-top: 30rpx;
 	}
 </style>

src/components/index/scoreDetails/analysisTest.vue

@@ -16,9 +16,9 @@
                 <td class="analysisTest-td" style="min-width: 56rpx;" :style="{'min-width':(item.KnowledgePoint.length*20+20)+'rpx'}" v-for="(item,index) in ScoreList" :key="index">
                     <view class="analysisTest-number">{{item.Sort}}</view>
                     <view class="analysisTest-difficulty">						
-						<view v-if="item.Difficulty == '易'"><van-icon name="star" v-for="(s,i) in 1" :key="i"/></view>
-						<view v-else-if="item.Difficulty == '中'"><van-icon name="star" v-for="(s,i) in 2" :key="i"/></view>
-						<view v-else-if="item.Difficulty == '难'"><van-icon name="star" v-for="(s,i) in 3" :key="i"/></view>
+						<template v-if="item.Difficulty == '易'"><van-icon name="star" v-for="(s,i) in 1" :key="i"/></template>
+						<template v-else-if="item.Difficulty == '中'"><van-icon name="star" v-for="(s,i) in 2" :key="i"/></template>
+						<template v-else-if="item.Difficulty == '难'"><van-icon name="star" v-for="(s,i) in 3" :key="i"/></template>
                     </view>
                     <view class="analysisTest-KnowledgePoint">{{item.KnowledgePoint}}</view>
                     <view class="analysisTest-ScoreOne">{{item.QScore}}</view>

src/components/index/scoreDetails/examDetailsComponents.vue

@@ -223,9 +223,10 @@
         position: relative;
     }
     .examDetailsComponents-time text{
+        width: 50rpx;
         font-size: 20rpx;
         font-weight: bold;
-        white-space: nowrap;
+        white-space: wrap;
         margin-top: 18rpx;
         margin-left: 4rpx;
     }

src/components/setComments/rulesPopup.vue

@@ -9,7 +9,8 @@
 					<view class="rulesPopup-RuleSettings">
 						<text class="RuleSettings-title">规则设置</text>
 						<view class="RuleSettings-slider">
-							<van-slider v-model="valueNum" range @change="onChange" />
+							<sRegionSlider :minValue="minValue" :maxValue="maxValue" :step="1"
+							@up="up"  @down="down"  @move="move" />
 						</view>
 					</view>
 				</view>
@@ -24,6 +25,7 @@
 	</view>
 </template>
 <script>
+	import sRegionSlider from '@/components/sregionslider/sregionslider'
 	import {
 		ref,
 		reactive,
@@ -37,17 +39,18 @@
 		uploadFile
 	} from "@/utils/index";
 	export default {
+		components: {
+			sRegionSlider
+		},
 		props: {
 
 		},
 		emits: ['change'],
-		components: {},
 		setup(props, ctx) {
 			let {
 				proxy
 			} = getCurrentInstance();
 			let data = reactive({
-				valueNum: [10, 50],
 				show: false,
 				loading: false,
 				isRange: true,
@@ -57,9 +60,22 @@
 					StartNum: 0, //开始值
 					EndNum: 0, //结束值
 					Info: "", //评价
-				}
+				},
+				minValue:0,
+				maxValue:10
 			});
 			let methods = {
+				chage(minValue,maxValue){
+					data.minValue = minValue;
+					data.maxValue = maxValue;
+				},
+				up(e){
+					// console.log(e);//// e中包含了原有的e信息, 并添加了custom对象
+					data.minValue = e.custom.minValue;
+					data.maxValue = e.custom.maxValue;
+				},
+				down(e){ },
+				move(e){ },
 				showFun(item) {
 					if (item) {
 						data.ruleObj.DetailId = item.DetailId;
@@ -113,7 +129,7 @@
 	}
 
 	.RuleSettings-slider {
-		padding: 52rpx 0 66rpx 0;
+		padding: 0 0 30rpx 0;
 	}
 
 	.rulesPopup-save view {

src/components/setComments/setComments.vue

@@ -83,7 +83,7 @@
 				},
 				addComments(){
 					uni.navigateTo({
-						url: '/pages/setComments/commentRulesList'
+						url: '/pages/setComments/commentRulesList?show=' + true
 					})
 				},
 				goComment(item){

src/pages/index/examDetails.vue

@@ -10,8 +10,13 @@
         <view class="jobDetails-content flex" style="flex-direction: column;flex:1;height:1px">
             <view class="jobDetails-content-header">
                 <view class="jobDetails-conten-title flex">
-                    <text>{{CreateTime}}</text>
-                    <view>{{ExamName}}</view>
+                    <view class="conten-title-left flex">
+                        <text>{{CreateTime}}</text>
+                        <view>{{ExamName}}</view>
+                    </view>
+                    <view class="conten-title-right">
+                        <text>仅查看未匹配学员</text>
+                    </view>
                 </view>
                 <view class="jobDetails-num-box flex">
                     <view class="jobDetails-num flex">
@@ -121,20 +126,35 @@
         justify-content: space-between;
         padding: 70rpx 185rpx 35rpx 185rpx;
     }
-    .jobDetails-conten-title view{
+    .conten-title-right text{
+        background: #C91727;
+        border-radius: 27rpx;
+        font-size: 24rpx;
+        font-weight: bold;
+        color: #FFFFFF;
+        padding: 10rpx 19rpx;
+        display: block;
+    }
+    .conten-title-right{
+        flex-shrink: 0;
+    }
+    .conten-title-left view{
         font-size: 50rpx;
         font-weight: 800;
     }
-    .jobDetails-conten-title text{
+    .conten-title-left text{
         font-size: 36rpx;
         font-weight: 400;
         margin-bottom: 10rpx;
     }
+    .conten-title-left{
+        color: #282828;
+        flex-direction: column;
+    }
     .jobDetails-conten-title{
         padding: 50rpx 50rpx 0 50rpx;
-        flex-direction: column;
-        color: #282828;
         letter-spacing: 1rpx;
+        justify-content: space-between;
     }
     .jobDetails-content-header{
         

src/pages/setComments/commentRulesList.vue

@@ -86,11 +86,16 @@
 				show:false
 			});
 			let methods = {
+				
 				back() {
 					uni.navigateBack({
 						delta: 1
 					})
 				},
+				// 关闭规则弹窗
+				closure(){
+					refs.getrulesPopup.$vm.closepopup()
+				},
 				saveRules() { //保存规则
 					proxy.$request("/Teacher/SetCourseComment", data.courseRule).then(res => {
 						if (res) {
@@ -111,9 +116,9 @@
 				//编辑规则
 				editRules(item) {
 					data.show = true
-
 					refs.getrulesPopup.$vm.showFun(item)
 				},
+
 				//删除规则
 				deleteRules(item, index) {
 					let self=this;
@@ -205,6 +210,18 @@
 		},
 		onLoad(option) {
 			this.Msg.CourseId = option.CourseId;
+			if(option.show){
+				this.show = option.show
+				this.addRules()
+			}
+			if(option.CourseId){
+				this.show = true
+				this.addRules()
+				setTimeout(()=>{
+					this.show = false
+					this.closure()
+				},200)
+			}
 			this.getCourseRule();
 		},
 	};