From c0917ad406e1216de1acbb2b926aeb871497c018 Mon Sep 17 00:00:00 2001
From: liangbin <15536829364@163.com>
Date: Tue, 3 Feb 2026 09:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=92=8C=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

统一将日期格式从'yyyy-MM-dd'改为'YYYY-MM-DD'
修改登录后默认跳转至企业管理系统
修复账号管理页面跳转参数错误
移除首页路由配置
优化出入证签发时间处理和显示
---
 src/router/index.js                           | 26 +++++++++----------
 src/views/Logistics/FilingReview/index.vue    |  2 +-
 .../Logistics/ProjectOverviewQuery/index.vue  |  2 +-
 .../EntryExitPermitIssue/DialogBox.vue        | 10 ++++++-
 .../Proprietor/EntryExitPermitIssue/index.vue | 18 ++++++++++---
 .../Proprietor/TicketIssueAudit/index.vue     |  2 +-
 .../BallheadCamera/InventoryAudit.vue         |  4 +--
 .../Tenement/BallheadCamera/StandingBook.vue  |  2 +-
 .../AccountManagement.vue                     |  4 +--
 .../Tenement/EnterpriseManagement/index.vue   |  5 ++--
 src/views/login.vue                           |  3 ++-
 11 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index ebe890c..5cd299b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,19 +57,19 @@ export const constantRoutes = [
     component: () => import("@/views/error/401"),
     hidden: true,
   },
-  {
-    path: "",
-    component: Layout,
-    redirect: "/index",
-    children: [
-      {
-        path: "/index",
-        component: () => import("@/views/index"),
-        name: "Index",
-        meta: { title: "首页", icon: "dashboard", affix: true },
-      },
-    ],
-  },
+  // {
+  //   path: "",
+  //   component: Layout,
+  //   redirect: "/index",
+  //   children: [
+  //     {
+  //       path: "/index",
+  //       component: () => import("@/views/index"),
+  //       name: "Index",
+  //       meta: { title: "首页", icon: "dashboard", affix: true },
+  //     },
+  //   ],
+  // },
 
   // 物业模块START
   {
diff --git a/src/views/Logistics/FilingReview/index.vue b/src/views/Logistics/FilingReview/index.vue
index 0dcfe97..fd05e3b 100644
--- a/src/views/Logistics/FilingReview/index.vue
+++ b/src/views/Logistics/FilingReview/index.vue
@@ -14,7 +14,7 @@
                 </el-select>
             </el-form-item> -->
             <el-form-item label="提交时间">
-                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
                     range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
 
diff --git a/src/views/Logistics/ProjectOverviewQuery/index.vue b/src/views/Logistics/ProjectOverviewQuery/index.vue
index 455b46f..78792b2 100644
--- a/src/views/Logistics/ProjectOverviewQuery/index.vue
+++ b/src/views/Logistics/ProjectOverviewQuery/index.vue
@@ -54,7 +54,7 @@
                 </el-col>
                 <el-col :span="6">
                     <el-form-item label="作业时间">
-                        <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                        <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
                             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
                     </el-form-item>
                 </el-col>
diff --git a/src/views/Proprietor/EntryExitPermitIssue/DialogBox.vue b/src/views/Proprietor/EntryExitPermitIssue/DialogBox.vue
index 7752209..73f4c50 100644
--- a/src/views/Proprietor/EntryExitPermitIssue/DialogBox.vue
+++ b/src/views/Proprietor/EntryExitPermitIssue/DialogBox.vue
@@ -47,7 +47,7 @@
             <el-form label-width="120px" label-position="top" :model="formData">
                 <el-form-item label="出入证有效期">
                     <div style="width: 200px;">
-                        <el-date-picker v-model="formData.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                        <el-date-picker v-model="formData.dateRange" type="daterange" value-format="YYYY-MM-DD"
                             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                     </div>
 
@@ -96,6 +96,7 @@
 </template>
 
 <script setup>
+import dayjs from 'dayjs'
 import { ref, onMounted } from 'vue'
 import { Delete } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
@@ -167,6 +168,13 @@ const handleSubmit = async () => {
         ...detailData.value,
         vehicleList: vehicleList.value
     }
+    if (!formData.value.dateRange || formData.value.dateRange.length !== 2) {
+        ElMessage.error('请选择作业时间')
+        return
+    } else {
+        pamams.validityStartTime = dayjs(formData.value.dateRange[0]).format('YYYY-MM-DD 08:00:00')
+        pamams.validityEndTime = dayjs(formData.value.dateRange[1]).format('YYYY-MM-DD 18:00:00')
+    }
     let res = await SignPassageway(pamams)
     if (res.code === 200) {
         ElMessage.success('签发成功')
diff --git a/src/views/Proprietor/EntryExitPermitIssue/index.vue b/src/views/Proprietor/EntryExitPermitIssue/index.vue
index 517dd7b..e1bbd96 100644
--- a/src/views/Proprietor/EntryExitPermitIssue/index.vue
+++ b/src/views/Proprietor/EntryExitPermitIssue/index.vue
@@ -42,11 +42,15 @@
                     <el-button type="info" size="default">打印</el-button>
                 </div>
             </div>
-            <el-table :data="tableData" :loading="loading">
+            <el-table :data="tableData" :loading="loading" height="480px">
                 <el-table-column prop="projectName" label="项目名称"></el-table-column>
                 <el-table-column prop="permitNumber" label="票证编号"></el-table-column>
-                <el-table-column prop="projectName" label="施工单位"></el-table-column>
-                <el-table-column prop="validityStartTime;" label="作业时间"></el-table-column>
+                <el-table-column prop="constructionUnitName" label="施工单位"></el-table-column>
+                <el-table-column prop="validityStartTime;" label="作业时间">
+                    <template #default="scope">
+                        {{ formatTime(scope.row.validityStartTime) }} 至 {{ formatTime(scope.row.validityEndTime) }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="sysUserListLength" label="成员数量">
                     <template #default="scope">
                         {{ scope.row.sysUserList?.length }}
@@ -131,6 +135,14 @@ onMounted(() => {
     getList();
 });
 
+// 格式化时间
+const formatTime = (time) => {
+    if (!time) {
+        return '';
+    }
+    return dayjs(time).format('YYYY-MM-DD');
+}
+
 // 获取出入证状态类型
 const getStatusType = (status) => {
     if (status === null || status === undefined) {
diff --git a/src/views/Proprietor/TicketIssueAudit/index.vue b/src/views/Proprietor/TicketIssueAudit/index.vue
index d1cdf61..6fddc0c 100644
--- a/src/views/Proprietor/TicketIssueAudit/index.vue
+++ b/src/views/Proprietor/TicketIssueAudit/index.vue
@@ -14,7 +14,7 @@
                 <el-input v-model="queryForm.keyword" placeholder="请输入项目名称/编号"></el-input>
             </el-form-item>
             <el-form-item label="提交时间">
-                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
                     range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <el-form-item label="签发人">
diff --git a/src/views/Tenement/BallheadCamera/InventoryAudit.vue b/src/views/Tenement/BallheadCamera/InventoryAudit.vue
index 0c368b5..ad8cf11 100644
--- a/src/views/Tenement/BallheadCamera/InventoryAudit.vue
+++ b/src/views/Tenement/BallheadCamera/InventoryAudit.vue
@@ -3,7 +3,7 @@
     <div class="MainBox">
         <el-form :model="queryForm" inline class="card-box mb-4">
             <el-form-item label="时间范围">
-                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
                     range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <el-form-item label="所属项目">
@@ -29,7 +29,7 @@
                 <el-table-column prop="projectName" label="所属项目"></el-table-column>
                 <el-table-column prop="remark" label="回收核验结果"></el-table-column>
                 <el-table-column prop="returnBy" label="回收人"></el-table-column>
-                <el-table-column prop="returnTime" label="提交入库时间" format="yyyy-MM-dd HH:mm:ss">
+                <el-table-column prop="returnTime" label="提交入库时间" format="YYYY-MM-DD HH:mm:ss">
                     <template #default="scope">
                         {{ formatDate(scope.row.returnTime) }}
                     </template>
diff --git a/src/views/Tenement/BallheadCamera/StandingBook.vue b/src/views/Tenement/BallheadCamera/StandingBook.vue
index e9a2ebb..60d29e5 100644
--- a/src/views/Tenement/BallheadCamera/StandingBook.vue
+++ b/src/views/Tenement/BallheadCamera/StandingBook.vue
@@ -50,7 +50,7 @@
 
         <el-form :model="queryForm" inline class="card-box mb-4">
             <el-form-item label="采购时间">
-                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
                     range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
             </el-form-item>
             <el-form-item label="设备状态">
diff --git a/src/views/Tenement/EnterpriseManagement/AccountManagement.vue b/src/views/Tenement/EnterpriseManagement/AccountManagement.vue
index 0ee3c6d..fd7bdd2 100644
--- a/src/views/Tenement/EnterpriseManagement/AccountManagement.vue
+++ b/src/views/Tenement/EnterpriseManagement/AccountManagement.vue
@@ -14,7 +14,7 @@
 
         <el-form :model="queryForm" inline class="card-box mb-4">
             <el-form-item label="时间范围">
-                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
+                <el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
                     range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
             </el-form-item>
             <el-form-item label="状态">
@@ -47,7 +47,7 @@
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column prop="userName" label="账号名"></el-table-column>
                 <el-table-column prop="nickName" label="姓名"></el-table-column>
-                <el-table-column prop="roleName" label="角色"></el-table-column>
+                <el-table-column prop="roleNames" label="角色"></el-table-column>
                 <el-table-column prop="phonenumber" label="手机号"></el-table-column>
                 <el-table-column prop="status" label="状态">
                     <template #default="scope">
diff --git a/src/views/Tenement/EnterpriseManagement/index.vue b/src/views/Tenement/EnterpriseManagement/index.vue
index c0316f2..7fe2dad 100644
--- a/src/views/Tenement/EnterpriseManagement/index.vue
+++ b/src/views/Tenement/EnterpriseManagement/index.vue
@@ -44,7 +44,7 @@
                         {{ getUnitTypeName(scope.row.deptType) }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="areaName" label="所属区域"></el-table-column>
+                <el-table-column prop="address" label="所属区域"></el-table-column>
                 <el-table-column prop="createTime" label="建档时间"></el-table-column>
                 <el-table-column prop="status" label="状态">
                     <template #default="scope">
@@ -175,14 +175,13 @@ const handlePageChange = (val) => {
 
 // 跳转到新增单位建档
 const handleAddEnterprise = () => {
-    console.log("新增单位建档", router);
     router.push(`/Tenement/newEnterprise?enterpriseType=${activeTab.value}`);
 };
 
 // 跳转到账号管理
 const handleAccountManagement = (row) => {
     console.log("账号管理", row);
-    router.push(`/Tenement/accountManagement?enterpriseName=${row.unitName || row.name}&unitId=${row.unitId || row.id}&deptId=${row.deptId}`);
+    router.push(`/Tenement/accountManagement?enterpriseName=${row.deptName}&unitId=${row.unitId || row.id}&deptId=${row.deptId}`);
 };
 
 // 跳转到编辑单位建档
diff --git a/src/views/login.vue b/src/views/login.vue
index 9d491ad..8a4065c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -128,7 +128,8 @@ function handleLogin() {
           }
           return acc
         }, {})
-        router.push({ path: redirect.value || "/", query: otherQueryParams })
+        console.log("登录成功-跳转页面",redirect.value)
+        router.push({ path: "/Tenement/enterpriseManagement", query: otherQueryParams })
       }).catch(() => {
         loading.value = false
         // 重新获取验证码