b57f2a267747845f2846002e7042c38727f12c45..d7bee17c1d8fdb9a2a3c0303d7c38bc74a778e31
2024-10-16 lohir
Merge remote-tracking branch 'origin/master'
d7bee1 对比 | 目录
2024-10-16 lohir
bug
603b25 对比 | 目录
2024-10-16 lohir
bug
aeef97 对比 | 目录
2024-10-16 lohir
bug
f7b405 对比 | 目录
2024-10-16 lohir
bug
42ebc2 对比 | 目录
2024-10-16 lohir
bug
374ca8 对比 | 目录
2024-10-16 lohir
bug
095213 对比 | 目录
8个文件已修改
55 ■■■■■ 已修改文件
src/views/answer/list.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/answer/user.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/class-management/ClassStaff.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/education/cheat/list.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/education/resource/list.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/education/subject/list.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/list.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/log/list.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/answer/list.vue
@@ -2,10 +2,10 @@
  <div class="app-container">
    <el-form :inline="true" :model="queryParam" class="demo-form-inline" label-width="80px">
      <el-form-item>
        <el-input v-model="queryParam.examName" placeholder="请输入考试名称" clearable></el-input>
        <el-input v-model="queryParam.examName" placeholder="请输入考试名称" @input="search" clearable></el-input>
      </el-form-item>
      <el-form-item>
        <el-input v-model="queryParam.name" placeholder="请输入试卷名称" clearable></el-input>
        <el-input v-model="queryParam.name" placeholder="请输入试卷名称" @input="search" clearable></el-input>
      </el-form-item>
      <el-form-item>
        <el-select v-model="queryParam.subjectId" placeholder="请选择科目" clearable multiple @change="search">
src/views/answer/user.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-form :inline="true" :model="queryParam" class="demo-form-inline" label-width="80px">
      <el-form-item>
        <el-input v-model="queryParam.name" placeholder="请输入姓名" clearable></el-input>
        <el-input v-model="queryParam.name" placeholder="请输入姓名" clearable @input="search()"></el-input>
      </el-form-item>
      <el-form-item>
        <el-button style="width:100px;" type="primary" size="small" @click="search()">查询</el-button>
src/views/class-management/ClassStaff.vue
@@ -60,7 +60,13 @@
      >
        <template slot-scope="scope">
          <el-button @click="handlerEditStudent(scope.row)" type="warning" size="small">编辑</el-button>
          <el-button @click="remove(scope.row.id)" type="danger" size="small">删除</el-button>
          <el-popconfirm
            style="margin: 0 5px"
            title="确定要删除该成员吗?"
            @confirm="remove(scope.row.id)"
          >
            <el-button slot="reference" type="danger" size="small">删除</el-button>
          </el-popconfirm>
        </template>
      </el-table-column>
    </el-table>
@@ -141,6 +147,7 @@
  editClassesUser
} from '@/api/classesUser'
import Pagination from '@/components/Pagination'
import {deleteExamById} from "@/api/exam";
export default {
  components: { Pagination },
@@ -246,9 +253,15 @@
      this.resetStudentForm()
    },
    remove (id) {
      deleteClassesUserById(id).then(res => {
        this.$message.success(res.data.message)
        this.page()
      this.$confirm('确认是否删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        deleteClassesUserById(id).then(res => {
          this.$message.success(res.data.message)
          this.page()
        })
      })
    },
    sexFormatter (row) {
src/views/education/cheat/list.vue
@@ -2,10 +2,10 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item>
        <el-input v-model="queryParam.keyword" placeholder="请输入名称" clearable></el-input>
        <el-input v-model="queryParam.keyword" placeholder="请输入名称" clearable @input="search"></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="search">查询</el-button>
        <el-button type="primary" @click="search" size="small">查询</el-button>
      </el-form-item>
    </el-form>
src/views/education/resource/list.vue
@@ -4,7 +4,7 @@
      <el-form :inline="true" :model="searchForm" class="demo-form-inline">
        <el-form-item label="主题">
          <el-input v-model="searchForm.introduction" size="small" placeholder="主题内容" clearable
                    @clear="page"></el-input>
                    @clear="page" @input="page"></el-input>
        </el-form-item>
        <el-form-item label="班级">
          <el-select v-model="searchForm.classId" clearable @clear="page" @change="page" placeholder="班级">
src/views/education/subject/list.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item>
        <el-input v-model="queryParam.name" placeholder="请输入名称" clearable></el-input>
        <el-input v-model="queryParam.name" placeholder="请输入名称" clearable @input="search"></el-input>
      </el-form-item>
      <el-form-item>
        <el-select v-model="queryParam.status" placeholder="请选择状态" clearable @change="search">
@@ -11,8 +11,8 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="search">查询</el-button>
        <el-button type="primary" @click="edit()">添加</el-button>
        <el-button type="primary" @click="search" size="small">查询</el-button>
        <el-button type="primary" @click="edit()" size="small">添加</el-button>
      </el-form-item>
    </el-form>
src/views/exam/question/list.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item>
        <el-input v-model="queryParam.content" placeholder="请输入题目" clearable></el-input>
        <el-input v-model="queryParam.content" placeholder="请输入题目" clearable @input="search"></el-input>
      </el-form-item>
      <el-form-item>
        <el-select v-model="queryParam.subjectId" placeholder="请选择科目" clearable multiple @change="search">
@@ -21,14 +21,14 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="search">查询</el-button>
        <el-button type="primary" @click="search" size="small">查询</el-button>
        <el-popover placement="bottom" trigger="click">
          <el-button type="warning" size="mini" v-for="item in editUrlEnum" :key="item.key"
            @click="$router.push({ path: item.value })">{{ item.name }}
          </el-button>
          <el-button slot="reference" type="primary" class="link-left">添加</el-button>
          <el-button slot="reference" type="primary" class="link-left" size="small">添加</el-button>
        </el-popover>
        <el-button class="link-left" type="danger" @click="downloadImportTemplate">下载模板</el-button>
        <el-button class="link-left" type="danger" @click="downloadImportTemplate" size="small">下载模板</el-button>
        <el-upload
          style="display: inline;"
          class="op-item link-left"
@@ -38,7 +38,7 @@
          accept=".xls,.xlsx"
          :show-file-list="false"
          :before-upload="beforeAvatarUpload">
          <el-button v-loading="importLoading" type="primary">导入</el-button>
          <el-button v-loading="importLoading" type="primary" size="small">导入</el-button>
        </el-upload>
      </el-form-item>
    </el-form>
src/views/log/list.vue
@@ -2,13 +2,13 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item label="用户Id:">
        <el-input v-model="queryParam.userId"></el-input>
        <el-input v-model="queryParam.userId" @input="search"></el-input>
      </el-form-item>
      <el-form-item label="真实姓名:">
        <el-input v-model="queryParam.realName"></el-input>
        <el-input v-model="queryParam.realName" @input="search"></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="submitForm">查询</el-button>
        <el-button type="primary" @click="submitForm" size="small">查询</el-button>
      </el-form-item>
    </el-form>