Merge branch 'vite' of https://gitlab.ezijing.com/ezijing/x-learn into vite

src/modules/teacher/data/course/index.js

@@ -4,9 +4,9 @@ const routes = [
     component: () => import('@/components/layout/index.vue'),
     children: [
       { path: '/teacher/data/course', component: () => import('./views/List.vue') },
-      { path: '/classDatas', component: () => import('./views/ClassList.vue') },
-      { path: '/personal', component: () => import('./views/PersonalList.vue') },
-      { path: '/detail', component: () => import('./views/CourseProcessList.vue') }
+      { path: '/teacher/data/classDatas', component: () => import('./views/ClassList.vue') },
+      { path: '/teacher/data/personal', component: () => import('./views/PersonalList.vue') },
+      { path: '/teacher/data/detail', component: () => import('./views/CourseProcessList.vue') }
     ]
   }
 ]

src/modules/teacher/data/course/views/List.vue

@@ -59,7 +59,7 @@ export default {
   methods: {
     toClassData(row) {
       this.$router.push({
-        path: '/classDatas',
+        path: '/teacher/data/classDatas',
         query: {
           row: row
         }
@@ -67,7 +67,7 @@ export default {
     },
     toPersonal(row) {
       this.$router.push({
-        path: '/personal',
+        path: '/teacher/data/personal',
         query: {
           row: row
         }

src/modules/teacher/data/course/views/PersonalList.vue

@@ -15,18 +15,14 @@
 <script>
 export default {
   data() {
-    return {
-    }
+    return {}
   },
   computed: {
     // 列表配置
     tableOptions() {
       return {
-        remote: {
-        },
-        filters: [
-          { type: 'input', prop: 'class_name', placeholder: '学生姓名', label: '学生姓名' }
-        ],
+        remote: {},
+        filters: [{ type: 'input', prop: 'class_name', placeholder: '学生姓名', label: '学生姓名' }],
         columns: [
           { label: '学生姓名', prop: 'paper_title', slots: 'table-name' },
           { label: '总学习时长', prop: 'class_name', align: 'center', sortable: true },
@@ -35,16 +31,14 @@ export default {
           { label: '本课完成率', prop: 'grthr', align: 'center', sortable: true },
           { label: '操作', slots: 'table-operate', align: 'center' }
         ],
-        data: [
-          { class_name: 'dfwjehf' }
-        ]
+        data: [{ class_name: 'dfwjehf' }]
       }
     }
   },
   methods: {
     toPersonDetail(row) {
       this.$router.push({
-        path: '/detail',
+        path: '/teacher/data/detail',
         query: {
           row: row
         }

src/modules/teacher/data/exam/components/ExamInfo.vue

@@ -5,16 +5,16 @@
       <h1 style="font-size: 16px">考试信息</h1>
       <img class="logo" src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/x-learning/data/exam.png" alt="" />
     </div>
-    <el-row type="flex" class="row-bg" justify="space-around">
-      <el-col :span="6">
+    <el-row :gutter="20" class="row-bg" justify="space-around">
+      <el-col :span="8">
         <div class="title">总分</div>
         <div><span class="num">100</span><span class="fen">分</span></div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <div class="title">及格分数</div>
         <div><span class="num">100</span><span class="fen">分</span></div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <div class="title">考试总时长</div>
         <div><span class="num">100</span><span class="fen">小时</span></div>
       </el-col>

src/modules/teacher/data/exam/components/Finished.vue

@@ -11,15 +11,13 @@
 <script>
 export default {
   data() {
-    return {
-    }
+    return {}
   },
   computed: {
     // 列表配置
     tableOptions() {
       return {
-        remote: {
-        },
+        remote: {},
 
         columns: [
           { label: '排名', prop: 'paper_title', align: 'center' },
@@ -43,7 +41,7 @@ export default {
   methods: {
     toPersonal(row) {
       this.$router.push({
-        path: '/PersonalList',
+        path: '/teacher/data/PersonalList',
         query: {
           row: row
         }

src/modules/teacher/data/exam/components/QuestionType.vue

 <template>
   <el-card class="box-card">
-    <div style="width: 90%; margin: 0 auto">
-      <div slot="header" class="clearfix">
-        <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题型数据</h1>
-      </div>
-      <div id="type" style="width: 100%; height: 360px"></div>
-      <div>客观题正确率76%</div>
-      <div>主观题正确率24%</div>
+    <div slot="header" class="clearfix">
+      <h1 style="font-size: 28px">题型数据</h1>
     </div>
+    <div id="type" style="width: 310px; height: 360px"></div>
+    <div>客观题正确率76%</div>
+    <div>主观题正确率24%</div>
   </el-card>
 </template>
 
@@ -24,8 +22,8 @@ export default {
           }
         },
         grid: {
-          // left: '10%',
-          // right: '20%',
+          left: '30%',
+          right: '5%',
           bottom: '20%',
           containLabel: true
         },

src/modules/teacher/data/exam/components/Result.vue

@@ -6,6 +6,7 @@
       </div>
       <div id="main" style="width: 100%; height: 400px"></div>
     </div>
+    <div id="main" style="width: 310px; height: 400px"></div>
   </el-card>
 </template>
 

src/modules/teacher/data/exam/components/Score.vue

@@ -5,16 +5,16 @@
       <h1 style="font-size: 16px">分数统计</h1>
       <img class="logo" src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/x-learning/data/score.png" alt="" />
     </div>
-    <el-row type="flex" class="row-bg" justify="space-around">
-      <el-col :span="6">
+    <el-row :gutter="20" class="row-bg" justify="space-around">
+      <el-col :span="8">
         <div class="title">平均分</div>
         <div><span class="num">100</span><span class="fen">分</span></div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <div class="title">最高分</div>
         <div><span class="num">100</span><span class="fen">分</span></div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <div class="title">最低分</div>
         <div><span class="num">100</span><span class="fen">分</span></div>
       </el-col>

src/modules/teacher/data/exam/components/ScoreRange.vue

 <template>
   <div class="score-range-box">
     <el-card class="box-card">
-      <div style="width: 90%; margin: 0 auto">
-        <div slot="header" class="clearfix">
-          <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">考分区间</h1>
-          <el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -35px">设置</el-button>
-        </div>
-        <div id="score" style="width: 100%; height: 400px"></div>
+      <div slot="header" class="clearfix">
+        <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">考分区间</h1>
+        <el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -35px">设置</el-button>
       </div>
+      <div id="score" style="width: 310px; height: 400px"></div>
     </el-card>
     <set-score-range class="pop"></set-score-range>
   </div>
@@ -25,7 +23,12 @@ export default {
           trigger: 'item'
         },
         legend: {
-          bottom: '5%'
+          bottom: '5%',
+          left: 'center'
+        },
+        grid: {
+          left: '10%',
+          right: '10%'
         },
         series: [
           {

src/modules/teacher/data/exam/components/Submission.vue

@@ -5,17 +5,17 @@
       <h1 style="font-size: 16px">交卷统计</h1>
       <img class="logo" src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/x-learning/data/time.png" alt="" />
     </div>
-    <el-row type="flex" class="row-bg" justify="space-around">
-      <el-col :span="6">
+    <el-row :gutter="20" class="row-bg" justify="space-around">
+      <el-col :span="8">
         <div class="title">最早交卷</div>
         <div><span class="num">100</span><span class="fen">分钟</span></div>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <div class="title">最迟交卷</div>
         <div><span class="num">100</span><span class="fen">分钟</span></div>
       </el-col>
-      <el-col :span="6">
-        <div class="title">平均交卷时长</div>
+      <el-col :span="8">
+        <div class="title" style="white-space: nowrap">平均交卷时长</div>
         <div><span class="num">100</span><span class="fen">分钟</span></div>
       </el-col>
     </el-row>

src/modules/teacher/data/exam/components/TitleData.vue

 <template>
-  <el-card>
+  <el-card style="margin-right: -20px">
     <app-container>
       <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题目数据</h1>
       <el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -40px">导出</el-button>

src/modules/teacher/data/exam/index.js

@@ -2,11 +2,12 @@ const routes = [
   {
     path: '/',
     component: () => import('@/components/layout/index.vue'),
-    children: [{ path: '/teacher/data/exam', component: () => import('./views/List.vue') },
-      { path: '/class', component: () => import('./views/ClassList.vue') },
-      { path: '/PersonalList', component: () => import('./views/PersonalList.vue') },
+    children: [
+      { path: '/teacher/data/exam', component: () => import('./views/List.vue') },
+      { path: '/teacher/data/class', component: () => import('./views/ClassList.vue') },
+      { path: '/teacher/data/PersonalList', component: () => import('./views/PersonalList.vue') },
       { path: '/teacher/data/exam/classDetail', component: () => import('./views/ClassDetail.vue') },
-      { path: '/examData', component: () => import('./views/ExamData.vue') }
+      { path: '/teacher/data/examData', component: () => import('./views/ExamData.vue') }
     ]
   }
 ]

src/modules/teacher/data/exam/views/ExamData.vue

 <template>
-  <div class="data-box">
+  <div class="container">
     <el-row type="flex" class="row-bg" justify="space-between" style="margin-bottom: 30px">
-      <el-col :span="10"><div class="title">模拟测试一</div></el-col>
-      <el-col :span="7">
+      <el-col><h1 style="padding-left: 50px; font-size: 30px">模拟测试一</h1></el-col>
+      <el-col :span="11">
         <el-select v-model="label" placeholder="请选择">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
         </el-select>
         <el-button type="text" style="margin-left: 20px">导出pdf</el-button>
       </el-col>
     </el-row>
-    <div class="data-content-top">
-        <examInfo class="flex" slot-scope=""/>
-        <submission class="flex" />
-        <score class="flex" />
-    </div>
-    <div class="data-content-center">
-      <scoreRanking class="flex" />
-      <titleData class="flex" />
-    </div>
-    <div class="data-content-bottom">
-      <result class="flex" />
-      <scoreRange class="flex" />
-      <questionType class="flex" />
-    </div>
-    <!-- <app-container>
-      <el-row type="flex" class="row-bg">
-        <el-col style="min-width: 366px; margin-right: 21px"><ExamInfo /></el-col>
-        <el-col style="min-width: 366px; margin-right: 21px"><Submission /></el-col>
-        <el-col style="min-width: 366px"><Score /></el-col>
-      </el-row>
-      <el-row type="flex" class="row-bg" style="margin-top: 30px">
-        <el-col style="min-width: 560px; margin-right: 21px"><ScoreRanking /></el-col>
-        <el-col style="min-width: 560px"><TitleData /></el-col>
-      </el-row>
-      <el-row type="flex" class="row-bg" style="margin-top: 30px">
-        <el-col style="min-width: 347px; margin-right: 21px"><Result /></el-col>
-        <el-col style="min-width: 347px; margin-right: 21px"><ScoreRange /></el-col>
-        <el-col style="min-width: 347px; margin-right: 21px"><QuestionType /></el-col>
-      </el-row>
-    </app-container> -->
+    <el-row :gutter="10" class="row-bg">
+      <el-col :span="8" class="col"><ExamInfo /></el-col>
+      <el-col :span="8" class="col"><Submission /></el-col>
+      <el-col :span="7"><Score /></el-col>
+    </el-row>
+    <el-row :gutter="10" class="row-bg">
+      <el-col :span="12" class="col"><ScoreRanking /></el-col>
+      <el-col :span="11"><TitleData /></el-col>
+    </el-row>
+    <el-row :gutter="10" class="row-bg">
+      <el-col :span="8" class="col"><Result /></el-col>
+      <el-col :span="8" class="col"><ScoreRange /></el-col>
+      <el-col :span="7"><QuestionType /></el-col>
+    </el-row>
   </div>
 </template>
 
@@ -61,52 +45,12 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-.data-box{
-  overflow-x: scroll;
-  &::-webkit-scrollbar {display:none}
-  .title{
-    font-size: 20px;
-    color: #333333;
-    opacity: 1;
-    margin-left: 20px;
-  }
-  .data-content-top{
-    display: flex;
-    .flex{
-      min-width: 366px;
-      flex: 1;
-      &:nth-child(2){
-        margin: 0 20px;
-      }
-    }
-  }
-  .data-content-center{
-    margin: 20px 0;
-    display: flex;
-    .flex{
-      min-width: 560px;
-      flex: 1;
-      &:nth-child(1){
-        margin-right: 20px;
-      }
-    }
-  }
-  .data-content-bottom{
-    display: flex;
-    .flex{
-      flex: 1;
-      &:nth-child(1){
-        min-width: 347px;
-      }
-      &:nth-child(2){
-        min-width: 366px;
-        margin: 0 20px;
-      }
-      &:nth-child(3){
-        min-width: 387px;
-      }
-    }
-  }
+<style>
+.row-bg {
+  margin-top: 30px;
+  padding: 10px 0;
+}
+.col {
+  margin-right: 21px;
 }
 </style>

src/modules/teacher/data/exam/views/List.vue

@@ -76,7 +76,7 @@ export default {
   methods: {
     toExamData(row) {
       this.$router.push({
-        path: '/examData',
+        path: '/teacher/data/examData',
         query: {
           row: row
         }
@@ -85,7 +85,7 @@ export default {
     // 班级数据
     toClassData(row) {
       this.$router.push({
-        path: '/class',
+        path: '/teacher/data/class',
         query: {
           row: row
         }

src/modules/teacher/data/test/components/Finished.vue

@@ -11,15 +11,13 @@
 <script>
 export default {
   data() {
-    return {
-    }
+    return {}
   },
   computed: {
     // 列表配置
     tableOptions() {
       return {
-        remote: {
-        },
+        remote: {},
 
         columns: [
           { label: '排名', prop: 'paper_title', align: 'center' },
@@ -43,7 +41,7 @@ export default {
   methods: {
     toPersonal(row) {
       this.$router.push({
-        path: '/person',
+        path: '/teacher/data/person',
         query: {
           row: row
         }

src/modules/teacher/data/test/index.js

@@ -2,9 +2,11 @@ const routes = [
   {
     path: '/',
     component: () => import('@/components/layout/index.vue'),
-    children: [{ path: '/teacher/data/test', component: () => import('./views/List.vue') },
-      { path: '/classList', component: () => import('./views/ClassList.vue') },
-      { path: '/person', component: () => import('./views/PersonalList.vue') }]
+    children: [
+      { path: '/teacher/data/test', component: () => import('./views/List.vue') },
+      { path: '/teacher/data/classList', component: () => import('./views/ClassList.vue') },
+      { path: '/teacher/data/person', component: () => import('./views/PersonalList.vue') }
+    ]
   }
 ]
 

src/modules/teacher/data/test/views/List.vue

@@ -22,9 +22,7 @@ export default {
     // 列表配置
     tableOptions() {
       return {
-        remote: {
-
-        },
+        remote: {},
         filters: [
           { type: 'select', prop: 'class_name', placeholder: '练习名称' },
           { type: 'select', prop: 'paper_title', placeholder: '所属课程' }
@@ -41,16 +39,14 @@ export default {
           { label: '及格率', prop: 'dwefw', align: 'center' },
           { label: '操作', slots: 'table-operate', align: 'center' }
         ],
-        data: [
-          { paper_title: 'adsada' }
-        ]
+        data: [{ paper_title: 'adsada' }]
       }
     }
   },
   methods: {
     toClassData(row) {
       this.$router.push({
-        path: '/classList',
+        path: '/teacher/data/classList',
         query: {
           row: row
         }