Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud

src/views/integrated/meeting/booking/form.vue

@@ -131,10 +131,10 @@
 </template>
 
 <script setup lang="ts" name="MeetingBookingDialog">
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/@/hooks/message";
+import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj, getMeetingRoomTimeSlots, getMeetingRoomList } from '/@/api/integrated/meetingBooking'
+import { getObj, addObj, putObj, getMeetingRoomTimeSlots, getMeetingRoomList } from '/src/api/integrated/meetingBooking'
-import { rule } from '/@/utils/validate';
+import { rule } from '/src/utils/validate';
 import axios from 'axios'
 import { ref, onMounted, watch } from 'vue'
 import dayjs from 'dayjs'

src/views/integrated/meeting/booking/index.vue

@@ -67,10 +67,10 @@
 </template>
 
 <script setup lang="ts" name="systemMeetingBooking">
-import { BasicTableProps, useTable } from "/@/hooks/table";
+import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/meetingBooking";
+import { fetchList, delObjs } from "/src/api/integrated/meetingBooking";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -111,7 +111,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingBooking.xlsx')
+  downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'booking.xlsx')
 }
 
 // 多选事件

src/views/integrated/meeting/cleanUser/form.vue

@@ -39,10 +39,10 @@
 </template>
 
 <script setup lang="ts" name="CleanUserDialog">
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/@/hooks/message";
+import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/integrated/cleanUser'
+import { getObj, addObj, putObj } from '/src/api/integrated/cleanUser'
-import { rule } from '/@/utils/validate';
+import { rule } from '/src/utils/validate';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -117,4 +117,4 @@ const getcleanUserData = (id: string) => {
 defineExpose({
   openDialog
 });
-</script>
+</script>

src/views/integrated/meeting/cleanUser/index.vue

@@ -32,7 +32,7 @@
             @queryTable="getDataList"></right-toolbar>
         </div>
       </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border 
+      <el-table :data="state.dataList" v-loading="state.loading" border
         :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
         @sort-change="sortChangeHandle">
@@ -60,10 +60,10 @@
 </template>
 
 <script setup lang="ts" name="systemCleanUser">
-import { BasicTableProps, useTable } from "/@/hooks/table";
+import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/cleanUser";
+import { fetchList, delObjs } from "/src/api/integrated/cleanUser";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -129,4 +129,4 @@ const handleDelete = async (ids: string[]) => {
     useMessage().error(err.msg);
   }
 };
-</script>
+</script>

src/views/integrated/meeting/meetingEquipment/form.vue

@@ -52,10 +52,10 @@
 </template>
 
 <script setup lang="ts" name="MeetingEquipmentDialog">
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/@/hooks/message";
+import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/integrated/meetingEquipment'
+import { getObj, addObj, putObj } from '/src/api/integrated/meetingEquipment'
-import { rule } from '/@/utils/validate';
+import { rule } from '/src/utils/validate';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容

src/views/integrated/meeting/meetingEquipment/index.vue

@@ -67,10 +67,10 @@
 </template>
 
 <script setup lang="ts" name="systemMeetingEquipment">
-import { BasicTableProps, useTable } from "/@/hooks/table";
+import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/meetingEquipment";
+import { fetchList, delObjs } from "/src/api/integrated/meetingEquipment";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));

src/views/integrated/meeting/meetingRoom/form.vue

@@ -49,10 +49,10 @@
               <el-col :span="12" class="mb20">
                 <el-form-item label="保洁信息" prop="cleanUserId">
                   <el-select v-model="form.cleanUserId" placeholder="请选择保洁人员" clearable>
-                    <el-option 
+                    <el-option
-                      v-for="item in cleanUserOptions" 
+                      v-for="item in cleanUserOptions"
-                      :key="item.id" 
+                      :key="item.id"
-                      :label="item.name || item.label || item.cleanUserName" 
+                      :label="item.name || item.label || item.cleanUserName"
                       :value="item.id || item.value"
                     />
                   </el-select>
@@ -154,12 +154,12 @@
 </template>
 
 <script setup lang="ts" name="MeetingRoomDialog">
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/@/hooks/message";
+import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoom'
+import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoom'
-import { fetchList } from '/@/api/integrated/meetingEquipment'
+import { fetchList } from '/src/api/integrated/meetingEquipment'
-import { dropdown } from '/@/api/integrated/cleanUser'
+import { dropdown } from '/src/api/integrated/cleanUser'
-import { rule } from '/@/utils/validate';
+import { rule } from '/src/utils/validate';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -273,17 +273,17 @@ const handleCurrentChange = (val: number) => {
 // 确认选择设备
 const handleEquipmentConfirm = () => {
   // 过滤掉已经存在的设备
-  const newEquipment = selectedEquipment.value.filter(selected => 
+  const newEquipment = selectedEquipment.value.filter(selected =>
     !equipmentList.value.some(existing => existing.equipId === selected.id)
   )
-  
+
   // 添加新选择的设备
   equipmentList.value.push(...newEquipment.map(item => ({
     equipId: item.id,
     equipmentName: item.name,
     quantity: 1
   })))
-  
+
   equipmentDialogVisible.value = false
 }
 

src/views/integrated/meeting/meetingRoom/index.vue

@@ -53,10 +53,10 @@
 </template>
 
 <script setup lang="ts" name="systemMeetingRoom">
-import { BasicTableProps, useTable } from "/@/hooks/table";
+import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/meetingRoom";
+import { fetchList, delObjs } from "/src/api/integrated/meetingRoom";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));

src/views/integrated/meeting/meetingRoomEquipment/form.vue

@@ -33,10 +33,10 @@
 </template>
 
 <script setup lang="ts" name="MeetingRoomEquipmentDialog">
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
-import { useMessage } from "/@/hooks/message";
+import { useMessage } from "/src/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoomEquipment'
+import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoomEquipment'
-import { rule } from '/@/utils/validate';
+import { rule } from '/src/utils/validate';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -108,4 +108,4 @@ const getmeetingRoomEquipmentData = (id: string) => {
 defineExpose({
   openDialog
 });
-</script>
+</script>

src/views/integrated/meeting/meetingRoomEquipment/index.vue

@@ -16,7 +16,7 @@
             @queryTable="getDataList"></right-toolbar>
         </div>
       </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border 
+      <el-table :data="state.dataList" v-loading="state.loading" border
         :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
         @sort-change="sortChangeHandle">
@@ -43,10 +43,10 @@
 </template>
 
 <script setup lang="ts" name="systemMeetingRoomEquipment">
-import { BasicTableProps, useTable } from "/@/hooks/table";
+import { BasicTableProps, useTable } from "/src/hooks/table";
-import { fetchList, delObjs } from "/@/api/integrated/meetingRoomEquipment";
+import { fetchList, delObjs } from "/src/api/integrated/meetingRoomEquipment";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useMessage, useMessageBox } from "/src/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { useDict } from '/src/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -112,4 +112,4 @@ const handleDelete = async (ids: string[]) => {
     useMessage().error(err.msg);
   }
 };
-</script>
+</script>