Parcourir la source

修改页面 缓存 首次查询后 再次点击 菜单会再次查询数据 修改页面缓存

bzd_lxf il y a 1 mois
Parent
commit
040e57e03e

+ 1 - 1
pm_ui/src/utils/errorCode.js

@@ -2,6 +2,6 @@ export default {
   '401': '认证失败,无法访问系统资源',
   '403': '当前操作没有权限',
   '404': '访问资源不存在',
-  '1203': '获取会议室列表失败',
+  '1203': '获取数据失败',
   'default': '系统未知错误,请反馈给管理员'
 }

+ 34 - 8
pm_ui/src/views/meeting/index.vue

@@ -86,9 +86,9 @@
   </div>
 </template>
 
-<script setup name="Waring">
-import { listMeeting } from "@/api/meeting/meeting";
+<script setup name="Meeting">
 import { ElMessage } from "element-plus";
+import axios from "axios";
 
 const { proxy } = getCurrentInstance();
 const {alarm_level} = proxy.useDict('alarm_level');
@@ -116,10 +116,10 @@ const data = reactive({
     interfaceName:"会议预订",
     search: '' // 搜索文本默认为空
   },
-
 });
 
 const { queryParams, form, rules } = toRefs(data);
+
 watch(() => queryParams.value.status, (newStatus) => {
   if(newStatus === "1") { // 当前可用
     queryParams.value.appoint_time = getCurrentTimeRange();
@@ -129,28 +129,53 @@ watch(() => queryParams.value.status, (newStatus) => {
     queryParams.value.appoint_time = ""; // 选择"全部"时清空
   }
 });
+
 function updateAppointTime() {
   if(queryParams.value.start_time && queryParams.value.end_time) {
     queryParams.value.appoint_time = `${queryParams.value.start_time}~${queryParams.value.end_time}`;
   }
 }
+
 /** 查询设备告警列表 */
 const getList = async () => {
   try {
     loading.value = true;
-    listMeeting(queryParams.value).then(response => {
-      waringList.value = response.data.list;
-      total.value = response.data.total;
-      loading.value = false;
+
+    // 构建请求数据
+    const requestData = {
+      date: queryParams.value.date,
+      search: queryParams.value.search,
+      locationId: [],
+      capacity: [],
+      deviceType: [],
+      roomType: [-1],
+      appoint_time: queryParams.value.appoint_time,
+      status: 1,
+      page: queryParams.value.pageNum,
+      page_size: queryParams.value.pageSize
+    };
+
+    const response = await axios.post('http://182.43.247.65:8000/Conference/getRoomsByLocation', requestData, {
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
+
+    // 修改这里:正确处理返回的数据结构
+    if (response.data.code === 200) {
+      waringList.value = response.data.data.list || [];
+      total.value = response.data.data.total || 0;
+    } else {
+      ElMessage.error(response.data.message || '获取数据失败');
+    }
   } catch (error) {
     console.error('获取数据失败:', error);
+    ElMessage.error('获取数据失败');
   } finally {
     loading.value = false;
   }
 };
 
-
 // 表单重置
 function reset() {
   form.value = {
@@ -161,6 +186,7 @@ function reset() {
   };
   proxy.resetForm("waringRef");
 }
+
 function getCurrentTimeRange(hoursLater = 0, fullHour = false) {
   const now = new Date();
   now.setHours(now.getHours() + hoursLater);

+ 47 - 21
pm_ui/src/views/meeting/index3.vue

@@ -61,12 +61,6 @@
         </template>
       </el-table-column>
       <el-table-column label="会议类型" align="center" prop="template_name" />
-<!--      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button type="text" size="small" @click="handleView(scope.row)">查看</el-button>
-          &lt;!&ndash; Add more buttons as needed &ndash;&gt;
-        </template>
-      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -79,10 +73,10 @@
   </div>
 </template>
 
-<script setup name="Waring">
-import { listMeetingHistory } from "@/api/meeting/meeting";
+<script setup name="Meeting_jl">
 import { ref, reactive } from "vue";
-import dayjs from 'dayjs'; // 引入 dayjs 库用于日期格式化
+import dayjs from 'dayjs';
+import axios from 'axios';
 
 const queryRef = ref(null);
 
@@ -95,16 +89,12 @@ const total = ref(0);
 const currentMonthStart = dayjs().startOf('month').format('YYYY-MM-DD');
 const currentMonthEnd = dayjs().endOf('month').format('YYYY-MM-DD');
 
-
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
   status: '100',
-  timeRange: [currentMonthStart, currentMonthEnd], // 默认时间范围为当前月份
+  timeRange: [currentMonthStart, currentMonthEnd],
   search: '',
-  interfaceName: "会议记录",
-  type: 0,
-  record: true,
   is_external: '2'
 });
 
@@ -112,18 +102,43 @@ const queryParams = reactive({
 const getList = async () => {
   try {
     loading.value = true;
-    const params = { ...queryParams };
+
+    // 构建请求参数
+    const params = {
+      page: queryParams.pageNum,
+      pageSize: queryParams.pageSize,
+      status: queryParams.status,
+      search: queryParams.search,
+      is_external: queryParams.is_external,
+      locationId: '',
+      capacity: '',
+      deviceType: '',
+      roomType: '-1'
+    };
+
+    // 处理时间范围
     if (queryParams.timeRange && queryParams.timeRange.length === 2) {
       params.date = `${queryParams.timeRange[0]}~${queryParams.timeRange[1]}`;
-      delete params.timeRange; // 删除原始的 timeRange 参数
     }
-    listMeetingHistory(params).then(response => {
-      meetingList.value = response.data.list;
-      total.value = response.data.total;
-      loading.value = false;
+
+    // 发送请求
+    const response = await axios.get('http://182.43.247.65:8000/Conference/meeting', {
+      params: params
     });
+
+    // 处理响应数据
+    if (response.data && response.data.code === 200) {
+      meetingList.value = response.data.data.list;
+      total.value = response.data.data.total;
+    } else {
+      console.error('获取数据失败:', response.data.message);
+      meetingList.value = [];
+      total.value = 0;
+    }
   } catch (error) {
     console.error('获取数据失败:', error);
+    meetingList.value = [];
+    total.value = 0;
   } finally {
     loading.value = false;
   }
@@ -137,10 +152,20 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-  queryRef.value.resetFields();
+  queryParams.pageNum = 1;
+  queryParams.pageSize = 10;
+  queryParams.status = '100';
+  queryParams.timeRange = [currentMonthStart, currentMonthEnd];
+  queryParams.search = '';
+  queryParams.is_external = '2';
   handleQuery();
 }
 
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  // 处理选中的数据
+}
+
 /** 获取会议状态类型 */
 function getStatusType(status) {
   switch (status) {
@@ -189,6 +214,7 @@ function formatTimeRange(startTime, endTime) {
   return `${startFormatted}~${endFormatted}`;
 }
 
+// 初始化加载数据
 getList();
 </script>
 

+ 1 - 1
pm_ui/src/views/repairOrder/repairOrder/index2.vue

@@ -498,7 +498,7 @@
   </div>
 </template>
 
-<script setup name="RepairOrder">
+<script setup name="RepairOrder2">
 import { ref, reactive, toRefs, onMounted, computed } from 'vue';
 import {
   listRepairOrder,

+ 1 - 1
pm_ui/src/views/spafjkxt/index.vue

@@ -366,7 +366,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="Spafjkxt">
 import { ref, reactive, onMounted } from 'vue'
 import axios from 'axios'