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

TEAMModelOS/ClientApp/src/api/http.js

@@ -112,8 +112,9 @@ axios.interceptors.response.use(
         return response
     },
     error => {
-        console.log(error)
-        if (error.response && error.response.status === 401) {
+		if(!error.response){
+			Message.error(app.$t('http.error'))
+		}else if (error.response && error.response.status === 401) {
             localStorage.clear()
             window.location.href = window.location.origin + '/login'
             Message.error(app.$t('http.error401'))

TEAMModelOS/ClientApp/src/common/BaseClassSelect.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="base-class-select dark-el-cascader">
+	<div class="base-class-select">
 		<RadioGroup v-model="targetType" @on-change="onTargetTypeChange" style="margin-bottom: 10px;">
 		    <Radio label="research">{{ $t('teachermgmt.page.text3') }}</Radio>
 		    <Radio label="student">{{ $t('courseManage.classroom.studentList')}}</Radio>

TEAMModelOS/ClientApp/src/common/BaseClassSelectPri.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="base-class-select dark-el-cascader">
+    <div class="base-class-select">
         <RadioGroup v-model="evaluationInfo.scope" @on-change="onClassTypeChange" style="margin-bottom: 10px;">
             <Radio label="private">{{ $t('survey.form.privateClass') }}</Radio>
             <Radio label="school" v-if="hasSchool">{{ $t('survey.form.schoolClass') }}</Radio>

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

@@ -37,8 +37,8 @@
 						top: 25,
 						left: 'center',
 						textStyle: {
-							color: '#f3f3f3',
-							fontSize: 12,
+							color: '#6c6c6c',
+							fontSize: 14,
 							fontWeight: 'bold'
 						}
 					},
@@ -65,7 +65,7 @@
 						}),
 						label: {
 							normal: {
-								formatter: ['{c|{c}}' + that.$t('unit.text7'), '{b|{b}}'].join('\n'),
+								formatter: ['{c|{c}}' + that.$t('unit.text7'), '{b|{b}}'].join(' '),
 								rich: {
 									c: {
 										color: '#1fb06d',

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

@@ -33,7 +33,7 @@
 	}
 
     .ivu-form .ivu-form-item-label {
-        color: #5a5a5a;
+        color: var(--second-text-color);
     }
 
     .ivu-form-item:not(:first-child) {
@@ -59,13 +59,13 @@
 
     .ivu-input, .ivu-select-single .ivu-select-selection,
     .ivu-select-multiple .ivu-select-selection {
-        border: 1px solid #c1c1c1;
+        // border: 1px solid #c1c1c1;
         margin-top: 10px;
         height: 40px;
         line-height: 40px;
 		padding-left: 8px;
-        color: @primary-textColor;
-		background-color: transparent;
+        /* color: @primary-textColor;
+		background-color: transparent; */
     }
 
     .ivu-input-number-input,
@@ -74,15 +74,15 @@
         padding-left: 10px;
         height: 40px;
         line-height: 40px;
-        color: @primary-textColor;
+        // color: @primary-textColor;
 
         .ivu-input-number-handler-wrap {
-            background: none;
+            /* background: none;
             border: none;
 
             .ivu-input-number-handler-down {
                 border-top: 1px solid #6f6f6f;
-            }
+            } */
 
             .ivu-input-number-handler {
                 height: 20px;
@@ -100,8 +100,8 @@
     }
 
     .ivu-tag {
-        border: none;
-        background: @primary-color;
+        /* border: none;
+        background: @primary-color; */
         height: 28px;
         line-height: 28px;
 

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

@@ -1,5 +1,5 @@
 <template>
-	<div class="component-qn-form">
+	<div class="component-qn-form light-iview-form light-el-input">
 		<Form ref="qnForm" :model="qnForm" label-position="top" :rules="ruleValidate" :disabled="!qnFormEdit">
 			<FormItem :label="$t('survey.form.name')" prop="name">
 				<Input :class="!qnFormEdit ? 'qn-form-disabled':''" v-model="qnForm.name"

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

@@ -8,7 +8,7 @@
 			<div class="myTable-title">{{ tableName }}</div>
 			<div>
 				<span @click="exportData(3)" class="table-export-btn">
-					<Icon type="ios-share-alt" /> {{$t('totalAnalysis.exportTable').slice(0,2)}}
+					<Icon type="ios-share-alt" /> {{$t('totalAnalysis.exportTable')}}
 				</span>
 				<span class="table-tips" v-if="tips">{{tips}}</span>
 				<span class="table-tips" v-if="!tips"></span>
@@ -595,6 +595,7 @@
 	.myTable .ivu-table-header .ivu-table-cell {
 		font-size: 14px;
 		font-weight: bold;
+		word-break: break-word;
 	}
 
 	.myTable .ivu-table-header {
@@ -683,7 +684,7 @@
 		color: #70B1E7;
 		font-weight: bold;
 		position: absolute;
-		right: 65px;
+		right: 120px;
 		top: 10px;
 	}
 
@@ -713,7 +714,6 @@
 	.table-subject-select .table-export-btn {
 		font-size: 14px;
 		font-weight: bold;
-		width: 50px;
 		position: absolute;
 		right: 5px;
 		top: 10px;

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

@@ -1,8 +1,8 @@
-@main-bgColor: rgb(40,40,40); //主背景颜色
+@main-bgColor: rgb(40,40,40); //锟斤拷锟斤拷锟斤拷锟斤拷色
 @borderColor: #424242;
 @primary-color: #1fb06d;
-@primary-textColor: #393939; //文本主颜色
-@second-textColor: #636363; //文本副级颜色
+@primary-textColor: #393939; //锟侥憋拷锟斤拷锟斤拷色
+@second-textColor: #636363; //锟侥憋拷锟斤拷锟斤拷锟斤拷色
 @primary-fontSize: 14px;
 @second-fontSize: 16px;
 
@@ -29,7 +29,7 @@
 	}
 
     .ivu-form .ivu-form-item-label {
-        color: #5a5a5a;
+        // color: #5a5a5a;
     }
 
     .ivu-form-item:not(:first-child) {
@@ -47,6 +47,7 @@
         width: 48%;
         border: none;
         height: 38px;
+        background-color: rgb(236, 236, 236);
     }
 
     .ivu-input::-webkit-input-placeholder {
@@ -55,13 +56,13 @@
 
     .ivu-input, .ivu-select-single .ivu-select-selection,
     .ivu-select-multiple .ivu-select-selection {
-        border: 1px solid #c1c1c1;
+        // border: 1px solid #c1c1c1;
         margin-top: 10px;
         height: 40px;
         line-height: 40px;
 		padding-left: 8px;
-        color: @primary-textColor;
-		background-color: transparent;
+        /* color: @primary-textColor;
+		background-color: transparent; */
     }
 
     .ivu-input-number-input,
@@ -191,20 +192,20 @@
     }
 
     .w-e-text {
-        /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
+        /*����������߿������� �߿��ֱ��Ӧ�����������ijߴ�*/
         &::-webkit-scrollbar {
             // width: 4px;
             // height: 16px;
             // background-color: #d6d6d6;
         }
-        /*定义滚动条轨道 内阴影+圆角*/
+        /*锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷影+圆锟斤拷*/
         &::-webkit-scrollbar-track {
    //          -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
    //          border-radius: 10px;
 			// width: 0;
    //          background-color: transparent;
         }
-        /*定义滑块 内阴影+圆角*/
+        /*锟斤拷锟藉滑锟斤拷 锟斤拷锟斤拷影+圆锟斤拷*/
         &::-webkit-scrollbar-thumb {
             // border-radius: 0;
             // -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);

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

@@ -1,5 +1,5 @@
 <template>
-	<div class="component-vote-form">
+	<div class="component-vote-form light-iview-form light-el-input">
 		<Form ref="voteForm" :model="voteForm" label-position="top" :rules="ruleValidate" :disabled="!voteFormEdit"
 		 hide-required-mark>
 			<FormItem :label="$t('vote.form.name')" prop="name">
@@ -74,7 +74,7 @@
 					</div>
 				</div>
 
-				<p style="float:right;color:#BDBDBD;cursor:pointer" @click="onAddOption" v-show="voteFormEdit">
+				<p style="float:right;color:#757575;cursor:pointer" @click="onAddOption" v-show="voteFormEdit">
 					<Icon type="md-add" />{{ $t('vote.form.addOption') }}</p>
 			</FormItem>
 

TEAMModelOS/ClientApp/src/css/light-iview-form.less

@@ -49,6 +49,14 @@
         background-color: var(--input-bg-color);
         border: none;
     }
+
+    .el-tag.el-tag--info{
+        color: var(--primary-text-color);
+    }
+
+    .el-cascader__tags .el-tag{
+        background-color: #e4e4e4;
+    }
 }
 
 .light-iview-form {
@@ -60,6 +68,18 @@
         background: var(--input-bg-color);
         color: var(--primary-text-color);
         border: none;
+
+        &:hover{
+            border: none;
+        }
+    }
+
+    .ivu-input[disabled], fieldset[disabled] .ivu-input{
+        color: var(--primary-text-color);
+    }
+
+    .ivu-input-number-focused{
+        box-shadow: none;
     }
 
     .ivu-input-number, .ivu-input-number-small input {
@@ -75,15 +95,29 @@
         border: none;
     }
 
+    .ivu-input:focus,
+    .ivu-form-item-error .ivu-input:focus{
+        border: none;
+        box-shadow: none;
+    }
+
     .ivu-select-selection {
         background: var(--input-bg-color);
         color: var(--primary-text-color);
         border: none;
     }
+
+    .ivu-select-disabled .ivu-select-selection{
+        color: var(--primary-text-color);
+    }
+
+    .ivu-select-visible .ivu-select-selection,
+    .ivu-form-item-error .ivu-select-visible .ivu-select-selection{
+        border: none;
+        box-shadow: none;
+    }
+    
     .ivu-radio-inner:after{
         background: #1CC0F3;
     }
-    .ivu-radio-inner{
-        // background: #1CC0F3;
-    }
 }

TEAMModelOS/ClientApp/src/css/site.css

@@ -313,6 +313,7 @@ audio::-internal-media-controls-overflow-button {
 
 .common-toolTip .ivu-tooltip-inner{
 	width: 200px;
+	word-break: break-word;
 }
 
 .common-toolTip .ivu-icon{

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

@@ -2,7 +2,7 @@ export default{
     error500:'Server error!',
     error401:'Login status has expired! Please log in again!',
     error404:'API address not accessed!',
-	error:'API error！',
+	error:'Network Error! please try again later!',
 	loading:'Loading...',
 	error403:'Authorization expired or authorization abnormal, please try again later!'
 }

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

@@ -90,7 +90,7 @@ export default {
     module3: 'Question Analysis',
     module4: 'Key Concept Mastery',
     module5: 'Cognitive Level Mastery',
-    exportTable: 'Export Table',
+    exportTable: 'Export',
     currentSubject: 'Current Subject',
     goExamList: 'View More Assessments',
 

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

@@ -2,7 +2,7 @@ export default{
     error500:'服务器错误！',
     error401:'登录状态已过期！请重新登录！',
     error404:'未访问到API地址！',
-	error:'API异常！',
+	error:'网络异常，请稍后重试！',
 	loading:'加载中',
 	error403:'授权过期或授权异常，请稍后重试！'
 }

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

@@ -2,7 +2,7 @@ export default {
 	error500: '伺務器錯誤！',
 	error401: '登入狀態已過期！請重新登入！',
 	error404: '未呼叫到API地址！',
-	error: 'API異常！',
+	error: '網絡異常，請稍後重試！',
 	loading: '處理中',
 	error403: '授權過期或授權异常，請稍後重試！'
 }

TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.vue

@@ -357,6 +357,8 @@
 					setTimeout(() => {
 						that.dataLoading = false;
 					}, 0);
+				}).catch(e => {
+					that.dataLoading = false;
 				});
 			},
 			
@@ -418,7 +420,7 @@
 			
 			/* 获取所有学段下的试题总数 */
 			getPeriodCount(items){
-				return this.periodList.map(i => this.itemConds.find(j => j.id === i.id).count)
+				return this.periodList.map(i => this.itemConds.find(j => j.id === i.id) ? this.itemConds.find(j => j.id === i.id).count : 0)
 			},
 			
 			/* 获取试题的年级、科目的数量统计 */

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

@@ -52,7 +52,7 @@
 				font-weight: 200;
 				cursor: pointer;
 				display: flex;
-				align-items: flex-end;
+				align-items: flex-start;
 
                 &:hover{
                     color: #40A8F0;

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

@@ -41,7 +41,6 @@
     flex-direction: row;
     justify-content: center;
     margin: 20px 0;
-    color: #fff;
   }
 }
 .ev-list-operation {
@@ -365,7 +364,7 @@
     font-size: 16px;
     font-weight: bold;
     margin-right: 10px;
-	// min-width: 65px;
+	min-width: 45px;
 	// display: inline-block;
 	// text-align: end;
   }

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

@@ -1,14 +1,14 @@
 @main-bgColor: rgb(40,40,40); //主背景颜色
-@borderColor: #424242;
-@primary-textColor: #fff; //文本主颜色
-@second-textColor: #a5a5a5; //文本副级颜色
+@borderColor: var(--border-color);
+@primary-textColor: var(--primary-text-color); //文本主颜色
+@second-textColor: var(--second-text-color); //文本副级颜色
 @primary-fontSize: 14px;
 @second-fontSize: 16px;
 
 .create-priv-container {
     width: 100%;
     height: 100%;
-    background: #242328;
+    // background: #242328;
 
     .create-header {
         width: 100%;
@@ -31,6 +31,11 @@
             cursor: pointer;
             margin-top: 6px;
             margin-right: 10px;
+            color: @second-textColor;
+
+            &:hover{
+                color: #40A8F0;
+            }
         }
     }
 
@@ -51,7 +56,7 @@
             padding-left: 20px;
     
             .wrap-label {
-                color: white;
+                // color: white;
                 font-size: @primary-fontSize;
                 height: 40px;
                 line-height: 40px;
@@ -172,7 +177,8 @@
 }
 .teacher-preview-container {
     height: 100%;
-    background: #404040;
+    // background: #404040;
+    border: 1px solid @borderColor;
     padding: 10px;
     padding-bottom: 30px;
     position:relative;

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

@@ -12,7 +12,7 @@
         <div class="create-body">
             <div class="evaluation-attr-wrap">
                 <p class="wrap-label">{{$t('learnActivity.createEv.baseInfo')}}</p>
-                <div style="width:100%; height:calc(100% - 45px);padding-top:30px;" class="dark-iview-form ivu-select-nochoose dark-el-cascader">
+                <div style="width:100%; height:calc(100% - 45px);padding-top:30px;" class="ivu-select-nochoose light-iview-form light-el-input">
                     <vuescroll>
                         <Form ref="evaForm" :model="evaluationInfo" label-position="top" class="evaluation-attr-form " label-colon :rules="ruleValidate">
                             <FormItem :label="$t('learnActivity.createEv.evName')" prop="name">
@@ -53,7 +53,7 @@
                             </FormItem>
                             <FormItem :label="$t('learnActivity.createEv.publishType')" prop="publish">
                                 <Checkbox v-model="evaluationInfo.publish" :true-value="$GLOBAL.PUBLISH_TYPE()[0].value" :false-value="$GLOBAL.PUBLISH_TYPE()[1].value" @on-change="publishChange">
-                                    <span style="color:white;margin-left:5px;user-select: none;">{{$GLOBAL.PUBLISH_TYPE()[0].label}}</span>
+                                    <span style="margin-left:5px;user-select: none;">{{$GLOBAL.PUBLISH_TYPE()[0].label}}</span>
                                 </Checkbox>
                             </FormItem>
                             <FormItem :label="$t('learnActivity.createEv.startTime')" v-if="evaluationInfo.publish == 1" prop="startTime">
@@ -726,11 +726,11 @@ export default {
     margin-top: 0px;
 }
 .evaluation-attr-wrap .ivu-form .ivu-form-item-label {
-    color: #a5a5a5;
+    color: var(--second-text-color);
 }
 
 .evaluation-question-main .ivu-tabs-tab-active {
-    background-color: #404040 !important;
+    // background-color: #404040 !important;
     font-weight: 600;
 }
 
@@ -745,9 +745,9 @@ export default {
     border-bottom: none;
 }
 .evaluation-question-main .ivu-tabs.ivu-tabs-card .ivu-tabs-bar .ivu-tabs-tab {
-    border: none;
+    /* border: none;
     background-color: #303030;
-    color: white;
+    color: white; */
     margin-right: 2px;
 }
 </style> 

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

@@ -18,7 +18,7 @@
     width: 100%;
     border-bottom: 1px dashed @borderColor;
     padding: 15px 15px 0px 15px;
-    color: white;
+    // color: white;
     display: flex;
     flex-direction: row;
     margin-bottom:15px;

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

@@ -1,6 +1,6 @@
 @main-bgColor: rgb(40,40,40); //主背景颜色
 @primary-textColor: #fff; //文本主颜色
-@second-textColor: #a5a5a5; //文本副级颜色
+@second-textColor: var(--second-text-color); //文本副级颜色
 @primary-fontSize: 14px;
 @second-fontSize: 16px;
 @status-pending: #1CC0F3;
@@ -49,19 +49,27 @@
         height: ~"calc(100% - 45px)";
 
         .evaluation-item {
-            border-bottom: 1px solid var(--border-color);
+            // border-bottom: 1px solid var(--border-color);
             padding: 15px 10px 15px 15px;
             cursor: pointer;
 
+            &:hover{
+                background-color: var(--hover-text-color);
+            }
+
             .evaluation-name {
                 font-size: 16px;
                 color: var(--primary-text-color);
             }
 
             .evaluation-type {
-                color: #AAA;
+                color: @second-textColor;
                 margin-top: 8px;
                 font-size: 12px;
+
+                .ivu-icon{
+                    color: #70B1E7;
+                }
             }
 
             .evaluation-type span {
@@ -168,12 +176,8 @@
     margin-right: 20px;
     margin-top: 12px;
     cursor: pointer;
-    color: white;
+    color: var(--normal-icon-color);
     font-size: 18px;
-    &:hover{
-        color:aqua;
-        /*display:flex;*/
-    }
 }
 
 .test-paper-detail .back-to-top {

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

@@ -75,13 +75,15 @@
 						CONTENT_START_Y + INFO_ITEM_MARGIN + gap * index,
 						`${item} :`
 					);
+					let isEnglish = localStorage.getItem('local') === 'en-us'
+					let dis = isEnglish ? 100 : 80
 					// 下划线
 					let leftInfo2 = snap
 						.line(
-							CONTENT_START_X + 80,
-							CONTENT_START_Y + INFO_ITEM_MARGIN + gap * index,
+							CONTENT_START_X + dis,
+							CONTENT_START_Y + INFO_ITEM_MARGIN + gap * index + 3,
 							CONTENT_START_X + lineWidth - 40,
-							CONTENT_START_Y + INFO_ITEM_MARGIN + gap * index
+							CONTENT_START_Y + INFO_ITEM_MARGIN + gap * index + 3
 						)
 						.attr({
 							fill: "none",
@@ -147,10 +149,12 @@
 						shapeRendering: "crispEdges"
 					})
 				);
+				let isEnglish = localStorage.getItem('local') === 'en-us'
+				let dis = isEnglish ? 130 : 70
 				// 准考证号
 				this.idNumberBox.add(
 					snap.text(
-						INFO_LEFT_X + (idLength * CELL_WIDTH - 69) / 2,
+						INFO_LEFT_X + (idLength * CELL_WIDTH - dis) / 2,
 						CONTENT_MT + 75,
 						isShowCode ? this.$t('answerSheet.qrCodeTitle') : this.$t('answerSheet.idTitle')
 					)

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

@@ -153,7 +153,7 @@
             .qn-item {
                 width: 100%;
                 padding: 10px 15px;
-                border-bottom: 1px solid #c7c7c7;
+                // border-bottom: 1px solid #c7c7c7;
                 cursor: pointer;
 
                 &:hover {
@@ -184,6 +184,10 @@
                 &-nums {
 					display: inline-block;
 					margin: 0 20px 5px 0;
+
+					.ivu-icon{
+						color: #70B1E7;
+					}
                 }
             }
         }
@@ -216,7 +220,7 @@
     float: right;
     cursor: pointer;
     line-height:45px;
-    color: @second-textColor;
+    color: var(--normal-icon-color);
     font-size: 18px;
 }
 
@@ -234,10 +238,11 @@
 }
 
 .item-active {
-    background-image: -webkit-linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
+    /* background-image: -webkit-linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
     background-image: -o-linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
     background-image: -moz-linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
-    background-image: linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
+    background-image: linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%); */
+	background-color: var(--active-item-start);
 }
 
 @media screen and (min-width:1280px) and (max-width:1366px){

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

@@ -3,7 +3,6 @@
 @highlightColor:#1fb06d;
 @second-textColor: var(--second-text-color); //文本副级颜色
 @borderColor: var(--border-color);
-@second-textColor: var(--second-text-color); //文本副级颜色
 .syllabus-container{
 	width: 100%;
 	height: 100%;
@@ -19,7 +18,7 @@
 		border-bottom: 1px solid @borderColor;
 		display: flex;
 		align-items: center;
-		padding-left: 5px;
+		padding-left: 15px;
 		z-index: 10;
 
 		.syllabus-tab-item {
@@ -32,7 +31,8 @@
 				font-size: 16px;
 				font-weight: bold;
 				padding-bottom: 3px;
-				border-bottom: 1px solid var(--tabs-bottom-color);
+				border-bottom: 2px solid var(--tabs-bottom-color);
+				color: var(--primary-text-color);
 			}
 		}
 
@@ -133,7 +133,7 @@
 					display: flex;
 					flex-direction: column;
 					justify-content: center;
-					border-bottom: 1px solid @borderColor;
+					// border-bottom: 1px solid @borderColor;
 					cursor: pointer;
 					&-name{
 						color: var(--primary-text-color);

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" style="white-space: normal;">
+								<Tooltip placement="bottom" style="white-space: normal;" transfer>
 									<span>{{ $t('syllabus.authorsTitle') }} {{ volume.auth.length }} </span>
 									<!-- <Icon type="md-information-circle" color="#9e9e9e" /> -->
 									<div slot="content">

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

@@ -1,7 +1,7 @@
 
 @main-bgColor: rgb(40,40,40); //主背景颜色
-@primary-textColor: #fff; //文本主颜色
-@second-textColor: #a5a5a5; //文本副级颜色
+@primary-textColor: var(--primary-text-color); //文本主颜色
+@second-textColor: var(--second-text-color); //文本副级颜色
 @primary-fontSize: 14px;
 @second-fontSize: 16px;
 
@@ -46,10 +46,15 @@
     cursor: pointer;
 }
 .ev-item{
-    border-bottom: 1px solid var(--border-color);
+    // border-bottom: 1px solid var(--border-color);
     padding: 15px 10px 15px 15px;
     cursor: pointer;
     user-select: none;
+
+    &:hover{
+        background-color: var(--hover-text-color);
+    }
+
     .ev-name{
         font-size: 16px;
         color: var(--primary-text-color);
@@ -66,11 +71,20 @@
     display: inline-block;
 }
 .ev-info{
-    color: #a5a5a5;
+    color: @second-textColor;
     margin-top: 5px;
+
+    .ivu-icon{
+        color: #70B1E7;
+    }
 }
 .setting-block {
     margin-top: 30px;
+
+    .block-title{
+        border-left: 3px solid var(--tabs-bottom-color);
+        padding-left: 10px;
+    }
 }
 .setting-block:first-child {
     margin-top: 20px;

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

@@ -59,7 +59,7 @@ export default {
                 itemHeight: 10,
                 icon: 'horizontal',
                 textStyle: {
-                    color: '#ddd',
+                    color: '#303030',
                     fontSize: 11,
                 },
                 data: this.legend
@@ -222,7 +222,7 @@ export default {
                     normal: {
                         position: 'left',
                         show: true,
-                        color:'#ddd',
+                        color:'#303030',
                         fontSize:10
                     }
                 },
@@ -253,7 +253,7 @@ export default {
                     normal: {
                         position: 'right',
                         show: true,
-                        color:'#ddd',
+                        color:'#303030',
                         fontSize:10
                     }
                 },

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

@@ -40,7 +40,7 @@ export default {
                         this.$t('learnActivity.mark.unmark')
                     ],
                     textStyle: {
-                        color: '#ddd',
+                        color: '#303030',
                         fontSize: 11,
                     },
                 },

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

@@ -166,7 +166,7 @@ export default {
     width: 80px;
     text-align: center;
     background: white;
-    color: #a5a5a5;
+    color: var(--second-text-color);
     margin-right: 1px;
     border-top-right-radius: 15px;
     padding: 2px 0px;
@@ -177,7 +177,8 @@ export default {
 .filter-tab-item-active {
     background: var(--input-bg-color);
     color: var(--primary-text-color);
-    border: 1px solid rgba(98, 97, 101, 0.4);
+    font-weight: bold;
+    // border: 1px solid rgba(98, 97, 101, 0.4);
     border-bottom: none;
 }
 .setting-block {
@@ -234,8 +235,9 @@ export default {
     background: white;
     color: var(--primary-text-color);
     &:hover {
-        background: #606060;
-        color: #ddd;
+        background: var(--hover-text-color);
+        font-weight: bold;
+        // color: #ddd;
     }
 }
 </style>

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

@@ -1,4 +1,4 @@
-@borderColor: #d6d6d6;
+@borderColor: var(--border-color);
 @primary-textColor: #5f5f5f; //文本主颜色
 @second-textColor: #3a3a3a; //文本副级颜色
 @status-pending:#1CC0F3;
@@ -102,6 +102,7 @@
                     font-size: 20px;
                     margin-right: 5px;
                     vertical-align: text-bottom;
+                    color: var(--normal-icon-color);
                 }
             }
         }
@@ -133,7 +134,7 @@
                 width: 100%;
                 height:80px;
                 padding: 10px 15px;
-                border-bottom: 1px solid #c7c7c7;
+                // border-bottom: 1px solid #c7c7c7;
                 cursor: pointer;
 
                 // &:first-child {
@@ -141,7 +142,8 @@
                 // }
 
                 &:hover {
-                    .item-active;
+                    // .item-active;
+                    background-color: var(--hover-text-color);
                 }
 
                 &-name {
@@ -168,6 +170,10 @@
                 &-nums {
 					display: inline-block;
 					margin: 0 20px 5px 0;
+
+                    .ivu-icon{
+                        color: #70B1E7;
+                    }
                 }
             }
         }
@@ -186,7 +192,7 @@
     float: right;
     cursor: pointer;
     line-height:45px;
-    color: @second-textColor;
+    color: var(--normal-icon-color);
     font-size: 18px;
 }
 
@@ -204,5 +210,5 @@
 }
 
 .item-active {
-   background:#e8e8e8;
+   background:var(--active-item-start);
 }