修改bug

src/utils/request.js

@@ -19,9 +19,13 @@ service.interceptors.request.use(
         //     // config.params = { 'admin_token': token } //如果要求携带在参数中
         //     config.headers["token"] = token; //如果要求携带在请求头中
         // }
+        console.log(config.data);
+        
         return config;
     },
     (error) => {
+        console.log(error);
+        
         Promise.reject(error);
     }
 );
@@ -29,7 +33,8 @@ service.interceptors.request.use(
 service.interceptors.response.use(
     (response) => {
         const res = response.data;
-
+        console.log(res);
+        
         return response.data;
     },
     (error) => {

src/views/account/account.vue

@@ -102,10 +102,7 @@
             width="230"
           >
             <template #default="{ row }">
-              <div
-                class="ul"
-                style="display: flex; flex-wrap: wrap"
-              >
+              <div class="ul" style="display: flex; flex-wrap: wrap">
                 <el-tag
                   v-for="i in row.checkOrg"
                   :key="i.name"
@@ -243,9 +240,12 @@
                   :key="item.id"
                   :label="item.cardNumber"
                   :value="item.cardNumber"
-                  style="padding: 0;"
+                  style="padding: 0"
                 >
-                  <div style="float: left;width: 100%;padding: 0 20px;" @click="schoolCardChanges(item)">
+                  <div
+                    style="float: left; width: 100%; padding: 0 20px"
+                    @click="schoolCardChanges(item)"
+                  >
                     <span style="display: inline-block; width: 80px">{{
                       item.userName
                     }}</span>
@@ -413,7 +413,7 @@ watch(
     if (newVal == null) {
       getList();
     }
-  }
+  },
 );
 
 const currentPage = ref(1); // 当前页
@@ -466,7 +466,8 @@ var checkFullName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg =
+    /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -587,10 +588,8 @@ const getList = async () => {
         item.adminMenuName = "";
       }
     });
-    res.data.data.records.forEach(i=>{
-      
-    })
-    
+    res.data.data.records.forEach((i) => {});
+
     tableData.list = res.data.data.records;
     total.value = res.data.data.total;
     loading.value = false;
@@ -602,6 +601,12 @@ const getList = async () => {
     // });
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,
@@ -744,11 +749,11 @@ const schoolCardChange = async (value) => {
   //   });
   // }
 };
-const schoolCardChanges=async (row) =>{
-      ruleForm.corpnName = row.userName;
-    ruleForm.corpnPhone = row.phone;
-    ruleForm.department = row.department;
-}
+const schoolCardChanges = async (row) => {
+  ruleForm.corpnName = row.userName;
+  ruleForm.corpnPhone = row.phone;
+  ruleForm.department = row.department;
+};
 // 角色列表数据
 const roleList = async () => {
   let res = await axios({
@@ -1163,7 +1168,6 @@ onUnmounted(() => {
         height: 50px;
         font-size: 15px;
         color: #000;
-        
       }
       :deep(.el-table__row td) {
         padding: 0;
@@ -1197,7 +1201,6 @@ onUnmounted(() => {
           cursor: pointer;
         }
       }
-      
     }
 
     // 添加员工弹窗样式
@@ -1315,7 +1318,7 @@ onUnmounted(() => {
     text-align: center;
   }
 }
-.el-popper.tag_title{
+.el-popper.tag_title {
   width: 450px;
   height: 75%;
   overflow: auto;

src/views/blackList/blackList.vue

@@ -25,36 +25,36 @@
         <div class="filter">
           <div class="condition">
             <span>预订人 : </span>
-              <el-input
-                :clearable="true"
-                @change="searchBtn"
-                v-model.trim="collect.searchInput.reserveName"
-                class="w-50 m-2"
-                placeholder="请输入预订人"
-                style="width: 200px"
-              />
+            <el-input
+              :clearable="true"
+              @change="searchBtn"
+              v-model.trim="collect.searchInput.reserveName"
+              class="w-50 m-2"
+              placeholder="请输入预订人"
+              style="width: 200px"
+            />
           </div>
           <div class="condition">
             <span>手机号码 : </span>
-              <el-input
-                :clearable="true"
-                @change="searchBtn"
-                v-model.trim="collect.searchInput.phone"
-                class="w-50 m-2"
-                placeholder="请输入手机号码"
-                style="width: 200px"
-              />
+            <el-input
+              :clearable="true"
+              @change="searchBtn"
+              v-model.trim="collect.searchInput.phone"
+              class="w-50 m-2"
+              placeholder="请输入手机号码"
+              style="width: 200px"
+            />
           </div>
           <div class="condition">
             <span>微校卡号 : </span>
-              <el-input
-                :clearable="true"
-                @change="searchBtn"
-                v-model.trim="collect.searchInput.cardNumber"
-                class="w-50 m-2"
-                placeholder="请输入微校卡号"
-                style="width: 200px"
-              />
+            <el-input
+              :clearable="true"
+              @change="searchBtn"
+              v-model.trim="collect.searchInput.cardNumber"
+              class="w-50 m-2"
+              placeholder="请输入微校卡号"
+              style="width: 200px"
+            />
           </div>
           <div class="condition">
             <span>创建时间 : </span>
@@ -411,7 +411,7 @@ const collect = reactive({
     reserveName: "",
     phone: "",
     cardNumber: "",
-    createTime:''
+    createTime: "",
   }, // 搜索按钮数据
   currentPage: 1, // 当前页
   pageSize: 10,
@@ -430,7 +430,7 @@ const detail = reactive({
     reserveName: "",
     phone: "",
     cardNumber: "",
-    createTime:""
+    createTime: "",
   }, // 搜索按钮数据
   currentPage: 1, // 当前页
   pageSize: 10,
@@ -474,6 +474,12 @@ const getList = async () => {
       loading.value = false;
     } else {
       loading.value = false;
+      if (res.data.code == 500) {
+        console.log(res.data);
+        if (res.data.message == "无效token,请重新登入") {
+          router.push({ path: "/login" });
+        }
+      }
       ElMessage({
         type: "error",
         showClose: true,
@@ -512,6 +518,12 @@ const getList = async () => {
       loading.value = false;
     } else {
       loading.value = false;
+      if (res.data.code == 500) {
+        console.log(res.data);
+        if (res.data.message == "无效token,请重新登入") {
+          router.push({ path: "/login" });
+        }
+      }
       ElMessage({
         type: "error",
         showClose: true,
@@ -536,11 +548,11 @@ const searchBtn = lodash.debounce(async () => {
 // 汇总 （========================================================）
 const collectFun = reactive({
   // 重置
-  collectResetClick:()=>{
-    collect.searchInput.reserveName="";
-    collect.searchInput.phone="";
-    collect.searchInput.cardNumber="";
-    collect.searchInput.createTime="";
+  collectResetClick: () => {
+    collect.searchInput.reserveName = "";
+    collect.searchInput.phone = "";
+    collect.searchInput.cardNumber = "";
+    collect.searchInput.createTime = "";
     searchBtn();
   },
   // 多选框功能
@@ -570,7 +582,7 @@ const collectFun = reactive({
       });
       console.log(res, "移出");
       if (res.data.code == 200) {
-        getList()
+        getList();
         ElMessage({
           type: "success",
           showClose: true,
@@ -585,11 +597,11 @@ const collectFun = reactive({
           center: true,
         });
       }
-    }else{
+    } else {
       ElMessage({
         type: "warning",
         showClose: true,
-        message: '至少选择一名人员移出',
+        message: "至少选择一名人员移出",
         center: true,
       });
     }
@@ -611,7 +623,7 @@ const collectFun = reactive({
     });
     console.log(res, "移出");
     if (res.data.code == 200) {
-      getList()
+      getList();
       ElMessage({
         type: "success",
         showClose: true,
@@ -638,11 +650,11 @@ const collectFun = reactive({
 // 明细列表（=========================================================）
 const detailFun = reactive({
   // 重置
-  detailResetClick:()=>{
-    detail.searchInput.reserveName="";
-    detail.searchInput.phone="";
-    detail.searchInput.cardNumber="";
-    detail.searchInput.createTime="";
+  detailResetClick: () => {
+    detail.searchInput.reserveName = "";
+    detail.searchInput.phone = "";
+    detail.searchInput.cardNumber = "";
+    detail.searchInput.createTime = "";
     searchBtn();
   },
   // 多选框功能
@@ -672,7 +684,7 @@ const detailFun = reactive({
       });
       console.log(res, "移出");
       if (res.data.code == 200) {
-        getList()
+        getList();
         ElMessage({
           type: "success",
           showClose: true,
@@ -687,11 +699,11 @@ const detailFun = reactive({
           center: true,
         });
       }
-    }else{
+    } else {
       ElMessage({
         type: "warning",
         showClose: true,
-        message: '至少选择一名人员移出',
+        message: "至少选择一名人员移出",
         center: true,
       });
     }
@@ -713,7 +725,7 @@ const detailFun = reactive({
     });
     console.log(res, "移出");
     if (res.data.code == 200) {
-      getList()
+      getList();
       ElMessage({
         type: "success",
         showClose: true,

src/views/building/building.vue

@@ -281,6 +281,12 @@ const getList = async () => {
     // });
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/class/class.vue

@@ -382,7 +382,7 @@ var checkFullName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -471,6 +471,12 @@ const getList = async () => {
     loading.value = false;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/doorLock/doorLock.vue

@@ -2008,7 +2008,7 @@ var checkFullName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -2306,7 +2306,7 @@ var fingerprintName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -2570,6 +2570,12 @@ const getList = async () => {
     roomList.list = arr;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/doorLock/doorLock11.vue

@@ -1445,7 +1445,7 @@ var checkFullName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -1564,7 +1564,7 @@ var passManagementName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -1622,7 +1622,7 @@ var identityCardName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {

src/views/meter/meter.vue

@@ -459,6 +459,12 @@ const getList = async () => {
     // });
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/order/order.vue

@@ -454,17 +454,17 @@
                 trigger="hover"
                 content="this is content, this is content, this is content"
               >
-              <template #reference>
-                <span style="color: #296de3; cursor: pointer">课表</span>
-              </template>
-              <el-table border :data="row.schedules">
-                <el-table-column label="日期">
-                  <template #default="{row}">
-                    {{ row.dateTime }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="教师资格" prop="jsxm" />
-              </el-table>
+                <template #reference>
+                  <span style="color: #296de3; cursor: pointer">课表</span>
+                </template>
+                <el-table border :data="row.schedules">
+                  <el-table-column label="日期">
+                    <template #default="{ row }">
+                      {{ row.dateTime }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="教师资格" prop="jsxm" />
+                </el-table>
               </el-popover>
               <el-popover
                 v-if="row.source == '流程'"
@@ -474,17 +474,17 @@
                 trigger="hover"
                 content="this is content, this is content, this is content"
               >
-              <template #reference>
-                <span style="color: #296de3; cursor: pointer">流程</span>
-              </template>
-              <el-table border :data="row.applicationProcedureTemporaries">
-                <el-table-column label="时间">
-                  <template #default="{row}">
-                    {{ row.startTime }} - {{ row.endTime }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="原因" prop="reasonApplication" />
-              </el-table>
+                <template #reference>
+                  <span style="color: #296de3; cursor: pointer">流程</span>
+                </template>
+                <el-table border :data="row.applicationProcedureTemporaries">
+                  <el-table-column label="时间">
+                    <template #default="{ row }">
+                      {{ row.startTime }} - {{ row.endTime }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="原因" prop="reasonApplication" />
+                </el-table>
               </el-popover>
             </template>
           </el-table-column>
@@ -639,6 +639,24 @@
             prop="remark"
             label="备注"
           />
+          <el-table-column align="center" width="120" label="身份类型">
+            <template #default="{ row }">
+              <div v-if="row.source == '自费'">
+                <span v-if="row.identityType == 0">学生</span>
+                <span v-if="row.identityType == 1">学生家长</span>
+                <span v-if="row.identityType == 2">朋友</span>
+                <span v-if="row.identityType == 3">老师</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="120" label="原因">
+            <template #default="{ row }">
+              <div v-if="row.source == '自费'">
+                <span v-if="row.identityType == 0">探视</span>
+                <span v-if="row.identityType == 1">交流</span>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             fixed="right"
@@ -740,7 +758,12 @@
                 </el-popconfirm>
                 <!-- 换房 -->
                 <span
-                  v-if="(scope.row.orderStart == 1 || scope.row.orderStart == 3 || scope.row.orderStart == 4) && flagBtn.huanfang == 1"
+                  v-if="
+                    (scope.row.orderStart == 1 ||
+                      scope.row.orderStart == 3 ||
+                      scope.row.orderStart == 4) &&
+                    flagBtn.huanfang == 1
+                  "
                   style="cursor: pointer; margin: 0 10px"
                   @click="roomChangeClick(scope.row)"
                   >换房</span
@@ -1496,12 +1519,13 @@
               <div class="changeItemss">
                 <div
                   class="changeNews"
-                  :class="roomChangeIndex == item.name ? 'changeNews_active' : ''"
+                  :class="
+                    roomChangeIndex == item.name ? 'changeNews_active' : ''
+                  "
                   @click="changeRoom(item.name)"
                   v-for="item in roomChangeItemList"
                 >
-                  {{ item.name
-                  }}
+                  {{ item.name }}
                   <!-- <span>
                     ({{ roomChangeRuleForm.roomType == 1 ? "全" : "钟" }})</span
                   > -->
@@ -1701,8 +1725,8 @@ const searchInput = reactive({
   cancelTime: "",
   liveTime: "",
   leaveTime: "",
-  reserveLiveTime:"",
-  reserveLeaveTime:"",
+  reserveLiveTime: "",
+  reserveLeaveTime: "",
   orgId: "",
 }); // 搜索按钮数据
 
@@ -1806,7 +1830,7 @@ var checkInName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -2021,7 +2045,7 @@ const roomChangeRuleForm = reactive({
   houseNumberIdNow: "", // 勾选的房间id
 });
 const checkInd = ref();
-const roomChangeItemList=ref()// 左边的房间类型
+const roomChangeItemList = ref(); // 左边的房间类型
 const roomChangeList = reactive({ list: [] });
 
 // 楼栋单元数据
@@ -2179,6 +2203,12 @@ const getList = async () => {
     loading.value = false;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,
@@ -3126,12 +3156,12 @@ const roomChangeClick = async (row) => {
   });
   console.log(res, "换房界面");
   if (res.data.code == 200) {
-    roomChangeItemList.value=res.data.data
-    roomChangeIndex.value=roomChangeItemList.value[0].name
-    if(roomChangeItemList.value[0].children.length!=[]){
+    roomChangeItemList.value = res.data.data;
+    roomChangeIndex.value = roomChangeItemList.value[0].name;
+    if (roomChangeItemList.value[0].children.length != []) {
       roomChangeList.list = roomChangeItemList.value[0].children;
-    }else{
-      roomChangeList.list =[]
+    } else {
+      roomChangeList.list = [];
     }
   } else {
     ElMessage({
@@ -3145,11 +3175,11 @@ const roomChangeClick = async (row) => {
 // 切换房类型
 const changeRoom = (name) => {
   roomChangeIndex.value = name;
-  roomChangeItemList.value.forEach(i=>{
-    if(i.name==name){
-      roomChangeList.list=i.children
-    }    
-  })
+  roomChangeItemList.value.forEach((i) => {
+    if (i.name == name) {
+      roomChangeList.list = i.children;
+    }
+  });
 };
 // 勾选房间
 const roomCheck = (row) => {

src/views/process/process.vue

@@ -699,6 +699,12 @@ const getList = async () => {
     loading.value = false;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/roles/roles.vue

@@ -716,6 +716,12 @@ const getList = async () => {
     total.value = res.data.data.total;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/roomList/roomList.vue

@@ -474,7 +474,7 @@ var checkFullName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -558,6 +558,12 @@ const getList = async () => {
     // });
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/roomPrice/roomPrice.vue

@@ -633,6 +633,12 @@ const getList = async () => {
     loading.value = false;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/roomStatus/roomStatus copy.vue

@@ -1141,7 +1141,7 @@ var checkFullName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -1257,7 +1257,7 @@ var passManagementName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -1315,7 +1315,7 @@ var fingerprintName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -1379,7 +1379,7 @@ var identityCardName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg = /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {

src/views/roomStatus/roomStatus.vue

@@ -18,7 +18,8 @@
             <span class="cameratxt">房态管理</span>
           </template>
           <div v-for="i in roomList.list" :key="i">
-            {{ i.name }} : 未使用 {{ i.freeCount }} 间 , 已使用 {{ i.useCount }} 间
+            {{ i.name }} : 未使用 {{ i.freeCount }} 间 , 已使用
+            {{ i.useCount }} 间
           </div>
         </el-popover>
       </div>
@@ -196,7 +197,6 @@
             ><span>刷新房态信息</span></el-button
           >
         </div>
-        
       </div>
       <div class="footer" v-if="switchDayIndex == 1">
         <div class="floor" v-for="item in roomList.list" :key="item">
@@ -215,7 +215,7 @@
                 :visible="i.visible"
               >
                 <template #reference>
-                  <div @click="itemClick(i)" style="position: relative;">
+                  <div @click="itemClick(i)" style="position: relative">
                     <div class="roomNum" v-if="i.status">
                       <span
                         >{{ i.houseNumber
@@ -314,9 +314,23 @@
                     <div class="rLock" v-if="i.status == 5 || i.status == 6">
                       <span>结束：{{ i.endTime }}</span>
                     </div>
-                    <div style="position: absolute;right: 15px;bottom: 8px;">
-                      <img title="关灯" v-if="i.electricType==1" @click="bulbsClick(i)" style="width: 22px;height: 22px;cursor: pointer;" src="../../assets/icons/bulbs.png" alt="">
-                      <img title="开灯" v-if="i.electricType==2" @click="bulbsClick(i)" style="width: 20px;height: 20px;cursor: pointer;" src="../../assets/icons/bulb.png" alt="">
+                    <div style="position: absolute; right: 15px; bottom: 8px">
+                      <img
+                        title="关灯"
+                        v-if="i.electricType == 1"
+                        @click="bulbsClick(i)"
+                        style="width: 22px; height: 22px; cursor: pointer"
+                        src="../../assets/icons/bulbs.png"
+                        alt=""
+                      />
+                      <img
+                        title="开灯"
+                        v-if="i.electricType == 2"
+                        @click="bulbsClick(i)"
+                        style="width: 20px; height: 20px; cursor: pointer"
+                        src="../../assets/icons/bulb.png"
+                        alt=""
+                      />
                     </div>
                   </div>
                 </template>
@@ -819,7 +833,6 @@
                   </div>
                 </div>
               </el-popover>
-            
             </div>
           </div>
         </div>
@@ -1233,22 +1246,26 @@
           >
             <template #header>
               <el-popover
-                  placement="top-start"
-                  title="房间使用情况"
-                  :width="250"
-                  trigger="hover"
-                  effect="light"
-                  content="this is content, this is content, this is content"
-                >
-                  <template #reference>
-                    <span>{{ i.date }}</span>
-                  </template>
-                  <div>
-                    <div v-for="item in i.freeNumbers" :key="item">{{ item.room_name }}: 未使用{{ item.num }}间</div><br>
-                    <div v-for="item in i.useNumbers" :key="item">{{ item.room_name }}: 已使用{{ item.num }}间</div>
+                placement="top-start"
+                title="房间使用情况"
+                :width="250"
+                trigger="hover"
+                effect="light"
+                content="this is content, this is content, this is content"
+              >
+                <template #reference>
+                  <span>{{ i.date }}</span>
+                </template>
+                <div>
+                  <div v-for="item in i.freeNumbers" :key="item">
+                    {{ item.room_name }}: 未使用{{ item.num }}间
                   </div>
-                </el-popover>
-              
+                  <br />
+                  <div v-for="item in i.useNumbers" :key="item">
+                    {{ item.room_name }}: 已使用{{ item.num }}间
+                  </div>
+                </div>
+              </el-popover>
             </template>
             <el-table-column
               prop="state"
@@ -1647,8 +1664,7 @@
                 v-for="item in roomChangeItemList"
                 :key="item"
               >
-                {{ item.name
-                }}
+                {{ item.name }}
                 <!-- <span>
                   ({{ roomChangeRuleForm.roomType == 1 ? "全" : "钟" }})</span
                 > -->
@@ -1657,7 +1673,11 @@
           </div>
           <div class="room">
             <div class="floors">
-              <div class="cards" v-for="item in roomChangeList.list" :key="item">
+              <div
+                class="cards"
+                v-for="item in roomChangeList.list"
+                :key="item"
+              >
                 <div class="roomList" @click="roomCheck(item)">
                   <div class="roomNumber">{{ item.roomNumber }}</div>
                   <img
@@ -2959,7 +2979,7 @@ const roomChangeRuleForm = reactive({
   houseNumberIdNow: "", // 勾选的房间id
 });
 const checkInd = ref();
-const roomChangeItemList=ref()// 左边的房间类型
+const roomChangeItemList = ref(); // 左边的房间类型
 const roomChangeList = reactive({ list: [] });
 
 // 预定（--------------------------------------------------------）
@@ -2988,7 +3008,8 @@ var reserveName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg =
+    /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -3128,7 +3149,8 @@ var checkInName = (rule, value, callback) => {
     return callback(new Error("请输入姓名"));
   }
 
-  var reg = /^[\u4e00-\u9fa5]{2,6}$/;
+  var reg =
+    /^[\u3400-\u4db5\u4e00-\u9fa5\u9fa6-\u9fbb\u{f900}-\u{faff}]{2,6}$/u;
   if (!reg.test(value)) {
     callback(new Error("必须为2-6个汉字！"));
   } else {
@@ -3371,7 +3393,7 @@ const lockRoomRules = reactive({
 // 维修弹窗
 const maintainVisible = ref(false);
 const maintainRef = ref();
-const maintainLoading=ref(false)
+const maintainLoading = ref(false);
 const maintainRuleForm = reactive({
   reason: "",
   // time: [dayjs().format('YYYY-MM-DD HH:mm:ss'),""],
@@ -3416,10 +3438,10 @@ const itemClick = async (val) => {
     faceplateInfo.name = res.data.data.name;
 
     faceplateInfo.liveTime = dayjs(res.data.data.reserveLiveTime).format(
-      "YYYY-MM-DD HH:mm:ss"
+      "YYYY-MM-DD HH:mm:ss",
     );
     faceplateInfo.leaveTime = dayjs(res.data.data.reserveLeaveTime).format(
-      "YYYY-MM-DD HH:mm:ss"
+      "YYYY-MM-DD HH:mm:ss",
     );
     faceplateInfo.roomPrice = res.data.data.payPrice;
     faceplateInfo.checkTime = res.data.data.checkTime;
@@ -3674,7 +3696,6 @@ const clean = async (flag) => {
   }
 };
 
-
 // 勾选房间
 const checkcleanRoom = (data, nodes) => {
   console.log(data, nodes);
@@ -3997,10 +4018,10 @@ const switchBatch = async () => {
   }
 };
 // 单独控制房间的电
-const bulbsClick=async (i)=>{
+const bulbsClick = async (i) => {
   roomLoading.value = true; // 加载页面
   // electricType==1表示开电状态
-  if(i.electricType==1){
+  if (i.electricType == 1) {
     let data = {
       houseNumberIds: [i.houseNumberId],
       adminId: sessionStorage.getItem("permissionSettingId"),
@@ -4036,7 +4057,7 @@ const bulbsClick=async (i)=>{
     }
   }
   // electricType==2表示关电状态
-  else if(i.electricType==2){
+  else if (i.electricType == 2) {
     let data = {
       houseNumberIds: [i.houseNumberId],
       adminId: sessionStorage.getItem("permissionSettingId"),
@@ -4071,8 +4092,7 @@ const bulbsClick=async (i)=>{
       });
     }
   }
-}
-
+};
 
 // 切换日历 单日
 const switchDay = (val) => {
@@ -4096,7 +4116,7 @@ const dateTimes = ref(
     dateStr: "2023-12-03",
     weekStr: "Sunday",
     roomSum: 27,
-  }
+  },
 );
 const tableDate = ref();
 const tableDateHeader = ref();
@@ -4242,6 +4262,12 @@ const getList = async () => {
       roomLoading.value = false;
     } else {
       roomLoading.value = false;
+      if (res.data.code == 500) {
+        console.log(res.data);
+        if (res.data.message == "无效token,请重新登入") {
+          router.push({ path: "/login" });
+        }
+      }
       ElMessage({
         type: "error",
         showClose: true,
@@ -4282,7 +4308,7 @@ const getList = async () => {
       //         }
       //       })
       //     }
-          
+
       //   })
       // })
       tableDateHeader.value = res.data.data.dateTime;
@@ -4290,6 +4316,12 @@ const getList = async () => {
       roomLoading.value = false;
     } else {
       roomLoading.value = false;
+      if (res.data.code == 500) {
+        console.log(res.data);
+        if (res.data.message == "无效token,请重新登入") {
+          router.push({ path: "/login" });
+        }
+      }
       ElMessage({
         type: "error",
         showClose: true,
@@ -4451,12 +4483,12 @@ const roomChangeClick = async (row) => {
   });
   console.log(res, "换房界面");
   if (res.data.code == 200) {
-    roomChangeItemList.value=res.data.data
-    roomChangeIndex.value=roomChangeItemList.value[0].name
-    if(roomChangeItemList.value[0].children.length!=[]){
+    roomChangeItemList.value = res.data.data;
+    roomChangeIndex.value = roomChangeItemList.value[0].name;
+    if (roomChangeItemList.value[0].children.length != []) {
       roomChangeList.list = roomChangeItemList.value[0].children;
-    }else{
-      roomChangeList.list =[]
+    } else {
+      roomChangeList.list = [];
     }
   } else {
     ElMessage({
@@ -4470,11 +4502,11 @@ const roomChangeClick = async (row) => {
 // 切换房类型
 const changeRoom = (name) => {
   roomChangeIndex.value = name;
-  roomChangeItemList.value.forEach(i=>{
-    if(i.name==name){
-      roomChangeList.list=i.children
-    }    
-  })
+  roomChangeItemList.value.forEach((i) => {
+    if (i.name == name) {
+      roomChangeList.list = i.children;
+    }
+  });
 };
 // 勾选房间
 const roomCheck = (row) => {
@@ -5463,7 +5495,7 @@ const configPayPrice = lodash.throttle(async (formEl) => {
             if (res.data.code == 200) {
               passForm.pass = res.data.data.houseOrder.keyPassWord;
               passForm.reserveLiveTime = dayjs(
-                res.data.data.houseOrder.liveTime
+                res.data.data.houseOrder.liveTime,
               ).format("YYYY-MM-DD HH:mm:ss");
               passForm.reserveLeaveTime =
                 res.data.data.houseOrder.reserveLeaveTime;
@@ -5561,7 +5593,7 @@ const configPayPrice = lodash.throttle(async (formEl) => {
                 if (res.data.code == 200) {
                   passForm.pass = res.data.data.houseOrder.keyPassWord;
                   passForm.reserveLiveTime = dayjs(
-                    res.data.data.houseOrder.liveTime
+                    res.data.data.houseOrder.liveTime,
                   ).format("YYYY-MM-DD HH:mm:ss");
                   passForm.reserveLeaveTime =
                     res.data.data.houseOrder.reserveLeaveTime;
@@ -5642,7 +5674,7 @@ const paymentCodeClick = async () => {
         if (ress.data.code == 200) {
           if (ress.data.data.tradeState == "SUCCESS") {
             payFlag++;
-            if(payFlag==1){
+            if (payFlag == 1) {
               successPay.value = true;
               let liveTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
               let livedata = {
@@ -5695,7 +5727,7 @@ const paymentCodeClick = async () => {
                   if (res.data.code == 200) {
                     passForm.pass = res.data.data.houseOrder.keyPassWord;
                     passForm.reserveLiveTime = dayjs(
-                      res.data.data.houseOrder.liveTime
+                      res.data.data.houseOrder.liveTime,
                     ).format("YYYY-MM-DD HH:mm:ss");
                     passForm.reserveLeaveTime =
                       res.data.data.houseOrder.reserveLeaveTime;
@@ -5722,11 +5754,11 @@ const paymentCodeClick = async () => {
             }
             console.log(payFlag);
             clearInterval(timer.value);
-            timer.value = null;       
-          }  else {
-              successPay.value = false;
-              payPriceSuccess.value = false;
-            }
+            timer.value = null;
+          } else {
+            successPay.value = false;
+            payPriceSuccess.value = false;
+          }
         } else {
         }
       }, 2000);
@@ -6081,7 +6113,7 @@ const cancelMaintain = () => {
   maintainVisible.value = false;
 };
 const maintainConfirm = lodash.throttle(async (formEl) => {
-  maintainLoading.value=true;
+  maintainLoading.value = true;
   if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
@@ -6105,9 +6137,9 @@ const maintainConfirm = lodash.throttle(async (formEl) => {
         getList();
         maintainVisible.value = false;
         maintainRef.value.resetFields();
-        maintainLoading.value=false;
+        maintainLoading.value = false;
       } else {
-        maintainLoading.value=false;
+        maintainLoading.value = false;
         ElMessage({
           type: "error",
           showClose: true,
@@ -6121,7 +6153,7 @@ const maintainConfirm = lodash.throttle(async (formEl) => {
   });
 }, 1500);
 // 取消维修功能
-const maintainCancel =lodash.throttle( async (row) => {
+const maintainCancel = lodash.throttle(async (row) => {
   roomLoading.value = true; // 加载页面
   let data = {
     houseNumberId: row.houseNumberId,
@@ -6156,7 +6188,7 @@ const maintainCancel =lodash.throttle( async (row) => {
       center: true,
     });
   }
-},5000);
+}, 5000);
 
 //导出功能
 const importExcel = lodash.debounce(async () => {
@@ -6356,7 +6388,7 @@ onUnmounted(() => {
   }
 
   .footer {
-    flex:1;
+    flex: 1;
     width: calc(100% - 61px);
     // height: calc(100% - 82px);
     margin: 0 auto 20px;
@@ -6965,7 +6997,7 @@ onUnmounted(() => {
         .changeItemss {
           /* // margin: 20px 0; */
           width: 130px;
-          
+
           .changeNews {
             margin: 15px 0;
             height: 40px;

src/views/roomType/roomType.vue

@@ -758,6 +758,12 @@ const getList = async () => {
     total.value = res.data.data.totalCount;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/staff/staff.vue

@@ -544,6 +544,12 @@ const getList = async () => {
     total.value = res.data.data.total;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/statement/statement.vue

@@ -644,6 +644,12 @@ const getList = async () => {
     loading.value = false;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/system/system.vue

@@ -856,6 +856,12 @@ const getList = async () => {
     systemData.openingTime = res.data.data.openingTime;
     systemData.phoneNumbr = res.data.data.phoneNumbr;
   } else {
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/user/user.vue

@@ -520,6 +520,12 @@ const getList = async () => {
     total.value = res.data.data.total;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,

src/views/userRoles/userRoles.vue

@@ -1527,6 +1527,12 @@ const getList = async () => {
     total.value = res.data.data.total;
   } else {
     loading.value = false;
+    if (res.data.code == 500) {
+      console.log(res.data);
+      if (res.data.message == "无效token,请重新登入") {
+        router.push({ path: "/login" });
+      }
+    }
     ElMessage({
       type: "error",
       showClose: true,