@@ -220,6 +229,7 @@ const getVideoList = async () => {
const bgImgSet = (index: any) => {
return bgImgList.value[index % bgImgList.value.length];
};
+
// 获取顶部数据
const getQualityStatisticsNumDataFn = async (tip: any) => {
let requestData: any = {
@@ -283,6 +293,11 @@ const getCompanyList = async () => {
enterpriseListData.value = res.result;
}
};
+let total = ref(0 as any);
+const onCurrentChange = (event: number) => {
+ pageNo.value = event;
+ getMemberCountList(true);
+};
//获取数据
const getMemberCountList = async (tip: any) => {
let requestData: any = {
@@ -290,7 +305,7 @@ const getMemberCountList = async (tip: any) => {
hardwareName: searchForm.value.hardwareName,
alarmTypeName: searchForm.value.alarmTypeName,
pageNo: tip == "search" ? 1 : pageNo.value,
- pageSize: 100,
+ pageSize: 10,
isPushed: 1
};
if(searchForm.value.dateRange && searchForm.value.dateRange.length > 0){
@@ -298,20 +313,22 @@ const getMemberCountList = async (tip: any) => {
requestData.endTime = searchForm.value.dateRange[1]
}
const res: any = await getAlarmRecordApi(requestData);
- if (tip == "more") {
- partyMemberList.value = partyMemberList.value.concat(res.result.records);
- } else {
- partyMemberList.value = res.result.records;
- }
- // 为图片拼接IP
- // partyMemberList.value.map((item:any) => {
- // item.fieldAcquisitionUrl = BASEURL + '/image/' + item.fieldAcquisitionUrl
- // })
- if (res.result.pages == pageNo.value) {
- moreScroll.value = false;
- } else {
- pageNo.value = pageNo.value + 1;
- }
+ partyMemberList.value = res.result.records;
+ total.value = Number(res.result.total);
+ // if (tip == "more") {
+ // partyMemberList.value = partyMemberList.value.concat(res.result.records);
+ // } else {
+ // partyMemberList.value = res.result.records;
+ // }
+ // // 为图片拼接IP
+ // // partyMemberList.value.map((item:any) => {
+ // // item.fieldAcquisitionUrl = BASEURL + '/image/' + item.fieldAcquisitionUrl
+ // // })
+ // if (res.result.pages == pageNo.value) {
+ // moreScroll.value = false;
+ // } else {
+ // pageNo.value = pageNo.value + 1;
+ // }
};
// onBeforeMount(async () => {
// getVideoList();
@@ -321,17 +338,17 @@ onMounted(async () => {
await getMemberCountList("search");
await getQualityStatisticsNumDataFn("search");
getWarnTypeOption();
- refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
- const scrollTop = e.target.scrollTop;
- const scrollHeight = e.target.scrollHeight;
- const clientHeight = e.target.clientHeight;
- // 向上加载更多
- if (scrollTop >= scrollHeight - clientHeight - 1) {
- if (moreScroll.value) {
- getMemberCountList("more");
- }
- }
- });
+ // refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+ // const scrollTop = e.target.scrollTop;
+ // const scrollHeight = e.target.scrollHeight;
+ // const clientHeight = e.target.clientHeight;
+ // // 向上加载更多
+ // if (scrollTop >= scrollHeight - clientHeight - 1) {
+ // if (moreScroll.value) {
+ // getMemberCountList("more");
+ // }
+ // }
+ // });
refAlarmScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
@@ -811,7 +828,7 @@ const previewVideo = (data: string | null) => {
}
}
.listBox {
- height: 82%;
+ height: 68%;
.listStyle {
display: flex;
align-items: center;
diff --git a/src/views/commandScreen/dialogCompnnents/major-hidder.vue b/src/views/commandScreen/dialogCompnnents/major-hidder.vue
index 20849c5..541dd29 100644
--- a/src/views/commandScreen/dialogCompnnents/major-hidder.vue
+++ b/src/views/commandScreen/dialogCompnnents/major-hidder.vue
@@ -77,6 +77,15 @@
暂无数据
-
-
{{item.weekBetweenStr}}
+
+
{{ item.weekBetweenStr }}
安全隐患数量：{{ item.dangerNum }}
未整改隐患次数：{{ item.rectificationNum }}
重大隐患次数：{{ item.greatFaultLevelNum }}
@@ -92,36 +92,45 @@
隐患描述及要求
整改时限
检查人
-
检查时间
+
检查时间
整改人
分包单位
-
{{index + 1}}
-
{{item.status?textFilter(item.status):''}}
-
{{item.level?levelListData[item.level - 1].name:''}}
-
{{item.regionName}}
+
{{ index + 1 }}
+
{{ item.status ? textFilter(item.status) : "" }}
+
{{ item.level ? levelListData[item.level - 1].name : "" }}
+
{{ item.regionName }}
- {{item.dangerItemContent}}
+ {{ item.dangerItemContent }}
- {{item.changeLimitTime}}
+ {{ item.changeLimitTime }}
-
{{item.inspectManName}}
-
{{item.inspectTime}}
-
{{item.changeName}}
-
{{item.enterpriseName}}
+
{{ item.inspectManName }}
+
{{ item.inspectTime }}
+
{{ item.changeName }}
+
{{ item.enterpriseName }}
暂无数据
+
@@ -131,7 +140,13 @@
import { ref, onMounted } from "vue";
import { GlobalStore } from "@/stores";
import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor";
-import { getQualityStatisticsNumDataApi, getProjectEnterpriseApi, getSystemUserApi,getSystemUserBySnApi, getInspectionRecordApi } from "@/api/modules/agjtCommandApi";
+import {
+ getQualityStatisticsNumDataApi,
+ getProjectEnterpriseApi,
+ getSystemUserApi,
+ getSystemUserBySnApi,
+ getInspectionRecordApi
+} from "@/api/modules/agjtCommandApi";
const store = GlobalStore();
const props = defineProps(["tip"]);
const BASEURL = import.meta.env.VITE_API_URL;
@@ -143,7 +158,7 @@ const levelListData = ref([
{ name: "二级", value: 2 },
{ name: "三级", value: 3 },
{ name: "四级", value: 4 }
-])
+]);
const statusList = ref([
// { name: "无需整改", value: 1 },
{ name: "待整改", value: 2 },
@@ -151,36 +166,36 @@ const statusList = ref([
{ name: "待核验", value: 4 },
{ name: "合格", value: 5 },
// { name: "已撤回", value: 6 },
- { name: "超期未关闭", value: 7 },
+ { name: "超期未关闭", value: 7 }
]);
let pageNo = ref(1 as any);
let moreScroll = ref(true as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
const searchForm = ref({
- status: '',
- inspectManId: '',
- changeId: '',
- enterpriseId: '',
- level: ''
+ status: "",
+ inspectManId: "",
+ changeId: "",
+ enterpriseId: "",
+ level: ""
});
-const topDangerList = ref([] as any)
+const topDangerList = ref([] as any);
const partyMemberList = ref({} as any);
// 文本处理
-const textFilter = (val:any) => {
- let findItem:any = statusList.value.find(item => {
+const textFilter = (val: any) => {
+ let findItem: any = statusList.value.find(item => {
return item.value == val;
- })
- return findItem.name
-}
+ });
+ return findItem.name;
+};
// 条件查询
const conditionSearch = async () => {
- getMemberCountList('search')
-}
+ getMemberCountList("search");
+};
// 获取检查人
const getSystemUserBySn = async () => {
let data = {
sn: store.sn,
- queryType: "projectLevelAndChildren",
+ queryType: "projectLevelAndChildren"
};
const res: any = await getSystemUserBySnApi(data);
if (res.code == 200) {
@@ -201,8 +216,8 @@ const getSystemUserFn = async () => {
const getDivisionUnitFn = async () => {
let data = {
projectSn: store.sn,
- pageNo: 1,
- pageSize: 999
+ pageNo: 1,
+ pageSize: 999
};
const res: any = await getProjectEnterpriseApi(data);
if (res.code == 200) {
@@ -217,7 +232,7 @@ const getQualityStatisticsNumDataFn = async () => {
};
const res: any = await getQualityStatisticsNumDataApi(data);
if (res.code == 200) {
- topDangerList.value = res.result || []
+ topDangerList.value = res.result || [];
}
};
@@ -233,37 +248,45 @@ const getCompanyList = async () => {
enterpriseListData.value = res.result;
}
};
+let total = ref(0 as any);
+const onCurrentChange = (event: number) => {
+ pageNo.value = event;
+ getMemberCountList(true);
+};
//获取数据
-const getMemberCountList = async (tip:any) => {
- let requestData:any = {
+const getMemberCountList = async (tip: any) => {
+ let requestData: any = {
projectSn: store.sn,
...searchForm.value,
- pageNo: tip == 'search'?1:pageNo.value,
- pageSize: 100,
+ pageNo: tip == "search" ? 1 : pageNo.value,
+ pageSize: 10,
recordType: 1,
- }
- if(props.tip == '实时'){
+ recordStatus: 8
+ };
+ if (props.tip == "实时") {
requestData.presence = 1;
- } else if(props.tip == '日累积') {
+ } else if (props.tip == "日累积") {
requestData.attendance = 1;
} else {
requestData.inserviceType = 1;
}
const res: any = await getInspectionRecordApi(requestData);
- if(tip == 'more'){
- partyMemberList.value = partyMemberList.value.concat(res.result.page.records.filter((item:any) => item.status != 6));
- } else {
- partyMemberList.value = res.result.page.records.filter((item:any) => item.status != 6);
- }
+ partyMemberList.value = res.result.page.records;
+ total.value = Number(res.result.page.total);
+ // if(tip == 'more'){
+ // partyMemberList.value = partyMemberList.value.concat(res.result.page.records.filter((item:any) => item.status != 6));
+ // } else {
+ // partyMemberList.value = res.result.page.records.filter((item:any) => item.status != 6);
+ // }
// 为图片拼接IP
// partyMemberList.value.map((item:any) => {
// item.fieldAcquisitionUrl = BASEURL + '/image/' + item.fieldAcquisitionUrl
// })
- if (res.result.pages == pageNo.value) {
- moreScroll.value = false;
- } else {
- pageNo.value = pageNo.value + 1;
- }
+ // if (res.result.pages == pageNo.value) {
+ // moreScroll.value = false;
+ // } else {
+ // pageNo.value = pageNo.value + 1;
+ // }
};
onMounted(async () => {
@@ -272,27 +295,27 @@ onMounted(async () => {
await getSystemUserBySn();
await getSystemUserFn();
await getQualityStatisticsNumDataFn();
- await getMemberCountList('search');
- refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
- const scrollTop = e.target.scrollTop;
- const scrollHeight = e.target.scrollHeight;
- const clientHeight = e.target.clientHeight;
- // 向上加载更多
- if (scrollTop >= scrollHeight - clientHeight - 1) {
- if (moreScroll.value) {
- getMemberCountList("more");
- }
- }
- });
+ await getMemberCountList(true);
+ // refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+ // const scrollTop = e.target.scrollTop;
+ // const scrollHeight = e.target.scrollHeight;
+ // const clientHeight = e.target.clientHeight;
+ // // 向上加载更多
+ // if (scrollTop >= scrollHeight - clientHeight - 1) {
+ // if (moreScroll.value) {
+ // getMemberCountList("more");
+ // }
+ // }
+ // });
});
+}
+