update

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

@@ -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/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,8 +1,8 @@
 @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;
 

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/locale/lang/zh-CN/index.js

@@ -40,7 +40,6 @@ import tip from './tip'
 import selflearn from './selflearn'
 import notify from './notify'
 import jyzx from './jyzx';
-import homework from './homework';
 export default {
   schoolBaseInfo,
   classMgmt,
@@ -84,7 +83,6 @@ export default {
   selflearn,
   notify,
   jyzx,
-  homework,
   test: '测试',
   formConfigP: {
     input: '请输入',

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

@@ -0,0 +1,64 @@
+export default{
+    create:{
+        lastStep:'上一步',
+        nextStep:'下一步',
+        baseInfo:'基础信息',
+        detailInfo:'详情信息',
+        advancedTitle:'高级设置',
+        publishTitle:'发布活动',
+        typeLabel:'类型',
+        hour:'学时',
+        target:'对象',
+        poster:'上传封面',
+        posterTips1:'1、格式支持：jpg、png、jpeg,大小不超过3M;',
+        posterTips2:'2、图片最佳比例400 * 300。',
+        presenter:'主讲人',
+        presenterHolder:'请输入主讲人',
+        topic:'培训主题',
+        topicHolder:'请输入培训主题',
+        trainTime:'培训时间',
+        timeHolder:'请设置培训时间',
+        address:'培训地点',
+        addressHolder:'请输入培训地点',
+        content:'培训内容',
+        contentHolder:'请输入活动描述',
+        signLabel:'现场签到',
+        hwLabel:'布置作业',
+        quLabel:'问卷反馈',
+        examLabel:'评测反馈',
+        hwName:'作业名称',
+        hwNameHolder:'请输入作业名称',
+        hwDesc:'作业描述',
+        hwDescHolder:'请输入作业描述',
+        endTime:'截止时间',
+        endTimeHolder:'请设置截止时间',
+        quName:'问卷名称',
+        quNameHolder:'请输入问卷名称',
+        quDesc:'问卷描述',
+        quDescHolder:'请输入问卷描述',
+        quItems:'问卷题目',
+        quItemsHolder:'请添加问卷题目',
+        addItem:'添加题目',
+        examName:'评测名称',
+        examNameHolder:'请输入评测名称',
+        examDesc:'评测描述',
+        examDescHolder:'请输入评测描述',
+        examItem:'评测题目',
+        examItemHolder:'请添加评测题目',
+        publishOk:'发布成功',
+        viewInfo:'查看信息',
+        back:'返回列表',
+        addItemTitle:'添加题目',
+        hwSet:'作业设置',
+        surveySet:'问卷设置',
+        examSet:'评测设置',
+        uploadErr:'请上传正确格式的封面图片！',
+        surveyOk:'问卷保存成功',
+        surveyErr:'问卷保存失败',
+        hwOk:'作业保存成功',
+        hwErr:'作业保存失败',
+        examOk:'评测保存成功',
+        examErr:'评测保存失败',
+        fullInfo:'请完善信息！'
+    }
+}

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/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/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/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/train/Create.vue

@@ -1,71 +1,75 @@
 <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">
                         <Icon type="ios-arrow-back" size="24" color="white" />
                     </span>
-                    <p style="margin-top:2px">上一步</p>
+                    <p style="margin-top:2px">
+                        {{$t('train.create.lastStep')}}
+                    </p>
                 </div>
                 <!-- 下一步 -->
                 <div v-show="step < 3" class="to-train-mgt next-step" @click="nextStep()">
                     <span class="step-icon-wrap">
                         <Icon type="ios-arrow-forward" size="24" color="white" />
                     </span>
-                    <p style="margin-top:2px">下一步</p>
+                    <p style="margin-top:2px">
+                        {{$t('train.create.nextStep')}}
+                    </p>
                 </div>
                 <Steps :current="step" class="step-wrap">
-                    <Step title="基础信息" @click.native="step = 0"></Step>
-                    <Step title="详情信息"></Step>
-                    <Step title="高级设置"></Step>
-                    <Step title="发布活动"></Step>
+                    <Step :title="$t('train.create.baseInfo')" @click.native="step = 0"></Step>
+                    <Step :title="$t('train.create.detailInfo')"></Step>
+                    <Step :title="$t('train.create.advancedTitle')"></Step>
+                    <Step :title="$t('train.create.publishTitle')"></Step>
                 </Steps>
                 <Form ref="baseInfo" :model="baseInfo" :rules="baseRule" :label-width="100" class="train-form" label-colon v-show="step == 0">
-                    <h1>基础信息</h1>
+                    <h1>{{$t('train.create.baseInfo')}}</h1>
                     <!-- <FormItem label="名称" prop="name">
                         <Input v-model="baseInfo.name" placeholder="活动名称"></Input>
                     </FormItem> -->
-                    <FormItem label="类型" prop="type" style="margin-top:80px">
+                    <FormItem :label="$t('train.create.typeLabel')" prop="type" style="margin-top:80px">
                         <Select v-model="baseInfo.type">
                             <Option v-for="item in typeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
                         </Select>
                     </FormItem>
-                    <FormItem label="学时" prop="hour" style="margin-top:30px">
-                        <InputNumber :max="10" :min="1" style="width:100%" v-model="baseInfo.hour" placeholder="请输入学时"></InputNumber>
+                    <FormItem :label="$t('train.create.hour')" prop="hour" style="margin-top:30px">
+                        <InputNumber :max="10" :min="1" style="width:100%" v-model="baseInfo.hour" :placeholder="$t('train.create.hourHolder')"></InputNumber>
                     </FormItem>
-                    <FormItem label="对象" prop="target" style="margin-top:30px">
+                    <FormItem :label="$t('train.create.target')" prop="target" style="margin-top:30px">
                         <Select v-model="baseInfo.target" multiple>
                             <Option v-for="item in groupList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                         </Select>
                     </FormItem>
                 </Form>
                 <Form ref="trainInfo" :model="trainInfo" :rules="trainRule" :label-width="100" class="train-form" label-colon v-show="step == 1">
-                    <h1>详细信息</h1>
-                    <FormItem label="上传封面">
+                    <h1>{{$t('train.create.detailInfo')}}</h1>
+                    <FormItem :label="$t('train.create.poster')">
                         <Upload :headers="updHeader" :on-error="handleUpdErr" type="drag" action="/blob/public-upload" :format="['jpg','png','jpeg']" :on-format-error="handleFormatError" :on-success="success">
                             <div style="padding: 10px 0">
                                 <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
-                                <p>1、格式支持：jpg、png、jpeg,大小不超过3M;</p>
-                                <p>2、图片最佳比例400 * 300;</p>
+                                <p>{{$t('train.create.posterTips1')}}</p>
+                                <p>{{$t('train.create.posterTips2')}}</p>
                             </div>
                         </Upload>
                     </FormItem>
-                    <FormItem label="主讲人" prop="presenter">
-                        <Input v-model="trainInfo.presenter" placeholder="请输入主讲人"></Input>
+                    <FormItem :label="$t('train.create.presenter')" prop="presenter">
+                        <Input v-model="trainInfo.presenter" :placeholder="$t('train.create.presenterHolder')"></Input>
                     </FormItem>
-                    <FormItem label="培训主题" prop="topic">
-                        <Input v-model="trainInfo.topic" placeholder="请输入培训主题"></Input>
+                    <FormItem :label="$t('train.create.topic')" prop="topic">
+                        <Input v-model="trainInfo.topic" :placeholder="$t('train.create.topicHolder')"></Input>
                     </FormItem>
-                    <FormItem label="培训时间" prop="time">
-                        <DatePicker :editable="false" @on-change="getTimeInfo" type="datetimerange" format="yyyy-MM-dd HH:mm" placeholder="请设置培训时间" style="width: 500px"></DatePicker>
+                    <FormItem :label="$t('train.create.address')" prop="time">
+                        <DatePicker :editable="false" @on-change="getTimeInfo" type="datetimerange" format="yyyy-MM-dd HH:mm" :placeholder="$t('train.create.addressHolder')" style="width: 500px"></DatePicker>
                     </FormItem>
-                    <FormItem label="培训地点" prop="address">
-                        <Input v-model="trainInfo.address" placeholder="请输入培训地点"></Input>
+                    <FormItem :label="$t('train.create.trainTime')" prop="address">
+                        <Input v-model="trainInfo.address" :placeholder="$t('train.create.timeHolder')"></Input>
                     </FormItem>
-                    <FormItem label="培训内容">
-                        <Input v-model="trainInfo.desc" type="textarea" placeholder="请输入活动描述" maxlength="200" show-word-limit :autosize="{minRows: 5, maxRows: 8}"></Input>
+                    <FormItem :label="培训内容">
+                        <Input v-model="trainInfo.desc" type="textarea" :placeholder="请输入活动描述" maxlength="200" show-word-limit :autosize="{minRows: 5, maxRows: 8}"></Input>
                     </FormItem>
                 </Form>
                 <Form ref="highInfo" :model="trainInfo" :rules="trainRule" :label-width="100" class="train-form" label-colon v-show="step == 2">
@@ -80,9 +84,9 @@
                         <Checkbox label="hw" class="check-item">
                             <span>布置作业</span>
                         </Checkbox>
-                        <!-- <Checkbox label="survey" class="check-item">
+                        <Checkbox label="survey" class="check-item">
                             <span>问卷反馈</span>
-                        </Checkbox> -->
+                        </Checkbox>
                         <Checkbox label="exam" class="check-item">
                             <span>评测反馈</span>
                         </Checkbox>
@@ -93,8 +97,8 @@
                                 <FormItem label="作业名称" prop="hwName">
                                     <Input v-model="trainInfo.hwName" placeholder="请输入作业名称"></Input>
                                 </FormItem>
-                                <FormItem label="作业内容" prop="hwDesc">
-                                    <Input v-model="trainInfo.hwDesc" type="textarea" placeholder="请输入活动描述" maxlength="200" show-word-limit :autosize="{minRows: 6, maxRows: 8}"></Input>
+                                <FormItem label="作业描述" prop="hwDesc">
+                                    <Input v-model="trainInfo.hwDesc" type="textarea" placeholder="请输入作业描述" maxlength="200" show-word-limit :autosize="{minRows: 6, maxRows: 8}"></Input>
                                 </FormItem>
                                 <FormItem label="截止时间" prop="hwTime">
                                     <DatePicker type="datetime" v-model="trainInfo.hwTime" placeholder="作业截止时间" format="yyyy-MM-dd HH:mm" style="width: 100%" @on-change="getHwTime"></DatePicker>
@@ -105,7 +109,7 @@
                                     <Input v-model="trainInfo.quName" placeholder="请输入问卷名称"></Input>
                                 </FormItem>
                                 <FormItem label="问卷描述" prop="quDesc">
-                                    <Input v-model="trainInfo.quDesc" type="textarea" placeholder="请输入活动描述" maxlength="200" show-word-limit :autosize="{minRows: 6, maxRows: 8}"></Input>
+                                    <Input v-model="trainInfo.quDesc" type="textarea" placeholder="请输入问卷描述" maxlength="200" show-word-limit :autosize="{minRows: 6, maxRows: 8}"></Input>
                                 </FormItem>
                                 <!-- 问卷题目区域 -->
                                 <FormItem label="问卷题目" prop="items">
@@ -196,7 +200,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <EmptyData v-show="!trainInfo.quItems" textContent="请添加问卷题目"></EmptyData>
+                                        <EmptyData v-show="!trainInfo.quItems" textContent="请添加评测题目"></EmptyData>
                                     </div>
                                     <Button type="info" @click="toAddQu">
                                         <Icon type="md-add" />
@@ -589,17 +593,6 @@ export default {
             if (this.trainInfo.setting.includes('hw')) {
                 this.beginSaveHw(workId)
             }
-
-            let t = []
-            this.teachers.forEach(item => {
-                if ((this.baseInfo.target.includes('默认分组') && !item.groupName) || this.baseInfo.target.includes(item.groupName)) {
-                    t.push({
-                        id: item.id,
-                        name: item.name,
-                        groupName: item.groupName
-                    })
-                }
-            })
             let params = {
                 name: this.trainInfo.topic,
                 school: this.$store.state.userInfo.schoolCode,
@@ -608,7 +601,6 @@ export default {
                 type: this.baseInfo.type,
                 targets: this.baseInfo.target,
                 tchLists: this.baseInfo.target,
-                teachers: t,
                 scope: 'school',
                 hour: this.baseInfo.hour,
                 startTime: this.trainInfo.startTime,

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/vote/ManageVote.less

@@ -67,7 +67,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;