Commit 0f3dca29215bbe9e116b5672c274010fe45643e9

Authored by 梁保满
1 parent 6b3dde63

教师格式化确认,报表列表添加去筛选按钮

src/views/basic/ask/list.vue
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 <div v-show="!isDetail" class="table-box"> 25 <div v-show="!isDetail" class="table-box">
26 <div class="table-cont" v-loading="loading"> 26 <div class="table-cont" v-loading="loading">
27 <p class="btn-box" v-if="tableData.length"> 27 <p class="btn-box" v-if="tableData.length">
  28 + <el-button type="primary" round @click="linkToAsk">筛选</el-button>
28 <el-button type="primary" round @click="linkToDetail2" 29 <el-button type="primary" round @click="linkToDetail2"
29 >查看汇总报表</el-button 30 >查看汇总报表</el-button
30 > 31 >
@@ -251,6 +252,12 @@ export default { @@ -251,6 +252,12 @@ export default {
251 return false; 252 return false;
252 } 253 }
253 }, 254 },
  255 + //去筛选
  256 + linkToAsk() {
  257 + this.$router.push({
  258 + path: "/ask",
  259 + });
  260 + },
254 //去详情 261 //去详情
255 linkToDetail(obj, types) { 262 linkToDetail(obj, types) {
256 this.$router.push({ 263 this.$router.push({
@@ -452,8 +459,9 @@ div::-webkit-scrollbar-thumb { @@ -452,8 +459,9 @@ div::-webkit-scrollbar-thumb {
452 } 459 }
453 460
454 .btn-box { 461 .btn-box {
455 - text-align: right;  
456 - padding: 0 12px 16px; 462 + display: flex;
  463 + justify-content: space-between;
  464 + padding: 0 12px 16px 0;
457 position: sticky; 465 position: sticky;
458 top: 4px; 466 top: 4px;
459 z-index: 10; 467 z-index: 10;
src/views/basic/setUp/teacher.vue
@@ -129,13 +129,18 @@ @@ -129,13 +129,18 @@
129 >{{ "" }}</el-checkbox 129 >{{ "" }}</el-checkbox
130 > 130 >
131 <span class="txt">教师列表</span> 131 <span class="txt">教师列表</span>
132 - <img 132 + <el-popconfirm
133 v-show="showDel" 133 v-show="showDel"
134 - class="clear"  
135 - @click="remove"  
136 - src="../../../assets/images/shuazi.svg"  
137 - alt=""  
138 - /> 134 + title="确定所选教师格式化吗?"
  135 + @confirm="remove"
  136 + >
  137 + <img
  138 + slot="reference"
  139 + class="clear"
  140 + src="../../../assets/images/shuazi.svg"
  141 + alt=""
  142 + />
  143 + </el-popconfirm>
139 </p> 144 </p>
140 <el-checkbox-group 145 <el-checkbox-group
141 v-model="clearTeacher" 146 v-model="clearTeacher"
@@ -972,7 +977,7 @@ export default { @@ -972,7 +977,7 @@ export default {
972 ...query, 977 ...query,
973 }); 978 });
974 this.loading = false; 979 this.loading = false;
975 - 980 +
976 if (status === 0) { 981 if (status === 0) {
977 this.teacherList = data.list || []; 982 this.teacherList = data.list || [];
978 if (type == 10) { 983 if (type == 10) {
src/views/basic/test/list.vue
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 <div v-show="!isDetail" class="table-box" v-loading="loading"> 25 <div v-show="!isDetail" class="table-box" v-loading="loading">
26 <div> 26 <div>
27 <p v-if="!isMultipleClass" class="btn-box"> 27 <p v-if="!isMultipleClass" class="btn-box">
  28 + <el-button type="primary" round @click="linkToTest">筛选</el-button>
28 <el-button type="primary" round @click="linkToDetail2" 29 <el-button type="primary" round @click="linkToDetail2"
29 >查看汇总报表</el-button 30 >查看汇总报表</el-button
30 > 31 >
@@ -331,6 +332,12 @@ export default { @@ -331,6 +332,12 @@ export default {
331 path: "/testArchiving", 332 path: "/testArchiving",
332 }); 333 });
333 }, 334 },
  335 + //去筛选
  336 + linkToTest() {
  337 + this.$router.push({
  338 + path: "/test",
  339 + });
  340 + },
334 //跳转单卷分析 341 //跳转单卷分析
335 linkTo(obj) { 342 linkTo(obj) {
336 //去详情 343 //去详情
@@ -665,8 +672,9 @@ div::-webkit-scrollbar-thumb { @@ -665,8 +672,9 @@ div::-webkit-scrollbar-thumb {
665 } 672 }
666 673
667 .btn-box { 674 .btn-box {
668 - text-align: right;  
669 - padding: 0 12px 16px; 675 + display: flex;
  676 + justify-content: space-between;
  677 + padding: 0 12px 16px 0;
670 position: sticky; 678 position: sticky;
671 top: 4px; 679 top: 4px;
672 z-index: 10; 680 z-index: 10;