房态和订单管理bug修改

src/views/doorLock/doorLock.vue

@@ -3068,12 +3068,18 @@ const fingerprintNext = (formEl) => {
     // console.log(evt.data, "输出指纹数据");
     let data = JSON.parse(evt.data);
     if (data.type == 0) {
-      console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
+      console.log(data.data.portNames);
+      let num=0
+      if(data.data.portNames){
+        num=data.data.portNames.length
+        console.log(JSON.parse(evt.data).data.portNames[num-1]);
+      }
+      // console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
       let params1 = {
         type: 1,
         data: {
           type: 0,
-          portName: JSON.parse(evt.data).data.portNames[1],
+          portName: JSON.parse(evt.data).data.portNames[num-1],
           baudRate: 115200,
         },
       };
@@ -3604,7 +3610,10 @@ onUnmounted(() => {
   }
 
   .middles {
-    height: calc(100% - 61px);
+    height: calc(100% - 81px);
+    display: flex;
+    flex-direction: column;
+
   }
 
   .middle {
@@ -3618,7 +3627,7 @@ onUnmounted(() => {
       display: flex;
       flex-wrap: wrap;
       align-items: center;
-      margin: 10px 0 0 0;
+      padding: 10px 0 0 0;
 
       .search {
         color: #fff;
@@ -3627,12 +3636,13 @@ onUnmounted(() => {
       .condition {
         display: flex;
         align-items: center;
-        margin: 10px 30px 10px 0;
+        margin: 0 0 10px 0;
       }
     }
     .changeItems {
       display: flex;
-      margin: 5px 0 15px 0;
+      flex-wrap: wrap;
+      margin:0;
       .changeItem {
         padding: 0 15px;
         height: 30px;
@@ -3640,7 +3650,7 @@ onUnmounted(() => {
         text-align: center;
         line-height: 30px;
         font-size: 14px;
-        margin-right: 15px;
+        margin:0 15px 10px 0;
         border-radius: 3px;
         color: rgba(166, 166, 166, 1);
         cursor: pointer;
@@ -3699,8 +3709,9 @@ onUnmounted(() => {
 
   .footer {
     width: calc(100% - 60px);
-    height: calc(100% - 180px);
-    margin: 10px auto 20px;
+    flex: 1;
+    overflow: auto;
+    margin: 0 auto;
     color: #000;
     overflow: auto;
     .floor {

src/views/order/order.vue

@@ -222,6 +222,14 @@
             @click="importExcel"
             ><span>导出订单</span></el-button
           >
+          <el-button
+            style="margin-left: 20px"
+            color="rgba(41, 109, 227, 1)"
+            type="primary"
+            class="search"
+            @click="searchBtn"
+            ><span>刷新订单列表</span></el-button
+          >
         </div>
       </div>
       <div class="footer" v-loading="loading">
@@ -2200,12 +2208,18 @@ const readFingerprint = () => {
     console.log(evt.data, "输出指纹数据");
     let data = JSON.parse(evt.data);
     if (data.type == 0) {
-      console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
+      console.log(data.data.portNames);
+      let num=0
+      if(data.data.portNames){
+        num=data.data.portNames.length
+        console.log(JSON.parse(evt.data).data.portNames[num-1]);
+      }
+      // console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
       let params1 = {
         type: 1,
         data: {
           type: 0,
-          portName: JSON.parse(evt.data).data.portNames[1],
+          portName: JSON.parse(evt.data).data.portNames[num-1],
           baudRate: 115200,
         },
       };

src/views/roomStatus/roomStatus.vue

@@ -168,9 +168,17 @@
           >
             日历
           </div>
+          <el-button
+            style="margin-left: 20px"
+            color="rgba(41, 109, 227, 1)"
+            type="primary"
+            class="search"
+            @click="searchBtn"
+            ><span>刷新房态信息</span></el-button
+          >
         </div>
       </div>
-      <div class="footer" v-if="switchDayIndex == 1">
+      <div class="footer" v-loading="roomLoading" v-if="switchDayIndex == 1">
         <div class="floor" v-for="item in roomList.list">
           <div class="title" v-if="item.roomlength">
             <span class="t1">{{ item.name }}</span
@@ -784,7 +792,7 @@
           </div>
         </div>
       </div>
-      <div class="footers" v-if="switchDayIndex == 2">
+      <div class="footers"  v-loading="roomLoading"  v-if="switchDayIndex == 2">
         <el-table :data="tableDate" :span-method="arraySpanMethod">
           <el-table-column prop="date" align="center" fixed="left">
             <template #header>
@@ -1833,6 +1841,7 @@
                   format="YYYY-MM-DD HH:mm:ss"
                   value-format="YYYY-MM-DD HH:mm:ss"
                   style="width: 220px"
+                  :disabled-date="defaultTimeOvertime"
                 />
               </div>
             </el-form-item>
@@ -2786,6 +2795,7 @@ const flagBtn = ref(); // 按钮权限
 const store = useStore();
 const api = ref("");
 const router = useRouter();
+const roomLoading=ref(false)
 
 // 全日房可用时段
 const startTime = ref();
@@ -2938,6 +2948,19 @@ const defaultTimeLiveTime = (data) => {
     return false;
   }
 };
+// 预定超时时间限制不能小于当前日期
+const defaultTimeOvertime = (data) => {
+  console.log(dayjs(data).format("YYYY-MM-DD HH:mm:ss"));
+  
+  // console.log(dayjs(data).format("YYYY-MM-DD"));
+  let nowTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+  let startTime = dayjs(data).format("YYYY-MM-DD HH:mm:ss");
+  if (startTime < nowTime) {
+    return true;
+  } else {
+    return false;
+  }
+};
 const reserveData = reactive({ list: [] });
 // 表单验证
 const reserveRules = reactive({
@@ -3303,7 +3326,8 @@ const itemClick = async (val) => {
   faceplateInfo.reserveLeaveTime = val.reserveLeaveTime;
   let data = {
     houseNumberId: val.houseNumberId,
-    dateTime: val.reserveLiveTime,
+    // dateTime: val.reserveLiveTime,
+    houseNumberStateId:val.houseNumberStateId
   };
   let res = await axios({
     method: "get",
@@ -3320,8 +3344,8 @@ const itemClick = async (val) => {
     roomInfoData.value = res.data.data;
     faceplateInfo.name = res.data.data.name;
 
-    faceplateInfo.liveTime = res.data.data.liveTime;
-    faceplateInfo.leaveTime = res.data.data.leaveTime;
+    faceplateInfo.liveTime = dayjs(res.data.data.reserveLiveTime).format('YYYY-MM-DD HH:mm:ss');
+    faceplateInfo.leaveTime =dayjs( res.data.data.reserveLeaveTime).format('YYYY-MM-DD HH:mm:ss');
     faceplateInfo.roomPrice = res.data.data.payPrice;
     faceplateInfo.checkTime = res.data.data.checkTime;
     faceplateInfo.electricQuantity = res.data.data.electricQuantity;
@@ -3986,6 +4010,7 @@ const roomTypeList = async () => {
 
 // 查看单日房间列表 （----------------------------------------------）
 const getList = async () => {
+  roomLoading.value=true
   if (switchDayIndex.value == 1) {
     let data = {
       houseType: searchInput.houseType,
@@ -4019,7 +4044,10 @@ const getList = async () => {
       roomList.list = res.data.data;
 
       dateTimes.value = res.data.data.dateTimes;
+      roomLoading.value=false
+
     } else {
+      roomLoading.value=false
       ElMessage({
         type: "error",
         showClose: true,
@@ -4052,7 +4080,9 @@ const getList = async () => {
     if (res.data.code == 200) {
       tableDateHeader.value = res.data.data.dateTime;
       tableDate.value = res.data.data.page.records;
+      roomLoading.value=false
     } else {
+      roomLoading.value=false
       ElMessage({
         type: "error",
         showClose: true,
@@ -4846,15 +4876,21 @@ const readFingerprint = () => {
     websocket.send(JSON.stringify(params));
   };
   websocket.onmessage = function (evt) {
-    // console.log(evt.data, "输出指纹数据");
+    console.log(evt.data, "输出指纹数据");
     let data = JSON.parse(evt.data);
     if (data.type == 0) {
-      console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
+      console.log(data.data.portNames);
+      let num=0
+      if(data.data.portNames){
+        num=data.data.portNames.length
+        console.log(JSON.parse(evt.data).data.portNames[num-1]);
+      }
+      // console.log(JSON.parse(evt.data).data.portNames[]); // 获取到 USB接口
       let params1 = {
         type: 1,
         data: {
           type: 0,
-          portName: JSON.parse(evt.data).data.portNames[1],
+          portName: JSON.parse(evt.data).data.portNames[num-1],
           baudRate: 115200,
         },
       };

src/views/staff/staff.vue

@@ -772,12 +772,18 @@ const entering = () => {
     // console.log(evt.data, "输出指纹数据");
     let data = JSON.parse(evt.data);
     if (data.type == 0) {
-      console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
+      // console.log(JSON.parse(evt.data).data.portNames[1]); // 获取到 USB接口
+      console.log(data.data.portNames);
+      let num=0
+      if(data.data.portNames){
+        num=data.data.portNames.length
+        console.log(JSON.parse(evt.data).data.portNames[num-1]);
+      }
       let params1 = {
         type: 1,
         data: {
           type: 0,
-          portName: JSON.parse(evt.data).data.portNames[1],
+          portName: JSON.parse(evt.data).data.portNames[num-1],
           baudRate: 115200,
         },
       };

src/views/system/system.vue

@@ -540,7 +540,7 @@
             >
             <span>度</span>
           </div>
-          <div class="titles">
+          <!-- <div class="titles">
             <div class="set">催缴设置</div>
           </div>
           <div class="system">
@@ -569,7 +569,7 @@
               >{{ callSystemData.askForPayment }}</span
             >
             <span>天，对待结账老师进行催缴</span>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>

src/views/userRoles/userRoles.vue

@@ -1016,9 +1016,9 @@ const addRolesList15 = reactive({
       name: "全部",
       id: 0,
       children: [
-        { name: "添加", id: 1 },
-        { name: "编辑", id: 2 },
-        { name: "删除", id: 3 },
+        // { name: "添加", id: 1 },
+        // { name: "编辑", id: 2 },
+        // { name: "删除", id: 3 },
         { name: "查看界面", id: 4 },
         // { name: "导出", id: 5 },
         // { name: "导入", id: 6 },
@@ -1041,7 +1041,7 @@ const addRolesList16 = reactive({
         { name: "退房设置", id: 1 },
         { name: "公寓设置", id: 2 },
         { name: "补助设置", id: 3 },
-        { name: "催缴设置", id: 4 },
+        // { name: "催缴设置", id: 4 },
         { name: "设施服务设置", id: 5 },
         { name: "查看界面", id: 6 },
       ],

vite.config.js

@@ -24,7 +24,7 @@ export default defineConfig({
     // https: false,
     proxy: {
       "/hotel/ihotel/auto": {
-        target: "https://chtech.ncjti.edu.cn/hotel/ihotel/auto", // 测试环境
+        target: "https://chtech.ncjti.edu.cn/hotel/ihotel/auto", // 线上环境
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/hotel\/ihotel\/auto/, ""),
       },