教师端——学情分析

TEAMModelOS/ClientApp/src/common/UploadModal.vue

@@ -607,7 +607,7 @@ export default {
 
 .upload-file-item:hover {
     /* color: white; */
-    background: #585858;
+    background: var(--hover-text-color);
     border-radius: 5px;
 }
 

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

@@ -432,5 +432,6 @@
         height: 400px;
         margin: 0 auto;
         display: block;
+        margin-top: 20px;
     }
 </style>

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

@@ -336,5 +336,6 @@
         height: 400px;
         margin: 0 auto;
         display: block;
+        margin-top: 20px;
     }
 </style>

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

@@ -34,7 +34,19 @@
 						center: ['45%', '55%'],
 						max: 100, // for funnel
 						sort: 'ascending', // for funnel
-						data: data
+						data: data,
+                        emphasis: {
+                            label: {
+                                show: true,
+                                fontSize: '16',
+                                fontWeight: 'bold'
+                            },
+                            itemStyle: {
+                                shadowBlur: 10,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.3)'
+                            }
+                        },
 					}
 				}
 

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

@@ -676,7 +676,7 @@
 		justify-content: space-between;
 		padding-right: 5px;
 		/* height: 40px; */
-		margin-bottom: 10px;
+		margin-bottom: 20px;
 	}
 
 	.table-subject-select .table-tips {
@@ -685,7 +685,7 @@
 		font-weight: bold;
 		position: absolute;
 		right: 120px;
-		top: 10px;
+		top: 40px;
 	}
 
 	.table-subject-select .ivu-select {
@@ -716,7 +716,7 @@
 		font-weight: bold;
 		position: absolute;
 		right: 5px;
-		top: 10px;
+		top: 40px;
 		cursor: pointer;
 	}
 
@@ -763,7 +763,10 @@
 		font-weight: 500;
 		color: var(--primary-text-color);
 		border-left: 5px solid var(--tabs-bottom-color);
+		padding: 5px 0;
 		padding-left: 10px;
 		margin-bottom: 10px;
+		width: 100%;
+    	background: var(--active-item-start);
 	}
 </style>

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

@@ -34,7 +34,19 @@
                         center: ['45%', '50%'],
                         max: 100, // for funnel
                         sort: 'ascending', // for funnel
-                        data: data
+                        data: data,
+                        emphasis: {
+                            label: {
+                                show: true,
+                                fontSize: '16',
+                                fontWeight: 'bold'
+                            },
+                            itemStyle: {
+                                shadowBlur: 10,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.3)'
+                            }
+                        },
                     }
                 }
 

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

@@ -188,7 +188,7 @@
 									label: {
 										show: true,
 										position: ['90%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: 'A'
 									}
@@ -212,7 +212,7 @@
 									label: {
 										show: true,
 										position: ['5%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: "A'"
 									}
@@ -231,7 +231,7 @@
 									label: {
 										show: true,
 										position: ['90%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: 'B'
 									}
@@ -250,7 +250,7 @@
 									label: {
 										show: true,
 										position: ['5%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										zIndex: 99999,
 										formatter: "B'"
@@ -270,7 +270,7 @@
 									label: {
 										show: true,
 										position: ['90%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: 'C'
 									}
@@ -289,7 +289,7 @@
 									label: {
 										show: true,
 										position: ['5%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: "C'"
 									}
@@ -351,5 +351,6 @@
 		height: 500px;
 		margin: 0 auto;
 		display: block;
+		margin-top: 20px;
 	}
 </style>

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

@@ -170,7 +170,7 @@
 									label: {
 										show: true,
 										position: ['90%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: 'B'
 									}
@@ -182,13 +182,13 @@
 									xAxis: '1',
 									yAxis: '50',
 									itemStyle: {
-										color: 'rgba(90,90,90,.2)'
+										color: 'rgba(90,90,90,.1)'
 
 									},
 									label: {
 										show: true,
 										position: ['5%', '10%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: "B'"
 									}
@@ -201,13 +201,13 @@
 									xAxis: '0.5',
 									yAxis: '100',
 									itemStyle: {
-										color: 'rgba(90,90,90,.2)'
+										color: 'rgba(90,90,90,.1)'
 
 									},
 									label: {
 										show: true,
 										position: ['90%', '80%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: 'A'
 									}
@@ -226,7 +226,7 @@
 									label: {
 										show: true,
 										position: ['5%', '40%'],
-										color: '#66ff33',
+										color: '#008955',
 										fontSize: 20,
 										formatter: "A'"
 									}
@@ -282,5 +282,6 @@
 		height: 500px;
 		margin: 0 auto;
 		display: block;
+		margin-top: 20px;
 	}
 </style>

TEAMModelOS/ClientApp/src/css/site.css

@@ -310,10 +310,12 @@ audio::-internal-media-controls-overflow-button {
 	font-size: 16px;
 	font-weight: 500;
 	color: var(--primary-text-color);
-	margin: 30px 0 0 55px;
+	/* margin: 30px 0 0 55px; */
 	display: block;
+	padding: 5px 0;
 	border-left: 5px solid var(--tabs-bottom-color);
 	padding-left: 10px;
+	background-color: var(--active-item-start);
 }
 
 .common-toolTip .ivu-tooltip-inner{

TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.less

@@ -137,7 +137,7 @@
 }
 .campus-modal {
     text-align: center;
-    color: #DDDDDD;
+    // color: #DDDDDD;
     .campus-name-item {
         margin-top: 10px;
         position: relative;
@@ -147,7 +147,7 @@
         }
 
         &:hover {
-            color: white;
+            color: var(--normal-icon-color);
             font-weight: 500;
         }
 

TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.vue

@@ -300,7 +300,7 @@
         </div>
         <!-- 添加校区 -->
         <Modal v-model="campusStatus" class="campus-modal" @on-cancel="selectedCampusIndex = -1" @on-ok="confirmCampus" @click.native="initStatus" :loading="modalLoading">
-            <p slot="header" style="color:#DDDDDD;letter-spacing:2px;font-weight:400;">{{$t('schoolBaseInfo.setCampus')}}</p>
+            <p slot="header" style="letter-spacing:2px;font-weight:400;">{{$t('schoolBaseInfo.setCampus')}}</p>
             <p v-for="(item,index) in schoolSetting.campuses" class="campus-name-item disabled-iview-select text-cursor-disabled" :key="index" @click.stop="selectedCampusIndex = index">
                 <Icon type="md-checkmark" size="20" style="margin-right:10px;position:absolute;left:15px;" v-if="index == selectedCampusIndex" />
                 <Input v-model="item.name" :disabled="editCamIndex !== index" :placeholder="$t('schoolBaseInfo.campusHolder')" :style="{width: getWidth(0, item.name)+'px'}" />
@@ -1569,6 +1569,9 @@ export default {
 .exam-type-item .ivu-input {
     padding: 0px 2px 0px 15px;
 }
+.exam-type-item .ivu-input::-webkit-input-placeholder {
+    color: rgb(224, 224, 224);
+}
 .profs-item .ivu-input {
     padding: 0px 2px 0px 15px;
 }
@@ -1703,4 +1706,8 @@ export default {
 .semster-item .ivu-select-selected-value {
     color: #80b2c9;
 }
+.campus-name-item .ivu-input[disabled] {
+    font-size: 14px !important;
+    color: var(--primary-text-color);
+}
 </style>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/AchievementAnalysis.less

@@ -2,7 +2,7 @@
   display: flex;
   flex-direction: column;
   width: 100%;
-  color: var(--second-text-color);
+  color: var(--primary-text-color);
   
   .class-info {
     position: relative;
@@ -38,6 +38,7 @@
     flex-direction: row;
     flex-wrap: wrap;
     min-height: 160px;
+    margin-left: 55px;
   }
   .percent-item {
     width: 16%;
@@ -55,7 +56,7 @@
       text-align: left;
     }
     .percent-line {
-      width: 3px;
+      width: 5px;
       height: 30px;
       display: inline-block;
       background: #ffd800;

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/AchievementAnalysis.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="achievement-container">
         <!-- 及格率统计 -->
-		<Row>
-            <span class="component-title" style="margin-top:40px">{{$t('totalAnalysis.ach_title1')}}</span>
+		<Row class-name="base-table-row">
+            <span class="component-title" style="width: 100%">{{$t('totalAnalysis.ach_title1')}}</span>
         </Row>
         <Row class-name="component-percents">
 			<div v-for="(item,index) in passRate" :key="index">
@@ -20,9 +20,9 @@
             
         </Row>
 		
-        <Row>
+        <Row class-name="base-table-row">
 			<Col span="12">
-				<span class="component-title">{{$t('totalAnalysis.ach_title2')}}</span>
+				<span class="component-title" style="margin-right: 55px">{{$t('totalAnalysis.ach_title2')}}</span>
 				<BaseBar :echartsData="baseBarData" :subjectIndex="curSubjectIndex" ref="baseBar"></BaseBar>
 			</Col>
 			<Col span="12">
@@ -42,7 +42,7 @@
         </Row>
 		
 		<Row></Row>
-		<Row v-if="isAllSubject">
+		<Row v-if="isAllSubject" class-name="base-table-row">
 			<Col span="12">
 				<span class="component-title">{{$t('totalAnalysis.scoreRate')}}</span>
 				<BaseScoreRateBar echartsId="sRateBar11" :echartsData="getAnalysisJson.students"></BaseScoreRateBar>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/EvaluationList/TotalIndex.less

@@ -314,6 +314,7 @@
             // background: #404040;
             overflow: hidden;
             border-bottom: 1px dashed var(--border-color);
+            background: #f5f5f5;
 
             .el-filter-item:first-child {
                 margin-top: 0px;

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/KnowledgeAnalysis/KnowledgeAnalysis.vue

@@ -4,9 +4,9 @@
 			<EmptyData :top="200" :textContent="$t('totalAnalysis.noKnowPointTip')"></EmptyData>
 		</div>
 		<div v-show='hasKnowledge'>
-			<Row>
+			<Row class-name="base-table-row">
 			    <Col span="12">
-			        <span class="component-title">{{$t('totalAnalysis.ka_title1')}}</span>
+			        <span class="component-title" style="margin-right: 55px">{{$t('totalAnalysis.ka_title1')}}</span>
 			        <BasePie pieId="knowPie"></BasePie>
 			    </Col>
 			    <Col span="12" style="position:relative">

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/KnowledgeAnalysis/ScoreDetails.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="scatter-container">
-        <Row>
+        <Row class-name="base-table-row">
             <Col span="12">
-                <span class="component-title">{{$t('totalAnalysis.ka_title4')}}</span>
+                <span class="component-title" style="margin-right: 55px">{{$t('totalAnalysis.ka_title4')}}</span>
                 <!-- <span class="pie-to-bar" @click="changeRadarOrBar"><Icon :type="isShowRadar ? 'ios-podium' : 'ios-pie'" />{{isShowRadar?$t('totalAnalysis.ka_chart_text1'):$t('totalAnalysis.ka_chart_text2')}}</span> -->
                 <div>
                     <BaseDetailBar echartsId="knowDetailBar" :classIndex="classIndex"  @handleItemClick="handleItemClick" ref="detailsBar"></BaseDetailBar>
@@ -11,7 +11,7 @@
                     <BaseRadar echartsId="knowRadar" :classIndex="classIndex"></BaseRadar>
                 </div> -->
             </Col>
-            <Col span="12"  style="padding: 30px 100px 0 0">
+            <Col span="12">
             <!-- 知识点得分详情 -->
                 <span class="component-title-point"><span>{{$t('totalAnalysis.ka_text2')}}：{{currentPoint}}</span></span>
                 <div>
@@ -252,8 +252,8 @@
 		position: absolute;
 		font-size: 14px;
 		font-weight: 600;
-		right: 200px;
-		top: 40px;
+		right: 220px;
+		top: 60px;
 		color: #70B1E7;
 	}
 </style>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/LevelAnalysis/LevelAnalysis.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="scatter-container">
-        <Row>
+        <Row class-name="base-table-row">
             <Col span="12">
-                <span class="component-title">{{$t('totalAnalysis.le_title1')}}</span>
+                <span class="component-title" style="margin-right: 55px">{{$t('totalAnalysis.le_title1')}}</span>
                 <BasePie pieId="levelPie"></BasePie>
             </Col>
             <Col span="12" style="position:relative">

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/LevelAnalysis/ScoreDetails.vue

@@ -1,8 +1,8 @@
 <template>
 	<div class="scatter-container">
-		<Row>
+		<Row class-name="base-table-row">
 			<Col span="12">
-			<span class="component-title">{{$t('totalAnalysis.le_title4')}}</span>
+			<span class="component-title" style="margin-right: 55px">{{$t('totalAnalysis.le_title4')}}</span>
 			<!-- <span class="pie-to-bar" @click="changeRadarOrBar">
 				<Icon :type="isShowRadar ? 'ios-podium' : 'ios-pie'" />
 				{{isShowRadar?$t('totalAnalysis.ka_chart_text1'):$t('totalAnalysis.ka_chart_text2')}}
@@ -17,7 +17,7 @@
 			</Col>
 			<Col span="12">
 			<span class="component-title-point"><span>{{$t('totalAnalysis.ka_text3')}}：{{transArr[+currentPoint-1]}}</span></span>
-			<div style="padding:30px 100px 0 0">
+			<div>
 				<BaseMyTable :columns="detailsColumns" :tableName="$t('totalAnalysis.le_title5')"
 					tableRef="levelScoreTable" :tableDatas="tableData" ref="detailsTable"></BaseMyTable>
 			</div>
@@ -270,8 +270,8 @@
 		position: absolute;
 		font-size: 14px;
 		font-weight: 600;
-		right: 200px;
-		top: 40px;
+		right: 220px;
+		top: 60px;
 		color: #70B1E7;
 	}
 </style>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/ScatterAnalysis/ScatterAnalysis.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="scatter-container">
-        <Row>
+        <Row class-name="base-table-row">
             <Col span="12">
             <div class="component-title">
                 <span>{{$t('totalAnalysis.sca_title1')}}</span>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/TestAnalysis/QuestionList.css

@@ -12,7 +12,7 @@
 .ql-left-box {
     position:relative;
     width:80%;
-    background:#dddddd;
+    background:#f5f5f5;
     color:#525252;
     font-size:14px;
 }

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/TestAnalysis/TestAnalysis.css

@@ -22,7 +22,7 @@
     flex-wrap:wrap;
 	justify-content: center;
 	align-items: center;
-	margin-left: 50px;
+	/* margin-left: 50px; */
     margin-top: 10px;
     width: 100%;
 }

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/TestAnalysis/TestAnalysis.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="scatter-container">
-		<Row>
+		<Row class-name="base-table-row">
 			<Col span="12">
 			<span class="component-title">{{$t('totalAnalysis.ta_title1')}}</span>
 			<BaseTestScatter @handleIndexClick="handleIndexClick" :scatterData="scatterData"
@@ -62,15 +62,16 @@
 		</Row>
 		<Divider />
 		<!-- 年级单题得分率表 -->
-		<Row>
-			<span class="component-title">
+		<Row class-name="base-table-row">
+			<span class="component-title" style="width: 100%">
 				<span>{{$t('totalAnalysis.ta_title2')}}</span>
 				
 			</span>
 			<div class="index-wrap" style="display: unset">
 					<span v-for="(item,index) in exerciseIndexList" :key="index" :title="index"
 						class="exercise-item-index" @click="onIndexClick(item)"
-						:style="{background: (+item > 9 ? item : '0' + item) === currentExerciseIndex ? '#d482ab':'#018B99' }">
+						:style="{background: (+item > 9 ? item : '0' + item) === currentExerciseIndex ? '#d482ab':'#c8e5e8',
+								color: (+item > 9 ? item : '0' + item) === currentExerciseIndex ? '#fff':'#757575' }">
 						{{+item > 9 ? item : '0' + item}}
 					</span>
 				</div>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/index.less

@@ -30,7 +30,7 @@ body, html, .total-container {
     bottom: 30px;
     height: 48px;
     width: 50px;
-    background: #595959;
+    background: #aeaeae;
     z-index: 99999;
     cursor: pointer;
     &:hover {
@@ -102,8 +102,9 @@ body, html, .total-container {
       width: 100%;
       height: 110px;
       padding-left: 50px;
-      margin-left: 30px;
+      // margin-left: 30px;
       // border-bottom: 1px solid #595959;
+      box-shadow: 0 2px 5px #e9e9e9;
     }
   }
 }
@@ -197,9 +198,11 @@ body, html, .total-container {
     }
   }
   .data-select {
-    padding: 25px 0 0 22px;
+    padding: 25px 0 0 0px;
     color: var(--second-text-color);
-    font-size: 14px;
+    font-size: 16px;
+    border-bottom: 1px solid #eeeeee;
+    margin: 0 100px 0 55px;
 
     .data-select-active {
       color: var(--primary-text-color);
@@ -210,13 +213,13 @@ body, html, .total-container {
   .data-select-items {
     span {
       padding: 8px;
-      margin-left: 50px;
+      margin-right: 50px;
       cursor: pointer;
     }
   }
   .data-container {
     width: 100%;
-    padding-left: 20px;
+    // padding-left: 20px;
     padding-bottom: 30px;
   }
   &::-webkit-scrollbar-track {
@@ -246,8 +249,10 @@ body, html, .total-container {
 }
 
 .class-subject-select{
-	padding: 10px 0 10px 50px;
+	padding: 10px 0 10px 0px;
 	margin-top: 30px;
+  // background-color: rgb(247, 247, 247);
+  // border-bottom: 1px solid #eeeeee;
 }