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

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseScoreRateBar.vue

@@ -55,7 +55,7 @@
 					legend: {
 						top: '5%',
 						right: '50%',
-						data: ['人数'],
+						data: [that.$t('unit.text13')],
 						textStyle: {
 							fontSize: 12,
 							color: '#808080'
@@ -129,7 +129,7 @@
 
 					}],
 					yAxis: [{
-						name: '人数',
+						name: that.$t('unit.text13'),
 						nameTextStyle: {
 							color: '#808080',
 							fontSize: 12,
@@ -155,7 +155,7 @@
 						}
 					}],
 					series: [{
-						name: '人数',
+						name: that.$t('unit.text13'),
 						type: 'bar',
 						label: {
 							show: true,

TEAMModelOS/ClientApp/src/components/vote/BaseVoteTable.vue

@@ -49,7 +49,7 @@
                         }
                     },
                     {
-                        title: '数量',
+                        title: vm.$t('home.countNum'),
                         render: (h, params) => {
                             return h('span', params.row.result.length)
                         },

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

@@ -11,5 +11,6 @@ export default {
     text10: ' question(s)',
     text11: 'point(s)',
     text12: 'total',
+	text13:'person',
     gradeYear:'',
   }

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

@@ -132,7 +132,7 @@ export default {
             sendInvite:'发送邀请',
             backHome: '重新检索'
         },
-        content: '<span>请输入<span class="point">手机号</span>、<span class="point">醍摩豆Id</span>或<span class="point">电子信箱</span >等资讯进行搜寻</span>',
+        content: '<span>请输入<span class="point">手机号</span>、<span class="point">用户编号</span>或<span class="point">电子信箱</span >等资讯进行搜寻</span>',
         skyBox:{
             text1: '本次搜寻结果',
             text2: '档案资料数',

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

@@ -11,5 +11,6 @@ export default {
   text10:'道',
   text11:'分',
   text12:'共',
+  text13:'人数',
   gradeYear:'级',
 }

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

@@ -132,7 +132,7 @@ export default {
             sendInvite:'發送邀請',
             backHome: '重新檢索'
         },
-        content: '<span>請輸入<span class="point">手機號</span>、<span class="point">醍摩豆Id</span>或<span class="point">電子信箱</span>等資訊進行搜尋</span>',
+        content: '<span>請輸入<span class="point">手機號</span>、<span class="point">用戶編號</span>或<span class="point">電子信箱</span>等資訊進行搜尋</span>',
         skyBox:{
             text1: '本次搜尋結果',
             text2: '檔案資料數',

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

@@ -11,5 +11,6 @@ export default {
   text10: '道',
   text11: '分',
   text12: '共',
+  text13:'人數',
   gradeYear: '級',
 }

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

@@ -918,6 +918,15 @@
 </style>
 
 <style lang="less">
+	
+	.rule-item{
+		.ivu-radio-wrapper{
+			display: table;
+			text-overflow: ellipsis;
+			white-space: normal;
+		}
+	}
+	
 	.ex-score-modal{
 		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 		

TEAMModelOS/ClientApp/src/view/evaluation/index/CommonExercise.less

@@ -252,7 +252,7 @@
     }
     .explain-title {
       width: 12%;
-      max-width: 85px;
+      max-width: 100px;
       display: inline-block;
       color: rgb(16, 171, 231);
     }
@@ -265,7 +265,8 @@
   .item-explain-details {
     vertical-align: top;
     display: inline-block;
-    width: calc(100% - 90px);
+    width: calc(100% - 100px);
+    // width: 90%;
     .item-point-tag {
       padding: 0 10px;
       border: 1px solid #d6d6d6;

TEAMModelOS/ClientApp/src/view/evaluation/index/CreateExercises.less

@@ -191,7 +191,7 @@ exersices-attr-diff {
 
 .ev-container .option-setting {
     display: inline-flex !important;
-    width: 80px;
+    width: 120px;
     min-height: 40px;
     color: #a0a0a0;
     background: rgb(240,240,240);

TEAMModelOS/ClientApp/src/view/learnactivity/AutoCreateNew.less

@@ -58,7 +58,7 @@
 			
 			&-text{
 				display: inline-block;
-				min-width: 45px;
+				min-width: 70px;
 				text-align: center;
 			}
 		}

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/TestAnalysis/TestAnalysis.css

@@ -57,7 +57,7 @@
 
 .scatter-statistics .index-box {
     width: 150px;
-    word-break: break-all;
+    word-break: break-word;
     text-overflow: -o-ellipsis-lastline;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -70,7 +70,7 @@
     .scatter-statistics .scatter-table-line span {
         text-align: center;
         width: 150px;
-        word-break: break-all;
+        word-break: break-word;
         overflow: hidden;
         text-overflow: ellipsis;
     }

TEAMModelOS/ClientApp/src/view/syllabus/Syllabus.less

@@ -109,6 +109,9 @@
 				margin-left: 10px;
 				overflow: hidden;
 				padding-bottom: 40px;
+				
+				
+				
 				.volume-item{
 					padding: 10px 0 10px 20px;
 					display: flex;

TEAMModelOS/ClientApp/src/view/syllabus/Syllabus.vue

@@ -62,7 +62,7 @@
 								<span>|</span>
 								<span>{{ getSemesterName(volume.semesterId) }}</span>
 								<span style="margin: 0 8px;">|</span>
-								<Tooltip placement="bottom">
+								<Tooltip placement="bottom" style="white-space: normal;">
 									<span>{{ $t('syllabus.authorsTitle') }} {{ volume.auth.length }} </span>
 									<!-- <Icon type="md-information-circle" color="#9e9e9e" /> -->
 									<div slot="content">
@@ -1929,6 +1929,11 @@
 
 <style lang="less" src="./Syllabus.less" scoped></style>
 <style lang="less">
+	.volume-list {
+		.ivu-tooltip-inner{
+			white-space: normal;
+		}
+	}
 	.syllabus-header {
 		.ivu-select-selection {
 			width: 140px;