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

TEAMModelOS/ClientApp/public/theme/dark-theme.css

@@ -1,11 +1,11 @@
-:root {
+:root {
     --header-bg: #1E1F21;
     --side-bg: #1E1F21;
     --primary-color: #1cc0f3; /*主题色*/
     --font-size-large: 16px; /*大号字体*/
     --font-size-normal: 14px; /*中号字体*/
     --font-size-small: 12px; /*小号字体*/
-    --font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif; /*字体*/
+    --font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",'Microsoft JhengHei',Arial,sans-serif; /*字体*/
     --active-item-center: #4E4E4E;
     --active-item-end: #6E6E6E;
     --top-height: 45px; /*列表头部高度*/

TEAMModelOS/ClientApp/src/App.vue

@@ -59,8 +59,11 @@
 </script>
 
 <style>
+	html,body{
+		font-family:'ALI' !important;
+	}
     #app {
-        font-family: 'Avenir', Helvetica, Arial, sans-serif;
+        /* font-family: 'Avenir', Helvetica, Arial, sans-serif; */
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         text-align: center;

TEAMModelOS/ClientApp/src/components/app-root.vue

@@ -48,7 +48,7 @@ body,
 html {
     width: 100%;
     height: 100%;
-    font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI",
-        "Microsoft YaHei", "微软雅黑", "Microsoft JhengHei";
+    /* font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI",
+        "Microsoft YaHei", "微软雅黑", "Microsoft JhengHei"; */
 }
 </style>

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

@@ -68,7 +68,7 @@
 			}
 			
 			&-content{
-				background-color: #ccffea;
+				background-color: #b9dbeb;
 				padding: 10px;
 				font-size: 14px;
 				margin-left: 20px;

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

@@ -51,7 +51,7 @@
 						type: 'pie',
 						radius: '50%',
 						center: ['50%', '50%'],
-						color: ['#eeeeee', '#1fb06d'],
+						color: ['#eeeeee', '#70B1E7'],
 						data: [{
 								value: this.total - this.noAnswerdCount,
 								name: that.$t('survey.questionaire.finished')
@@ -68,19 +68,19 @@
 								formatter: ['{c|{c}}' + that.$t('unit.text7'), '{b|{b}}'].join(' '),
 								rich: {
 									c: {
-										color: '#1fb06d',
+										color: '#70B1E7',
 										fontSize: 12,
 										fontWeight: 'bold',
 										lineHeight: 2
 									},
 									b: {
-										color: 'rgb(26, 109, 112)',
+										color: '#757575',
 										fontSize: 12,
 										height: 40
 									},
 								},
 								textStyle: {
-									color: '#1fb06d',
+									color: '#70B1E7',
 									fontSize: '12'
 								}
 							}
@@ -98,7 +98,7 @@
 						},
 						itemStyle: {
 							normal: {
-								shadowColor: 'rgba(0, 0, 0, 0.8)',
+								shadowColor: 'rgba(0, 0, 0, 0.5)',
 								shadowBlur: 10,
 							}
 						}

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

@@ -31,7 +31,7 @@
 				let that = this
 				// 基于准备好的dom，初始化echarts实例
 				let myBar = this.$echarts.init(document.getElementById(this.barId), 'chalk')
-				var color = ['#12a568', '#12a568', '#17d988']
+				var color = ['#12a568', '#12a568', '#70B1E7']
 				let option = {
 					// backgroundColor: 'rgba(255,255,255,0.05)',
 					title: {
@@ -137,10 +137,10 @@
 									opacity: 1,
 									color: new that.$echarts.graphic.LinearGradient(0, 0, 1, 1, [{
 										offset: 0,
-										color: '#1fb06d'
+										color: '#D0E5F6'
 									}, {
 										offset: 1,
-										color: '#1fb06d'
+										color: '#70B1E7'
 									}])
 								}
 							},

TEAMModelOS/ClientApp/src/components/questionnaire/BaseQnForm.less

@@ -1,6 +1,6 @@
 @main-bgColor: rgb(40,40,40); //主背景颜色
 @borderColor: #424242;
-@primary-color: #1fb06d;
+@primary-color: #70B1E7;
 @primary-textColor: #393939; //文本主颜色
 @second-textColor: #636363; //文本副级颜色
 @primary-fontSize: 14px;

TEAMModelOS/ClientApp/src/components/questionnaire/BaseQuestionnaire.less

@@ -14,7 +14,7 @@
     background: #fff;
     // padding: 30px 6%;
 	padding-bottom: 100px;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
+	// font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 
 	
 	.tools-bar{
@@ -141,7 +141,7 @@
 				top: -30px;
 				right:0;
 				font-size: 14px;
-				background: #00ae9b;
+				background: #4e94b4;
 				color:#fff;
 				visibility: hidden;
 				
@@ -154,7 +154,7 @@
 					}
 					
 					&:hover{
-						background: #2597ae;
+						// background: #2597ae;
 					}
 					
 					span{

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

@@ -2,7 +2,7 @@
     <div class="component-survey-table">
         <Table border size='small' ref="selection" :columns="columns" :data="tableData" stripe>
 			<template slot-scope="{ row, index }" slot="finish">
-				<span style="color: #26d4a0;font-weight: bold;" v-if="row.finish"><Icon type="ios-checkmark-circle" size="16"/> {{ $t('survey.questionaire.finished') }}</span>
+				<span style="color: #70B1E7;font-weight: bold;" v-if="row.finish"><Icon type="ios-checkmark-circle" size="16"/> {{ $t('survey.questionaire.finished') }}</span>
 				<span v-else>{{ $t('survey.questionaire.unfinished') }}</span>
 			</template>
 		</Table>

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

@@ -97,7 +97,7 @@
 
 <style>
     .export-container {
-        font-family: 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI','Microsoft JhengHei' !important;
+        /* font-family: 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI','Microsoft JhengHei' !important; */
     }
 
         .export-container .ivu-checkbox-wrapper {

TEAMModelOS/ClientApp/src/components/syllabus/DragTree.less

@@ -76,7 +76,7 @@
 }
 /* 修改iview Modal样式 */
 .tree-modal {
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
+	// font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	
 	
 	

TEAMModelOS/ClientApp/src/components/syllabus/InviteTeacher.vue

@@ -8,7 +8,7 @@
 			<div style="display: inline-block;" v-if="!isSchool">
 				<span>{{ $t('syllabus.sharedTeacher') }}：</span>
 				<!-- <span v-for="(item,index) in nodeInfo.auth" :key="item.tmdid" class="share-item">{{ item.tmdname }}( {{ item.tmdid }})</span> -->
-				<span v-if="!nodeInfo.auth || !nodeInfo.auth.length" style="color: #dacaca;">{{ $t('syllabus.noData') }}</span>
+				<span v-if="!nodeInfo.auth || !nodeInfo.auth.length">{{ $t('syllabus.noData') }}</span>
 				<Tag closable color="success" v-for="(item,index) in nodeInfo.auth" :key="item.tmdid" @on-close="doDelShare(item,index)">{{ item.tmdname }}( {{ item.tmdid }})</Tag>
 			</div>
 		</div>
@@ -345,9 +345,9 @@
 		
 		.search-id-wrap{
 			margin-top: 20px;
-			color: #adadad;
+			color: var(--second-text-color);
 			.point{
-				color: #F1F1F1;
+				color: #70B1E7;
 				font-weight: bold;
 				font-size: 16px;
 				margin: 0 10px;
@@ -365,10 +365,10 @@
 					line-height: 35px;
 				}
 				.ivu-input{
-					background-color: #474747;
-					border-color: #515151;
+					/* background-color: #474747;
+					border-color: #515151; */
 					font-size: 14px;
-					color: #ddd;
+					// color: #ddd;
 					margin: 20px 0;
 					border-radius: 50px;
 					padding-left: 20px;
@@ -387,7 +387,8 @@
 			}
 			
 			.search-result-wrap{
-				background-color: #4e4e4e;
+				// background-color: #4e4e4e;
+				border: 1px solid var(--border-color);
 				padding: 20px;
 				border-radius: 10px;
 				display: flex;
@@ -400,7 +401,7 @@
 					border-radius: 50%;
 				}
 				.t-name{
-					color: #fff;
+					color: #70B1E7;
 					font-size: 16px;
 					font-weight: bold;
 					margin: 10px 0;
@@ -417,7 +418,7 @@
 			.re-search{
 				margin: 20px 0;
 				text-decoration: underline;
-				color: #FFFCFC;
+				// color: #FFFCFC;
 				font-size: 14px;
 				cursor: pointer;
 			}

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

@@ -79,10 +79,10 @@
 							normal: {
 								color: new that.$echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 									offset: 0,
-									color: '#00fcae'
+									color: '#D0E5F6'
 								}, {
 									offset: 1,
-									color: '#006388'
+									color: '#70B1E7'
 								}]),
 								opacity: 1,
 								barBorderRadius: 12 //圆角大小

TEAMModelOS/ClientApp/src/components/vote/BaseVoteForm.less

@@ -1,6 +1,6 @@
 @main-bgColor: rgb(40,40,40); //��������ɫ
 @borderColor: #424242;
-@primary-color: #1fb06d;
+@primary-color: #70B1E7;
 @primary-textColor: #393939; //�ı�����ɫ
 @second-textColor: #636363; //�ı�������ɫ
 @primary-fontSize: 14px;

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

@@ -60,7 +60,7 @@
 						selectedOffset: 10,
 						clockwise: true,
 						center: ['50%', '40%'],
-						color: ['#eeeeee', '#1fb06d'], //'#FBFE27','rgb(11,228,96)','#FE5050'
+						color: ['#f1f1f1', '#70B1E7'], //'#FBFE27','rgb(11,228,96)','#FE5050'
 						data: [{
 							name: that.$t('vote.noVote'),
 							value: this.noChooseNum
@@ -74,19 +74,19 @@
 								formatter: ['{c|{c}}' + that.$t('unit.text7'), '{b|{b}}'].join('\n'),
 								rich: {
 									c: {
-										color: 'rgb(29, 188, 212)',
+										color: '#70B1E7',
 										fontSize: 12,
 										fontWeight: 'bold',
 										lineHeight: 2
 									},
 									b: {
-										color: 'rgb(26, 109, 112)',
+										color: '#757575',
 										fontSize: 12,
 										height: 40
 									},
 								},
 								textStyle: {
-									color: 'rgb(29, 188, 212)',
+									color: '#70B1E7',
 									fontSize: '12'
 								}
 							}
@@ -104,7 +104,7 @@
 						},
 						itemStyle: {
 							normal: {
-								shadowColor: 'rgba(0, 0, 0, 0.8)',
+								shadowColor: 'rgba(0, 0, 0, 0.5)',
 								shadowBlur: 10,
 							}
 						}

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

@@ -41,7 +41,7 @@
                         render: (h, params) => {
                             return h('Progress', {
                                 props: {
-									strokeColor:'#1fb06d',
+									strokeColor:'#70B1E7',
                                     percent: parseInt(((params.row.result.length / this.studentsNum) * 100).toFixed(2)),
                                     strokeWidth: 18,
                                     textInside:true

TEAMModelOS/ClientApp/src/css/less-variable.less

@@ -1,4 +1,4 @@
-@header-bg: #1E1F21;//头部菜单背景色
+@header-bg: #1E1F21;//头部菜单背景色
 @body-bg: #2B2B2E;//内容区域背景色
 @side-menu-bg: #1E1F21; //侧边菜单背景
 
@@ -8,7 +8,8 @@
 @font-size-large:16px;//大号字体
 @font-size-normal:14px;//中号字体
 @font-size-small:12px;//小号字体
-@font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;//字体
+// @font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;//字体
+@font-family: "ALI";//字体
 
 @primary-textColor: #fff; //文本主颜色
 @label-textColor: #a5a5a5; //标签颜色

TEAMModelOS/ClientApp/src/view/ability/Ability.less

@@ -3,8 +3,8 @@
 		height: 100vh;
 		overflow: auto;
 		padding-bottom: 100px;
-		background-color: #f7f7f7;
-		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
+		// background-color: #f7f7f7;
+		// font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 
 		.table-filter {
 			margin: 10px 0;

TEAMModelOS/ClientApp/src/view/ability/Ability.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="ability-container">
         <div v-if="!isShowDetail && !isShowReview">
-            <div class="table-filter">
+            <div class="table-filter light-iview-select light-iview-input">
                 <Select v-model="curAbility" style="width:250px" @on-change="onAbilityFilter">
                     <Option v-for="(item,index) in abilityList" :value="index" :key="index">{{ item.no }} {{ item.name }}</Option>
                 </Select>

TEAMModelOS/ClientApp/src/view/ability/TestPaper.less

@@ -68,7 +68,7 @@
 				}
 				
 				.ivu-radio-group-button .ivu-radio-wrapper-checked{
-					background-color: #16c18e;
+					background-color: #70B1E7;
 					color: #fff;
 				}
 				
@@ -102,7 +102,7 @@
 				}
 				
 				.ivu-checkbox-wrapper-checked.ivu-checkbox-border{
-					background-color: #16c18e;
+					background-color: #70B1E7;
 					color: #fff;
 				}
 				

TEAMModelOS/ClientApp/src/view/abilityMgmt/Index.less

@@ -138,7 +138,7 @@
 						font-size: 12px;
 						display: inline-block;
 						padding: 0 8px;
-						background-color: #16C18E;
+						background-color: #70B1E7;
 						color: #fff;
 						margin-right: 5px;
 						margin-bottom: 1px;
@@ -149,9 +149,9 @@
 					
 					.status-compulsory{
 						background-color: transparent;
-						color: #108d6c;
+						color: #70B1E7;
 						margin-left: 5px;
-						border: 1px solid #108d6c;
+						border: 1px solid #70B1E7;
 					}
 
 					.status-coedit {
@@ -272,6 +272,10 @@
 							align-items: center;
 							margin-right: 15px;
 							cursor: pointer;
+
+							&:hover{
+								color: #40A8F0;
+							}
 						}
 
 						.ivu-icon {

TEAMModelOS/ClientApp/src/view/abilityMgmt/Index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="ability-mgmt-container">
+	<div class="ability-mgmt-container light-iview-input light-iview-select">
 		<Loading v-if="isLoading" hideMask></Loading>
 		<div class="ability-mgmt-header">
 			<div class="period-select">

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

@@ -942,8 +942,6 @@
 	}
 	
 	.ex-score-modal{
-		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
-		
 		.ivu-table-body{
 			height: 600px !important;
 			overflow: auto !important;

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

@@ -2,7 +2,6 @@
     user-select: none !important;
     background: #fff;
     padding: 30px;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 }
 
     .ev-container .w-e-text-container {

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

@@ -11,7 +11,6 @@
     height: 100%;
     // background: #242328;
     user-select: none;
-	  font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	
 	.save-tips{
 		position: absolute;

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

@@ -1,7 +1,6 @@
 .paper-container {
 	position: relative;
     user-select: none !important;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	
 	.back-to-top {
 	    position:fixed;

TEAMModelOS/ClientApp/src/view/evaluation/index/TestPaper.vue

@@ -409,11 +409,6 @@
 <style src="../index/TestPaper.less" lang="less" scoped>
 </style>
 <style>
-	.ex-score-modal {
-		font-family: "NotoSerif", "微软正黑体", "Microsoft JhengHei UI",
-			"Microsoft JhengHei", Sans-serif;
-	}
-
 	.complete-line {
 		padding: 0 45px;
 		border-bottom: 2px solid rgb(128, 128, 128);

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

@@ -200,7 +200,10 @@ export default {
 				if(qnItem.owner === 'area'){
 					blobHost = this.$store.state.user.osblob_uri
 					sasString = { sas : '?' + this.$store.state.user.osblob_sas }
-				}
+				} else {
+                    blobHost = blobHost + '/' + cntr
+                    sasString = { sas : sasString }
+                }
                 let indexJson = JSON.parse(await this.$tools.getFile(blobHost + qnItem.blob + sasString.sas))
                 if(indexJson.slides.length) {
                     for (let item of indexJson.slides) {

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

@@ -371,11 +371,6 @@ export default {
     overflow: auto;
 }
 
-.application-container {
-    font-family: "NotoSerif", "微软正黑体", "Microsoft JhengHei UI",
-        "Microsoft JhengHei", Sans-serif;
-}
-
 .appraise-detail {
     padding: 20px;
 

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

@@ -360,7 +360,6 @@ export default {
 .class-memoir {
     padding:1%;
 	background-color: #f7f7f7;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
     .ivu-card {
         height: 100%;
         margin: 20px;

TEAMModelOS/ClientApp/src/view/jyzx/index.less

@@ -5,7 +5,6 @@
 	height: 100%;
 	display: flex;
 	flex-direction: column;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 
 	.online-content {
 		height: 100%;

TEAMModelOS/ClientApp/src/view/jyzx/offline.less

@@ -5,7 +5,6 @@
 	background-color: #fff;
 	display: flex;
 	flex-direction: column;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	.detailheader{
 		display: inline-block;
 		width:100%;

TEAMModelOS/ClientApp/src/view/knowledge-point/index/Index.vue

@@ -1179,10 +1179,6 @@
 		cursor: pointer;
 	}
 
-	/* 修改iview Modal样式 */
-	.point-modal {
-		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
-	}
 
 	.point-modal .ivu-modal-content {
 		/* background: #3c3c3c; */

TEAMModelOS/ClientApp/src/view/knowledge-point/index/operation/ComposeBlock.vue

@@ -147,7 +147,6 @@
 
      .compose-container .ivu-tabs {
         height:100%;
-		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
     }
 
     .compose-container .ivu-tabs-nav .ivu-icon {

TEAMModelOS/ClientApp/src/view/questionnaire/ManageQuestionnaire.less

@@ -64,7 +64,7 @@
             line-height: 45px;
             padding: 0 15px;
             // font-weight: bold;
-            border-bottom: 1px solid @borderColor;
+            // border-bottom: 1px solid @borderColor;
             display: flex;
             justify-content: space-between;
 

TEAMModelOS/ClientApp/src/view/questionnaire/ManageQuestionnaire.vue

@@ -135,7 +135,7 @@
 										</div>
 
 										<div class="qn-box-header-tools-tool" @click="onCancelEditQn" v-show="editable">
-											<Icon type="md-create" color="#209460" />
+											<Icon type="md-create" />
 											<span>{{ $t('survey.cancelEdit') }}</span>
 										</div>
 									</div>

TEAMModelOS/ClientApp/src/view/resource/Policy.less

@@ -12,6 +12,9 @@
     width: 48%;
     height: 400px;
     margin-bottom: 15px;
+    // border: 1px solid var(--border-color);
+    // border-radius: 3px;
+    box-shadow: 0px 0px 10px 2px var(--card-shadow);
 }
 .policy-info{
     list-style: none;

TEAMModelOS/ClientApp/src/view/settings/SchoolMgmt.css

@@ -1,7 +1,6 @@
 .school-container {
   display: flex;
   height: 100%;
-  font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 }
 .school-container .school-container-header {
   display: flex;

TEAMModelOS/ClientApp/src/view/statistics/Hour.vue

@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="class-hours-table">
-                <div class="table-tools-wrap">
+                <div class="table-tools-wrap light-iview-input">
                     <Input v-model="keyword" search placeholder="搜索" style="width:200px" @on-change="serchData" />
                     <Button type="text" style="float:right" @click="exportData">
                         <Icon type="md-download" />

TEAMModelOS/ClientApp/src/view/statistics/Result.vue

@@ -21,7 +21,7 @@
                 </div>
             </div>
             <div class="result-table-wrap">
-                <div class="table-tools-wrap">
+                <div class="table-tools-wrap light-iview-input">
                     <Input v-model="keyword" search placeholder="搜索" style="width:200px" @on-change="serchData" />
                     <Button type="text" style="float:right" @click="exportData">
                         <Icon type="md-download" />

TEAMModelOS/ClientApp/src/view/statistics/Statistics.less

@@ -14,13 +14,13 @@
     display: inline-block;
     line-height: 42px;
     cursor: pointer;
-    color: #808695;
+    color: var(--second-text-color);
     margin: 0px 35px 0px 10px;
     user-select: none;
     font-size: 15px;
 }
 .statistics-tab-active{
-    border-bottom: 2px solid #2b85e4;
-    color: #2b85e4;
+    border-bottom: 2px solid var(--tabs-bottom-color);
+    color: var(--tabs-text-color);
     font-weight: 600;
 }

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

@@ -2023,11 +2023,6 @@
 		}
 	}
 
-	/* 修改iview Modal样式 */
-	.add-volume-modal {
-		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
-	}
-
 	.add-volume-modal .ivu-modal-content {
 		// background: #3c3c3c;
 		// color: #fff;

TEAMModelOS/ClientApp/src/view/teachers/AddTeacher.less

@@ -21,7 +21,6 @@
 	margin: 150px auto;
 	justify-content: center;
 	align-items: center;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	
 	.ivu-input-wrapper{
 		width: auto !important;

TEAMModelOS/ClientApp/src/view/train/Create.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="create-train-container">
         <vuescroll>
-            <div class="create-form-wrap">
+            <div class="create-form-wrap light-iview-form">
                 <!-- 上一步 -->
                 <div v-show="step > 0" class="to-train-mgt last-step" @click="lastStep()">
                     <span class="step-icon-wrap">

TEAMModelOS/ClientApp/src/view/train/TrainDetail.vue

@@ -134,7 +134,7 @@
                 <div class="detail-right">
                     <Card style="width:100%" :bordered="false" v-if="trainInfo.settings.includes('sign')">
                         <p slot="title">
-                            <Icon type="ios-film-outline"></Icon>
+                            <Icon type="ios-film-outline" color="#40A8F0"></Icon>
                             签到码
                         </p>
                         <div class="my-card-content">
@@ -156,7 +156,7 @@
                     </Card>
                     <Card style="width:100%;margin-top:30px" :bordered="false" v-if="trainInfo.settings.includes('sign')">
                         <p slot="title">
-                            <Icon type="ios-film-outline"></Icon>
+                            <Icon type="ios-film-outline" color="#40A8F0"></Icon>
                             签到统计
                         </p>
                         <div class="my-card-content">
@@ -197,7 +197,7 @@
                     </Card>
                     <Card style="width:100%;margin-top:30px" :bordered="false" v-if="trainInfo.settings.includes('hw')">
                         <p slot="title">
-                            <Icon type="ios-film-outline"></Icon>
+                            <Icon type="ios-film-outline" color="#40A8F0"></Icon>
                             作业统计
                         </p>
                         <div class="my-card-content">
@@ -229,7 +229,7 @@
                     </Card>
                     <Card style="width:100%;margin-top:30px" :bordered="false" v-if="trainInfo.settings.includes('survey')">
                         <p slot="title">
-                            <Icon type="ios-film-outline"></Icon>
+                            <Icon type="ios-film-outline" color="#40A8F0"></Icon>
                             问卷统计
                         </p>
                         <div class="my-card-content">
@@ -261,7 +261,7 @@
                     </Card>
                     <Card style="width:100%;margin-top:30px" :bordered="false" v-if="trainInfo.settings.includes('exam')">
                         <p slot="title">
-                            <Icon type="ios-film-outline"></Icon>
+                            <Icon type="ios-film-outline" color="#40A8F0"></Icon>
                             评测统计
                         </p>
                         <div class="my-card-content">
@@ -293,7 +293,7 @@
                     </Card>
                     <Card style="width:100%;margin-top:30px" :bordered="false">
                         <p slot="title">
-                            <Icon type="ios-film-outline"></Icon>
+                            <Icon type="ios-film-outline" color="#40A8F0"></Icon>
                             学时审核
                         </p>
                         <div class="my-card-content">

TEAMModelOS/ClientApp/src/view/train/TrainMgt.less

@@ -98,4 +98,8 @@
     float: right;
     user-select: none;
     cursor: pointer;
+
+    &:hover {
+        color: #40A8F0;
+    }
 }

TEAMModelOS/ClientApp/src/view/train/TrainMgt.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="train-mgt-container">
-        <div class="train-mgt-top">
+        <div class="train-mgt-top light-iview-select light-iview-input">
             <span>活动类型：</span>
             <Select v-model="filter.type" style="width:200px" @on-change="filterByType">
                 <Option v-for="item in typeList" :value="item.value" :key="item.value">{{ item.label }}</Option>

TEAMModelOS/ClientApp/src/view/video/Video.less

@@ -4,7 +4,6 @@
 		background-color: #f7f7f7;
 		overflow: auto;
 		padding-bottom: 100px;
-		font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 		
 		#videoLine {
 			background: #fff;

TEAMModelOS/ClientApp/src/view/vote/ManageVote.less

@@ -66,7 +66,7 @@
             line-height: 45px;
             padding: 0 15px;
             // font-weight: bold;
-            border-bottom: 1px solid @borderColor;
+            // border-bottom: 1px solid @borderColor;
             display: flex;
             justify-content: space-between;