From 1ab83a98c50e6de33e502553b3d3da532e3f0ce9 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 25 May 2021 11:15:40 +0800
Subject: [PATCH] fix

---
 src/assets/css/main.css                    |  4 +++-
 src/components/page/Achievement.vue        |  4 ++--
 src/components/page/Assessment.vue         |  4 ++--
 src/components/page/ClassStudent.vue       |  2 +-
 src/components/page/Dashboard.vue          | 16 -------------
 src/components/page/ExperimentAss.vue      |  8 +++++++
 src/components/page/ExperimentTeach.vue    | 11 ++++++++-
 src/components/page/ExperimentVir.vue      | 26 ++++++++++++++++++++--
 src/components/page/Project.vue            |  8 ++++---
 src/components/page/StaffSide.vue          |  2 ++
 src/components/page/Student.vue            |  5 +++--
 src/components/page/classExperimentAss.vue |  4 ++--
 12 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 983eafa..43d600f 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -10,6 +10,9 @@ body,
     width: 100%;
     height: 100%;
 }
+.wrapper{
+    background: #f0f0f0;
+}
 
 body {
     font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
@@ -31,7 +34,6 @@ li {
     padding-bottom: 30px;
     -webkit-transition: left .3s ease-in-out;
     transition: left .3s ease-in-out;
-    background: #f0f0f0;
 }
 
 .content {
diff --git a/src/components/page/Achievement.vue b/src/components/page/Achievement.vue
index 74dcd3b..cb1526d 100644
--- a/src/components/page/Achievement.vue
+++ b/src/components/page/Achievement.vue
@@ -74,7 +74,7 @@
                 </template>
 
                 <!-- 竞赛 -->
-                <template v-if="projectPermissions == 1">
+                <template v-else-if="projectPermissions == 1">
                     <el-table-column prop="experimentalName" label="竞赛名称" align="center"></el-table-column>
                     <el-table-column prop="projectName" label="项目名称" align="center">
                     </el-table-column>
@@ -87,7 +87,7 @@
                 </template>
 
                 <!-- 考核 -->
-                <template v-if="projectPermissions == 2">
+                <template v-else-if="projectPermissions == 2">
                     <el-table-column prop="experimentalName" label="考核名称" align="center"></el-table-column>
                     <el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
                     <el-table-column prop="projectPermissions" label="分类" align="center">
diff --git a/src/components/page/Assessment.vue b/src/components/page/Assessment.vue
index 516b73c..39783ae 100644
--- a/src/components/page/Assessment.vue
+++ b/src/components/page/Assessment.vue
@@ -146,7 +146,7 @@ export default {
         return {
             name: sessionStorage.getItem('ms_username'),
             userId: this.$store.state.userLoginId,
-            roleId: this.$store.state.userRoleId.includes(',') ? 13 : Number(this.$store.state.userRoleId),
+            roleId: this.$store.state.userRoleId.includes(',') ? 2 : Number(this.$store.state.userRoleId),
             systemList: [
                 {
                     id: 1,
@@ -311,7 +311,7 @@ export default {
                 pageNum: this.pageNo,
                 pageSize: this.pageSize,
                 userId: this.userId,
-                role: this.roleId
+                role: this.roleId == 13 ? 2 : (this.roleId == 14 ? 3 : this.roleId) 
             }
             this.$post(this.api.assessmentByScreen,data).then(res => {
                 this.customerData = res.list.list
diff --git a/src/components/page/ClassStudent.vue b/src/components/page/ClassStudent.vue
index f9a2ef8..58371fe 100644
--- a/src/components/page/ClassStudent.vue
+++ b/src/components/page/ClassStudent.vue
@@ -62,7 +62,7 @@
                     <el-input v-model="form.workNumber" placeholder="请输入学生学号" @change="worknumberChange"></el-input>
                 </el-form-item>
                  <el-form-item prop="account" label="账号">
-                    <el-input v-model="form.account" placeholder="请输入学生账号" @change="accountChange"></el-input>
+                    <el-input v-model="form.account" placeholder="请输入学生账号"></el-input>
                 </el-form-item>
                 <el-form-item prop="userName" label="学生姓名">
                     <el-input v-model="form.userName" placeholder="请输入学生姓名"></el-input>
diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue
index 67b1385..338c08e 100644
--- a/src/components/page/Dashboard.vue
+++ b/src/components/page/Dashboard.vue
@@ -144,22 +144,6 @@ export default {
                     value: '2019',
                     name: '2019'
                 },
-                {
-                    value: '2018',
-                    name: '2018'
-                },
-                {
-                    value: '2017',
-                    name: '2017'
-                },
-                {
-                    value: '2016',
-                    name: '2016'
-                },
-                {
-                    value: '2015',
-                    name: '2015'
-                }
             ],
             semesterList: [
                 {
diff --git a/src/components/page/ExperimentAss.vue b/src/components/page/ExperimentAss.vue
index 375b8b8..d4efb98 100644
--- a/src/components/page/ExperimentAss.vue
+++ b/src/components/page/ExperimentAss.vue
@@ -123,6 +123,14 @@ export default {
             ]
         };
     },
+    watch: {
+        keyword: function(val) {
+            clearTimeout(this.searchTimer)
+            this.searchTimer = setTimeout(() => {
+                this.getData()
+            },500)
+        }
+    },
     mounted() {
         this.classId = this.classList[0].classId
         this.getData()
diff --git a/src/components/page/ExperimentTeach.vue b/src/components/page/ExperimentTeach.vue
index 2721611..c110e0c 100644
--- a/src/components/page/ExperimentTeach.vue
+++ b/src/components/page/ExperimentTeach.vue
@@ -119,13 +119,22 @@ export default {
             ]
         };
     },
+    watch: {
+        keyword: function(val) {
+            clearTimeout(this.searchTimer)
+            this.searchTimer = setTimeout(() => {
+                this.getData()
+            },500)
+        }
+    },
     mounted() {
         this.getData()
     },
     methods: {
         getData() {
             let data = {
-                id: this.id
+                id: this.id,
+                searchContent: this.keyword,
             }
             this.$get(this.api.getTeachAchievement,data).then(res => {
                 let list = res.data
diff --git a/src/components/page/ExperimentVir.vue b/src/components/page/ExperimentVir.vue
index 45b71f8..eba5b42 100644
--- a/src/components/page/ExperimentVir.vue
+++ b/src/components/page/ExperimentVir.vue
@@ -42,7 +42,7 @@
                     
                 </div>
                 <div>
-                    <!-- <el-button type="primary" size="small" @click="delAllData">批量删除</el-button> -->
+                    <el-button type="primary" size="small" @click="delAllData">批量删除</el-button>
                     <el-button type="primary" size="small" @click="exportData">导出</el-button>
                 </div>
             </div>
@@ -62,11 +62,16 @@
                 <el-table-column prop="score" label="分数" align="center"></el-table-column>
                 <el-table-column prop="creationTime" label="提交时间" align="center">
                 </el-table-column>
+                <el-table-column prop="experimentalName" label="批阅状态" align="center">
+                    <template slot-scope="scope">
+                        {{reviewList.find(n => n.id == scope.row.isRead).name}}
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center" width="220">
                     <template slot-scope="scope">
                         <el-button type="text" @click="edit(scope.row)">批阅</el-button>
                         <el-button type="text" @click="show(scope.row)">查看成绩报告</el-button>
-                        <!-- <el-button type="text" @click="handleDelete(scope.row)">删除</el-button> -->
+                        <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -96,8 +101,25 @@ export default {
             pageSize: 10,
             totals: 0,
             avg: 0,
+            reviewList: [
+                {
+                    id: 1,
+                    name: '已批阅'
+                },{
+                    id: 0,
+                    name: '待批阅'
+                }
+            ]
         };
     },
+    watch: {
+        keyword: function(val) {
+            clearTimeout(this.searchTimer)
+            this.searchTimer = setTimeout(() => {
+                this.getData()
+            },500)
+        }
+    },
     mounted() {
         this.getData()
     },
diff --git a/src/components/page/Project.vue b/src/components/page/Project.vue
index 14d760d..7d61b6e 100644
--- a/src/components/page/Project.vue
+++ b/src/components/page/Project.vue
@@ -80,7 +80,7 @@
                 </el-table-column>
                 <el-table-column label="模式" align="center">
                     <template slot-scope="scope">
-                        {{patternList.find(n => n.value === scope.row.pattern).label}}
+                        {{(scope.row.pattern == 1 || scope.row.pattern == 0) ? patternList.find(n => n.value === scope.row.pattern).label : ''}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="creationTime" label="创建时间" align="center">
@@ -94,7 +94,7 @@
                     <template slot-scope="scope">
                         <el-button type="text" v-auth @click="edit(scope.row)" v-if="roleId == 1 || (roleId == 13 && scope.row.founder != '超级管理员') || (roleId == 14 && scope.row.founder == '老师')">编辑</el-button>
                         <el-button type="text" v-auth @click="delData(scope.row)" v-if="roleId == 1 || (roleId == 13 && scope.row.founder != '超级管理员') || (roleId == 14 && scope.row.founder == '老师')">删除</el-button>
-                        <!-- <el-button type="text" @click="copyData(scope.row)">复制</el-button> -->
+                        <el-button type="text" @click="copyData(scope.row)">复制</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -318,7 +318,8 @@ export default {
                 systemId: row.systemId,
                 userId: row.userId,
                 knowledgePoints: row.knowledgePoints,
-                experimentIntroduction: row.experimentIntroduction
+                experimentIntroduction: row.experimentIntroduction,
+                pattern: row.pattern
             }
             this.currentRow.founder = row.founder
             this.projectName = row.projectName
@@ -345,6 +346,7 @@ export default {
             })
         },
         copySubmit(){
+            // return console.log(11,this.projectNameRepeat)
             if(!this.projectName.length) return this.$message.warning('请填写项目名称')
             if(this.projectNameRepeat) return this.$message.warning('该项目名称已存在')
             let data = this.currentRow
diff --git a/src/components/page/StaffSide.vue b/src/components/page/StaffSide.vue
index 3de6abc..b9668bc 100644
--- a/src/components/page/StaffSide.vue
+++ b/src/components/page/StaffSide.vue
@@ -244,6 +244,7 @@ export default {
                 this.$post(this.api.deleteStaffPro,data).then(res => {
                     this.$message.success('删除成功');
                     this.majorList.splice(index, 1)
+                    this.$emit('getData')
                 }).catch(res => {});
             })
             .catch(() => {});
@@ -268,6 +269,7 @@ export default {
                             }
                         })
                     })
+                    this.$emit('getData')
                 }).catch(res => {});
             })
             .catch(() => {});
diff --git a/src/components/page/Student.vue b/src/components/page/Student.vue
index f61a808..e49b14e 100644
--- a/src/components/page/Student.vue
+++ b/src/components/page/Student.vue
@@ -372,11 +372,12 @@ export default {
                     },
                     grid: {
                         left: '3%',
-                        right: '4%',
+                        right: '10%',
                         bottom: '3%',
                         containLabel: true
                     },
                     xAxis: {
+                        name: '小时',
                         type: 'value',
                         boundaryGap: [0, 0.01]
                     },
@@ -386,7 +387,7 @@ export default {
                     },
                     series: [
                         {
-                            name: '2011年',
+                            name: '平均实验时间：',
                             type: 'bar',
                             data: timeList,
                             color: ['#9278ff']
diff --git a/src/components/page/classExperimentAss.vue b/src/components/page/classExperimentAss.vue
index aaad127..1c63519 100644
--- a/src/components/page/classExperimentAss.vue
+++ b/src/components/page/classExperimentAss.vue
@@ -114,10 +114,10 @@ export default {
             not: 0,
             reviewList: [
                 {
-                    id: 0,
+                    id: 1,
                     name: '已批阅'
                 },{
-                    id: 1,
+                    id: 0,
                     name: '待批阅'
                 }
             ]