diff --git a/src/api/modules/labor.ts b/src/api/modules/labor.ts
index b2b3d44..8786bf7 100644
--- a/src/api/modules/labor.ts
+++ b/src/api/modules/labor.ts
@@ -63,3 +63,8 @@ export const getworkerAttendanceTrendApi = (params: {}) => {
export const getComapnyWorkTotalListApi = (params: {}) => {
return http.post(BASEURL + `/xmgl/workerInfo/selectProjectComapnyWorkTotalList`, params, { headers: { noLoading: true } });
};
+
+// 获取闸机列表
+export const getUfaceDevListApi = (params: {}) => {
+ return http.post(BASEURL + `/xmgl/ufaceDev/list`, params, { headers: { noLoading: true } });
+};
diff --git a/src/config/config.ts b/src/config/config.ts
index 6451d29..9a0ce76 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -23,9 +23,9 @@ export const BAIDU_MAP_KEY: string = "";
export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目
-export const COMPANY: string = ""; //标准版
+// export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "zhzrf"; //中海·臻如府
-// export const COMPANY: string = "zsbf"; //中水北方
+export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "tj"; // 同济项目
diff --git a/src/views/sevenLargeScreen/laborManagement/leftTop.vue b/src/views/sevenLargeScreen/laborManagement/leftTop.vue
index 763ad7a..1d8a00f 100644
--- a/src/views/sevenLargeScreen/laborManagement/leftTop.vue
+++ b/src/views/sevenLargeScreen/laborManagement/leftTop.vue
@@ -75,6 +75,11 @@
>
+
+
+
+
+
查询
@@ -118,11 +123,11 @@
班组/部门:
- {{ item.teamName || '-' }}
+ {{ item.teamName || "-" }}
闸机名称:
- {{ item.passagewayName || '-' }}
+ {{ item.passagewayName || "-" }}
@@ -197,7 +202,8 @@ import {
getRealTimeMoreDataApi,
getDepartDataList,
getTeamDataList,
- getCompanyDataList
+ getCompanyDataList,
+ getUfaceDevListApi
} from "@/api/modules/labor";
import { GlobalStore } from "@/stores";
const BASEURL = import.meta.env.VITE_API_URL;
@@ -217,10 +223,12 @@ const searchForm = reactive({
teamId: "",
departmentId: "",
enterpriseId: "",
+ devSn: "",
startTime: null,
endTime: null
});
const rangeTime = ref([]);
+const ufaceDevList = ref([]);
let xData = ref([]);
let yData = ref([]);
@@ -411,6 +419,14 @@ const openDialogHistoryData = (tip: any) => {
emits("openDialog", { type: 2, tip });
};
+// 获取闸机列表
+const getUfaceDevList = async () => {
+ const res = await getUfaceDevListApi({ projectSn: store.sn });
+ if (res.code == 200) {
+ ufaceDevList.value = res.result;
+ }
+};
+
const timeChange = (e: any) => {
searchForm.startTime = e[0];
searchForm.endTime = e[1];
@@ -544,6 +560,7 @@ const reset = () => {
searchForm.enterpriseId = "";
searchForm.startTime = null;
searchForm.endTime = null;
+ searchForm.devSn = "";
rangeTime.value = [];
getCrewRealTimeData();
};
@@ -557,6 +574,7 @@ defineExpose({
loadMethod
});
onMounted(async () => {
+ getUfaceDevList();
getPersonList();
getQueryTodayList();
getCrewRealTimeData();
@@ -670,7 +688,7 @@ onMounted(async () => {
gap: 4px;
.search-item {
@include flex;
- max-width: 20%;
+ max-width: 14%;
// margin-right: 20px;
span {
color: white;