Merge remote-tracking branch 'origin/master'

xiangpei

2024-10-16 b57f2a267747845f2846002e7042c38727f12c45

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/class-management/Class.vue

 src/views/class-management/Class.vue

@@ -127,7 +127,8 @@
      title="班级通知"
      :visible.sync="notifyOpen"
      width="600px"
      :before-close="handleClose">
      :before-close="handleNotifyClose"
      :close-on-click-modal="false">
      <el-form :model="notifyForm" :rules="notifyRules" ref="notifyForm" label-width="100px" class="demo-ruleForm">
        <el-form-item label="通知班级：" prop="className">
          <span>{{ notifyForm.className }}</span>
@@ -331,10 +332,20 @@
      this.form = row
      this.open = true
    },
    handleClose (done) {
    handleClose () {
      this.open = false
      this.resetForm()
      done()
    },
    handleNotifyClose () {
      this.notifyOpen = false
      this.resetNotifyForm()
    },
    resetNotifyForm () {
      this.notifyForm = {
        className: '',
        notifyContent: '',
        classesId: null
      }
    },
    handlerAdd () {
      this.open = true

 src/views/class-management/ClassStaff.vue

@@ -14,7 +14,7 @@
                      placeholder="学员姓名"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" @click="page">查询</el-button>
            <el-button type="primary" @click="page" size="small">查询</el-button>
          </el-form-item>
        </el-form>
      </div>
@@ -79,7 +79,6 @@
      :before-close="handleAddClose"
      :close-on-click-modal="false">
      <el-form :model="studentForm" :rules="studentRules" ref="studentForm" label-width="100px" class="demo-ruleForm">
        <el-form-item label="学号" prop="id" v-show="false"/>
        <el-form-item label="姓名" prop="realName">
          <el-input v-model="studentForm.realName"></el-input>
        </el-form-item>

 src/views/exam/paper/list.vue

@@ -2,16 +2,16 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item label="试卷ID：">
        <el-input v-model="queryParam.id" clearable></el-input>
        <el-input v-model="queryParam.id" clearable @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>
        <router-link :to="{ path: '/exam/paper/edit' }" class="link-left">
          <el-button type="primary" >添加</el-button>
          <el-button type="primary" size="small">添加</el-button>
        </router-link>
        <el-button class="link-left" type="danger" @click="downloadImportTemplate">下载模板</el-button>
        <el-button class="link-left" type="danger" @click="downloadImportTemplate" size="small">下载模板</el-button>
        <router-link :to="{ path: '/exam/paper/import' }" class="link-left">
          <el-button type="success">导入</el-button>
          <el-button type="success" size="small">导入</el-button>
        </router-link>
      </el-form-item>
    </el-form>

 src/views/user/student/list.vue

@@ -2,14 +2,14 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item label="用户名：">
        <el-input v-model="queryParam.userName"></el-input>
        <el-input v-model="queryParam.userName" @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>
        <router-link :to="{path:'/user/student/edit'}" class="link-left">
          <el-button type="primary">添加</el-button>
          <el-button type="primary" size="small">添加</el-button>
        </router-link>
        <el-button class="link-left" type="danger" @click="exportExcel">下载模板</el-button>
        <el-button class="link-left" type="danger" @click="exportExcel" size="small">下载模板</el-button>
        <el-upload
           class="link-left"
           style="display: inline;"
@@ -19,7 +19,7 @@
           :with-credentials="true"
           :on-success="importSuccess"
           :show-file-list="false">
           <el-button type="success">导入</el-button>
           <el-button type="success" size="small">导入</el-button>
         </el-upload>
      </el-form-item>
    </el-form>