Merge remote-tracking branch 'origin/master'

lohir

2024-10-17 bcc67be745fd4b1b9a57e0e8cd7c13cab8dfd2fd

 src/views/user/student/list.vue

@@ -1,15 +1,15 @@
<template>
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item label="用户名：">
        <el-input v-model="queryParam.userName" @input="search"></el-input>
      <el-form-item label="真实姓名：">
        <el-input v-model="queryParam.realName" @input="search"></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="submitForm" size="small">查询</el-button>
        <router-link :to="{path:'/user/student/edit'}" class="link-left">
          <el-button type="primary" size="small">添加</el-button>
        </router-link>
        <el-button class="link-left" type="danger" @click="exportExcel" size="small">下载模板</el-button>
        <el-button class="link-left" type="danger" @click="exportExcel" size="small">下载导入模板</el-button>
        <el-upload
           class="link-left"
           style="display: inline;"
@@ -74,7 +74,7 @@
  data () {
    return {
      queryParam: {
        userName: '',
        realName: '',
        role: 1,
        pageIndex: 1,
        pageSize: 10