Merge branch 'develop5.0-tmd' into develop5.0-grouplist

TEAMModelFunction/TriggerExam.cs

@@ -710,13 +710,13 @@ namespace TEAMModelFunction
                 int phcount = 0;
                 int plcount = 0;
                 //存放并去重知识点
-                List<int> knowledgeName = new List<int>();
-                knowledgeName.Add(1);
+                List<int> knowledgeName = new List<int>() { 1,2,3,4,5,6};
+/*                knowledgeName.Add(1);
                 knowledgeName.Add(2);
                 knowledgeName.Add(3);
                 knowledgeName.Add(4);
                 knowledgeName.Add(5);
-                knowledgeName.Add(6);
+                knowledgeName.Add(6);*/
                 foreach (ExamClassResult classResult in classResults)
                 {
                     if (classResult.subjectId.Equals(subject.id))

TEAMModelOS/ClientApp/src/locale/lang/en-US/jyzx.js

@@ -24,6 +24,7 @@ export default{
         success2: "举报成功",
         success3: "删除成功",
         error: "删除失败",
+        noData:'暂无数据',
     },
     // 线上研修
     online: {

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/jyzx.js

@@ -24,6 +24,7 @@ export default{
         success2: "举报成功",
         success3: "删除成功",
         error: "删除失败",
+        noData:'暂无数据',
     },
     // 线上研修
     online: {

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js

@@ -24,6 +24,7 @@ export default{
         success2: "舉報成功",
         success3: "刪除成功",
         error: "刪除失敗",
+        noData:'暫無數據',
     },
     // 线上研修
     online: {

TEAMModelOS/ClientApp/src/view/jyzx/application.vue

@@ -49,7 +49,7 @@
                         </div>
                     </TabPane>
                     <TabPane :label="$t('jyzx.application.discuss')" name="name2">
-                        <EmptyData textContent="暂无数据" v-if="!otherList.length"></EmptyData>
+                        <EmptyData :textContent="$t('jyzx.common.noData')" v-if="!otherList.length"></EmptyData>
                         <div v-else class="app-table">
                             <Table :columns="comCol" :data="otherList">
 								 <template slot-scope="{ row }" slot="myAppraise">
@@ -73,7 +73,7 @@
                 <span>{{ $store.state.userInfo.name }} 【 {{ curData.name }} 】</span>
             </div>
             <Table :columns="appraiseColumns" :data="appraiseArr" border>
-                <template slot-scope="{ row, index }" slot="result">
+                <template slot-scope="{ row }" slot="result">
                     <span v-show="row.result === '优秀'" style="color: #007700;">{{ $t('jyzx.application.fine') }}</span>
                     <span v-show="row.result === '合格'" style="color: orangered;">{{ $t('jyzx.application.qualified') }}</span>
                     <span v-show="row.result === '不合格'" style="color: red;">{{ $t('jyzx.application.unqualified') }}</span>