Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS.SDK/Models/Cosmos/Common/MQActivity.cs

@@ -24,6 +24,7 @@ namespace TEAMModelOS.SDK.Models
         public string blob { get; set; }
         public long startTime { get; set; }
         public long endTime { get; set; }
+        public string source { get; set; }
 
     }
     public class Sub { 

TEAMModelOS.SDK/Models/Service/TriggerStuActivity.cs

@@ -46,6 +46,7 @@ namespace TEAMModelOS.SDK
                             scode = activity.code,
                             name = activity.name,
                             code = $"Activity-{tmdid.id}",
+                            source = activity.source,
                             scope = activity.scope,
                             school = activity.school,
                             creatorId = activity.creatorId,
@@ -74,6 +75,7 @@ namespace TEAMModelOS.SDK
                             name = activity.name,
                             code = $"Activity-{activity.school}-{student.id}",
                             scope = activity.scope,
+                            source = activity.source,
                             school = activity.school,
                             creatorId = activity.creatorId,
                             pk = "Activity",

TEAMModelOS/ClientApp/src/components/questionnaire/BaseProgress.vue

@@ -131,7 +131,7 @@
 							},
 							coordinateSystem: 'polar',
 							roundCap: true,
-							barWidth: 18, //大的占比环
+							barWidth: 24, //大的占比环
 							itemStyle: {
 							    normal: {
 							        color: new this.$echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -147,7 +147,7 @@
 						{
 							type: 'pie',
 							name: '内层细圆环',
-							radius: ['50%', '40%'],
+							radius: ['50%', '35%'],
 							// radius: '50%',
 							startAngle: 90,
 							hoverAnimation: false,

TEAMModelOS/ClientApp/src/components/student-web/HomeView/newHomeView.vue

@@ -529,6 +529,7 @@ export default {
             }
             //改變ItemName的狀態 vuex mutations
             this.$store.commit("ChangeItemName", item);
+            localStorage.setItem("Item", encodeURIComponent(JSON.stringify(item)))
         },
 
         choiceDate(date) {

TEAMModelOS/ClientApp/src/utils/evTools.js

@@ -276,7 +276,7 @@ export default {
 							/* 如果是来自试卷的题目 则需要匹配试卷HOST */
 							if(paperItem && paperItem.examId){
 								let examContainer = paperItem.examId
-								let blobUrl = src.includes(curHost) ? src : (curHost +  '/' + examContainer  + paperItem.blob +  '/' + src)
+								let blobUrl = src.includes(curHost) ? src.split('?')[0] : (curHost +  '/' + examContainer  + paperItem.blob +  '/' + src)
 								try{
 									let addSasUrl = await $tools.getFileSas(blobUrl)
 									richTextObj[key] = richTextObj[key].replace(`src="${ src }"`, `src="${ addSasUrl.url }"`);
@@ -284,7 +284,7 @@ export default {
 									j(500)
 								}
 							}else if(paperItem){
-								let blobUrl = src.includes(curHost) ? src : (curHost +  '/'  + container + '/paper/' + paperItem.name + '/' + src)
+								let blobUrl = src.includes(curHost) ? src.split('?')[0] : (curHost +  '/'  + container + '/paper/' + paperItem.name + '/' + src)
 								try{
 									let addSasUrl = await $tools.getFileSas(blobUrl)
 									richTextObj[key] = richTextObj[key].replace(`src="${ src }"`, `src="${ addSasUrl.url }"`);
@@ -292,7 +292,7 @@ export default {
 									j(500)
 								}
 							}else{
-								let blobUrl = src.includes(curHost) ? src : (curHost +  '/'  + container + '/item/' + exerciseItem.id + '/' + src)
+								let blobUrl = src.includes(curHost) ? src.split('?')[0] : (curHost +  '/'  + container + '/item/' + exerciseItem.id + '/' + src)
 								try{
 									let addSasUrl = await $tools.getFileSas(blobUrl)
 									richTextObj[key] = richTextObj[key].replace(`src="${ src }"`, `src="${ addSasUrl.url }"`);

TEAMModelOS/ClientApp/src/view/evaluation/components/BasePasteTool.vue

@@ -86,8 +86,7 @@
 					if (item.kind === "string" && item.type === 'text/html') {
 						item.getAsString(async (str) => {
 							// 先排查粘贴的内容里面是否包含图片
-							console.log(that.normalizeSpacing(str))
-							let html = stemEditor.txt.html()
+							let html = that.normalizeSpacing(str)
 							let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/ig;
 							let srcArr = html.match(srcReg)
 							let srcArrStr = str.match(srcReg)
@@ -102,6 +101,8 @@
 									// 如果开启则直接进行转换操作
 									let base64Arrs = await that.transBase64ByTool(localImgArr)
 									console.log('转换前的',html);
+									console.log(base64Arrs);
+									html = html.replace('v:imagedata', 'img')
 									// 获取到转换后的Base64要进行图片替换
 									localImgArr.forEach((i,index) => {
 										html = html.replace(i, base64Arrs[index])

TEAMModelOS/ClientApp/src/view/homepage/AcCountPie.vue

@@ -16,7 +16,7 @@ export default {
     data() {
         return {
             index: 0,
-            color: ['#00f492', '#fa8d38', '#f862bb', '#65dcda', '#d6b8ff'],
+            color: ['#00C6CF', '#7FD1AE', '#8685EF', '#DBBEBC', '#E1DEF1'],
             typeCountPie: undefined,
             option: {
                 tooltip: {

TEAMModelOS/ClientApp/src/view/homepage/NewHomePage.less

@@ -142,7 +142,7 @@
     margin-top: 5px;
 }
 .text-title{
-    background: rgba(45, 183, 245, 0.6);
+    background: #70B1F0;
     width: fit-content;
     color: white;
     padding: 1px 10px 2px 8px;
@@ -154,7 +154,7 @@
         top: 6px;
         border-right: 12px solid transparent;
         border-left: 12px solid transparent;
-        border-bottom: 12px solid rgba(45, 183, 245, 0.6);
+        border-bottom: 12px solid #70B1F0;
         transform: rotate(90deg);
     }
 }
@@ -166,6 +166,7 @@
 }
 .notice-list-wrap{
     height: 184px;
+    margin-top: 10px;
 }
 .going-box{
     margin-bottom: 10px;
@@ -191,6 +192,7 @@
     width: 100%;
     color: @second-textColor;
     padding: 5px 0px;
+    padding-left: 10px;
     font-size: 14px;
     display: flex;
     cursor: pointer;

TEAMModelOS/ClientApp/src/view/homepage/NewHomePage.vue

@@ -119,7 +119,7 @@
                                         <span class="ac-name-label">{{item.name}}</span>
                                     </p>
                                     <p class="ac-time-wrap">
-                                        <Icon type="md-alarm" />
+                                        <Icon type="md-alarm" color="#6a9a8b" />
                                         {{$jsFn.dateFormat(item.startTime)}} - {{$jsFn.dateFormat(item.endTime)}}
                                     </p>
                                 </div>
@@ -183,7 +183,7 @@ export default {
             noticeList: [],
             viewNoticeStatus: false,
             noticeIndex: 0,
-            strokeColor: ['#5cadff', '#2d8cf0'],
+            strokeColor: ['#3381E8', '#19be6b',],
             strokeColor1: ['#00ffa0', '#19be6b'],
             onlineInfo: {
                 name: '线上研修',

TEAMModelOS/ClientApp/src/view/learnactivity/CreateSchoolEva.vue

@@ -121,7 +121,7 @@
         <Modal v-model="addSubjectStatus" :title="$t('learnActivity.createEv.addSubject')" @on-ok="confirmAddSubject">
             <div style="padding:20px 0px;">
                 <CheckboxGroup v-model="evaluationInfo.subjectIds">
-                    <Checkbox v-for="(subjectItem,index) in curSubjects" :key="index" :label="subjectItem.id">
+                    <Checkbox v-for="(subjectItem,index) in curSubjects" :key="index" :label="subjectItem.id" style="margin-bottom:10px;margin-right:15px">
                         <span>{{subjectItem.name}}</span>
                     </Checkbox>
                 </CheckboxGroup>

TEAMModelOS/ClientApp/src/view/learnactivity/MgtSchoolEva.vue

@@ -459,9 +459,9 @@ export default {
 
         //查询评测列表
         findEvaluation() {
+            this.isLoading = true
             let requestData = {
-                code: this.scope == 'school' ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo.TEAMModelId,
-                // classIds: undefined
+                code: this.scope == 'school' ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo.TEAMModelId
             }
             this.$api.learnActivity.FindExamInfo(requestData).then(
                 res => {
@@ -473,20 +473,17 @@ export default {
                         this.evaListShow = res.examInfo
                         if (this.scope == 'school') {
                             this.filterByPeriod()
-                            //如果当前学段没有评测则自动切换下一个学段
-                            // if (!this.evaListShow.length) {
-                            //     if (this.schoolBase.period && this.schoolBase.period.length > 1) {
-                            //         this.filterPeriod = this.schoolBase.period[1].id
-                            //         this.filterByPeriod()
-                            //     }
-                            // }
                         } else {
                             if (res.examInfo.length) this.selectEvaluation(0)
                         }
 
                     } else {
                         this.$Message.error('API ERROR!')
+                        this.isLoading = false
                     }
+                },
+                err=>{
+                    this.isLoading = false
                 }
             )
         },
@@ -578,9 +575,8 @@ export default {
                     this.schoolBase = res.school_base
                 }
             }
-        ).finally(() => {
-            this.findEvaluation()
-        })
+        )
+        this.findEvaluation()
     },
     watch: {
         $route: {

TEAMModelOS/ClientApp/src/view/learnactivity/markpaper/MarkData.vue

@@ -86,8 +86,8 @@
                         </template>
                         <template slot-scope="{ row }" slot="progress">
                             <div style="display: flex;justify-content: center;">
-                                <i-circle :percent="row.percent" :size="40" :stroke-width="8" :trail-width="7" stroke-color="#5cb85c">
-                                    <span v-if="row.percent != 100" style="font-size:12px">{{row.percent}}%</span>
+                                <i-circle :percent="row.percent || 0" :size="40" :stroke-width="8" :trail-width="7" stroke-color="#5cb85c">
+                                    <span v-if="row.percent != 100" style="font-size:12px">{{row.percent || 0}}%</span>
                                     <Icon v-else type="ios-checkmark" size="30" style="color:#5cb85c"></Icon>
                                 </i-circle>
                             </div>

TEAMModelOS/ClientApp/src/view/newsheet/BaseEditor.vue

@@ -236,19 +236,19 @@
 							addStr +
 							'<span class="underline">' +
 							new Array(underLineSpaceCount).fill("&nbsp;").join("") +
-							"</span>";
+							"</span>&#8203";
 						lineBlankCount += item.blankCount
 					}
 					// 如果空格数量默认渲染状态下到3 则需要换行
 					if(lineBlankCount % 3 !== 0){
-						lineStr += `<span class='complete-item'>${addStr}</span>`
+						lineStr += `<span class='complete-item'>${addStr}</span>&#8203`
 						// 如果是最后一排 则直接渲染 不需要排满
 						if(index === items.length - 1){
 							lineStr = '<p>' + lineStr + '</p>'
 							totalStr += lineStr
 						}
 					}else{
-						lineStr += `<span class='complete-item'>${addStr}</span>`
+						lineStr += `<span class='complete-item'>${addStr}</span>&#8203`
 						lineStr = '<p>' + lineStr + '</p>'
 						totalStr += lineStr
 						lineStr = ''

TEAMModelOS/ClientApp/src/view/task/mark/ByQu.vue

@@ -16,7 +16,7 @@
             <span class="info-label">{{$t('learnActivity.mark.stuId')}}: </span>
             <span class="info-value cur-stu-id">{{stusInfo[stuIndex] ? stusInfo[stuIndex].stuId : ''}}</span>
             <div class="btn-wrap">
-                <span class="action-btn" @click="toggleStatus = !toggleStatus">
+                <span class="action-btn" @click="toggleStatus = true">
                     <Icon type="md-shuffle" class="action-btn-icon" />
                     {{$t('learnActivity.mark.toggleQu')}}
                 </span>