-
@@ -126,46 +142,76 @@
import { ref, onMounted } from "vue";
import { GlobalStore } from "@/stores";
import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor";
-import type { TabsPaneContext } from 'element-plus'
+import { getQualityStatisticsNumDataApi, getProjectEnterpriseApi, getSystemUserApi, getInspectionRecordApi } from "@/api/modules/agjtCommandApi";
const store = GlobalStore();
const props = defineProps(["tip"]);
const BASEURL = import.meta.env.VITE_API_URL;
-const activeName = ref('first')
-const activeIndex = ref('1' as any)
-const onlineWorkList = ref([
- { name: "在职", value: 1 },
- { name: "离职", value: 2 }
-])
+const inspectList = ref([] as any);
const enterpriseListData = ref([] as any);
-const memberTypeList = ref([
- { name: "劳务人员", value: 1 },
- { name: "管理人员", value: 2 },
- { name: "临时人员", value: 3 }
+const levelListData = ref([
+ { name: "重大隐患", value: 1 },
+ { name: "较大隐患", value: 2 },
+ { name: "一般隐患", value: 3 },
+ { name: "低隐患", value: 4 }
+])
+const statusList = ref([
+ { name: "无需整改", value: 1 },
+ { name: "待整改", value: 2 },
+ { name: "待复查", value: 3 },
+ { name: "待核验", value: 4 },
+ { name: "合格", value: 5 },
+ { name: "不合格", value: 6 },
+ { name: "超期未关闭", value: 7 },
]);
-const alarmTypeList = ref(["报警", "预警"]);
let pageNo = ref(1 as any);
let moreScroll = ref(true as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
-const deviceList = ref([] as any); // 设备列表
const searchForm = ref({
- memberType: '',
- belongCompany: '',
- workState: '',
- name: '',
- idCard: ''
+ status: '',
+ inspectId: '',
+ changeId: '',
+ enterpriseId: '',
+ level: ''
});
-
+const topDangerList = ref([] as any)
const partyMemberList = ref({} as any);
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-// console.log(tab, event)
-// console.log('tab',tab.index)
-// console.log('activeName',activeName.value)
-// if(activeName.value === 'first') console.log('1')
-// if(activeName.value === 'second') console.log('2')
-// if(activeName.value === 'third') console.log('3')
- activeIndex.value = tab.index
- console.log('activeIndex',activeIndex.value)
-}
+// 获取整改人、检查人
+const getSystemUserFn = async () => {
+ let data = {
+ projectSn: store.sn
+ };
+ const res: any = await getSystemUserApi(data);
+ if (res.code == 200) {
+ console.log("整改人、检查人",res)
+ inspectList.value = res.result;
+ }
+};
+// 获取分包单位
+const getDivisionUnitFn = async () => {
+ let data = {
+ projectSn: store.sn,
+ pageNo: 1,
+ pageSize: 999
+ };
+ const res: any = await getProjectEnterpriseApi(data);
+ if (res.code == 200) {
+ console.log("分包单位",res)
+ enterpriseListData.value = res.result.records;
+ }
+};
+// 获取顶部数据
+const getQualityStatisticsNumDataFn = async () => {
+ let data = {
+ projectSn: store.sn,
+ isStatsByWeek: 1
+ };
+ const res: any = await getQualityStatisticsNumDataApi(data);
+ if (res.code == 200) {
+ console.log("安全隐患顶部数据",res)
+ topDangerList.value = res.result || []
+ }
+};
+
//获取企业列表
const getCompanyList = async () => {
let data = {
@@ -182,11 +228,7 @@ const getCompanyList = async () => {
const getMemberCountList = async (tip:any) => {
let requestData:any = {
projectSn: store.sn,
- personType: searchForm.value.memberType, //人员类型
- enterpriseId: searchForm.value.belongCompany, //所属企业
- inserviceType: searchForm.value.workState, //在职状态
- idCard: searchForm.value.idCard, //身份证号
- workerName: searchForm.value.name, //姓名
+ ...searchForm.value,
pageNo: tip == 'search'?1:pageNo.value,
pageSize: 100
}
@@ -197,12 +239,12 @@ const getMemberCountList = async (tip:any) => {
} else {
requestData.inserviceType = 1;
}
- const res: any = await getMemberInfoList(requestData);
- console.log("获取人员信息列表", res);
+ const res: any = await getInspectionRecordApi(requestData);
+ console.log("获取安全隐患底部列表", res);
if(tip == 'more'){
- partyMemberList.value = partyMemberList.value.concat(res.result.records);
+ partyMemberList.value = partyMemberList.value.concat(res.result.page.records);
} else {
- partyMemberList.value = res.result.records;
+ partyMemberList.value = res.result.page.records;
}
// 为图片拼接IP
// partyMemberList.value.map((item:any) => {
@@ -217,6 +259,9 @@ const getMemberCountList = async (tip:any) => {
onMounted(async () => {
await getCompanyList();
+ await getDivisionUnitFn();
+ await getSystemUserFn();
+ await getQualityStatisticsNumDataFn();
await getMemberCountList('search');
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("滚动容器", e);
@@ -340,7 +385,7 @@ onMounted(async () => {
margin-top: 2%;
div {
text-align: center;
- width: 20%;
+ width: 10%;
}
}
.listBox {
@@ -365,7 +410,7 @@ onMounted(async () => {
}
}
div {
- width: 20%;
+ width: 10%;
white-space: nowrap; //单行
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue
index d70204a..217dbc2 100644
--- a/src/views/commandScreen/dialogCompnnents/weather-info.vue
+++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue
@@ -4,7 +4,7 @@
+
+ {{item.weekBetweenStr}}
+ 安全隐患数量：{{ item.dangerNum }}
+ 未整改隐患次数：{{ item.overdueRectificationNum }}
+ 重大隐患次数：{{ item.greatFaultLevelNum }}
+ 未销项隐患次数：{{ item.notCloseNum }}
+ 一般隐患次数：{{ item.generalRiskNum }}
+
+
状态
-
- 影响级别
+ 问题等级
-
@@ -68,49 +67,66 @@
class="m-2"
placeholder="请选择"
size="small"
- v-model="searchForm.workState"
+ v-model="searchForm.inspectId"
:clearable="true"
style="width: 150px"
>
-
整改人
-
+
分包单位
-
+
序号
- 检查结果
+ 状态
+ 问题等级
+ 隐患部位
+ 隐患描述及要求
+ 整改时限
检查人
- 检查时间
- 隐患信息
+ 检查时间
整改人
+ 分包单位
{{index + 1}}
- {{item.workerName}}
-
-
-
-
-
- {{item.phoneNumber}}
- {{item.personType == 1?item.teamName:item.personType == 2?item.departmentName:''}}
- {{item.phoneNumber}}
+ {{statusList[item.status].name}}
+ {{item.level?levelListData[item.level - 1].name:''}}
+ {{item.regionName}}
+ {{item.dangerItemContent}}
+ {{item.changeLimitTime}}
+ {{item.inspectManName}}
+ {{item.inspectTime}}
+ {{item.changeId}}
+ {{item.enterpriseName}}
@@ -126,46 +142,76 @@
import { ref, onMounted } from "vue";
import { GlobalStore } from "@/stores";
import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor";
-import type { TabsPaneContext } from 'element-plus'
+import { getQualityStatisticsNumDataApi, getProjectEnterpriseApi, getSystemUserApi, getInspectionRecordApi } from "@/api/modules/agjtCommandApi";
const store = GlobalStore();
const props = defineProps(["tip"]);
const BASEURL = import.meta.env.VITE_API_URL;
-const activeName = ref('first')
-const activeIndex = ref('1' as any)
-const onlineWorkList = ref([
- { name: "在职", value: 1 },
- { name: "离职", value: 2 }
-])
+const inspectList = ref([] as any);
const enterpriseListData = ref([] as any);
-const memberTypeList = ref([
- { name: "劳务人员", value: 1 },
- { name: "管理人员", value: 2 },
- { name: "临时人员", value: 3 }
+const levelListData = ref([
+ { name: "重大隐患", value: 1 },
+ { name: "较大隐患", value: 2 },
+ { name: "一般隐患", value: 3 },
+ { name: "低隐患", value: 4 }
+])
+const statusList = ref([
+ { name: "无需整改", value: 1 },
+ { name: "待整改", value: 2 },
+ { name: "待复查", value: 3 },
+ { name: "待核验", value: 4 },
+ { name: "合格", value: 5 },
+ { name: "不合格", value: 6 },
+ { name: "超期未关闭", value: 7 },
]);
-const alarmTypeList = ref(["报警", "预警"]);
let pageNo = ref(1 as any);
let moreScroll = ref(true as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
-const deviceList = ref([] as any); // 设备列表
const searchForm = ref({
- memberType: '',
- belongCompany: '',
- workState: '',
- name: '',
- idCard: ''
+ status: '',
+ inspectId: '',
+ changeId: '',
+ enterpriseId: '',
+ level: ''
});
-
+const topDangerList = ref([] as any)
const partyMemberList = ref({} as any);
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-// console.log(tab, event)
-// console.log('tab',tab.index)
-// console.log('activeName',activeName.value)
-// if(activeName.value === 'first') console.log('1')
-// if(activeName.value === 'second') console.log('2')
-// if(activeName.value === 'third') console.log('3')
- activeIndex.value = tab.index
- console.log('activeIndex',activeIndex.value)
-}
+// 获取整改人、检查人
+const getSystemUserFn = async () => {
+ let data = {
+ projectSn: store.sn
+ };
+ const res: any = await getSystemUserApi(data);
+ if (res.code == 200) {
+ console.log("整改人、检查人",res)
+ inspectList.value = res.result;
+ }
+};
+// 获取分包单位
+const getDivisionUnitFn = async () => {
+ let data = {
+ projectSn: store.sn,
+ pageNo: 1,
+ pageSize: 999
+ };
+ const res: any = await getProjectEnterpriseApi(data);
+ if (res.code == 200) {
+ console.log("分包单位",res)
+ enterpriseListData.value = res.result.records;
+ }
+};
+// 获取顶部数据
+const getQualityStatisticsNumDataFn = async () => {
+ let data = {
+ projectSn: store.sn,
+ isStatsByWeek: 1
+ };
+ const res: any = await getQualityStatisticsNumDataApi(data);
+ if (res.code == 200) {
+ console.log("安全隐患顶部数据",res)
+ topDangerList.value = res.result || []
+ }
+};
+
//获取企业列表
const getCompanyList = async () => {
let data = {
@@ -182,11 +228,7 @@ const getCompanyList = async () => {
const getMemberCountList = async (tip:any) => {
let requestData:any = {
projectSn: store.sn,
- personType: searchForm.value.memberType, //人员类型
- enterpriseId: searchForm.value.belongCompany, //所属企业
- inserviceType: searchForm.value.workState, //在职状态
- idCard: searchForm.value.idCard, //身份证号
- workerName: searchForm.value.name, //姓名
+ ...searchForm.value,
pageNo: tip == 'search'?1:pageNo.value,
pageSize: 100
}
@@ -197,12 +239,12 @@ const getMemberCountList = async (tip:any) => {
} else {
requestData.inserviceType = 1;
}
- const res: any = await getMemberInfoList(requestData);
- console.log("获取人员信息列表", res);
+ const res: any = await getInspectionRecordApi(requestData);
+ console.log("获取安全隐患底部列表", res);
if(tip == 'more'){
- partyMemberList.value = partyMemberList.value.concat(res.result.records);
+ partyMemberList.value = partyMemberList.value.concat(res.result.page.records);
} else {
- partyMemberList.value = res.result.records;
+ partyMemberList.value = res.result.page.records;
}
// 为图片拼接IP
// partyMemberList.value.map((item:any) => {
@@ -217,6 +259,9 @@ const getMemberCountList = async (tip:any) => {
onMounted(async () => {
await getCompanyList();
+ await getDivisionUnitFn();
+ await getSystemUserFn();
+ await getQualityStatisticsNumDataFn();
await getMemberCountList('search');
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("滚动容器", e);
@@ -340,7 +385,7 @@ onMounted(async () => {
margin-top: 2%;
div {
text-align: center;
- width: 20%;
+ width: 10%;
}
}
.listBox {
@@ -365,7 +410,7 @@ onMounted(async () => {
}
}
div {
- width: 20%;
+ width: 10%;
white-space: nowrap; //单行
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue
index d70204a..217dbc2 100644
--- a/src/views/commandScreen/dialogCompnnents/weather-info.vue
+++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue
@@ -4,7 +4,7 @@
@@ -36,29 +36,29 @@
-
@@ -71,27 +71,21 @@
序号
- 天气状况
- 影响工期天数
- 预警提示
- 预警记录时间
- 备注
+ 区域
+ 单位名称
+ 延期误工类型
+ 延期误工原因
+ 图片
{{ index + 1 }}
- {{ item.workerName }}
+ {{ item.regionName }}
+ {{ item.enterpriseName }}
+ {{ item.delayEventType == 1 ? "人为因素" : item.personType == 2 ? "环境因素" : "不可抵抗因素" }}
+ {{ item.delayEventReason }}
{{ item.phoneNumber }}
- {{ item.personType == 1 ? item.teamName : item.personType == 2 ? item.departmentName : "" }}
- {{ item.phoneNumber }}
@@ -71,27 +71,21 @@