pyj 7.14 个人工作-录播室预约-空闲情况日期完成

584423c7 · peijy · d6075f55 · 584423c7 · 584423c7 · 584423c7
Commit 584423c7 authored Jul 14, 2023 by peijy
Showing with 49 additions and 29 deletions

ruoyi-ui/src/main.js
+1 -1

ruoyi-ui/src/router/routerMenus/indexMould/index.js
+3 -3

ruoyi-ui/src/views/index.vue
+3 -2

ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment /IdleSituation/index.vue
+42 -23

No files found.
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -11,7 +11,7 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import {download} from '@/utils/request'
-import moment from "moment"; 
+import moment from "moment";
 import './assets/icons' // icon
 import './permission' // permission control

--- a/ruoyi-ui/src/router/routerMenus/indexMould/index.js
+++ b/ruoyi-ui/src/router/routerMenus/indexMould/index.js
@@ -67,10 +67,10 @@ export default [
  },
  //我的任务--礼堂申请审批
  {
-    path: "/indexMould/audApplicationapproval",
+    path: "/indexMould/myTask",
    component: Layout,
    hidden: true,
-    // permissions: ["system:user:edit"],
+    permissions: ["system:user:edit"],
    children: [
      {
        path: "audApplicationapproval",
@@ -85,7 +85,7 @@ export default [
  },
  //我的任务--科室申请审批
  {
-    path: "/indexMould/depBudgetapproval",
+    path: "/indexMould/myTask",
    component: Layout,
    hidden: true,
    permissions: ["system:user:edit"],

--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -135,8 +135,7 @@
          <el-card :body-style="{ padding: '0px' }"
                   style="height: 210px; width: 100%; margin-top: 3px; background-color: #ffffff">
            <div class="cardHeader" style="margin-top: 5px">
-              <div style="display: inline-block; vertical-align: middle"><i class="el-icon-s-check"
+              <div style="display: inline-block; vertical-align: middle"><i class="el-icon-s-check" style="color: #2f79ff"></i>
-                                                                            style="color: #2f79ff"></i>
                <span>&emsp;我的任务</span></div>
            </div>
            <el-divider></el-divider>
@@ -530,6 +529,7 @@ export default {
    //从后端获取任务数量
    taskNum() {
      getTaskNum().then(res => {
+        console.log('taskNumList',res)
        this.taskNumList = res.data
      })
    },
@@ -659,6 +659,7 @@ export default {
    getShowCommonfunctionsList() {
      this.offentUse = true
      showCommonfunctionsList().then(res => {
        this.blocks = res.data
        this.offentUse = false
      })

--- a/ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment /IdleSituation/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment /IdleSituation/index.vue
@@ -3,19 +3,22 @@
    <!-- 搜索条件表单 -->
    <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="日期" prop="startTime">
-        <el-date-picker v-model="queryParams.startTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+        <el-date-picker size="small" v-model="queryParams.startTime" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
-          end-placeholder="结束日期" :disabledDate="disableDate">
+                        format="yyyy-MM-dd" @change="changeDate" :picker-options="pickerOptions">
+        </el-date-picker>
+        <el-date-picker size="small" type="date" v-model="endTime" disabled>
        </el-date-picker>
      </el-form-item>
        <el-form-item prop="studioName">
          <el-select v-model="queryParams.studioName" placeholder="录播室">
            <el-option v-for="item in options" :key="item.studioName" :label="item.studioId" :value="item.studioName">
            </el-option>
          </el-select>
      </el-form-item>
      <el-button type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
@@ -29,6 +32,7 @@
      <thead>
        <tr>
          <th></th>
+<!--          表格日期-->
          <th v-for="day in days" :key="day">{{ day }}</th>
        </tr>
      </thead>
@@ -63,9 +67,21 @@ import {
  addIdle, // 新增录播室预约
  getstudioUse, // 查询录播室使用情况
 } from "@/api/smartSchool/personWork/recordingroomAppointment/IdleSituation";
+import moment from 'moment'
 export default {
  data() {
    return {
+      //选择日期限制
+      pickerOptions: {
+        disabledDate(time) {
+          //包含今天
+          // return time.getTime() < Date.now() - 8.64e7;
+          //不含今天
+          return time.getTime() < Date.now() ;
+        }
+      },
+      time:'',
      studioUseData: [], // 存储录播室占用情况数据
      showSearch: true, // 是否显示搜索条件
      successDialogVisible: false, // 预约录播室成功的弹窗是否可见
@@ -85,18 +101,24 @@ export default {
        startTime: "", // 查询的开始时间
      },
      rooms: [], //录播室下拉列表存储
+      endTime:''
    };
  },
  created() {
+    this.queryParams.startTime = moment(new Date()).add(1,'days').format("YYYY-MM-DD");
+    this.endTime = moment(this.queryParams.startTime).add(9,'days')
    // 初始化日期和时间段
    this.initDays();
    this.initTimeSlots();
    // 获取录播室下拉框列表
    this.getRoomList();
-    this.fetchStudioUseData();
+    // this.fetchStudioUseData();
-    this.fetchData();
+    // this.fetchData();
  },
  methods: {
+    changeDate(){
+      this.endTime = moment(this.queryParams.startTime).add(9,'days')
+    },
    fetchStudioUseData() {
      // 调用接口获取录播室占用情况数据
      const params = {
@@ -104,7 +126,7 @@ export default {
        studioId: this.queryParams.studioId,
      };
      console.log(123654, params);
-      getstudioUse({}).then((res) => {
+      getstudioUse({params}).then((res) => {
        this.studioUseData = res.rows;
        console.log(123, this.studioUseData);
      });
@@ -150,17 +172,22 @@ export default {
        "第十一节(晚上)",
      ];
    },
+    //表格头部日期
    initDays() {
      // 假设从明天开始，获取未来10天的日期
-      const startDate = new Date();
+      // const startDate = new Date();
-      startDate.setDate(startDate.getDate() + 1);
+      // startDate.setDate(startDate.getDate() + 1);
+      // console.log('startDate',startDate)
      for (let i = 0; i < 10; i++) {
-        const currentDate = new Date(startDate);
+        const formattedDate = moment(this.queryParams.startTime).add(i,'days').format("YYYY-MM-DD");
-        currentDate.setDate(currentDate.getDate() + i);
+        console.log('formattedDate',formattedDate)
-        const formattedDate = this.formatDate(currentDate);
+        //   const currentDate = new Date(startDate);
+      //   currentDate.setDate(currentDate.getDate() + i);
+      //   const formattedDate = this.formatDate(currentDate);
        this.days.push(formattedDate);
      }
    },
    formatDate(date) {
      // 格式化日期为'YYYY-MM-DD'的形式
@@ -257,8 +284,9 @@ export default {
      });
    },
    fetchData() {
+      this.days = [];
      // 查询按钮的点击事件处理程序
+      this.initDays()
      getstudioUse({
        startTime: this.queryParams.startTime,
        studioId: this.queryParams.studioId,
@@ -308,15 +336,6 @@ export default {
      console.log("确定");
    },
-    disableDate(time) {
-      // 禁用日期选择，只允许预约明天开始的录播室
-      const today = new Date();
-      today.setHours(0, 0, 0, 0);
-      const targetDate = new Date(time);
-      targetDate.setHours(0, 0, 0, 0);
-      return targetDate < today;
-    },
    // isReservationDisabled() {
    //   // 预约按钮是否禁用
    //   return this.selectedTimeSlots.length === 0;