From 69db917e5d7bd7f17c95bc9d661d0eb3d5dfd7ed Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Tue, 14 Dec 2021 18:20:21 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E7=8A=B6=E6=80=81=E5=8A=A0=E8=BD=BD=E6=85=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=8E=E5=BC=80=E5=90=AF=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E5=8F=B0=E5=90=AF=E5=8A=A8=E7=A6=81=E7=94=A8=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/assessment/list/index.vue |  2 +-
 src/pages/project/list/index.vue    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index eea10df..1374cd9 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -90,7 +90,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="实验状态" align="center">
-                <template slot-scope="scope" v-if="scope.row.show">
+                <template slot-scope="scope">
                     <span>
                         {{ status[scope.row.status] }}
                     </span>
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index f8d7b7a..2e1175a 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -90,15 +90,15 @@
                         <el-button v-if="scope.row.founder != 0" type="text" @click="edit(scope.row,'1',queryData.founder)">编辑</el-button>
                         <el-button v-if="scope.row.founder != 0" type="text" @click="handleDelete(scope.row.projectId)">删除</el-button>
                         <el-button v-if="auth('复制')" type="text" @click="copyData(scope.row.projectId)">复制</el-button>
-<!--                        <el-switch-->
-<!--                            v-if="auth('禁用')"-->
-<!--                            v-model="scope.row.isOpen"-->
-<!--                            :active-text="scope.row.isOpen ? '关闭' : '启用'"-->
-<!--                            :active-value="0"-->
-<!--                            :inactive-value="1"-->
-<!--                            style="margin: 0 10px 0 10px"-->
-<!--                            @change="switchOff(scope.row)"-->
-<!--                        ></el-switch>-->
+                        <el-switch
+                            v-if="auth('禁用')"
+                            v-model="scope.row.isOpen"
+                            :active-text="scope.row.isOpen ? '关闭' : '启用'"
+                            :active-value="0"
+                            :inactive-value="1"
+                            style="margin: 0 10px 0 10px"
+                            @change="switchOff(scope.row)"
+                        ></el-switch>
                     </template>
                 </el-table-column>
             </el-table>

From 4ed82ecdc666553f4a610e8a984b6f7b9585fe5b Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 20 Dec 2021 18:01:11 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=B6=E8=A1=8C=E4=B8=8Epy=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=90=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/show/index.vue | 54 +++++++++++++++++++++-------
 src/styles/common.scss               |  1 +
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 6f78d13..83be907 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -54,14 +54,14 @@
                             <p class="meta-title">实验数据</p>
                         </div>
                         <el-table :data="expData" class="table" stripe header-align="center">
-                            <el-table-column type="index" width="100" label="序号" align="center">
+                            <el-table-column type="index" width="50" label="序号" align="center">
                                 <template slot-scope="scope">
                                     {{ scope.$index + 1 }}
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="judgmentName" label="任务名称" align="center">
+                            <el-table-column prop="judgmentName" width="150" label="任务名称" align="center">
                             </el-table-column>
-                            <el-table-column prop="userAnswer" label="考核点" align="center">
+                            <el-table-column v-if='project' prop="userAnswer" label="考核点" align="center">
                                 <template slot-scope="scope">
                                     <div v-for="(item, index) in scope.row.lcRuleRecords">
                                         <span>{{index+1}}. </span>{{item.name}}
@@ -70,19 +70,29 @@
                             </el-table-column>
                             <el-table-column prop="userAnswer" label="学生答案" align="center">
                                 <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                    <div v-if=' scope.row.lcRuleRecords'>
+                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                            <span>{{index+1}}. </span>{{item.userAnswer}}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        {{scope.row.answer}}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="answer" label="参考答案" align="center">
                                 <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                    <div v-if=' scope.row.lcRuleRecords'>
+                                        <div v-for="(item, index) in scope.row.lcRuleRecords">
+                                            <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        {{scope.row.referenceAnswer}}
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="score" label="得分" align="center">
+                            <el-table-column prop="score" width="50" label="得分" align="center">
                             </el-table-column>
                         </el-table>
                     </div>
@@ -142,6 +152,7 @@ export default {
             autograph: "1",
             pages: 1,
             ipVisible: false,
+            project:false,
             fileList: [{ name: "food.jpeg", url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100" }, {
                 name: "food2.jpeg",
                 url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100"
@@ -160,6 +171,7 @@ export default {
         ])
     },
     mounted() {
+
         this.getData();
     },
     methods: {
@@ -173,6 +185,16 @@ export default {
                     let expData = res.userScores;
                     let form = this.form;
                     let score = form.score;
+                    for(var i=0;i<expData.length;i++){
+                        console.log(expData[i].referenceAnswer)
+                        if (expData[i].referenceAnswer != undefined && expData[i].referenceAnswer){
+                            console.log('123')
+                            this.project = false
+                        }else{
+                            console.log('456')
+                            this.project = true
+                        }
+                    }
                     if (expData) {
                         if (score) {
                             expData.map(n => {
@@ -183,7 +205,6 @@ export default {
                             });
                             form.score = score;
                         }
-
                         this.expData = expData;
                     }
                     this.infoData.push({
@@ -212,7 +233,16 @@ export default {
                     let expData = res.userScores;
                     let form = this.form;
                     let score = form.score;
-
+                    for(var i=0;i<expData.length;i++){
+                        console.log(expData[i].referenceAnswer)
+                        if (expData[i].referenceAnswer != undefined && expData[i].referenceAnswer){
+                            console.log('123')
+                            this.project = false
+                        }else{
+                            console.log('456')
+                            this.project = true
+                        }
+                    }
                     if (expData) {
                         if (score) {
                             expData.map(n => {
@@ -345,12 +375,11 @@ export default {
     /deep/ .info-table {
         margin-bottom: 40px;
         border: 0;
-
         th {
             background-color: #fff !important;
-
             .cell {
                 color: #444;
+                line-height: 35px;
             }
         }
 
@@ -385,6 +414,7 @@ export default {
         background-color: #e1eaff !important;
 
         .cell {
+            line-height: 35px;
             color: #555555;
         }
     }
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 5dab496..7a9d882 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -138,6 +138,7 @@
 
   .cell {
     font-size: 14px;
+    line-height: 35px;
   }
 
   th {

From 2011c40fe993ab10a84b9d2a5b946f271de614b7 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 22 Dec 2021 11:59:57 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=88=A0=E9=99=A4=E4=BC=A0ID=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/vir/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/achievement/vir/index.vue b/src/pages/achievement/vir/index.vue
index 36ce388..35352e3 100644
--- a/src/pages/achievement/vir/index.vue
+++ b/src/pages/achievement/vir/index.vue
@@ -152,7 +152,7 @@ export default {
             this.$confirm("确定要删除吗？", "提示", {
                 type: "warning"
             }).then(() => {
-                this.$post(this.api.deleteExperimentalReport, [row.projectId]).then(res => {
+                this.$post(this.api.deleteExperimentalReport, [row.reportId]).then(res => {
                     util.successMsg("删除成功");
                     this.getData();
                 }).catch(res => {
@@ -166,7 +166,7 @@ export default {
                     type: "warning"
                 }).then(() => {
                     let ids = this.multipleSelection.map(item => {
-                        return item.projectId;
+                        return item.reportId;
                     });
                     this.$post(this.api.deleteExperimentalReport, ids).then(res => {
                         this.multipleSelection = [];

From dee36069b9eb521c5170a2935869bb4f94822a03 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 22 Dec 2021 16:37:54 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=88=87=E6=8D=A2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/show/index.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 83be907..b6fa35c 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -68,30 +68,31 @@
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="userAnswer" label="学生答案" align="center">
+                            <el-table-column prop="answer" label="参考答案" align="center">
                                 <template slot-scope="scope">
                                     <div v-if=' scope.row.lcRuleRecords'>
                                         <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                            <span>{{index+1}}. </span>{{item.userAnswer}}
+                                            <span>{{index+1}}. </span>{{item.ruleAnswer}}
                                         </div>
                                     </div>
                                     <div v-else>
-                                        {{scope.row.answer}}
+                                        {{scope.row.referenceAnswer}}
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="answer" label="参考答案" align="center">
+                            <el-table-column prop="userAnswer" label="学生答案" align="center">
                                 <template slot-scope="scope">
                                     <div v-if=' scope.row.lcRuleRecords'>
                                         <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                            <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                            <span>{{index+1}}. </span>{{item.userAnswer}}
                                         </div>
                                     </div>
                                     <div v-else>
-                                        {{scope.row.referenceAnswer}}
+                                        {{scope.row.answer}}
                                     </div>
                                 </template>
                             </el-table-column>
+
                             <el-table-column prop="score" width="50" label="得分" align="center">
                             </el-table-column>
                         </el-table>

From 082e2822648e5fe97f6fac23d4a9d085abd1945e Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 22 Dec 2021 17:33:14 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/ass/index.vue  | 5 ++++-
 src/pages/achievement/show/index.vue | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue
index e6f9822..54b85c0 100644
--- a/src/pages/achievement/ass/index.vue
+++ b/src/pages/achievement/ass/index.vue
@@ -196,7 +196,10 @@ export default {
                 type: "warning"
             })
                 .then(() => {
-                    this.$post(`${this.api.deleteReport}?reportId=${row.reportId}&recordId=${row.recordId}`).then(res => {
+                    let ids = this.multipleSelection.map(item => {
+                        return item.reportId;
+                    });
+                    this.$post(`${this.api.deleteExperimentalReport}`,ids).then(res => {
                         util.successMsg("删除成功");
                         this.getData();
                     }).catch(res => {
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index b6fa35c..a59073a 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -75,8 +75,8 @@
                                             <span>{{index+1}}. </span>{{item.ruleAnswer}}
                                         </div>
                                     </div>
-                                    <div v-else>
-                                        {{scope.row.referenceAnswer}}
+                                    <div v-else v-html='scope.row.referenceAnswer'>
+<!--                                        {{scope.row.referenceAnswer}}-->
                                     </div>
                                 </template>
                             </el-table-column>

From 762b73ad39f6c882056843736455ddb57ed0496a Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 23 Dec 2021 10:51:21 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=80=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/show/index.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index a59073a..40368ae 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -87,8 +87,8 @@
                                             <span>{{index+1}}. </span>{{item.userAnswer}}
                                         </div>
                                     </div>
-                                    <div v-else>
-                                        {{scope.row.answer}}
+                                    <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'>
+<!--                                        {{scope.row.answer}}-->
                                     </div>
                                 </template>
                             </el-table-column>
@@ -486,4 +486,16 @@ export default {
     padding-top: 20px;
     border-top: 1px dashed #ccc;
 }
+pre {
+    white-space: pre-wrap;       /* css-3 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    word-break:break-all;
+    overflow:hidden;
+    font-size: 12px;
+    font-weight:400;
+    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
+}
 </style>
\ No newline at end of file

From ed867825c785ab6c2f2b2410a0d18686999ae840 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 27 Dec 2021 16:23:38 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=8F=82=E8=80=83=E7=AD=94=E6=A1=88=E5=AD=97=E4=BD=93=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/show/index.vue |  9 +++++++-
 src/pages/system/list/staff.vue      | 32 +++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 40368ae..dbf1af7 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -420,7 +420,14 @@ export default {
         }
     }
 }
-
+/deep/ pre, code, kbd, samp{
+    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+}
+/deep/ pre{
+    white-space: pre-wrap;
+}
 /deep/ .cell {
     font-size: 12px;
 }
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index f95cec4..59c35ee 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -68,15 +68,18 @@
                 <el-form-item prop="workNumber" label="工号">
                     <el-input v-model.trim="teacherForm.workNumber" placeholder="请输入职工工号"></el-input>
                 </el-form-item>
-                <template v-for="item in teacherForm.roleAndDeptList">
-                    <el-form-item :label="`${item.roleName}所属部门`">
-                        <el-cascader
-                            v-model="item.cascaderValue"
-                            :options="majorList"
-                            style="width: 100%"
-                        ></el-cascader>
-                    </el-form-item>
-                </template>
+                <el-form-item v-for="item in teacherForm.roleAndDeptList" :label="`${item.roleName}所属部门`" :rules="{
+      required: true, message: '请选择', trigger: 'change'
+    }">
+                    <el-cascader
+                        v-model="item.cascaderValue"
+                        :options="majorList"
+                        style="width: 100%"
+                    ></el-cascader>
+                </el-form-item>
+<!--                <template v-for="item in teacherForm.roleAndDeptList">-->
+<!--                    -->
+<!--                </template>-->
 
                 <el-form-item prop="phone" label="手机号">
                     <el-input v-model.trim="teacherForm.phone" placeholder="请输入手机号" maxlength="11" @blur="phoneChange"></el-input>
@@ -471,10 +474,15 @@ export default {
             }
         },
         roleRemove(value) { // 处理移除角色
-            let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleName === value);
-            if (index !== -1) {
-                this.teacherForm.roleAndDeptList.splice(index, 1);
+            let list = [];
+            for(var i=0;i<this.teacherForm.roleAndDeptList.length;i++){
+                if (this.teacherForm.roleAndDeptList[i].roleId == value){
+
+                }else{
+                    list.push(this.teacherForm.roleAndDeptList[i])
+                }
             }
+            this.teacherForm.roleAndDeptList = list
         },
         async saveSure(teacherForm) {
             this.$refs[teacherForm].validate((valid) => {