fix: 日期选择bug修复&表格设置最大高度

src/api/datamanagement/dataplatform.ts

@@ -11,7 +11,7 @@ export interface UserAccessRecordQueryParams {
   /** 查询员工姓名 */
   nickname?: string;
   /** 查询工号 */
-  username?: string;
+  stuffNo?: string;
   /** 查询部门ID */
   deptId?: string;
   /** 设置排序字段 */
@@ -24,8 +24,13 @@ export interface UserAccessRecordQueryParams {
  * @description: 用户访问记录列表数据
  */
 export interface UserAccessRecord {
+  /** 系统分配id */
   userId: number;
+  /** 登录账户名 */
   username: string;
+  /** 工号 */
+  stuffNo: string;
+  /** 姓名 */
   nickname: string;
   deptId: number;
   deptName: string;
@@ -103,9 +108,9 @@ export interface CameraVisitedTimes {
  */
 export const getCameraVisitedTimes = (params: ChartQuery) => {
   return http.request<CameraVisitedTimes[]>({
-    url: '/userRecord/statisticByCamera',
+    url: `/userRecord/statisticByCamera?startTime=${params.startTime}&endTime=${params.endTime}&workshopList=${params.workshopList?.join(',')}`,
+    // url: '/userRecord/statisticByCamera'+"?startTime="+params.startTime+"&endTime="+params.endTime+"&workshopList="+params.workshopList,
     method: 'get',
-    params,
   });
 };
 

src/views/datamanager/platformdata/compoents/common/DialogNavBar.vue

@@ -26,6 +26,7 @@
       start-placeholder="开始日期"
       end-placeholder="结束日期"
       :shortcuts="shortcuts"
+      :default-time="[new Date().setHours(0, 0, 0, 0), new Date().setHours(23, 59, 59, 999)]"
       style="max-width: 299px"
     ></el-date-picker>
     <el-button @click="onSearch" type="primary" style="width: 65px; height: 32px; margin-left: 16px"
@@ -112,21 +113,22 @@
     {
       text: '今天',
       value: () => {
-        return [new Date().setHours(0, 0, 0, 0), new Date()];
+        return [new Date().setHours(0, 0, 0, 0), new Date().setHours(23, 59, 59, 999)];
       },
     },
     {
       text: '本月',
       value: () => {
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * (start.getDate() - 1));
+        const start = new Date(
+          new Date().getTime() - 3600 * 1000 * 24 * (new Date().getDate() - 1),
+        ).setHours(0, 0, 0, 0);
         return [start, new Date()];
       },
     },
     {
       text: '累计',
       value: () => {
-        return [new Date(2000, 1, 1, 0, 0, 0), new Date()];
+        return [new Date(2000, 1, 1, 0, 0, 0, 0), new Date()];
       },
     },
   ];
@@ -143,4 +145,16 @@
     justify-content: flex-start;
     align-items: center;
   }
+  .el-select-dropdown.is-multiple .el-select-dropdown__item.is-selected:after {
+    left: 5px;
+  }
+  .el-select-dropdown__item.is-selected {
+    font-weight: inherit;
+  }
+  :deep(.el-checkbox__label) {
+    padding-left: 2px;
+  }
+  :deep(.el-checkbox__input) {
+    margin-left: 4px;
+  }
 </style>

src/views/datamanager/platformdata/compoents/common/PlatformTable.vue

@@ -25,6 +25,7 @@
       </div>
     </div>
     <el-table
+      max-height="calc(100vh - 350px)"
       style="width: 100%; margin-top: 18px"
       stripe
       :data="tableData.list"
@@ -158,16 +159,16 @@
       delete tableQueryParams.value.sortType;
     }
     tableQueryParams.value.pageNumber = 1;
-    console.log(tableQueryParams.value);
+    // console.log(tableQueryParams.value);
     // TODO 替换
-    // emits('tableParamsChanged', tableQueryParams.value);
+    emits('tableParamsChanged', tableQueryParams.value);
   };
 
   // 复用输入框类型和变化事件
   const tableQueryType = ref<string>('姓名');
   const handleTableQueryTypeChange = (v: string) => {
     if (v === '姓名') {
-      delete tableQueryParams.value.username;
+      delete tableQueryParams.value.stuffNo;
     } else {
       delete tableQueryParams.value.nickname;
     }
@@ -179,7 +180,7 @@
     if (tableQueryType.value === '姓名') {
       tableQueryParams.value.nickname = tableQueryTypeContent.value;
     } else {
-      tableQueryParams.value.username = tableQueryTypeContent.value;
+      tableQueryParams.value.stuffNo = tableQueryTypeContent.value;
     }
     emits('tableParamsChanged', tableQueryParams.value);
   }

src/views/datamanager/platformdata/compoents/query/Query.vue

@@ -95,8 +95,8 @@
     pageSize: 10,
     // nickname: '',
     // username: '',
-    // sortKey: '',
-    // sortType: '',
+    sortKey: 'statisticAll',
+    sortType: 'asc',
   });
   const tableData = ref<UserAccessRecordList>();
   watch(