修改

src/api/meeting.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+//会议室预定情况
+export function reserveInfo(query) {
+    return request({
+      url: '/system/post/page',
+      method: 'get',
+      params: query
+    })
+  }
+
+// 查询岗位列表
+export function listPost(query) {
+  return request({
+    url: '/system/post/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取岗位精简信息列表
+export function listSimplePosts() {
+  return request({
+    url: '/system/post/list-all-simple',
+    method: 'get'
+  })
+}
+
+// 查询岗位详细
+export function getPost(postId) {
+  return request({
+    url: '/system/post/get?id=' + postId,
+    method: 'get'
+  })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/system/post/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/system/post/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(postId) {
+  return request({
+    url: '/system/post/delete?id=' + postId,
+    method: 'delete'
+  })
+}
+
+// 导出岗位
+export function exportPost(query) {
+  return request({
+    url: '/system/post/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/login.vue

@@ -123,26 +123,26 @@ export default {
       LoginRules: {
         username: [
           {required: true, trigger: "blur", message: "手机号不能为空"},
-          // {
-          //   validator: (rule, value, callback) => {
-          //     if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
-          //       callback(new Error("手机号格式错误"));
-          //     } else {
-          //       removeTenantId()
-          //       getTenantIdByName(value).then(res => {
-          //         const tenantId = res.data;
-          //         if (tenantId && tenantId >= 0) {
-          //           setTenantId(tenantId)
-          //           callback();
-          //         } else {
-          //           callback('该手机号未创建账号,请重新输入');
-          //         }
-          //       });
-          //     }
+          {
+            validator: (rule, value, callback) => {
+              if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+                callback(new Error("手机号格式错误"));
+              } else {
+                removeTenantId()
+                getTenantIdByName(value).then(res => {
+                  const tenantId = res.data;
+                  if (tenantId && tenantId >= 0) {
+                    setTenantId(tenantId)
+                    callback();
+                  } else {
+                    callback('该手机号未创建账号,请重新输入');
+                  }
+                });
+              }
            
-          //   },
-          //   trigger: 'blur'
-          // }
+            },
+            trigger: 'blur'
+          }
 
         ],
         password: [
@@ -200,7 +200,7 @@ export default {
             removePassword()
             removeRememberMe()
           }
-          setTenantId(1)
+          // setTenantId(1)
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
             this.$router.push({path: "/"}).catch(() => {
             });

src/views/meeting/list/index.vue

@@ -89,7 +89,7 @@
   </template>
   
   <script>
-  import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
+  import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/meeting";
   
   import {CommonStatusEnum} from '@/utils/constants'
   import { getDictDatas, DICT_TYPE } from '@/utils/dict'

src/views/meeting/reserve/index.vue

@@ -25,6 +25,7 @@
 
 
 <script>
+import { reserveInfo } from "@/api/meeting";
 import FullCalendar from '@fullcalendar/vue'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
@@ -142,6 +143,9 @@ export default {
     // 并且在组件未加载的时候this.$refs中是没有fullCalendar的，所以未加载的时候调用方法会报错
     this.calendarApi = this.$refs.fullCalendar.getApi()
   },
+  created() {
+    // this.getEvents();
+  },
   methods: {
     // 获取当前年月
     nowDate() {
@@ -156,17 +160,16 @@ export default {
       var str = d.getFullYear() + '-' + month;
       return str;
     },
-    getEvent() {
-      //这里用的mock
-      this.$http.post('/schedule/query').then(res => {
-        const event = res.result.data // 拿到返回的数据
+    getEvents() {
+      reserveInfo(this.queryParams).then(response => {
+        const event = response.data // 拿到返回的数据
         for (var i = 0; i < event.length; i++) {
           this.calendarOptions.events.push(event[i]) // 使用push方法将事件逐一添加，
         }
         console.log(this.calendarOptions.events)
         this.calendarApi.refetchEvents()
         // 重新抓取所有的日程事件源上的日程事件并渲染它们。
-      })
+      });
     },
     // 格式化日期
     formatDate(dateStr) {

src/views/meeting/reserveList/index.vue

@@ -89,7 +89,7 @@
   </template>
   
   <script>
-  import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
+  import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/meeting";
   
   import {CommonStatusEnum} from '@/utils/constants'
   import { getDictDatas, DICT_TYPE } from '@/utils/dict'

src/views/system/role/index.vue

@@ -379,6 +379,7 @@ export default {
       this.form.code = row.code;
       // 打开弹窗
       this.openMenu = true;
+      this.title = "菜单权限";
       // 获得菜单列表
       listSimpleMenus().then(response => {
         // 处理 menuOptions 参数