Jelajahi Sumber

教师端样式

XW 3 tahun lalu
induk
melakukan
54b65e8105
44 mengubah file dengan 260 tambahan dan 166 penghapusan
  1. 3 3
      TEAMModelOS/ClientApp/public/theme/dark-theme.css
  2. 2 2
      TEAMModelOS/ClientApp/src/components/vote/BaseVoteForm.less
  3. 2 2
      TEAMModelOS/ClientApp/src/css/light-iview-form.less
  4. 16 10
      TEAMModelOS/ClientApp/src/view/ability/Review.less
  5. 8 7
      TEAMModelOS/ClientApp/src/view/ability/TestPaper.less
  6. 1 1
      TEAMModelOS/ClientApp/src/view/ability/TestPaper.vue
  7. 1 1
      TEAMModelOS/ClientApp/src/view/classmgt/ManageClass.less
  8. 2 2
      TEAMModelOS/ClientApp/src/view/jyzx/HomePage.vue
  9. 21 6
      TEAMModelOS/ClientApp/src/view/jyzx/Question.vue
  10. 35 10
      TEAMModelOS/ClientApp/src/view/jyzx/Vote.vue
  11. 13 1
      TEAMModelOS/ClientApp/src/view/jyzx/application.vue
  12. 32 19
      TEAMModelOS/ClientApp/src/view/jyzx/classMemoir.vue
  13. 10 3
      TEAMModelOS/ClientApp/src/view/jyzx/discuss.vue
  14. 13 13
      TEAMModelOS/ClientApp/src/view/jyzx/index.less
  15. 8 0
      TEAMModelOS/ClientApp/src/view/jyzx/index.vue
  16. 27 25
      TEAMModelOS/ClientApp/src/view/jyzx/offline.less
  17. 1 1
      TEAMModelOS/ClientApp/src/view/jyzx/relatedTopic.vue
  18. 2 2
      TEAMModelOS/ClientApp/src/view/jyzx/topicPublish.vue
  19. 2 2
      TEAMModelOS/ClientApp/src/view/learnactivity/MgtPrivEva.less
  20. 2 2
      TEAMModelOS/ClientApp/src/view/newcourse/CoursePlan.less
  21. 6 4
      TEAMModelOS/ClientApp/src/view/newcourse/MyCourse.less
  22. 10 8
      TEAMModelOS/ClientApp/src/view/newcourse/NewCusMgt.less
  23. 1 1
      TEAMModelOS/ClientApp/src/view/notify/NotifyMgt.less
  24. 1 1
      TEAMModelOS/ClientApp/src/view/resource/Diagnosis.vue
  25. 2 2
      TEAMModelOS/ClientApp/src/view/resource/Index.vue
  26. 1 1
      TEAMModelOS/ClientApp/src/view/resource/Leadership.vue
  27. 1 1
      TEAMModelOS/ClientApp/src/view/resource/Literacy.vue
  28. 1 1
      TEAMModelOS/ClientApp/src/view/resource/Probation.vue
  29. 1 1
      TEAMModelOS/ClientApp/src/view/schoolmgmt/RoomMgt/RoomMgt.less
  30. 5 5
      TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.less
  31. 1 1
      TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/TimeSetting.less
  32. 2 2
      TEAMModelOS/ClientApp/src/view/student-account/Index.less
  33. 2 2
      TEAMModelOS/ClientApp/src/view/student-account/class/ClassMgt.less
  34. 2 2
      TEAMModelOS/ClientApp/src/view/student-account/stuMgt/AddStudent.less
  35. 1 1
      TEAMModelOS/ClientApp/src/view/student-account/stuMgt/StuMgt.vue
  36. 2 2
      TEAMModelOS/ClientApp/src/view/student-account/stulist/MgtStuList.less
  37. 5 4
      TEAMModelOS/ClientApp/src/view/task/index.less
  38. 1 1
      TEAMModelOS/ClientApp/src/view/task/mark/QuProg.vue
  39. 2 2
      TEAMModelOS/ClientApp/src/view/task/mark/StuProg.vue
  40. 2 2
      TEAMModelOS/ClientApp/src/view/teachermgmt/Index.less
  41. 3 3
      TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.less
  42. 1 1
      TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/Index.less
  43. 3 3
      TEAMModelOS/ClientApp/src/view/video/Video.less
  44. 3 3
      TEAMModelOS/ClientApp/src/view/video/Video.vue

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

@@ -1,4 +1,4 @@
-:root {
+:root {
     --header-bg: #1E1F21;
     --side-bg: #1E1F21;
     --primary-color: #1cc0f3; /*主题色*/
@@ -27,11 +27,11 @@
     --normal-icon-color: #40A8F0; /* Icon基本颜色 */
 
     --tabs-bottom-color: #006ee6; /* tab切换,底部颜色,左边时,padding-left = 10px */
-    --tabs-text-color: #303030; /* tab切换,底部颜色,左边时,padding-left = 10px */
+    --tabs-text-color: #303030; /* tab切换,文字颜色 */
 
     --card-shadow: #ececec; /* 卡片阴影 */
 
-    --input-bg-color: #f5f5f5; /* 输入框背景色 */
+    --input-bg-color: #eee; /* 输入框背景色 */
 
     --assist-color-light: #70B1E7; /* 辅助颜色 */
     --assist-color-dark: #80B2C9; /* 辅助颜色 */

+ 2 - 2
TEAMModelOS/ClientApp/src/components/vote/BaseVoteForm.less

@@ -225,8 +225,8 @@
             min-height: 42px;
             width: 10%;
             float: left;
-            color: #a0a0a0;
-            background: #f1f1f1;
+            // color: #a0a0a0;
+            background: var(--input-bg-color);
 			
 			&:hover{
 				.ivu-icon{

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

@@ -51,11 +51,11 @@
     }
 
     .el-tag.el-tag--info{
-        color: var(--primary-text-color);
+        color: #fff;
     }
 
     .el-cascader__tags .el-tag{
-        background-color: #e4e4e4;
+        background-color: #70B1E7;
     }
 }
 

+ 16 - 10
TEAMModelOS/ClientApp/src/view/ability/Review.less

@@ -1,18 +1,24 @@
 .review-container{
 	padding: 0 20px;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
+	// font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	overflow: auto;
 	height: 100vh;
-	background-color: #f7f7f7;
+	// background-color: #f7f7f7;
 	padding-bottom: 120px;
+	color: var(--primary-text-color);
 	
 	.ivu-btn{
 		margin-left: 40px;
 	}
+
+	.ivu-btn-success{
+		background-color: #70B1E7;
+		border-color: #70B1E7;
+	}
 	
 	.upload-btn{
-		background-color: #00c3c3;
-		border-color: #00c3c3;
+		background-color: #529fdf;
+		border-color: #529fdf;
 		margin: 10px;
 	}
 	
@@ -20,14 +26,14 @@
 		position: sticky;
 		top: 0;
 		padding: 15px 0;
-		background: #f7f7f7;
+		background: var(--body-bg);
 		z-index: 9;
-		border-bottom: 1px solid #e2e2e2;
+		border-bottom: 1px solid var(--border-color);
 	}
 	
 	.review-title{
 		font-size: 20px;
-		font-weight: bold;
+		font-weight: 500;
 		margin-bottom: 20px;
 		
 		.ivu-icon{
@@ -39,7 +45,7 @@
 	.ability-des{
 		margin-left: 35px;
 		font-weight: bold;
-		color: #838383;
+		color: var(--second-text-color);
 	}
 	
 	.unit-list{
@@ -68,11 +74,11 @@
 			
 			&-name{
 				font-size: 16px;
-				font-weight: bold;
+				// font-weight: bold;
 			}
 			&-des{
 				margin: 10px;
-				color: #838383;
+				color: var(--second-text-color);
 			}
 			&-files{
 				.unit-file-item{

+ 8 - 7
TEAMModelOS/ClientApp/src/view/ability/TestPaper.less

@@ -1,22 +1,23 @@
 .test-paper-container{
 	padding: 0 20px;
-	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
+	// font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	overflow: auto;
 	height: 100vh;
 	padding-bottom: 200px;
+	color: var(--primary-text-color);
 	
 	.review-header{
 		position: sticky;
 		top: 0;
 		padding: 15px 0;
-		background: #f7f7f7;
+		background: var(--body-bg);
 		z-index: 9;
-		border-bottom: 1px solid #e2e2e2;
+		border-bottom: 1px solid var(--border-color);
 	}
 	
 	.review-title{
 		font-size: 20px;
-		font-weight: bold;
+		font-weight: 500;
 		margin-bottom: 20px;
 		
 		.ivu-icon{
@@ -27,8 +28,8 @@
 	}
 	.ability-des{
 		margin-left: 35px;
-		font-weight: bold;
-		color: #838383;
+		// font-weight: bold;
+		color: var(--second-text-color);
 	}
 	
 	.questions-wrap{
@@ -41,7 +42,7 @@
 				display: inline-block;
 				font-size: 16px;
 				margin-left: 5px;
-				font-weight: bold;
+				// font-weight: bold;
 			}
 			
 			&-tools{

+ 1 - 1
TEAMModelOS/ClientApp/src/view/ability/TestPaper.vue

@@ -37,7 +37,7 @@
 			
 		</div>
 		
-		<Button v-if="!isNewPaper && items.length" type="success" size="large" :loading="isBtnLoading" style="margin-left: 30px;background-color: #16c18e;border: none;" icon="ios-paper-plane" @click="onSubmit">提交答案</Button>
+		<Button v-if="!isNewPaper && items.length" type="success" size="large" :loading="isBtnLoading" style="margin-left: 30px;background-color: #70B1E7;border: none;" icon="ios-paper-plane" @click="onSubmit">提交答案</Button>
 		<Button v-if="isNewPaper && hasModify" type="success" :loading="isBtnLoading" style="margin-left: 30px;background-color: #16c18e;border: none;" icon="ios-paper-plane" @click="onSavePaper">保存试卷</Button>
 	
 		<!-- 新建题目弹窗 -->

+ 1 - 1
TEAMModelOS/ClientApp/src/view/classmgt/ManageClass.less

@@ -16,7 +16,7 @@
     padding:0px 10px;
     height:45px;
     line-height:45px;
-    border-bottom:1px solid var(--border-color);
+    // border-bottom:1px solid var(--border-color);
     color:var(--second-text-color);
 }
 .text-label{

+ 2 - 2
TEAMModelOS/ClientApp/src/view/jyzx/HomePage.vue

@@ -406,13 +406,13 @@ export default {
 .homePage {
     .box-border {
         margin: 25px;
-        box-shadow: 0 0 15px #c5c5c5;
+        box-shadow: 0 0 15px #d6d6d6;
         border-radius: 5px;
         background: white;
     }
 
     .act-border {
-        box-shadow: 0 0 15px #c5c5c5;
+        box-shadow: 0 0 15px #d6d6d6;
         border-radius: 5px;
         background: white;
     }

+ 21 - 6
TEAMModelOS/ClientApp/src/view/jyzx/Question.vue

@@ -116,7 +116,8 @@
                                         class="unitTestbg"
                                         @click="onOptionClick(item, index, option.code)"
                                         :style="{
-                                            backgroundColor: submitArr[index].includes(option.code) ? '#24b880' : 'transparent',
+                                            backgroundColor: submitArr[index].includes(option.code) ? '#80B2C9' : 'transparent',
+                                            borderColor: submitArr[index].includes(option.code) ? '#80B2C9' : '#d5d5d5',
 											color: submitArr[index].includes(option.code) ? '#ffffff' : '#000',	
                                         }"
                                     >
@@ -390,17 +391,22 @@ export default {
     }
 
     .list-item-selected {
-        background: linear-gradient(-270deg, #fafafa, #d4ede1);
-        color: #03966a;
+        // background: linear-gradient(-270deg, #fafafa, #d4ede1);
+        background-color: var(--active-item-start);
+        // color: #03966a;
         cursor: pointer;
         width: 100%;
     }
     .list-new {
         display: flex;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        padding: 15px 20px 15px 25px;
+        // border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+        padding: 20px 20px 20px 25px;
         cursor: pointer;
 
+        &:hover{
+            background-color: var(--hover-text-color);
+        }
+
         .list-item-title{
             display: inline-block;
             width: 20px;
@@ -424,7 +430,7 @@ export default {
         }
         &-test {
             width: 70%;
-            font-weight: bolder;
+            // font-weight: bolder;
             font-size: 14px;
             line-height: 22px;
             margin-right: 20px;
@@ -459,6 +465,15 @@ export default {
         padding-left: 50px;
         padding-top: 40px;
 
+        .title-rect-name{
+            font-weight: 500;
+            border-left: 5px solid var(--tabs-bottom-color);
+        }
+        
+        .uploadBtn{
+            background-color: #80B2C9 !important;
+        }
+
         .servey-title{
             font-size: 25px;
             font-weight: bold;

+ 35 - 10
TEAMModelOS/ClientApp/src/view/jyzx/Vote.vue

@@ -534,17 +534,22 @@ export default {
     }
 
     .list-item-selected {
-        background: linear-gradient(-270deg, #fafafa, #d4ede1);
-        color: #03966a;
+        // background: linear-gradient(-270deg, #fafafa, #d4ede1);
+        background-color: var(--active-item-start);
+        // color: #03966a;
         cursor: pointer;
         width: 100%;
     }
     .list-new {
         display: flex;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        padding: 15px 20px 15px 25px;
+        // border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+        padding: 20px 20px 20px 25px;
         cursor: pointer;
 
+        &:hover{
+            background-color: var(--hover-text-color);
+        }
+
         .list-item-title{
             display: inline-block;
             width: 20px;
@@ -568,7 +573,7 @@ export default {
         }
         &-test {
             width: 70%;
-            font-weight: bolder;
+            // font-weight: bolder;
             font-size: 14px;
             // line-height: 40px;
             margin-right: 20px;
@@ -603,9 +608,16 @@ export default {
         padding-left: 50px;
         padding-top: 40px;
 
-        .billboard-and-LightBox > p:first-child{
-            font-size: 25px;
-            font-weight: bold;
+        .billboard-and-LightBox{
+            & > p:first-child{
+                font-size: 25px;
+                // font-weight: bold;
+            }
+
+            .title-rect-name{
+                font-weight: 500;
+                border-left: 5px solid var(--tabs-bottom-color);
+            }
         }
 
         .title-rect-group {
@@ -714,9 +726,22 @@ export default {
     }
     .ivu-checkbox-wrapper-checked.ivu-checkbox-border,
     .ivu-radio-wrapper-checked.ivu-radio-border {
-        background: #24b880;
-        border-color: #24b880;
+        background: #80B2C9;
+        border-color: #80B2C9;
         color: #fff;
     }
 }
+
+.vote-option{
+    .ivu-btn-success{
+        background-color: #80B2C9;
+        border-color: #80B2C9;
+        box-shadow: none;
+    }
+
+    .ivu-btn-success[disabled]{
+        background-color: #f7f7f7;
+        border-color: #dcdee2;
+    }
+}
 </style>

+ 13 - 1
TEAMModelOS/ClientApp/src/view/jyzx/application.vue

@@ -341,7 +341,7 @@ export default {
 <style lang="less">
 .application-container {
 	height: 100%;
-	background-color: #f7f7f7;
+	// background-color: #f7f7f7;
     .ivu-card {
         height: 100%;
 
@@ -361,6 +361,18 @@ export default {
     .ivu-tabs .ivu-tabs-tabpane {
         height: 100%;
     }
+    
+    .ivu-tabs-nav .ivu-tabs-tab,
+    .ivu-tabs-nav .ivu-tabs-tab:hover{
+        color: var(--second-text-color);
+    }
+
+    .ivu-tabs-nav .ivu-tabs-tab-active{
+        border-color: var(--tabs-bottom-color);
+        color: var(--tabs-text-color);
+        font-weight: bold;
+    }
+
 }
 </style>
 

+ 32 - 19
TEAMModelOS/ClientApp/src/view/jyzx/classMemoir.vue

@@ -359,31 +359,44 @@ export default {
 <style lang="less">
 .class-memoir {
     padding:1%;
-	background-color: #f7f7f7;
+	// background-color: #f7f7f7;
     .ivu-card {
         height: 100%;
         margin: 20px;
+        border: none;
+        box-shadow: none;
     }
-}
-    .teachnames {
-        font-size: 26px;
-        margin-left:10px;
-    }
-    .coursename {
-        font-size:26px;
-    }
-    .backward:hover{
-        cursor:pointer
+    
+    .ivu-tabs-nav .ivu-tabs-tab,
+    .ivu-tabs-nav .ivu-tabs-tab:hover{
+        color: var(--second-text-color);
     }
-/*    .appraise {
-        width:100%;
-        padding:3%;
-        margin-top:5%;
-        border:1px solid #ccc;
-    }*/
-    .short span {
-        color: red;
+
+    .ivu-tabs-nav .ivu-tabs-tab-active{
+        border-color: var(--tabs-bottom-color);
+        color: var(--tabs-text-color);
+        font-weight: bold;
     }
+}
+.teachnames {
+    font-size: 26px;
+    margin-left:10px;
+}
+.coursename {
+    font-size:26px;
+}
+.backward:hover{
+    cursor:pointer
+}
+/* .appraise {
+    width:100%;
+    padding:3%;
+    margin-top:5%;
+    border:1px solid #ccc;
+}*/
+.short span {
+    color: red;
+}
 .qualified span{
     color:orangered
 }

+ 10 - 3
TEAMModelOS/ClientApp/src/view/jyzx/discuss.vue

@@ -409,8 +409,9 @@ export default {
 
 <style lang="less" scoped>
 .discuss {
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     padding: 10px;
+    padding-bottom: 20px;
 
     .disContent {
         .disName {
@@ -443,7 +444,8 @@ export default {
         float: right;
     }
     .disChild {
-        border: 1px solid #ccc;
+        // border: 1px solid #ccc;
+        background-color: rgb(241, 241, 241);
         border-radius: 10px;
         margin: 15px 40px;
         padding: 5px 10px;
@@ -451,7 +453,8 @@ export default {
         & > div {
             padding: 2px 10px 5px;
             &:not(:last-child) {
-                border-bottom: 1px solid #ccc;
+                border-bottom: 1px solid #ffffff;
+                margin-bottom: 10px;
             }
         }
 
@@ -482,5 +485,9 @@ export default {
     .ivu-card-body {
         overflow: hidden;
     }
+
+    .ivu-card-bordered{
+        border: none;
+    }
 }
 </style>

+ 13 - 13
TEAMModelOS/ClientApp/src/view/jyzx/index.less

@@ -11,21 +11,21 @@
 		display: flex;
 
 		&-header {
-			height: 35px;
+			height: 45px;
 			width: 100%;
-			border-bottom: 1px solid @borderColor;
+			// border-bottom: 1px solid @borderColor;
 			display: flex;
 			align-items: center;
 			padding-left: 15px;
-			color: #000000;
-			font-weight: bold;
+			color: var(--primary-text-color);
+			// font-weight: bold;
 			position: relative;
 
 
 			&::before {
 				content: '';
 				display: inline-block;
-				border: 4px solid #16c18e;
+				border: 4px solid #70B1E7;
 				border-radius: 50%;
 				margin-right: 10px;
 				margin-bottom: 3px;
@@ -58,7 +58,7 @@
 			.volume-list {
 				display: flex;
 				flex-direction: column;
-				margin-left: 10px;
+				// margin-left: 10px;
 				overflow: hidden;
 				padding-bottom: 60px;
 
@@ -72,17 +72,17 @@
 
 					&-name {
 						font-size: 16px;
-						font-weight: bold;
+						// font-weight: bold;
 						margin: 10px 0 5px 0;
 						padding-right: 10px;
 						overflow: hidden;
-						color: #383838;
+						color: var(--primary-text-color);
 
 						.abli-type{
 							background-color: transparent;
-							color: #108d6c;
+							color: #70B1E7;
 							margin-left: 5px;
-							border: 1px solid #108d6c;
+							border: 1px solid #70B1E7;
 							border-radius: 4px;
 							font-size: 12px;
 							padding: 0 8px;
@@ -92,7 +92,7 @@
 							font-size: 12px;
 							display: inline-block;
 							padding: 2px 8px;
-							background-color: #16C18E;
+							background-color: #70B1E7;
 							color: #fff;
 							margin-right: 5px;
 							margin-bottom: 3px;
@@ -106,7 +106,7 @@
 							font-size: 12px;
 							margin-right: 10px;
 							margin-top: 3px;
-							color: #7b7b7b;
+							color: var(--second-text-color);
 							float: right;
 						}
 					}
@@ -149,7 +149,7 @@
 
 				.node-resource-item {
 					position: relative;
-					border-bottom: 1px solid #aaa;
+					border-bottom: 1px solid var(--border-color);
 					padding: 10px 20px;
 					color: #515a6e;
 					font-size: 16px;

+ 8 - 0
TEAMModelOS/ClientApp/src/view/jyzx/index.vue

@@ -1057,6 +1057,8 @@ export default {
 
     .ivu-tree-title {
         width: 94%;
+        color: var(--primary-text-color);
+        font-weight: normal;
     }
 
     .ivu-tree-title-selected,
@@ -1070,6 +1072,12 @@ export default {
         line-height: 40px;
         height: 40px;
     }
+
+    .online-right{
+        .ivu-tabs-nav-container{
+            line-height: 2
+        }
+    }
 }
 </style>
 <style lang="less" scoped>

+ 27 - 25
TEAMModelOS/ClientApp/src/view/jyzx/offline.less

@@ -9,7 +9,7 @@
 		display: inline-block;
 		width:100%;
 		padding: 1%;
-		border:1px solid #ccc;
+		// border:1px solid #ccc;
 		border-radius: 10px;
 		box-shadow: 3px 3px 5px #d9d9d9;
 	}
@@ -40,18 +40,18 @@
 	}
 	.participation{
 		font-size:16px;
-		color: #a5a5a5 !important;
+		color: var(--second-text-color) !important;
 		margin-top:2%;
 	}
 	.info-label {
-		color: #a5a5a5 !important;
+		color: var(--second-text-color) !important;
 		display: inline-block;
 		width: 80px;
 		margin-left:2%;
 	}
     .info-labels{
 		width:66px;
-		color: #a5a5a5 !important;
+		color: var(--second-text-color) !important;
 		display: inline-block;
 	}
 	.parname{
@@ -61,17 +61,17 @@
 	.basics{
 		width: 100%;
 		padding: 0% 1% 1% 0%;
-		border:1px solid #ccc;
+		// border:1px solid #ccc;
 		margin-top:1%;
 		border-radius: 10px;
 		box-shadow: 3px 3px 5px #d9d9d9;
 	}
 	.headeicon{
-		border-left:8px solid #2D8CF0;
+		// border-left:8px solid #2D8CF0;
 		color:#fff;
 		padding: 1%;
 		font-size:24px;
-		background: linear-gradient(to right, #5EA7F4, #fff);
+		background: linear-gradient(to right, #7ab6f5, #fff);
 		border-top-left-radius: 10px;
 		margin-bottom: 20px;
 	}
@@ -79,7 +79,7 @@
 		padding-left: 1%;
 	}
 	.submitarea{
-		border:1px solid #ccc;
+		// border:1px solid #ccc;
 		margin: 15px 0px 15px 0px;
 		border-radius: 10px;
 		box-shadow: 3px 3px 5px #d9d9d9;
@@ -95,12 +95,12 @@
 		&-header {
 			height: 40px;
 			width: 100%;
-			border-bottom: 1px solid @borderColor;
+			// border-bottom: 1px solid @borderColor;
 			display: flex;
 			align-items: center;
 			padding-left: 15px;
-			color: #000000;
-			font-weight: bold;
+			color: var(--primary-text-color);
+			// font-weight: bold;
 			position: relative;
 
 			&::before {
@@ -121,7 +121,7 @@
 			.volume-list {
 				display: flex;
 				flex-direction: column;
-				margin-left: 10px;
+				// margin-left: 10px;
 				overflow: hidden;
 				padding-bottom: 40px;
 
@@ -139,11 +139,11 @@
 
 					&-name {
 						font-size: 16px;
-						font-weight: bold;
+						// font-weight: bold;
 						margin: 10px 0 5px 0;
 						padding-right: 10px;
 						overflow: hidden;
-						color: #383838;
+						color: var(--primary-text-color);
 
 						& > span {
 							display: inline-block;
@@ -157,14 +157,15 @@
 							color: #fff;
 						}
 
-						.status-time {
-							display: inline-block;
-							font-size: 12px;
-							margin-right: 10px;
-							margin-top: 3px;
-							color: #7b7b7b;
-							float: right;
-						}
+					}
+					
+					.status-time {
+						display: inline-block;
+						font-size: 12px;
+						margin-right: 10px;
+						margin-top: 3px;
+						color: var(--second-text-color);
+						float: right;
 					}
 				}
 			}
@@ -206,7 +207,7 @@
 	height: calc(100vh - 80px);
 	overflow: auto;
 	font-size: initial;
-	font-weight: bold;
+	// font-weight: bold;
 
 	.detailstitle {
 		color: #2b85e4;
@@ -233,8 +234,9 @@
 	.titlename, .target, .type, .object, .time, .keynote, .totalperiod, .score, .site, .content, .accessory, .successbtn {
 		padding: 10px;
 		// color: #000;
-		& > span:first-child {
-			color: #13457a;
+		& > span:nth-child(2) {
+			// color: #13457a;
+			font-weight: bold;
 		}
 	}
 

+ 1 - 1
TEAMModelOS/ClientApp/src/view/jyzx/relatedTopic.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="height: 100%" class="discuss1">
         <div style="width: 90%; margin: 0% 5%; height: 100%">
-            <div>
+            <div class="light-iview-input">
                 <Input v-model="topicname" :placeholder="$t('jyzx.online.placeholder1')" style="width:100%;padding:1% 0%" @on-focus="topstatus = true" />
             </div>
             <div class="topicboxinfo" v-show="topstatus">

+ 2 - 2
TEAMModelOS/ClientApp/src/view/jyzx/topicPublish.vue

@@ -16,7 +16,7 @@
                 </div>
             </div>
             <div class="headerright">
-                <div class="searchbox">
+                <div class="searchbox light-iview-input">
                     <Input
                         search
                         enter-button
@@ -50,7 +50,7 @@
         </div>
 
         <div id="statementBox" v-show="topicShow">
-            <Form :model="formItem">
+            <Form :model="formItem" class="light-iview-form">
                 <FormItem>
                     <Input v-model="formItem.input"
                            :placeholder="$t('jyzx.discuss.placeholder2')"></Input>

+ 2 - 2
TEAMModelOS/ClientApp/src/view/learnactivity/MgtPrivEva.less

@@ -40,7 +40,7 @@
         height: 45px;
         padding-left: 15px;
         line-height: 45px;
-        border-bottom: 1px solid var(--border-color);
+        // border-bottom: 1px solid var(--border-color);
         color: var(--second-text-color);
     }
 
@@ -85,7 +85,7 @@
         width: 100%;
         height: 45px;
         line-height: 45px;
-        border-bottom: 1px solid var(--border-color);
+        // border-bottom: 1px solid var(--border-color);
         color: @second-textColor;
 
         .edit-evaluation {

+ 2 - 2
TEAMModelOS/ClientApp/src/view/newcourse/CoursePlan.less

@@ -50,7 +50,7 @@
 }
 .class-list-item {
     padding: 15px 0px;
-    border-bottom:1px solid @borderColor;
+    // border-bottom:1px solid @borderColor;
     cursor: pointer;
     position: relative;
     padding-left: 15px;
@@ -195,5 +195,5 @@
     line-height: 45px;
     border-bottom: 1px solid @borderColor;
     color: #a5a5a5;
-    padding-left: 10px;
+    padding-left: 15px;
 }

+ 6 - 4
TEAMModelOS/ClientApp/src/view/newcourse/MyCourse.less

@@ -20,7 +20,7 @@
     .course-info-wrap {
         width: 100%;
         height: 100%;
-        padding-left: 15px;
+        // padding-left: 15px;
         display: flex;
         flex-direction: row;
     }
@@ -28,7 +28,7 @@
 .course-list-header {
     width: 100%;
     height: 45px;
-    border-bottom: 1px solid var(--border-color);
+    // border-bottom: 1px solid var(--border-color);
     line-height: 45px;
     color: white;
 
@@ -158,6 +158,7 @@
 }
 .tea-class-item{
     padding: 10px;
+    padding-left: 15px;
     // color: white;
     // border-bottom: 1px solid var(--border-color);
     cursor: pointer;
@@ -276,10 +277,11 @@
     height: 100%;
 
     .course-classroom-list-header {
+        padding-left: 15px;
         width: 100%;
         height: 45px;
         line-height: 45px;
-        border-bottom: 1px solid var(--border-color);
+        // border-bottom: 1px solid var(--border-color);
 
         .add-classroom-icon {
             float: right;
@@ -323,7 +325,7 @@
         width: 100%;
         height: 45px;
         line-height: 45px;
-        border-bottom: 1px solid var(--border-color);
+        // border-bottom: 1px solid var(--border-color);
 
         .course-classroom-label {
             margin-right: 50px;

+ 10 - 8
TEAMModelOS/ClientApp/src/view/newcourse/NewCusMgt.less

@@ -16,7 +16,7 @@
         height: 45px;
         line-height: 45px;
         border-bottom: 1px solid @borderColor;
-        padding-left:10px;
+        padding-left:15px;
         color: @second-textColor;
     }
 
@@ -65,7 +65,8 @@
     // padding-left: 8px;
     /* height: 40px;
     line-height: 40px; */
-    padding: 0px 8px;
+    // padding: 0px 8px;
+    padding-left: 15px;
     // border-bottom: 1px solid @borderColor;
     color: @second-textColor;
     display: flex;
@@ -79,7 +80,7 @@
 }
 .cus-item{
     width: 100%;
-    padding: 10px 8px 10px 8px;
+    padding: 10px 8px 10px 15px;
     color: @primary-textColor;
     // border-bottom: 1px solid @borderColor;
     cursor: pointer;
@@ -99,7 +100,7 @@
         border: 1px solid var(--assist-color-light);
         padding: 0px 3px;
         border-radius: 3px;
-        vertical-align: middle;
+        vertical-align: text-bottom;
     }
     .attr-label{
         color: @second-textColor;
@@ -113,7 +114,7 @@
     height: 100%;
 }
 .teacher-list{
-    padding-left: 8px;
+    // padding-left: 8px;
     height: 100%;
 }
 .tea-list-content{
@@ -128,7 +129,7 @@
     // border-left: 3px solid var(--tabs-bottom-color);
     margin: 12px 0;
     // padding-left: 10px;
-    margin-left: 8px;
+    margin-left: 15px;
 }
 .tea-action-icon{
     float: right;
@@ -138,7 +139,7 @@
     cursor: pointer;
 }
 .class-setting{
-    padding-left: 8px;
+    // padding-left: 8px;
     height: ~"calc(100% - 40px)";
 }
 
@@ -153,7 +154,7 @@
 }
 .tea-item{
     width: 100%;
-    padding: 12px 8px 12px 5px;
+    padding: 12px 8px 12px 15px;
     color: @primary-textColor;
     // border-bottom: 1px solid @borderColor;
     cursor: pointer;
@@ -191,6 +192,7 @@
 }
 .tea-class-item{
     padding: 10px;
+    padding-left: 15px;
     color: @primary-textColor;
     // border-bottom: 1px solid @borderColor;
     cursor: pointer;

+ 1 - 1
TEAMModelOS/ClientApp/src/view/notify/NotifyMgt.less

@@ -12,7 +12,7 @@
 .notify-mgt-container{
     width: 100%;
     height: 100%;
-    padding: 10px;
+    padding: 15px;
 }
 .notify-filter-wrap{
     width: 100%;

+ 1 - 1
TEAMModelOS/ClientApp/src/view/resource/Diagnosis.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="literacy-container">
-        <div class="literacy-search">
+        <div class="literacy-search light-iview-input">
             <Input v-model="keyword" suffix="ios-search" placeholder="搜索" style="width: 200px;margin-top:0px" @on-change="search" />
         </div>
         <!-- <div class="literacy-mgt-top">

+ 2 - 2
TEAMModelOS/ClientApp/src/view/resource/Index.vue

@@ -53,8 +53,8 @@ export default {
     font-size: 15px;
 }
 .resource-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;
 }
 </style>

+ 1 - 1
TEAMModelOS/ClientApp/src/view/resource/Leadership.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="literacy-container">
-        <div class="literacy-search">
+        <div class="literacy-search light-iview-input">
             <Input v-model="keyword" suffix="ios-search" placeholder="搜索" style="width: 200px;margin-top:0px" @on-change="search" />
         </div>
         <!-- <div class="literacy-mgt-top">

+ 1 - 1
TEAMModelOS/ClientApp/src/view/resource/Literacy.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="literacy-container">
-        <div class="literacy-search">
+        <div class="literacy-search light-iview-input">
             <Input v-model="keyword" suffix="ios-search" placeholder="搜索" style="width: 200px;margin-top:0px" @on-change="search" />
         </div>
         <!-- <div class="literacy-mgt-top">

+ 1 - 1
TEAMModelOS/ClientApp/src/view/resource/Probation.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="literacy-container">
-        <div class="literacy-search">
+        <div class="literacy-search light-iview-input">
             <Input v-model="keyword" suffix="ios-search" placeholder="搜索" style="width: 200px;margin-top:0px" @on-change="search" />
         </div>
         <!-- <div class="literacy-mgt-top">

+ 1 - 1
TEAMModelOS/ClientApp/src/view/schoolmgmt/RoomMgt/RoomMgt.less

@@ -213,7 +213,7 @@
     background-image: linear-gradient(90deg, rgba(30,30,30,0) 0%, rgba(110,110,110,.2) 50%, rgba(110,110,110,.4) 100%);
 }
 .class-list-item {
-    padding: 10px 0px 8px 18px;
+    padding: 10px 0px 8px 15px;
     // .border(bottom);
     cursor:pointer;
     position:relative;

+ 5 - 5
TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.less

@@ -11,7 +11,7 @@
     &-school-header {
         height: 50px;
         border-bottom: 1px solid var(--border-color);
-        padding: 0px 20px;
+        padding: 0px 15px;
         .school-tools {
             font-size: var(--font-size-normal);
             // margin-right: 30px;
@@ -86,7 +86,7 @@
         /* height: 40px;
         line-height:40px; */
         width: 100%;
-        padding: 0 10px 0 10px;
+        padding: 0 10px 0 0;
         font-size: var(--font-size-normal);
         color: var(--second-text-color);
         // border-bottom: 1px solid var(--border-color);
@@ -175,7 +175,7 @@
 .period-wrap {
 
     .col-title{
-        padding-left: 20px;
+        padding-left: 15px;
     }
 
     .period-list {
@@ -210,7 +210,7 @@
 
     .period-item {
         position: relative;
-        padding: 10px 10px 10px 15px;
+        padding: 10px 10px 10px 10px;
         // border-bottom: 1px solid var(--border-color);
         cursor: pointer;
 
@@ -297,7 +297,7 @@
         }
     }
     .setting-content {
-        padding: 12px 16px 16px 16px;
+        padding: 12px 15px 16px 15px;
         min-height: 150px;
         border-radius: 5px;
         margin-right: 12px;

+ 1 - 1
TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/TimeSetting.less

@@ -17,7 +17,7 @@
         width: 100%;
         height: 100%;
         border-right: 1px solid @borderColor;
-        padding-left:10px;
+        // padding-left:10px;
     }
     .time-table-wrap {
         width: calc(100% - 400px);

+ 2 - 2
TEAMModelOS/ClientApp/src/view/student-account/Index.less

@@ -20,8 +20,8 @@
 
 .stu-mgt-header{
     height: 50px;
-    border-bottom: 1px solid var(--border-color);
-    padding: 0 20px;
+    // border-bottom: 1px solid var(--border-color);
+    padding: 0 15px;
 }
 .class-mgt-wrap{
     height: ~"calc(100% - 50px)";

+ 2 - 2
TEAMModelOS/ClientApp/src/view/student-account/class/ClassMgt.less

@@ -54,7 +54,7 @@
     width:100%;
     height:45px;
     line-height:45px;
-    border-bottom:1px solid @borderColor;
+    // border-bottom:1px solid @borderColor;
 }
 .class-info-content{
     width:100%;
@@ -63,7 +63,7 @@
 }
 .main-header-tab {
     color: @second-textColor;
-    margin-right: 15px;
+    margin-right: 30px;
     cursor: pointer;
     position: relative;
     display: inline-block;

+ 2 - 2
TEAMModelOS/ClientApp/src/view/student-account/stuMgt/AddStudent.less

@@ -13,7 +13,7 @@
     user-select:none;
 }
 .confirm-btn-active {
-    background-color: #6DE2C4;
+    background-color: #70B1E7;
     color:white;
 }
 .account-form {
@@ -21,6 +21,6 @@
     margin:auto;
 }
 .account-item {
-    color: white;
+    color: #006ee6;
     font-size: 16px;
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/view/student-account/stuMgt/StuMgt.vue

@@ -59,7 +59,7 @@
             </div>
         </div>
         <!--学生账号table-->
-        <div class="sc-content" style="position: relative; padding-left: 20px" :style="{width: authorizationStatus == true ? '70%' : '100%',transition: 'all 0.7s'}">
+        <div class="sc-content" style="position: relative; padding-left: 15px" :style="{width: authorizationStatus == true ? '70%' : '100%',transition: 'all 0.7s'}">
             <Scroll :on-reach-bottom="scrollLoad" height="750" :distance-to-edge="[15, 15]">
                 <Table ref="selection" :columns="tableColumns" :data="tableShowData" :loading="tableLoading" @on-selection-change="(selection)=>{selections = selection}">
                     <template slot-scope="{ row }" slot="status">

+ 2 - 2
TEAMModelOS/ClientApp/src/view/student-account/stulist/MgtStuList.less

@@ -15,7 +15,7 @@
     // padding-left: 10px;
     height: 100%;
     .list-header{
-        padding-left: 10px;
+        padding-left: 15px;
         height: 45px;
         line-height: 45px;
         // border-bottom: 1px solid @borderColor;
@@ -29,7 +29,7 @@
         cursor: pointer;
         // border-bottom: 1px solid @borderColor;
         padding: 15px 0px;
-        padding-left: 10px;
+        padding-left: 15px;
 
         &:hover{
             background: var(--hover-text-color);

+ 5 - 4
TEAMModelOS/ClientApp/src/view/task/index.less

@@ -8,7 +8,7 @@
 .task-container{
     width: 100%;
     height: 100%;
-    color: #a5a5a5;
+    color: var(--second-text-color);
     .success-color{
         color:#19be6b;
         border-color:#19be6b
@@ -36,7 +36,7 @@
         width: 100%;
         height: 45px;
         line-height: 45px;
-        border-bottom: 1px solid var(--border-color);
+        // border-bottom: 1px solid var(--border-color);
         color: @second-textColor;
     }
 }
@@ -47,7 +47,7 @@
 }
 .ev-item{
     // border-bottom: 1px solid var(--border-color);
-    padding: 15px 10px 15px 15px;
+    padding: 20px 10px 20px 15px;
     cursor: pointer;
     user-select: none;
 
@@ -83,6 +83,7 @@
 
     .block-title{
         border-left: 3px solid var(--tabs-bottom-color);
+        color: var(--tabs-text-color);
         padding-left: 10px;
     }
 }
@@ -140,7 +141,7 @@
         width: 100%;
         height: 45px;
         line-height: 45px;
-        border-bottom: 1px solid var(--border-color);
+        // border-bottom: 1px solid var(--border-color);
         color: @second-textColor;
     }
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/view/task/mark/QuProg.vue

@@ -164,7 +164,7 @@ export default {
     .qu-index {
         display: block;
         width: 80px;
-        color: var(--second-text-color);
+        color: var(--primary-text-color);
         font-size: 20px;
         font-weight: 600;
     }

+ 2 - 2
TEAMModelOS/ClientApp/src/view/task/mark/StuProg.vue

@@ -235,9 +235,9 @@ export default {
     background: white;
     color: var(--primary-text-color);
     &:hover {
-        background: var(--hover-text-color);
+        background: #80B2C9;
         font-weight: bold;
-        // color: #ddd;
+        color: #fff;
     }
 }
 </style>

+ 2 - 2
TEAMModelOS/ClientApp/src/view/teachermgmt/Index.less

@@ -4,8 +4,8 @@
     .mgmt-top {
         width: 100%;
         height: 50px;
-        border-bottom: 1px solid var(--border-color);
-        padding: 0px 20px;
+        // border-bottom: 1px solid var(--border-color);
+        padding: 0px 15px;
         background-color: var(--body-bg);
         .tab-box {
             display: inline-block;

+ 3 - 3
TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.less

@@ -22,7 +22,7 @@
         height: 100%;
         border-right: 1px solid var(--border-color);
         .sort-box{
-            padding-left: 20px;
+            padding-left: 15px;
             // border-bottom: 1px solid var(--border-color);
             .title{
                 color: var(--second-text-color);
@@ -51,7 +51,7 @@
                 height: 100%;
                 overflow: auto;
                 .detail{
-                    padding: 20px 40px 20px 45px;
+                    padding: 20px 40px 20px 15px;
                     // border-bottom: 1px solid var(--border-color);
                     display: flex;
                     &-info{
@@ -125,7 +125,7 @@
         width: 65%;
         height: 100%;
         &-box{
-            padding-left: 20px;
+            padding-left: 15px;
             .title-box{
                 // border-bottom: 1px solid var(--border-color);
                 padding-right: 20px;

+ 1 - 1
TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/Index.less

@@ -15,7 +15,7 @@
             width: 70%;
         }
         .serch-box{            
-            padding: 5px 5px 5px 20px;
+            padding: 5px 5px 5px 15px;
             border-bottom: 1px solid var(--border-color);
             height: 45px;
             /* background: -webkit-linear-gradient(left,#2a2a2a,#1b1b1b);

+ 3 - 3
TEAMModelOS/ClientApp/src/view/video/Video.less

@@ -1,7 +1,7 @@
 .video-container {
 		padding: 20px;
 		height: 100vh;
-		background-color: #f7f7f7;
+		// background-color: #f7f7f7;
 		overflow: auto;
 		padding-bottom: 100px;
 		
@@ -128,7 +128,7 @@
 			&::before {
 				content: '';
 				display: inline-block;
-				border: 2px solid #19be6b;
+				border: 2px solid var(--tabs-bottom-color);
 				height: 12px;
 				margin-right: 10px;
 			}
@@ -167,7 +167,7 @@
 			
 			.detail-title{
 				font-size: 20px;
-				font-weight: bold;
+				// font-weight: bold;
 				margin-bottom: 20px;
 				
 				.ivu-icon{

+ 3 - 3
TEAMModelOS/ClientApp/src/view/video/Video.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="video-container">
+	<div class="video-container light-iview-select light-iview-input">
 		<div v-if="!isShowDetail">
 			<div class="table-filter">
 				<Select v-model="curGroup" style="width:200px" @on-change="onGroupFilter">
@@ -479,7 +479,7 @@
 						symbolSize: 8,
 						itemStyle: {
 							normal: {
-								color: '#66CDAA', //改变折线点的颜色
+								color: '#70B1E7', //改变折线点的颜色
 								borderWidth: 5,
 								areaStyle: {
 									color: that.$echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -500,7 +500,7 @@
 							}
 						},
 						lineStyle: {
-							color: '#66CDAA', //改变折线颜色
+							color: '#70B1E7', //改变折线颜色
 							width: 3,
 						},
 					}],