Merge branch 'develop' into hhb/develop-2205

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -434,7 +434,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 lessonDis.record = 1;
             }
             //删除数据的情况
-            else if (oldRecord != null && newRecord == null)
+            /*else if (oldRecord != null && newRecord == null)
             {
                 lessonDis.record = -1;
                 //P分数量加减
@@ -451,7 +451,7 @@ namespace TEAMModelOS.SDK.Models.Service
                 {
                     lessonDis.disTCount = -1;
                 }
-            }
+            }*/
             //无效操作
             else if (oldRecord == null && newRecord == null)
             {
@@ -571,8 +571,16 @@ namespace TEAMModelOS.SDK.Models.Service
                 string code = string.Empty;
                 if (data.scope != null && data.scope.Equals("school"))
                 {
-                    code = $"LessonCount-{data.school}-{year}-{data.periodId}";
-                    tbname = "School";
+                    if (string.IsNullOrEmpty(data.periodId))
+                    {
+                        code = $"LessonCount-{data.school}-{year}";
+                        tbname = "School";
+                    }
+                    else {
+                        code = $"LessonCount-{data.school}-{year}-{data.periodId}";
+                        tbname = "School";
+                    }
+                    
                 }
                 else
                 {
@@ -589,12 +597,6 @@ namespace TEAMModelOS.SDK.Models.Service
                     count.pCount[day - 1] += lessonDis.disPCount;
                     count.ptCount[day - 1] += lessonDis.disDCount;
                     count.beginCount[day - 1] += lessonDis.record;
-                    /*if (!count.courseIds.Contains(data.courseId))
-                    {
-                        count.courseIds.Add(data.courseId);
-                        count.beginCount[day] += 1;
-                    }*/
-
 
                     await client.GetContainer("TEAMModelOS", tbname).ReplaceItemAsync(count, count.id, new PartitionKey(code));
                 }

TEAMModelOS/ClientApp/public/index.html

@@ -5,6 +5,12 @@
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
+	<!--设置不缓存页面-->
+	<meta http-equiv="Pragma" content="no-cache">
+	<!--设置不修改消息存储-->
+	<meta http-equiv="Cache-control" content="no-cache">
+	<!--同上-->
+	<meta http-equiv="Cache" content="no-cache">
 	<link rel="icon" href="<%= BASE_URL %>favicon.ico">
 	<link id="theme" type="text/css" rel="stylesheet" href="<%= BASE_URL %>theme/dark-theme.css">
 	<!-- <script src="<%= BASE_URL %>lang/zh-CN.js"></script>

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -5539,6 +5539,12 @@ const LANG_EN_US = {
     },
     // 学情分析
     totalAnalysis: {
+        backToTop:'返回頂部',
+        noMore:'沒有更多了',
+        reachBottomTip:'我也是有底線的',
+        filterOrigin:'評測來源',
+        examName:'評測名稱',
+        examNameTip:'請輸入評測名稱',
         totalIndex: {
             title: 'Learning Status Analysis Dashboard',
             tab1: 'Statistical Data',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -5539,6 +5539,12 @@ const LANG_ZH_CN = {
     },
     // 学情分析
     totalAnalysis: {
+        backToTop:'返回顶部',
+        noMore:'没有更多了',
+        reachBottomTip:'我也是有底线的',
+        filterOrigin:'评测来源',
+        examName:'评测名称',
+        examNameTip:'请输入评测名称',
         totalIndex: {
             title: '学情分析仪表盘',
             tab1: '统计数据',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -5539,6 +5539,12 @@ const LANG_ZH_TW = {
     },
     // 学情分析
     totalAnalysis: {
+        backToTop:'返回頂部',
+        noMore:'沒有更多了',
+        reachBottomTip:'我也是有底線的',
+        filterOrigin:'評測來源',
+        examName:'評測名稱',
+        examNameTip:'請輸入評測名稱',
         totalIndex: {
             title: '學情分析儀表',
             tab1: '統計資料',

TEAMModelOS/ClientApp/public/web/viewer.html

@@ -31,10 +31,12 @@ See https://github.com/adobe-type-tools/cmap-resources
 
 <!-- This snippet is used in production (included from viewer.html) -->
 <link rel="resource" type="application/l10n" href="locale/locale.properties">
-<script src="../pdfjs/pdf.js"></script>
-
-  <script src="viewer.js"></script>
-
+<!-- <script src="../pdfjs/pdf.js"></script> -->
+<script>
+    var now = new Date().getTime();
+    document.write('<script language="javascript" src="../pdfjs/pdf.js?t=' + now + '"><\/script\>');
+    document.write('<script language="javascript" src="viewer.js?t=' + now + '"><\/script\>');
+ </script>
   </head>
 
   <body tabindex="1">

TEAMModelOS/ClientApp/src/components/dashboard/art/RightTop.vue

@@ -2,11 +2,11 @@
   <div id="bottomLeft">
 	  <p class="dashboard-block-title">
 	  	<Icon type="md-pulse" />
-	  	<span>{{ $store.state.dashboard.classType === 'all' ? '各班级测评情况统计' : '班级测评情况统计' }}</span>
+	  	<span>{{ classType === 'all' ? '各班级测评情况统计' : '班级测评情况统计' }}</span>
 		<dv-decoration-1 class="dv-dec-3" />
 	  </p>
     <div class="bg-color-black">
-        <BaseClassLineBar v-if="$store.state.dashboard.classType === 'all'"/>
+        <BaseClassLineBar v-if="classType === 'all'"/>
         <BaseStuLineBar v-else/>
     </div>
   </div>
@@ -19,7 +19,13 @@ export default {
   components: {
     BaseClassLineBar,
     BaseStuLineBar
-  }
+  },
+  computed: {
+    classType() {
+      console.log(this.$store.state.dashboard.classType);
+      return this.$store.state.dashboard.classType
+    }
+  },
 }
 </script>
 

TEAMModelOS/ClientApp/src/view/Home.vue

@@ -441,7 +441,7 @@ export default {
 .header-right-box .overlay-qrcode {
     position: absolute;
     right: 115px;
-    bottom: -215px;
+    top: 40px;
     background-color: #fff;
     padding: 10px;
     border-radius: 8px;

TEAMModelOS/ClientApp/src/view/dashboard/Art.vue

@@ -128,6 +128,7 @@ export default {
   },
   created() {
     this.curPeriod = this.$store.state.user.curPeriod
+    this.$store.state.dashboard.classType = 'all'
     this.getDashboardData()
     this.onChangeSubject('music')
   },

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/EarlyWarning.vue

@@ -19,7 +19,7 @@
 			<div class="percent-item" v-show="isAllSubject">
 				<div class="fl-col-center">
 					<span class="percent-name">{{ this.$t('totalAnalysis.ach_text9') }}</span>
-					<span class="percent-value">{{ ((currentClass.lineCount / currentClass.stuCount) * 100).toFixed(1) }}%</span>
+					<span class="percent-value">{{ currentClass.stuCount ? ((currentClass.lineCount / currentClass.stuCount) * 100).toFixed(1) : 0 }}%</span>
 				</div>
 			</div>
 			<div class="percent-item">

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue

@@ -14,7 +14,7 @@
           <transition name="indexFade">
             <div class="el-filter-wrap" v-show="isShowFilter">
               <div class="el-filter-item">
-                <span class="el-filter-title">{{ `评测来源` }}:</span>
+                <span class="el-filter-title">{{ $t('totalAnalysis.filterOrigin') }}:</span>
                 <RadioGroup v-model="filterScope" type="button" @on-change="filterScopeChange">
                   <Radio label="school">{{ $t('learnActivity.mgtScEv.listLabel1') }}</Radio>
                   <Radio label="teacher">{{ $t('learnActivity.mgtScEv.listLabel2') }}</Radio>
@@ -63,8 +63,8 @@
                 </RadioGroup>
               </div>
               <div class="el-filter-item">
-                <span class="el-filter-title">{{ `评测名称` }}:</span>
-                <Input v-special-char v-model="searchValue" search :placeholder="`输入评测名称`" @on-search="doFilter" @on-enter="doFilter" />
+                <span class="el-filter-title">{{ $t('totalAnalysis.examName') }}:</span>
+                <Input v-special-char v-model="searchValue" search :placeholder="$t('totalAnalysis.examNameTip')" @on-search="doFilter" @on-enter="doFilter" />
               </div>
               <!-- 暂时隐藏学期筛选 -->
               <!-- <div class="el-filter-item">
@@ -129,7 +129,7 @@
 										</span> -->
                 </div>
               </div>
-              <p v-if="noMoreData" style="text-align: center;padding-top:20px;color:#888;font-weight: bold;">我也是有底线的~</p>
+              <p v-if="noMoreData" style="text-align: center;padding-top:20px;color:#888;font-weight: bold;">{{ $t('totalAnalysis.reachBottomTip') }}</p>
             </div>
           </div>
         </div>
@@ -253,7 +253,7 @@ export default {
         setTimeout(() => this.isLoadingList = false, 1000)
       } else {
         this.noMoreData = true
-        this.$Message.warning('没有更多了')
+        this.$Message.warning(this.$t('totalAnalysis.noMore'))
       }
     },
     /* 获取当前学校基础信息 */

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/index.vue

@@ -5,7 +5,7 @@
 			<!-- 右侧数据展示区域 -->
 			<div class="total-content light-iview-select" ref="dataContainer">
 				<vuescroll ref="vs" @handle-scroll="handleScroll">
-					<div class="back-to-top fl-col-center" title="返回顶部" v-if="isShowBackToTop" @click="handleBackToTop">
+					<div class="back-to-top fl-col-center" :title="$t('totalAnalysis.backToTop')" v-if="isShowBackToTop" @click="handleBackToTop">
 						<Icon type="ios-arrow-up" />
 					</div>
 					<!--<Spin fix v-show="contentLoading"></Spin>-->