From 191051e58c4a94a46c03f4cd4836dc2c9a624782 Mon Sep 17 00:00:00 2001 From: cjp <3096114695@qq.com> Date: Fri, 22 Dec 2023 11:12:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A6=95=E5=9B=BE=E6=B1=9F=E5=9D=91?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9A=E5=88=B6=E5=BC=80=E5=8F=91=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 3 +- src/components/commonIframe.vue | 30 ++ src/routers/modules/staticRouter.ts | 15 + .../projectOverview/centerTop.vue | 4 +- .../projectOverview/leftTop.vue | 8 +- src/views/sevenLargeScreen/indexL.vue | 455 ++++++++++-------- src/views/sevenLargeScreen/indexL_syhy.vue | 55 +-- .../safeRisk/generalManage.vue | 31 ++ .../sevenLargeScreen/safeRisk/riskManage.vue | 31 ++ .../safeRisk/warehouseManage.vue | 31 ++ 11 files changed, 425 insertions(+), 242 deletions(-) create mode 100644 src/components/commonIframe.vue create mode 100644 src/views/sevenLargeScreen/safeRisk/generalManage.vue create mode 100644 src/views/sevenLargeScreen/safeRisk/riskManage.vue create mode 100644 src/views/sevenLargeScreen/safeRisk/warehouseManage.vue diff --git a/.env.development b/.env.development index dc2d4b5..cab83f3 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) -VITE_API_URL = 'http://192.168.34.221:30002' +# VITE_API_URL = 'http://192.168.34.221:30002' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' @@ -12,7 +12,7 @@ VITE_API_URL = 'http://192.168.34.221:30002' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -# VITE_API_URL = 'http://101.43.164.214:11113' +VITE_API_URL = 'http://101.43.164.214:11113' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/.env.production b/.env.production index 9b285b3..3c02fd3 100644 --- a/.env.production +++ b/.env.production @@ -10,10 +10,11 @@ NODE_ENV = "production" # 嘉兴王江泾公用码头 # VITE_API_URL = "http://183.249.224.118:9003" +VITE_API_URL = 'http://101.43.164.214:11113' # 七参数标准版(演示平台) -VITE_API_URL = 'http://jxj.zhgdyun.com:9809' +# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' diff --git a/src/components/commonIframe.vue b/src/components/commonIframe.vue new file mode 100644 index 0000000..55d0e87 --- /dev/null +++ b/src/components/commonIframe.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 0285e66..b554a18 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -216,6 +216,21 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/schedulePlan", name: "进度管理", component: () => import("@/views/sevenLargeScreen/qualityControl/schedulePlan/index.vue") + }, + { + path: "/riskManage", + name: "安全风险", + component: () => import("@/views/sevenLargeScreen/safeRisk/riskManage.vue") + }, + { + path: "/warehouseManage", + name: "仓库管理", + component: () => import("@/views/sevenLargeScreen/safeRisk/warehouseManage.vue") + }, + { + path: "/generalManage", + name: "综合管理", + component: () => import("@/views/sevenLargeScreen/safeRisk/generalManage.vue") } ], meta: { diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue index 327e82a..f752057 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue @@ -90,8 +90,8 @@ const showChangeImg = ref(false as any); const showChangeVideo = ref(false as any); let topText = ref([ - { id: 1, title: "宣传视频", isActive: true }, - { id: 2, title: "效果图", isActive: false } + { id: 1, title: "全景视频", isActive: true }, + { id: 2, title: "3D图片", isActive: false } ]); function boxStyle(item: any) { diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue index 4c7cb07..de102e5 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue @@ -1,7 +1,7 @@ diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 5545f9c..361fa6e 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -5,7 +5,10 @@

数字化项目监管平台

- + + + +

江坑110kv变电站智慧工地
{{ nowTime }}
@@ -82,6 +85,7 @@ import ScaleBox from "vue3-scale-box"; import { ref, reactive, onMounted, onBeforeUnmount } from "vue"; import { getTaskTimeDetail } from "@/api/modules/schedulePlan"; +import { jumpLargeUserInfoApi } from "@/api/modules/login"; import { useRouter } from "vue-router"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); @@ -120,39 +124,9 @@ function getNowDate() { let showUserBox = ref(false as any); let adminName = ref("" as any); -// let menuList = ref([ -// { -// moduleName: "工程概况", -// modulePath: "/projectOverview" -// }, -// { -// moduleName: "智慧党建", -// modulePath: "/smartPartyBuilding" -// }, -// { -// moduleName: "扬尘噪声", -// modulePath: "/headNoise" -// }, -// { -// moduleName: "劳务管理", -// modulePath: "/laborManagement" -// }, -// { -// moduleName: "视频管理", -// modulePath: "/videoManagement" -// }, -// { -// moduleName: "配电箱监测", -// modulePath: "/distributionMonitoring" -// }, -// { -// moduleName: "AI预警", -// modulePath: "/aIEarlyWarning" -// } -// ]); let menuList = ref([ - { - moduleName: "综合管理", + { + moduleName: "决策看板", modulePath: "/projectOverview", menuList: [ { @@ -165,105 +139,7 @@ let menuList = ref([ } ] }, - { - moduleName: "数字工地", - modulePath: "/videoManagement", - menuList: [ - { - menuName: "视频管理", - companyPath: "/videoManagement" - }, - { - menuName: "AI预警", - companyPath: "/aIEarlyWarning" - }, - { - menuName: "地磅管理", - companyPath: "/loadometerManage" - }, - { - menuName: "车辆管理", - companyPath: "/vehicleManagement" - }, - { - menuName: "配电箱监测", - companyPath: "/distributionMonitoring" - }, - { - menuName: "标养室监测", - companyPath: "/standardCureRoom" - }, - { - menuName: "车辆定位", - companyPath: "/carPosition" - } - ] - }, - { - moduleName: "劳务管理", - modulePath: "/laborManagement" - }, - { - moduleName: "安全管理", - modulePath: "/securityManagement", - menuList: [ - { - menuName: "安全管理", - companyPath: "/securityManagement" - }, - { - companyPath: "/foundationPitMonitor", - menuName: "基坑监测" - }, - { - menuName: "隧道定位监测", - companyPath: "/tunnelPosition" - }, - { - menuName: "临边防护", - companyPath: "/edgeProtection" - }, - { - menuName: "有毒气体监测", - companyPath: "/toxicGasMonitor" - }, - { - menuName: "高支模监测", - companyPath: "/highFormwork" - }, - { - menuName: "高边坡监测", - companyPath: "/highSlope" - }, - { - menuName: "烟感监测", - companyPath: "/smokeSensor" - }, - { - menuName: "安全教育", - companyPath: "/safeEducation" - } - ] - }, - { - moduleName: "质量管理", - modulePath: "/qualityManagement", - menuList: [ - { - menuName: "质量管理", - companyPath: "/qualityManagement" - }, - { - menuName: "混凝土测温", - companyPath: "/concreteMonitor" - }, - { - menuName: "进度计划", - companyPath: "/schedulePlan" - } - ] - }, - { + { moduleName: "绿色施工", modulePath: "/headNoise", menuList: [ @@ -279,68 +155,245 @@ let menuList = ref([ companyPath: "/waterMonitor", menuName: "用水监测" }, + ] + }, + + { + moduleName: "视频监控", + modulePath: "/videoManagement", + menuList: [ { - companyPath: "/sewageMonitor", - menuName: "污水监测" + menuName: "视频监控", + companyPath: "/videoManagement" } ] }, { - moduleName: "大型机械", - modulePath: "/towerCraneMonitoring", + moduleName: "进度管控", + modulePath: "/schedulePlan", menuList: [ { - menuName: "塔吊监测", - companyPath: "/towerCraneMonitoring" - }, - { - menuName: "升降机监测", - companyPath: "/elevatorMonitoring" - }, - { - menuName: "卸料平台", - companyPath: "/unloadPlatform" - }, - { - menuName: "混凝土拌合站", - companyPath: "/concreteMixingPlant" - }, - { - menuName: "龙门吊监测", - companyPath: "/gantryCrane" - }, - { - companyPath: "/erectCrane", - menuName: "架桥机" - }, - { - companyPath: "/hangBasket", - menuName: "挂篮监测" - }, - { - companyPath: "/pressureTestMachine", - menuName: "压力试验机" - }, - { - companyPath: "/universalTestMachine", - menuName: "万能试验机" - }, - { - companyPath: "/compressionIntegrate", - menuName: "抗压一体机" - }, - { - companyPath: "/asphaltMixer", - menuName: "沥青拌合站" - }, - { - companyPath: "/waterStabilizedMixer", - menuName: "水稳拌合站" + menuName: "进度管控", + companyPath: "/schedulePlan" } ] }, - { moduleName: "BIM模型", modulePath: "/bImModel" } + { + moduleName: "安全风险", + modulePath: "/riskManage", + menuList: [ + { + menuName: "安全管理", + companyPath: "/riskManage" + }, + { + menuName: "仓库管理", + companyPath: "/warehouseManage" + }, + ] + }, + { + moduleName: "综合管理", + modulePath: "/generalManage", + menuList: [ + { + menuName: "综合管理", + companyPath: "/generalManage" + } + ] + } ]); +// let menuList = ref([ +// { +// moduleName: "综合管理", +// modulePath: "/projectOverview", +// menuList: [ +// { +// menuName: "工程概况", +// companyPath: "/projectOverview" +// }, +// { +// menuName: "智慧党建", +// companyPath: "/smartPartyBuilding" +// } +// ] +// }, +// { +// moduleName: "数字工地", +// modulePath: "/videoManagement", +// menuList: [ +// { +// menuName: "视频管理", +// companyPath: "/videoManagement" +// }, +// { +// menuName: "AI预警", +// companyPath: "/aIEarlyWarning" +// }, +// { +// menuName: "地磅管理", +// companyPath: "/loadometerManage" +// }, +// { +// menuName: "车辆管理", +// companyPath: "/vehicleManagement" +// }, +// { +// menuName: "配电箱监测", +// companyPath: "/distributionMonitoring" +// }, +// { +// menuName: "标养室监测", +// companyPath: "/standardCureRoom" +// }, +// { +// menuName: "车辆定位", +// companyPath: "/carPosition" +// } +// ] +// }, +// { +// moduleName: "劳务管理", +// modulePath: "/laborManagement" +// }, +// { +// moduleName: "安全管理", +// modulePath: "/securityManagement", +// menuList: [ +// { +// menuName: "安全管理", +// companyPath: "/securityManagement" +// }, +// { +// companyPath: "/foundationPitMonitor", +// menuName: "基坑监测" +// }, +// { +// menuName: "隧道定位监测", +// companyPath: "/tunnelPosition" +// }, +// { +// menuName: "临边防护", +// companyPath: "/edgeProtection" +// }, +// { +// menuName: "有毒气体监测", +// companyPath: "/toxicGasMonitor" +// }, +// { +// menuName: "高支模监测", +// companyPath: "/highFormwork" +// }, +// { +// menuName: "高边坡监测", +// companyPath: "/highSlope" +// }, +// { +// menuName: "烟感监测", +// companyPath: "/smokeSensor" +// }, +// { +// menuName: "安全教育", +// companyPath: "/safeEducation" +// } +// ] +// }, +// { +// moduleName: "质量管理", +// modulePath: "/qualityManagement", +// menuList: [ +// { +// menuName: "质量管理", +// companyPath: "/qualityManagement" +// }, +// { +// menuName: "混凝土测温", +// companyPath: "/concreteMonitor" +// }, +// { +// menuName: "进度计划", +// companyPath: "/schedulePlan" +// } +// ] +// }, +// { +// moduleName: "绿色施工", +// modulePath: "/headNoise", +// menuList: [ +// { +// menuName: "扬尘噪声", +// companyPath: "/headNoise" +// }, +// { +// companyPath: "/electricityMonitor", +// menuName: "用电监测" +// }, +// { +// companyPath: "/waterMonitor", +// menuName: "用水监测" +// }, +// { +// companyPath: "/sewageMonitor", +// menuName: "污水监测" +// } +// ] +// }, +// { +// moduleName: "大型机械", +// modulePath: "/towerCraneMonitoring", +// menuList: [ +// { +// menuName: "塔吊监测", +// companyPath: "/towerCraneMonitoring" +// }, +// { +// menuName: "升降机监测", +// companyPath: "/elevatorMonitoring" +// }, +// { +// menuName: "卸料平台", +// companyPath: "/unloadPlatform" +// }, +// { +// menuName: "混凝土拌合站", +// companyPath: "/concreteMixingPlant" +// }, +// { +// menuName: "龙门吊监测", +// companyPath: "/gantryCrane" +// }, +// { +// companyPath: "/erectCrane", +// menuName: "架桥机" +// }, +// { +// companyPath: "/hangBasket", +// menuName: "挂篮监测" +// }, +// { +// companyPath: "/pressureTestMachine", +// menuName: "压力试验机" +// }, +// { +// companyPath: "/universalTestMachine", +// menuName: "万能试验机" +// }, +// { +// companyPath: "/compressionIntegrate", +// menuName: "抗压一体机" +// }, +// { +// companyPath: "/asphaltMixer", +// menuName: "沥青拌合站" +// }, +// { +// companyPath: "/waterStabilizedMixer", +// menuName: "水稳拌合站" +// } +// ] +// }, +// { moduleName: "BIM模型", modulePath: "/bImModel" } +// ]); const itemList = ref([]); const activeTab = ref(0); const activeTab2 = ref(0); @@ -376,17 +429,14 @@ onMounted(async () => { activeTab.value = menuList.value[0].modulePath; activeTab2.value = menuList.value[0].modulePath; itemList.value = menuList.value[0].menuList; - await getProjectInfo(); + //数据看板跳转免登录 if (window.location.href.indexOf("token") != -1) { - const token = window.location.href.split("token=")[1]; - const res = await fetch(import.meta.env.VITE_API_URL + "/xmgl/base/getLoginInfoByToken", { - method: "POST", - headers: { - "Content-Type": "application/json" - }, - body: JSON.stringify({ token: token }) - }); + console.log("跳转进来了吗----", window.location.href.indexOf("token")); + + const newToken = window.location.href.split("token=")[1]; + const data = await jumpLargeUserInfoApi({ token: newToken }); + console.log("跳转请求的数据----", data.result); store.setSN(data.result.sn); store.setToken(data.result.token); store.setAccount(data.result.account); @@ -403,7 +453,9 @@ onMounted(async () => { // }); // console.log("当前项目的看板数据：：", moduleListData.value); } - + navigateTo(menuList.value[0], 1); + activeTab.value = menuList.value[0].modulePath; + itemList.value = menuList.value[0].menuList; // console.log("进入页面， "); adminName.value = store.account; // console.log("store数据", store.account); @@ -412,8 +464,9 @@ onMounted(async () => { document.addEventListener("click", bodyCloseMenus); const subMenus = document.querySelectorAll(".menStyle"); if (subMenus.length >= 5) { - subMenus[4].style.marginLeft = "30%"; + subMenus[3].style.marginLeft = "40%"; } + await getProjectInfo(); }); let timer = ref(null as any); @@ -453,7 +506,7 @@ function loginOut() { } //跳转后台 function jumpBgd() { - window.location.replace("http://jxj.zhgdyun.com:100"); + window.location.replace("http://101.43.164.214:11111/#/projectIndex"); } @@ -476,10 +529,20 @@ function jumpBgd() { background: url("@/assets/images/headerImg.webp") no-repeat; background-size: 100% 100%; .projectTitle { + display: flex; + justify-content: center; + font-size: 38px; + color: #fff; + font-family: YouSheBiaoTiHei; + } + .projectSmallTitle { + position: absolute; + top: 6%; + left: 44%; display: flex; align-items: center; justify-content: center; - font-size: 44px; + font-size: 20px; color: #fff; font-family: YouSheBiaoTiHei; } diff --git a/src/views/sevenLargeScreen/indexL_syhy.vue b/src/views/sevenLargeScreen/indexL_syhy.vue index f3d4c6a..654cef7 100644 --- a/src/views/sevenLargeScreen/indexL_syhy.vue +++ b/src/views/sevenLargeScreen/indexL_syhy.vue @@ -6,12 +6,11 @@ -

数字化智慧综合管控平台

-

数字化项目监管平台

+

数字化项目监管平台

 - + -

盘锦西环66KV变电站工程

+

江坑110kv变电站智慧工地
{{ nowTime }}
@@ -251,36 +250,24 @@ let adminName = ref("" as any); //沈阳和盈项目模块 let menuList = ref([ { - moduleName: "工程概况", - modulePath: "/projectOverview" + moduleName: "环境监测", + modulePath: "/headNoise" + }, + { + moduleName: "用水监测", + modulePath: "/waterMonitor" + }, + { + moduleName: "用电监测", + modulePath: "/electricityMonitor" + }, + { + moduleName: "视频管理系统", + modulePath: "/videoManagement" }, { moduleName: "智慧党建", modulePath: "/smartPartyBuilding" - }, - { - moduleName: "人员管理", - modulePath: "/laborManagement" - }, - { - moduleName: "AI安全预警", - modulePath: "/aIEarlyWarning" - }, - { - moduleName: "绿色施工", - modulePath: "/headNoise" - }, - { - moduleName: "智能管理", - modulePath: "/videoManagement" - }, - { - moduleName: "用电智能检测", - modulePath: "/electricityMonitor" - }, - { - moduleName: "进度计划", - modulePath: "/schedulePlan" } ]); @@ -421,13 +408,7 @@ function loginOut() { } //跳转后台 function jumpBgd() { - // window.location.replace("http://192.168.34.226:8080/#/projectIndex"); - if (COMPANY === "syhy") { - window.location.replace("http://101.43.164.214:45020/#/projectIndex"); //沈阳和盈 - } - if (COMPANY === "jxwjj") { - window.location.replace("http://183.249.224.118:9000/#/projectIndex"); //嘉兴王江泾公用码头 - } + window.location.replace("http://101.43.164.214:11111/#/projectIndex"); // 江坑 } diff --git a/src/views/sevenLargeScreen/safeRisk/generalManage.vue b/src/views/sevenLargeScreen/safeRisk/generalManage.vue new file mode 100644 index 0000000..612b311 --- /dev/null +++ b/src/views/sevenLargeScreen/safeRisk/generalManage.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/views/sevenLargeScreen/safeRisk/riskManage.vue b/src/views/sevenLargeScreen/safeRisk/riskManage.vue new file mode 100644 index 0000000..d77140e --- /dev/null +++ b/src/views/sevenLargeScreen/safeRisk/riskManage.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/views/sevenLargeScreen/safeRisk/warehouseManage.vue b/src/views/sevenLargeScreen/safeRisk/warehouseManage.vue new file mode 100644 index 0000000..9089044 --- /dev/null +++ b/src/views/sevenLargeScreen/safeRisk/warehouseManage.vue @@ -0,0 +1,31 @@ + + + + +