首页改版

src/App.vue

@@ -106,4 +106,7 @@
 		align-items: center;
 		justify-content: space-around;
 	}
+	.el-message__icon{
+		font-size: 16px;
+	}
 </style>

src/api/source/total.js

@@ -335,3 +335,214 @@ export const getWeather = () => {
     params: {},
   });
 };
+
+// 首页改版总览 20221208----------------------------------------------------------------
+//业务区及塔台总人数 - 业务区（封闭运行）
+export const getAllJZByDate = (date) => {
+  return request({
+    url: "/epiHome/epidemicback/getAllJZByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//获取胶州机关行政人员总人数
+export const getJZAdminByDate = (date) => {
+  return request({
+    url: "/epiHome/getJZAdminByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//在青、外地总人数
+export const getIsLeaveByDate = (date) => {
+  return request({
+    url: "/epiHome/getIsLeaveByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//休假外出/出差人数
+export const getLeaveByDate = (date) => {
+  return request({
+    url: "/epiHome/getLeaveByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//备勤、居家总人数
+export const getAllBQByDate = (date) => {
+  return request({
+    url: "/epiHome/getAllBQByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//流亭总人数
+export const getAllLTByDate = (date) => {
+  return request({
+    url: "/epiHome/getAllLTByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//流亭台站总人数
+export const getAllLTTZByDate = (date) => {
+  return request({
+    url: "/epiHome/getAllLTTZByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//集中隔离 - 获取今日健康码、行程码信息
+export const getCodeByDate = (date) => {
+  return request({
+    url: "/epiHome/epi-code/getCodeByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//公寓使用情况
+export const getDorInfo = (date) => {
+  return request({
+    url: "/epiHome/epi-report/getDorInfo",
+    method: "get",
+    params: {date},
+  });
+};
+//航班
+export const getPlaneInfo = (date) => {
+  return request({
+    url: "/epiHome/epi-report/getPlaneInfo",
+    method: "get",
+    params: {date},
+  });
+};
+//访客
+export const getGardenAndApprove = (date) => {
+  return request({
+    url: "/epiHome/epidemicback/getGardenAndApprove",
+    method: "get",
+    params: {date},
+  });
+};
+/**
+ * 运行保障
+*/
+//获取业务区以及塔台人员（管制部分）
+export const getGZWorkPersonByJ = (date) => {
+  return request({
+    url: "/epiHome/getGZWorkPersonByJ",
+    method: "get",
+    params: {date},
+  });
+};
+//获取各台站运行人员
+export const getTowerPerson = (date) => {
+  return request({
+    url: "/epiHome/getTowerPerson",
+    method: "get",
+    params: {date},
+  });
+};
+//获取运行管理人员
+export const getRunAdminPersonByJ = (date) => {
+  return request({
+    url: "/epiHome/getRunAdminPersonByJ",
+    method: "get",
+    params: {date},
+  });
+};
+//获取业务区保障人员
+export const getSafePersonByJ = (date) => {
+  return request({
+    url: "/epiHome/getSafePersonByJ",
+    method: "get",
+    params: {date},
+  });
+};
+/**
+ * 流亭及备勤
+*/
+//获取流亭-园区人员
+export const getGardenPersonByL = (date) => {
+  return request({
+    url: "/epiHome/getGardenPersonByL",
+    method: "get",
+    params: {date},
+  });
+};
+//获取流亭-备勤人员
+export const getDormitoryPersonByL = (date) => {
+  return request({
+    url: "/epiHome/getDormitoryPersonByL",
+    method: "get",
+    params: {date},
+  });
+};
+/**
+ * 行政办公
+*/
+//行政办公人员
+export const getPersonByJ = (date) => {
+  return request({
+    url: "/epiHome/getPersonByJ",
+    method: "get",
+    params: {date},
+  });
+};
+//当日报修情况
+export const getRepair = (date) => {
+  return request({
+    url: "/epiHome/epidemicback/getRepair",
+    method: "get",
+    params: {date},
+  });
+};
+//共享资源
+export const getShare = (date) => {
+  return request({
+    url: "/epiHome/epidemicback/getShare",
+    method: "get",
+    params: {date},
+  });
+};
+//车辆资源
+export const getCarInfo = (date) => {
+  return request({
+    url: "/epiHome/epidemicback/getCarInfo",
+    method: "get",
+    params: {date},
+  });
+};
+//今日就餐情况
+export const getGardenEat = (date) => {
+  return request({
+    url: "/epiHome/epidemicback/getGardenEat",
+    method: "get",
+    params: {date},
+  });
+};
+//防疫要求-每日情况//0 正常 1 封闭运行 2 分区域运行
+export const getReportByDate = (date) => {
+  return request({
+    url: "/epiHome/epi-report/getReportByDate",
+    method: "get",
+    params: {date},
+  });
+};
+//节假日判断
+export const isHolidays = (date) => {
+  return request({
+    url: "/epiHome/epi-report/isHolidays",
+    method: "get",
+    params: {date},
+  });
+};
+//获取疫苗接种情况
+export const getYMInfo = (date) => {
+  return request({
+    url: "/epiHome/getYMInfo",
+    method: "get",
+    params: {date},
+  });
+};

src/permission.js

@@ -11,7 +11,10 @@ import 'nprogress/nprogress.css' // progress bar style
 NProgress.configure({showSpinner: false});
 const lockPage = store.getters.website.lockPage; //锁屏页
 router.beforeEach((to, from, next) => {
-	console.log(to)
+	console.log(to);
+  if(to.path.indexOf('home') < 0){
+    document.documentElement.style.fontSize = '';
+  }
   const meta = to.meta || {};
   const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
   store.commit('SET_IS_MENU', isMenu === undefined);

src/router/views/index.js

@@ -3,7 +3,7 @@ import Layout from '@/page/index/'
 export default [{
 	path: '/garden',
 	component: Layout,
-		redirect: '/garden/index',
+	redirect: '/garden/home',
 	children: [{
 		path: 'index',
 		name: '园区监控',
@@ -22,6 +22,19 @@ export default [{
 		component: () =>
 			import( /* webpackChunkName: "views" */ '@/views/garden/monitoring')
 	}]
+}, {
+	path: '/garden',
+	component: Layout,
+	redirect: '/garden/home',
+	children: [{
+		path: 'home',
+		name: '园区概况',
+		meta: {
+			i18n: 'dashboard'
+		},
+		component: () =>
+			import( /* webpackChunkName: "views" */ '@/views/garden/home')
+	}]
 }, {
 	path: '/sourceAnaly',
 	component: Layout,

src/util/bfHelper.js

@@ -2862,12 +2862,12 @@ const loadModel = (i) => {
   // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080";
   BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local;
   BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk";
-  // BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' :
-  // 	'http://47.103.199.45:8000/face/tt/viewToken.json';
-  BimfaceLoaderConfig.path =
-    i == 1
-      ? "http://10.90.100.203:8080/ywq/viewToken.json"
-      : "http://10.90.100.203:8080/tt/viewToken.json";
+  BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' :
+  	'http://47.103.199.45:8000/face/tt/viewToken.json';
+  // BimfaceLoaderConfig.path =
+  //   i == 1
+  //     ? "http://10.90.100.203:8080/ywq/viewToken.json"
+  //     : "http://10.90.100.203:8080/tt/viewToken.json";
 
   BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded);
 };
@@ -4504,7 +4504,7 @@ const lookPipeline2 = (
     }
 
     // 设置视角为南侧俯视
-    console.log(sbType+' - top 视角=====')
+    // console.log(sbType+' - top 视角=====')
     if (sbType == "空调" || sbType == '电' || sbType == '暖') {
       if (layer) {
        setTimeout(() => {
@@ -4512,10 +4512,12 @@ const lookPipeline2 = (
         setCameraStatus(sbType == "空调" ? ktCamera[tower][layer - 1] : cameraPosition[tower]);
        },300)
       } else {
+        console.log('ll1--2')
         setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
       }
       // 缩放到加入选中集合的构件
     } else {
+      console.log('ll1--')
       setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
     }
   }

src/views/garden/home.vue

@@ -0,0 +1,252 @@
+<template>
+	<div id="bimModelBox1" class="bimModelBox1">
+		<div class="bimModelBox">
+			<!-- 模型承载 -->
+			<div id="domId"></div>
+			<!-- 顶部导航 -->
+			<div class="animated topNav flex-center"
+				:style="{ 'height': topNavHeight + 'rem', 'background-image': topNav == 1 ? 'url(' + topbg1 + ')' : 'url(' + topbg1 + ')' }">
+				<div class="topNav1" v-if="isActive" :class="[isActive ? 'fadeInDown' : 'fadeOutUp']">
+					<div class="flex-center">
+						<div @click="topNavFun(1)" :class="[topNav == 1 ? 'active' : '']"
+							class="item flex-center-center" style="margin-right: 0.32rem;"
+							:style="{ 'border-color': topNav == 1 ? '#00bbff' : '#00bbff', 'box-shadow': topNav == 1 ? '#0790eb 0px 0px 0.15rem inset' : '' }">
+							<img v-if="topNav == 1" src="../../../public/img/top_nav1-1.png">
+							<img v-else src="../../../public/img/top_nav1.png">
+							<span>概况模式</span>
+						</div>
+						<div @click="topNavFun(3)" :class="[topNav == 3 ? 'active' : '']"
+							class="item flex-center-center"
+							:style="{ 'border-color': topNav == 1 ? '#00bbff' : '#00bbff', 'box-shadow': topNav == 3 ? '#0790eb 0px 0px 0.15rem inset' : '' }">
+							<img v-if="topNav == 3" src="../../../public/img/top_nav3-1.png">
+							<img v-else src="../../../public/img/top_nav3.png">
+							<span>监控模式</span>
+						</div>
+					</div>
+					<!-- 顶部隐藏显示导航按钮 -->
+					<img @click="cutTopNav" class="navStateImg1" src="../../../public/img/top_navIcon.png">
+				</div>
+				<!-- 顶部隐藏显示导航按钮 -->
+				<img @click="cutTopNav" class="navStateImg" src="../../../public/img/top_navIcon.png" v-else>
+
+			</div>
+
+			<!-- 概况 -->
+			<generalizePatternNew ref="generalizePattern" :bimModel="bimModel" v-if="topNav == 1">
+			</generalizePatternNew>
+			<!-- 模型切换 -->
+			<!-- <div v-if="topNav != 2" class="cut flex-center"
+				:style="{ 'top': topNav == 1 ? '0.2rem' : '1.938rem', 'left': topNav == 1 ? '0.2rem' : 'auto', 'right': topNav == 1 ? 'auto' : '7.625rem' }">
+				<div @click="selectBim(1)" :class="[bimModel == 1 ? 'active' : '']" class="cut_select left"
+					:style="{ 'borderColor': topNav == 1 ? '#00bbff' : '#00BAFE', 'boxShadow': bimModel == 1 && topNav == 1 ? '#0790eb 0px 0px 0.15rem inset' : bimModel == 1 && topNav == 3 ? 'rgb(7, 144, 235) 0px 0px 0.15rem inset' : 'none' }">
+					业务区</div>
+				<div @click="selectBim(2)" :class="[bimModel == 2 ? 'active' : '']" class="cut_select right"
+					:style="{ 'borderColor': topNav == 1 ? '#00bbff' : '#00BAFE', 'boxShadow': bimModel == 2 && topNav == 1 ? '#0790eb 0px 0px 0.15rem inset' : bimModel == 2 && topNav == 3 ? 'rgb(7, 144, 235) 0px 0px 0.15rem inset' : 'none' }">
+					塔台</div>
+			</div> -->
+		</div>
+	</div>
+</template>
+
+<script>
+import generalizePatternNew from './generalizePatternNew'
+export default {
+	components: {
+		generalizePatternNew, //概况
+	},
+	data() {
+		return {
+			topNav: 1,
+			isActive: true,
+			bimModel: 1,
+			topNavHeight: 0.57,
+			topbg1: require('../../../public/img/top_navBg.png'),
+			topbg2: require('../../../public/img/top_navBg1.png'),
+			clickNum: 1
+
+		};
+	},
+	watch: {
+		topNav(newValue, oldValue) {
+			if (newValue == oldValue) {
+
+			} else {
+				if (newValue == 1) {
+				} else {
+				}
+
+			}
+		}
+	},
+	created() {
+		var dev_width = document.documentElement.clientWidth || document.body.clientWidth
+		document.documentElement.style.fontSize = (dev_width / 1920) * 100 + 'px'
+	},
+	mounted() {
+		window.onresize = function () {
+			var dev_width = document.documentElement.clientWidth || document.body.clientWidth
+			document.documentElement.style.fontSize = (dev_width / 1920) * 100 + 'px'
+		}
+	},
+	methods: {
+		// 顶部导航按钮
+		topNavFun(i) {
+
+			window.sessionStorage.removeItem('build');
+			window.sessionStorage.removeItem('floor');
+			window.sessionStorage.removeItem('ttbuild');
+			this.topNav = i;
+			if (i == 3) {
+				// if (this.clickNum == 1) {
+				// 	this.$nextTick(() => {
+				// 		setTimeout(() => {
+				// 			this.$refs.monitoringPattern.clickMenu(1, '电', true);
+				// 		}, 300)
+				// 	})
+				// }
+				// this.clickNum++;
+				this.$router.push({ path: '/garden/index' });
+
+			} else {
+				this.clickNum = 1;
+			}
+		},
+		// 顶部隐藏显示按钮
+		cutTopNav() {
+			this.isActive = !this.isActive;
+			if (this.isActive) {
+				this.topNavHeight = 0.57
+			} else {
+				this.topNavHeight = 0.2
+			}
+		},
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.bimModelBox1 {
+	width: 100%;
+	height: 100%;
+	background-image: url(../../../public/img/bimBg.png);
+	background-size: 100% 100%;
+	overflow: auto;
+
+	.bimModelBox {
+		width: 100%;
+		height: 100%;
+		min-height: 1016px;
+		position: relative;
+
+		// 模型承载
+		#domId {
+			padding: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+
+		// 模型切换
+		.cut {
+			z-index: 10;
+			position: absolute;
+			text-align: center;
+
+			.cut_select {
+				letter-spacing: 0.015rem;
+				font-size: 0.14rem;
+				color: #B9D6DF;
+				line-height: 0.36rem;
+				width: 0.91rem;
+				height: 0.36rem;
+				background-color: rgba(31, 49, 99, 0.5);
+				border: 0.01rem solid;
+			}
+
+			.cut_select:hover {
+				cursor: pointer
+			}
+
+			.left {
+				border-right: none;
+				border-top-left-radius: 0.08rem;
+				border-bottom-left-radius: 0.08rem;
+			}
+
+			.right {
+				border-top-right-radius: 0.08rem;
+				border-bottom-right-radius: 0.08rem;
+			}
+
+			.active {
+				color: white;
+			}
+		}
+
+		// 顶部导航
+		.topNav {
+			z-index: 998;
+			position: absolute;
+			top: 0;
+			left: 50%;
+			margin-left: -3.1rem;
+			width: 6.2rem;
+			background-size: 100% 100%;
+			padding: 0 0.32rem;
+
+			.topNav1 {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 6.2rem;
+				height: 0.57rem;
+			}
+
+			.item {
+				// margin-top: 0.625rem;
+				width: 1.02rem;
+				height: 0.29rem;
+				border: 0.01rem solid;
+				font-size: 0.14rem;
+				color: #c3e1ea;
+
+				img {
+					margin-right: 0.08rem;
+					width: 0.21rem;
+					height: 0.22rem;
+					display: block;
+				}
+			}
+
+			.item:hover {
+				cursor: pointer;
+			}
+		}
+
+		// 顶部隐藏显示导航按钮
+		.navStateImg,
+		.navStateImg1 {
+			transition: transform .3s;
+			width: 0.17rem;
+			height: 0.16rem;
+			transform: rotateZ(0deg);
+			z-index: 999;
+		}
+
+		.navStateImg {
+			position: absolute;
+			top: 0.02rem;
+			left: 50%;
+			transform: rotate(180deg);
+		}
+
+		.navStateImg:hover {
+			cursor: pointer;
+		}
+
+		.navStateImg1:hover {
+			cursor: pointer;
+		}
+	}
+}
+</style>

vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
         // target: 'http://180.76.231.175:8000',
         // target: 'http://192.168.0.105:80',
         // target: "http://192.168.43.35",
-        // target: 'http://192.168.1.106',
-        target: "http://10.90.100.204",
+        target: 'http://192.168.1.106',
+        // target: "http://10.90.100.204",
         // target: "http://rsvz4t.natappfree.cc",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
@@ -41,6 +41,10 @@ module.exports = {
           "^/api": "/",
         },
       },
+      "/epiHome": {
+        target: 'http://10.90.100.201:8093',
+        ws: true,
+      },
     },
   },
 };