From 0f3dca29215bbe9e116b5672c274010fe45643e9 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 19 Mar 2024 11:26:47 +0800
Subject: [PATCH] 教师格式化确认，报表列表添加去筛选按钮

---
 src/views/basic/ask/list.vue      | 12 ++++++++++--
 src/views/basic/setUp/teacher.vue | 19 ++++++++++++-------
 src/views/basic/test/list.vue     | 12 ++++++++++--
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue
index 3bb13cd..b1ac7c7 100644
--- a/src/views/basic/ask/list.vue
+++ b/src/views/basic/ask/list.vue
@@ -25,6 +25,7 @@
     <div v-show="!isDetail" class="table-box">
       <div class="table-cont" v-loading="loading">
         <p class="btn-box" v-if="tableData.length">
+          <el-button type="primary" round @click="linkToAsk">筛选</el-button>
           <el-button type="primary" round @click="linkToDetail2"
             >查看汇总报表</el-button
           >
@@ -251,6 +252,12 @@ export default {
         return false;
       }
     },
+    //去筛选
+    linkToAsk() {
+      this.$router.push({
+        path: "/ask",
+      });
+    },
     //去详情
     linkToDetail(obj, types) {
       this.$router.push({
@@ -452,8 +459,9 @@ div::-webkit-scrollbar-thumb {
 }
 
 .btn-box {
-  text-align: right;
-  padding: 0 12px 16px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 12px 16px 0;
   position: sticky;
   top: 4px;
   z-index: 10;
diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue
index ea62862..d47a8e3 100644
--- a/src/views/basic/setUp/teacher.vue
+++ b/src/views/basic/setUp/teacher.vue
@@ -129,13 +129,18 @@
               >{{ "" }}</el-checkbox
             >
             <span class="txt">教师列表</span>
-            <img
+            <el-popconfirm
               v-show="showDel"
-              class="clear"
-              @click="remove"
-              src="../../../assets/images/shuazi.svg"
-              alt=""
-            />
+              title="确定所选教师格式化吗？"
+              @confirm="remove"
+            >
+              <img
+                slot="reference"
+                class="clear"
+                src="../../../assets/images/shuazi.svg"
+                alt=""
+              />
+            </el-popconfirm>
           </p>
           <el-checkbox-group
             v-model="clearTeacher"
@@ -972,7 +977,7 @@ export default {
         ...query,
       });
       this.loading = false;
-      
+
       if (status === 0) {
         this.teacherList = data.list || [];
         if (type == 10) {
diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue
index 4d1eefa..ff1357b 100644
--- a/src/views/basic/test/list.vue
+++ b/src/views/basic/test/list.vue
@@ -25,6 +25,7 @@
     <div v-show="!isDetail" class="table-box" v-loading="loading">
       <div>
         <p v-if="!isMultipleClass" class="btn-box">
+          <el-button type="primary" round @click="linkToTest">筛选</el-button>
           <el-button type="primary" round @click="linkToDetail2"
             >查看汇总报表</el-button
           >
@@ -331,6 +332,12 @@ export default {
         path: "/testArchiving",
       });
     },
+    //去筛选
+    linkToTest() {
+      this.$router.push({
+        path: "/test",
+      });
+    },
     //跳转单卷分析
     linkTo(obj) {
       //去详情
@@ -665,8 +672,9 @@ div::-webkit-scrollbar-thumb {
 }
 
 .btn-box {
-  text-align: right;
-  padding: 0 12px 16px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 12px 16px 0;
   position: sticky;
   top: 4px;
   z-index: 10;
--
libgit2 0.21.4