Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue

ruoyi-ui/src/api/smartSchool/personWork/venueReservation/recordingroomManagement/index.js

@@ -10,10 +10,11 @@ export function addStudio(data) {
 }
 }
 
 
 // 查看录播室列表
 // 查看录播室列表
-export function getStudio() {
+export function getStudio(query) {
   return request({
   return request({
     url: "/studio/list",
     url: "/studio/list",
     method: "get",
     method: "get",
+    params: query,
   });
   });
 }
 }
 
 

ruoyi-ui/src/views/smartSchool/personWork/leaveApply/components/SelectUser.vue

@@ -154,6 +154,7 @@ export default {
     },
     },
     /** 选项选中发生变化 */
     /** 选项选中发生变化 */
     selectionChange(selections) {
     selectionChange(selections) {
+      console.log('seselections', selections);
       this.selectUser = selections[0];
       this.selectUser = selections[0];
     },
     },
     /** 点击选中、取消 */
     /** 点击选中、取消 */

ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue

@@ -34,8 +34,8 @@
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
         </el-table>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" /> -->
         <!-- 新增/修改弹窗 -->
         <!-- 新增/修改弹窗 -->
         <el-dialog :title="title" :visible.sync="open" width="1200px">
         <el-dialog :title="title" :visible.sync="open" width="1200px">
             <el-form ref="form" :model="form" label-width="114px" :rules="rules">
             <el-form ref="form" :model="form" label-width="114px" :rules="rules">
@@ -90,12 +90,7 @@ export default {
         return {
         return {
             studioStatu: "",
             studioStatu: "",
             queryParams: {
             queryParams: {
-                id: "",
-                studioName: "",
-                studioStatu: "",
-                studioArea: '',
-                pageNum: 1,
-                pageSize: 10,
+                studioArea: "",
             },
             },
             title: "",
             title: "",
             rules: {
             rules: {
@@ -125,7 +120,7 @@ export default {
     methods: {
     methods: {
         /** 查询 */
         /** 查询 */
         getList() {
         getList() {
-            getStudio(this.queryParams.studioArea).then((response) => {
+            getStudio(this.queryParams).then((response) => {
                 this.tableData = response.rows;
                 this.tableData = response.rows;
                 this.loading = false;
                 this.loading = false;
                 console.log(111, response.rows);
                 console.log(111, response.rows);