diff --git a/.env.development b/.env.development index a067575..9e2ebd0 100644 --- a/.env.development +++ b/.env.development @@ -19,7 +19,7 @@ NODE_ENV = 'development' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) diff --git a/.env.production b/.env.production index a491cf3..9892a5d 100644 --- a/.env.production +++ b/.env.production @@ -13,7 +13,7 @@ NODE_ENV = "production" # VITE_API_URL = "http://183.249.224.118:9003" # 百色 新项目通用地址 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' diff --git a/src/assets/images/bigImg.png b/src/assets/images/bigImg.png new file mode 100644 index 0000000..b6c9eaf Binary files /dev/null and b/src/assets/images/bigImg.png differ diff --git a/src/assets/images/bigImg.gif b/src/assets/images/bigImg3.gif similarity index 100% rename from src/assets/images/bigImg.gif rename to src/assets/images/bigImg3.gif diff --git a/src/config/config.ts b/src/config/config.ts index 8b3ca52..f6308d9 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,7 +23,7 @@ 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 = "as"; //鞍山项目 diff --git a/src/views/agjtLiveScreen/indexLive.vue b/src/views/agjtLiveScreen/indexLive.vue index ab565e7..d8cad59 100644 --- a/src/views/agjtLiveScreen/indexLive.vue +++ b/src/views/agjtLiveScreen/indexLive.vue @@ -182,7 +182,7 @@ function loginOut() { .largeScreen { width: 100%; height: 100%; - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; position: relative; overflow: hidden; diff --git a/src/views/agjtProjectKanban/indexL.vue b/src/views/agjtProjectKanban/indexL.vue index dc1cad9..d57052d 100644 --- a/src/views/agjtProjectKanban/indexL.vue +++ b/src/views/agjtProjectKanban/indexL.vue @@ -209,7 +209,7 @@ function jumpBgd() { .largeScreen { width: 100%; height: 100%; - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; .header { diff --git a/src/views/commandScreen/indexCommand.vue b/src/views/commandScreen/indexCommand.vue index fe6c146..f1f08f8 100644 --- a/src/views/commandScreen/indexCommand.vue +++ b/src/views/commandScreen/indexCommand.vue @@ -228,7 +228,7 @@ function jumpBgd() { .largeScreen { width: 100%; height: 100%; - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; .header { diff --git a/src/views/locationLive/locationL.vue b/src/views/locationLive/locationL.vue index 3ef4962..d3d2e19 100644 --- a/src/views/locationLive/locationL.vue +++ b/src/views/locationLive/locationL.vue @@ -228,7 +228,7 @@ function jumpBgd() { .largeScreen { width: 100%; height: 100%; - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; .header { diff --git a/src/views/overviewScreen/indexCommand.vue b/src/views/overviewScreen/indexCommand.vue index 81d057f..577071c 100644 --- a/src/views/overviewScreen/indexCommand.vue +++ b/src/views/overviewScreen/indexCommand.vue @@ -219,7 +219,7 @@ function jumpBgd() { .largeScreen { width: 100%; height: 100%; - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; .header { diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue index 8eb30bb..e83da1a 100644 --- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue +++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue @@ -2,6 +2,33 @@
+
+
+ + +
+ +
+ + + +
+
+ 查询 +
+
+ 重置 +
+
序号
抓拍照片
@@ -12,41 +39,41 @@
操作
-
+
-
{{ index + 1 }}
-
-
- - - - - +
{{ index + 1 }}
+
+
+ + + + + +
+ +
{{ item.hardwareName }}
+
+ 未穿安全工作服 + 未戴安全帽 + 烟火报警 + 未穿戴安全带 +
+
{{ item.alarmType ? getWarnName(item.alarmType) : "" }}
+
{{ item.createTime }}
+
查看详情
- -
{{ item.hardwareName }}
-
- 未穿安全工作服 - 未戴安全帽 - 烟火报警 - 未穿戴安全带 +
+ +

暂无数据

-
{{ item.alarmType ? getWarnName(item.alarmType) : "" }}
-
{{ item.createTime }}
-
查看详情
-
-
- -

暂无数据

-
@@ -109,86 +136,19 @@ let aiAlarmTypeEnum = ref([] as any); // 当前环境 const BASEURL = import.meta.env.VITE_API_URL; const store = GlobalStore(); -// const list = reactive([ -// { -// id: 1, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 2, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 3, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 4, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 5, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 6, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 7, -// devName: "青金山隧道钢筋加场枪机", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 8, -// devName: "青金山隧道钢筋加场枪机", -// dev: "未知", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 9, -// devName: "青金山隧道钢筋加场枪机", -// dev: "未知", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 10, -// devName: "青金山隧道钢筋加场枪机", -// dev: "未知", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 11, -// devName: "青金山隧道钢筋加场枪机", -// dev: "未知", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// }, -// { -// id: 12, -// devName: "青金山隧道钢筋加场枪机", -// dev: "未知", -// warnType: "未穿反光衣", -// warnTime: "2023-01-01 12:00:00" -// } -// ]); +const searchForm = reactive({ + alarmType: "", + startTime: dayjs().format("YYYY-MM-DD") + " 00:00:00", + endTime: dayjs().format("YYYY-MM-DD") + " 23:59:59" +}); +const rangeTime = ref([dayjs().format("YYYY-MM-DD") + " 00:00:00", dayjs().format("YYYY-MM-DD") + " 23:59:59"] as any); + +const timeChange = (e: any) => { + searchForm.startTime = e[0]; + searchForm.endTime = e[1]; +}; + let showDialog = ref(false as any); function handleClick(event: any) { // console.log("点击", event.target.className); @@ -202,29 +162,30 @@ let warnAlarmList = ref([] as any); const pageInfo = reactive({ pageNo: 0, pageSize: 10, - total: 0, + total: 0 } as any); const load = async () => { console.log("加载", pageInfo.pageNo * pageInfo.pageSize, pageInfo.total); - if(pageInfo.pageNo > 0 && pageInfo.total == 0) return - if(pageInfo.pageNo * pageInfo.pageSize > pageInfo.total) return ElMessage.warning("到底部了！"); + if (pageInfo.pageNo > 0 && pageInfo.total == 0) return; + if (pageInfo.pageNo * pageInfo.pageSize > pageInfo.total) return; // ElMessage.warning("到底部了！"); pageInfo.pageNo += 1; await getWarnAlarmList(); -} +}; //获取告警列表 const getWarnAlarmList = async () => { - const res: any = await getAlarmPageList({ - projectSn: store.sn, - selectType: 3, - pageNo: pageInfo.pageNo, + const res: any = await getAlarmPageList({ + projectSn: store.sn, + selectType: 3, + pageNo: pageInfo.pageNo, pageSize: pageInfo.pageSize, - startTime: dayjs().format("YYYY-MM-DD") + " 00:00:00", - endTime: dayjs().format("YYYY-MM-DD") + " 23:59:59", + ...searchForm + // startTime: dayjs().format("YYYY-MM-DD") + " 00:00:00", + // endTime: dayjs().format("YYYY-MM-DD") + " 23:59:59" }); console.log("获取告警列表", res); if (res.result.records.length > 0) { warnAlarmList.value = warnAlarmList.value.concat(res.result.records); - if(pageInfo.pageNo == 1){ + if (pageInfo.pageNo == 1) { mitts.emit("warnAlarmList", res.result.records[0]); detailData.value = res.result.records[0]; pageInfo.total = Number(res.result.total); @@ -255,6 +216,23 @@ function getWarnName(warnType: any) { return enumObj ? enumObj.value : ""; } +const search = () => { + pageInfo.pageNo = 0; + pageInfo.total = 0; + warnAlarmList.value = []; + load(); +}; + +const reset = () => { + searchForm.alarmType = ""; + searchForm.startTime = dayjs().format("YYYY-MM-DD") + " 00:00:00"; + searchForm.endTime = dayjs().format("YYYY-MM-DD") + " 23:59:59"; + pageInfo.pageNo = 0; + pageInfo.total = 0; + warnAlarmList.value = []; + load(); +}; + // 打开详情弹窗 function openDetailDialog(item: any) { // console.log(item, "当前行数据"); @@ -269,10 +247,11 @@ function closeDialog() { //将方法暴露给父组件 defineExpose({ getWarnTypeOption, - getWarnAlarmList + search }); onMounted(async () => { getWarnTypeOption(); + // search(); // getWarnAlarmList(); }); onBeforeUnmount(async () => { @@ -283,6 +262,7 @@ onBeforeUnmount(async () => { diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue index 60b1d4d..e699630 100644 --- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue +++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue @@ -44,7 +44,7 @@ const callChildFn = async () => { topRightRef.value.getWarnAlarmTotal() bottomLeftRef.value.getMemberCareList() bottomRightRef.value.getWarnTypeOption() - // bottomRightRef.value.getWarnAlarmList() + bottomRightRef.value.search() }) // await topLeftRef.value.getMemberCareList() // await topCenterRef.value.getMemberCareList() diff --git a/src/views/sevenLargeScreen/indexL copy.vue b/src/views/sevenLargeScreen/indexL copy.vue index 64bde25..bf3c459 100644 --- a/src/views/sevenLargeScreen/indexL copy.vue +++ b/src/views/sevenLargeScreen/indexL copy.vue @@ -595,7 +595,7 @@ function jumpBgd() { justify-content: center; } .largeScreen { - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; position: relative; .header { diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 7ba1ce9..3116930 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -814,7 +814,7 @@ function jumpBgd() { } .largeScreen { - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; position: relative; diff --git a/src/views/sevenLargeScreen/indexL_syhy.vue b/src/views/sevenLargeScreen/indexL_syhy.vue index c01cfb8..c8737bf 100644 --- a/src/views/sevenLargeScreen/indexL_syhy.vue +++ b/src/views/sevenLargeScreen/indexL_syhy.vue @@ -690,7 +690,7 @@ function jumpBgd() { .largeScreen { width: 100%; height: 100%; - background: url("@/assets/images/bigImg.gif") no-repeat; + background: url("@/assets/images/bigImg.png") no-repeat; background-size: 100% 100%; .header { diff --git a/src/views/sevenLargeScreen/laborManagement/leftTop.vue b/src/views/sevenLargeScreen/laborManagement/leftTop.vue index d6c4c0b..763ad7a 100644 --- a/src/views/sevenLargeScreen/laborManagement/leftTop.vue +++ b/src/views/sevenLargeScreen/laborManagement/leftTop.vue @@ -82,16 +82,53 @@ 重置
-
+ - diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue index 665d597..a97ede8 100644 --- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue +++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue @@ -2,11 +2,11 @@
-
+
今日
近7天
@@ -320,12 +320,12 @@ const getEquipList = async () => { }; // let noData = ref(false as any); const getMemberCareList = async () => { - let requestData:any = { + let requestData: any = { projectSn: store.sn, type: checked.value }; - if (selectEquipSn.value) { - requestData.devSn = selectEquipSn.value; + if (deviceSn.value) { + requestData.devSn = deviceSn.value; } const res: any = await countMaterialName(requestData); console.log("原材料用量统计", res); @@ -359,8 +359,16 @@ const getMemberCareList = async () => { } }; +let deviceSn = ref(""); +const loadData = async (devSn: string = "") => { + deviceSn.value = devSn; + getMemberCareList(); +}; +defineExpose({ + loadData +}); onMounted(async () => { - getEquipList(); + // getEquipList(); getMemberCareList(); }); diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue index 0a03df9..13bbb5b 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue @@ -1,5 +1,5 @@