教师端样式

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

@@ -190,6 +190,10 @@ export default{
     },
     // 活动
     activity: {
+        voteHeader1: "投票列表",
+        voteHeader2: "投票内容",
+        queHeader1: "问卷列表",
+        queHeader2: "问卷内容",
         des: "描述",
         voteArea: "投票区",
         haveVoteNum: "可投票数",

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

@@ -190,6 +190,10 @@ export default{
     },
     // 活动
     activity: {
+        voteHeader1: "投票列表",
+        voteHeader2: "投票内容",
+        queHeader1: "问卷列表",
+        queHeader2: "问卷内容",
         des: "描述",
         voteArea: "投票区",
         haveVoteNum: "可投票数",

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

@@ -190,6 +190,10 @@ export default{
     },
     // 活动
     activity: {
+        voteHeader1: "投票清單",
+        voteHeader2: "投票內容",
+        queHeader1: "問卷清單",
+        queHeader2: "問卷內容",
         des: "描述",
         voteArea: "投票區",
         haveVoteNum: "可投票數",

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

@@ -1,5 +1,5 @@
 <template>
-	<div class="create-evaluation-container">
+	<div class="create-evaluation-container custom-iview-split">
 		<div class="create-header">
 			<p class="create-header-title">
 				{{ isEditPaper ? $t('evaluation.paperList.editPaper') : evaluationInfo.createType === 'auto' ? $t('evaluation.index.autoCreate') : evaluationInfo.createType === 'import' ? $t('evaluation.index.importCreate')  : $t('evaluation.index.manualCreate') }}
@@ -1469,4 +1469,8 @@
 		/* background: none; */
 		/* border-color: #999999; */
 	}
+
+	.question-main-tabs .ivu-badge-count-primary{
+		background-color: #05C19C;
+	}
 </style>

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

@@ -7,6 +7,7 @@
                 border-right: 1px solid rgba(0, 0, 0, 0.1);
             "
         >
+            <div class="list-head">{{ $t("jyzx.activity.queHeader1") }}</div>
             <vuescroll>
                 <EmptyData v-if="!listShow.length" :top="100"></EmptyData>
                 <div style="margin-bottom: 50px;" v-else>
@@ -54,9 +55,10 @@
             </vuescroll>
         </div>
         <div class="ques-option">
+            <div class="list-head">{{ $t("jyzx.activity.queHeader2") }}</div>
             <div
-                style="height: 100%"
-				  v-if="listShow.length"
+                style="height: 100%; margin: 0 15px"
+				v-if="listShow.length"
             >
                 <vuescroll>
                     <div>
@@ -380,6 +382,13 @@ export default {
     height: 100%;
 	// font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 
+
+    .list-head{
+        height: 45px;
+        line-height: 45px;
+        padding: 0 15px;
+    }
+
     .school-gade{
         vertical-align: middle;
         font-size: 14px;
@@ -464,9 +473,9 @@ export default {
 
     .ques-option {
         width: 100%;
-        background-color: #fff;
-        padding-left: 20px;
-        padding-top: 15px;
+        // background-color: #fff;
+        /* padding-left: 20px;
+        padding-top: 15px; */
 
         .title-rect-name{
             font-weight: 500;

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

@@ -7,6 +7,7 @@
                 border-right: 1px solid rgba(0, 0, 0, 0.1);
             "
         >
+            <div class="list-head">{{ $t("jyzx.activity.voteHeader1") }}</div>
             <vuescroll>
                 <EmptyData v-if="!listShow.length" :top="100"></EmptyData>
                 <div style="margin-bottom: 50px" v-else>
@@ -53,6 +54,7 @@
             </vuescroll>
         </div>
         <div style="width: 75%; background-color: #fff;overflow: auto;padding-bottom: 40px;">
+            <div class="list-head">{{ $t("jyzx.activity.voteHeader2") }}</div>
             <EmptyData v-if="!Object.keys(voteInfo).length" :top="-100"></EmptyData>
             <div class="vote-option" v-else>
                 <div class="billboard-and-LightBox">
@@ -523,6 +525,12 @@ export default {
     display: flex;
     height: 100%;
 
+    .list-head{
+        height: 45px;
+        line-height: 45px;
+        padding: 0 15px;
+    }
+
     .school-gade{
         vertical-align: middle;
         font-size: 14px;
@@ -608,7 +616,7 @@ export default {
     .vote-option {
         width: 100%;
         background-color: #fff;
-        padding-left: 20px;
+        padding-left: 15px;
         padding-top: 15px;
 
         .billboard-and-LightBox{

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

@@ -7,7 +7,7 @@
                         <AbilityUpload :auth="curSas" :acceptTypes="['mp4','avi','flv','mkv','rmvb']" :scope="'school'" mode='other' :prefix="uploadId" @uploadFinish="uploadFinish"></AbilityUpload>
                         <Button type="info" size="large" :long="true" @click="confirm">{{ $t('jyzx.classRecord.loadOK') }}</Button>
                     </div>
-                    <div v-if="calssListinfo.length" style="height: calc(100vh - 255px); overflow: auto">
+                    <div v-if="calssListinfo.length" style="height: calc(100vh - 255px); overflow: auto; margin-top: 20px">
                         <Table :columns="classCol" :data="calssListinfo" height="680">
                             <template slot-scope="{ row, index }" slot="action">
                                 <Button size="small" @click="checkevaluate(row,true)" style="margin-right:2%">{{ $t('jyzx.common.seeEvaluate') }}</Button>

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

@@ -41,7 +41,7 @@
                                         <span style="color: #2d8cf0"
                                             >{{ $t('jyzx.common.content') }}：</span
                                         >
-                                        <p v-html="item.comment"></p>
+                                        <span v-html="item.comment"></span>
                                     </div>
                                     <div class="disAction">
                                         <div>

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

@@ -144,7 +144,7 @@
 			.node-resource-box {
 				display: flex;
 				flex-direction: column;
-				padding: 10px 20px;
+				padding: 0px 10px;
 				overflow: auto;
 				padding-bottom: 30px;
 

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

@@ -106,7 +106,7 @@
 		display: flex;
 
 		&-header {
-			height: 40px;
+			height: 45px;
 			width: 100%;
 			// border-bottom: 1px solid @borderColor;
 			display: flex;

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

@@ -2,11 +2,8 @@
     <div class="topicbox">
         <div class="topicheader">
             <div class="headerleft">
-                <div class="totalbox">
-                    <Button type="primary" @click="topicShow = !topicShow">{{ $t("jyzx.discuss.addTopic") }}</Button>
-                </div>
                 <div class="taginfo">
-                    <span style="margin-left: 20px">{{ $t("jyzx.discuss.topicType") }}：</span>
+                    <span>{{ $t("jyzx.discuss.topicType") }}：</span>
                     <CheckboxGroup v-model="toType" @on-change="topicType">
                         <Checkbox label="1" border>{{ $t("jyzx.discuss.normal") }}</Checkbox>
                         <Checkbox label="2" border>{{ $t("jyzx.discuss.point") }}</Checkbox>
@@ -14,6 +11,20 @@
                     <!-- <Tag checkable color="geekblue" size ="large" @on-change="topicType(1)">普通话题</Tag>
                     <Tag checkable color="volcano" size ="large" @on-change="topicType(2)">能力点话题</Tag> -->
                 </div>
+                
+                <div class="aboutme">
+                    <Dropdown @on-click="metopic">
+                        <Buuton>
+                            {{ showType }}
+                            <Icon type="ios-arrow-down"></Icon>
+                        </Buuton>
+                        <DropdownMenu slot="list">
+                            <DropdownItem name="allTopic">{{ $t("jyzx.discuss.allTopic") }}</DropdownItem>
+                            <DropdownItem name="metopic">{{ $t("jyzx.discuss.myTopic") }}</DropdownItem>
+                            <DropdownItem name="mereply">{{ $t("jyzx.discuss.replyMe") }}</DropdownItem>
+                        </DropdownMenu>
+                    </Dropdown>
+                </div>
             </div>
             <div class="headerright">
                 <div class="searchbox light-iview-input">
@@ -25,18 +36,10 @@
                         @on-search="searchKeyword"
                     />
                 </div>
-                <div class="aboutme">
-                    <Dropdown @on-click="metopic">
-                        <a href="javascript:void(0)">
-                            {{ showType }}
-                            <Icon type="ios-arrow-down"></Icon>
-                        </a>
-                        <DropdownMenu slot="list">
-                            <DropdownItem name="allTopic">{{ $t("jyzx.discuss.allTopic") }}</DropdownItem>
-                            <DropdownItem name="metopic">{{ $t("jyzx.discuss.myTopic") }}</DropdownItem>
-                            <DropdownItem name="mereply">{{ $t("jyzx.discuss.replyMe") }}</DropdownItem>
-                        </DropdownMenu>
-                    </Dropdown>
+                
+                <div class="totalbox">
+                    <Icon type="md-add-circle" size="25" color="#57a3f3" @click="topicShow = !topicShow" :title="$t('jyzx.discuss.addTopic')" />
+                    <!-- <Button type="primary">{{ $t("jyzx.discuss.addTopic") }}</Button> -->
                 </div>
                 <!-- <div class="topicbtn">
                     <Button
@@ -299,7 +302,7 @@ export default {
 }
 .topicheader {
     /* width: 90%; */
-    height: 70px;
+    height: 55px;
     /* margin: 0% 5%; */
     border-bottom: 1px solid #ccc;
 }
@@ -307,7 +310,11 @@ export default {
 .headerleft {
     width: 48%;
     float: left;
-    padding: 1% 0% 1% 2%;
+    // padding: 1% 0% 1% 2%;
+    padding-left: 2%;
+    display: flex;
+    // justify-content: flex-end;
+    align-items: center;
 }
 
 .totalbox {
@@ -318,7 +325,7 @@ export default {
 .taginfo {
     display: flex;
     align-items: center;
-    margin-left: 4%;
+    // margin-left: 4%;
 
     .ivu-checkbox{
         display: none;
@@ -329,6 +336,10 @@ export default {
         border-color: #16C18E;
         color: #fff;
     }
+
+    .ivu-checkbox-border{
+        border: none;
+    }
 }
 #statementBox {
     margin: 1%;
@@ -339,14 +350,17 @@ export default {
     /* float: left; */
     padding: 0% 2%;
     display: inline-block;
-    margin-top: 10px;
+    // margin-top: 10px;
 }
 
 .headerright {
     width: 45%;
     float: right;
     padding: 0.5% 2% 1% 2%;
-    text-align: right;
+    // text-align: right;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
 }
 
 .aboutme {
@@ -354,12 +368,17 @@ export default {
     /* display: inline-block;
     line-height: 40px; */
     line-height: 48px;
-    float: right;
+    // float: right;
+    padding-left: 2%;
+
+    .ivu-dropdown{
+        cursor: pointer;
+    }
 }
 
 .topicbtn {
     width: 15%;
-    float: right;
+    // float: right;
 }
 
 .ivu-btn-circle {

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

@@ -109,7 +109,7 @@
                 &-item {
                     position: relative;
                     width: 100%;
-                    padding: 16px 25px;
+                    padding: 15px;
                     // border-bottom: 1px solid @borderColor;
                     cursor: pointer;
 

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

@@ -92,7 +92,7 @@
 						<EmptyData :top="100"></EmptyData>
 					</div>
 					<div v-else>
-						<p style="font-size: 12px;font-weight: 400;margin-left: 10px;margin-top: 10px;color: #888686;">
+						<p style="font-size: 12px;font-weight: 400;margin-left: 15px;margin-top: 10px;color: #888686;">
 							{{$t("knowledge.colorTip")}}
 						</p>
 						<draggable class="points-wrap" tag="div" v-model="pointList" v-bind="dragOptions">

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

@@ -49,7 +49,7 @@
 .question-shopping-car{
   position:absolute;
   right:50px;
-  bottom:80px;
+  bottom: 27px;
   z-index:9999;
   
 }

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

@@ -2,7 +2,7 @@
     <div style="height: 100%;position:relative;">
         <Poptip padding="0px 0px" offset="10" placement="top-end" width="300" trigger="hover" :class="shoppingCarClass">
             <Badge type="primary" :count="shoppingQuestionList.length" show-zero :offset="[-3,-3]"  @mouseenter.native="changeActive($event)" @mouseleave.native="removeActive($event)">
-                <Icon custom="iconfont icon-sp-car" color="#1cc0f3" size="50"/>
+                <Icon custom="iconfont icon-sp-car" color="#05C19C" size="50"/>
             </Badge>
             <div slot="content">
                 <div class="shopping-car-detail">

TEAMModelOS/ClientApp/src/view/selflearn/CreateOrderLearn.less

@@ -1,7 +1,7 @@
-@main-bgColor: rgb(40,40,40); //主背景颜色
+@main-bgColor: rgb(40,40,40); //锟斤拷锟斤拷锟斤拷锟斤拷色
 @borderColor: #424242;
-@primary-textColor: #fff; //文本主颜色
-@second-textColor: #a5a5a5; //文本副级颜色
+@primary-textColor: #fff; //锟侥憋拷锟斤拷锟斤拷色
+@second-textColor: #a5a5a5; //锟侥憋拷锟斤拷锟斤拷锟斤拷色
 @primary-fontSize: 14px;
 @second-fontSize: 16px;
 

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

@@ -213,7 +213,7 @@
 
         .content-file-list {
             height: ~"calc(100% - 50px)";
-            padding: 15px 30px;
+            padding: 15px;
             overflow-y: auto;
             // background-image: linear-gradient(to bottom right, #282828, #505050);