Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-03-01 a5a81efad512d32da6d1027fe8ab5cc29a3b6af4

 ruoyi-ui/src/views/honor/index.vue

@@ -3,7 +3,7 @@
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="名称" prop="name">
        <el-select v-model="queryParams.name" placeholder="所有名称" clearable
                   style="width: 200px;
                   style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;" @keyup.enter.native="handleQuery">
@@ -98,7 +98,7 @@
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.2">
        <el-col :span="1.5">

          <el-upload
            action=""
@@ -109,7 +109,7 @@
          >
            <el-button size="mini"   type="primary"
                       plain
                       icon="el-icon-plus" >导入</el-button>
                       icon="el-icon-top" >导入</el-button>

          </el-upload>
        </el-col>