diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue index 4525d2a..1ba7cdf 100644 --- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue @@ -36,6 +36,26 @@ background :isShowSearch="false" > + + + + @@ -88,34 +108,22 @@ const columns: ColumnProps[] = [ { prop: "pm25", label: "PM2.5", - width: 150, - render: scoped => { - return scoped.row.pm25 + "μg/m³"; - } + width: 150 }, { prop: "noise", label: "噪音", - width: 150, - render: scoped => { - return scoped.row.noise + "db"; - } + width: 150 }, { prop: "pm10", label: "PM10", - width: 150, - render: scoped => { - return scoped.row.pm10 + "μg/m³"; - } + width: 150 }, { prop: "tsp", label: "TSP", - width: 150, - render: scoped => { - return scoped.row.tsp + "μg/m³"; - } + width: 150 }, { prop: "humidity", diff --git a/src/views/goverment/huizhou/unDealList/index.vue b/src/views/goverment/huizhou/unDealList/index.vue index a09ded0..ec37f30 100644 --- a/src/views/goverment/huizhou/unDealList/index.vue +++ b/src/views/goverment/huizhou/unDealList/index.vue @@ -58,6 +58,9 @@ const handleDealItem = (obj: any) => { case 3: // 施工节点管理 routeUrl = "/goverment/huizhou/progressManagement/divisionsAndISubItems/index"; break; + case 4: // 扬尘报警 + routeUrl = "/hz-enterprise/smartSite/alarmLedger/index"; + break; } router.push({ path: routeUrl, query: { projectName } }); }; diff --git a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue index 7a311d5..188b918 100644 --- a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue +++ b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue @@ -4,6 +4,7 @@ v-model="active" :tabs="['项目名称', '工程名称']" :records="records" + :activeIndex="modelActive" @change-page="onCurChange" @search="onSearchInput" :pageable="pages" @@ -68,6 +69,10 @@ import { getRelevanceList } from "@/api/modules/common"; import DialogForm from "@/components/DialogForm/index.vue"; import LeftMenu from "@/components/LeftMenu/LeftMenu.vue"; import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage } from "@/api/modules/goverment"; +import { useRoute } from "vue-router"; +import { sendIframeMessage } from "@/utils/util"; +const route = useRoute(); +const modelActive = ref(0); const pages = ref({ pageNo: 1, pageSize: 7, @@ -362,7 +367,18 @@ onMounted(async () => { await getEngPage(); searchSn.value = records.value[0].engineeringSn; searchName.value = records.value[0].engineeringName; - onSearch(records.value[0]); + if (route.query.projectName) { + let defaultActive = records.value.findIndex((item: any) => { + return route.query.projectName == item.engineeringName; + }); + if (defaultActive != -1) { + modelActive.value = defaultActive; + onSearch(records.value[defaultActive]); + } + } else { + onSearch(records.value[0]); + } + await sendIframeMessage({ obj: { path: route.path } }, 2, undefined); });