flx：修复新劳务管理模块

src/views/sevenLargeScreen/indexL.vue

@@ -864,7 +864,9 @@ function jumpBgd() {
 	if (COMPANY == "") {
 		// window.location.replace("http://192.168.34.216:8080/#/login?token=" + store.token);
 		// window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token);
-		window.location.replace(BASEURL + "/#/login?token=" + store.token);
+		// window.location.replace(BASEURL + "/#/login?token=" + store.token);
+		// 新项目通用(百色服务器)
+		window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
 	} else if (COMPANY === "tj") {
 		window.location.replace("http://192.168.110.220:9809/#/login?token=" + store.token);
 	} else if (COMPANY === "as") {

src/views/sevenLargeScreen/newLaborManagement/leftTop.vue

@@ -180,7 +180,7 @@ function drawChart(result: any) {
 	let myEchartsNum = echarts.init(dom);
 	const option = {
 		grid: {
-			left: "4%",
+			left: "6%",
 			right: "5%",
 			bottom: "10%"
 			// containLabel: true,
@@ -248,7 +248,9 @@ function drawChart(result: any) {
 					color: "#fff",
 					nameLocation: "start"
 				},
-				splitNumber: 5,
+				// splitNumber: 5,
+				max: 100,
+				min: 0,
 				axisLabel: {
 					color: "#fff",
 					formatter: "{value}"

src/views/sevenLargeScreen/newLaborManagement/rightBottom.vue

@@ -60,7 +60,7 @@ function drawChart(result: any) {
 			textStyle: {
 				color: "#ffffff"
 			},
-			data: ["出勤人数", "在职人数", "出勤率"],
+			data: ["出勤人数", "在职人数", "出勤率"]
 		},
 		xAxis: [
 			{
@@ -108,7 +108,8 @@ function drawChart(result: any) {
 					color: "#fff",
 					nameLocation: "start"
 				},
-				splitNumber: 5,
+				max: 100,
+				min: 0,
 				axisLabel: {
 					color: "#fff",
 					formatter: "{value}"

src/views/sevenLargeScreen/newLaborManagement/videoSurveillance.vue

@@ -10,9 +10,10 @@
 								:options="filterTreeData"
 								filterable
 								placeholder="请选择"
-                                size="small"
+								size="small"
 								:show-all-levels="false"
 								@change="handleUnfold"
+								@visible-change="visibleChange"
 								:props="{
 									emitPath: false,
 									value: 'id',
@@ -22,21 +23,23 @@
 							></el-cascader>
 						</div>
 					</div>
-					<!-- 萤石云播放 -->
+					<div v-if="showVideo">
-					<!-- <div ref="playWndBox" style="width: 100%; height: 100%; margin: 0 5% 2% 5%" v-if="videoType === 1">
+						<!-- 萤石云播放 -->
+						<!-- <div ref="playWndBox" style="width: 100%; height: 100%; margin: 0 5% 2% 5%" v-if="videoType === 1">
 						<ysyPlayAndPlayback :ref="'ysy'" :ysyParams="ysyParams"></ysyPlayAndPlayback>
 					</div> -->
-					<div class="ysy-player-container" v-if="videoType === 1">
+						<div class="ysy-player-container" v-if="videoType === 1">
-						<ysyPlayer :isCardVideo="true" ref="ysy"></ysyPlayer>
+							<ysyPlayer :isCardVideo="true" ref="ysy"></ysyPlayer>
-					</div>
+						</div>
-					<DHPlayer :devList="dhVideoList" v-else-if="videoType === 4" ref="dhplayer"></DHPlayer>
+						<DHPlayer :devList="dhVideoList" v-else-if="videoType === 4" ref="dhplayer"></DHPlayer>
-					<!-- 播放海康 -->
+						<!-- 播放海康 -->
-					<div ref="playWndBox" style="width: 100%; height: 100%">
+						<div ref="playWndBox" style="width: 100%; height: 100%">
-						<div id="playWnd" class="playWnd" style="width: 100%; height: 100%"></div>
+							<div id="playWnd" class="playWnd" style="width: 100%; height: 100%"></div>
-						<!-- :style="{
+							<!-- :style="{
 							height: playWndHeight + 'px',
 							width: playWndWidth + 'xp'
 						}"-->
+						</div>
 					</div>
 				</Card>
 			</div>
@@ -57,12 +60,14 @@ import { GlobalStore } from "@/stores";
 import { selectProjectVideoListApi, selectProjectVideoGroupApi, getSafeHatSessionApi } from "@/api/modules/video";
 import { COMPANY } from "@/config/config";
 import emitter from "@/views/sevenLargeScreen/videoManagement/mitt";
+import { type } from "os";
 const defaultProps = {
 	children: "children",
 	label: (data: any, node: any) => node.data.name
 };
 let videoType = ref("") as any;
 let ysyParams = ref({} as any);
+const showVideo = ref(true);
 let select = ref(1) as any;
 // 修改布局选项配置
 const layoutOptions = [
@@ -222,21 +227,21 @@ let objData = ref({
 	layout: "1x1" //页面展示的模块数【16】
 });
 const handleUnfold = (rowId: any) => {
-    let expandedItem = {};
+	let expandedItem = {};
 	// 递归 筛选出节点的id
 	const recursion = (dataList: [], itemId: any) => {
 		dataList.forEach((item: any) => {
-			if(item.id === itemId) {
+			if (item.id === itemId) {
-                expandedItem = item;
+				expandedItem = item;
-            }
+			}
 			if (item.list && item.list.length) {
 				recursion(item.list, itemId);
 			}
 		});
 	};
 	recursion(shipinList.value, rowId);
-    console.log(rowId,shipinList.value,expandedItem, 2222)
+	console.log(rowId, shipinList.value, expandedItem, 2222);
-    checkVideo(expandedItem);
+	checkVideo(expandedItem);
 };
 //设备列表的点击操作
 const checkVideo = async (item: any) => {
@@ -320,6 +325,14 @@ const handleVideoConfig = (videoData: any) => {
 		initPlugin();
 	}
 };
+const visibleChange = (val: any) => {
+	if(val) {
+		oWebControl.JS_HideWnd();
+	} else {
+		oWebControl.JS_ShowWnd();
+	}
+	showVideo.value = val;
+};
 onBeforeMount(() => {
 	getVideoList();
 });
@@ -680,7 +693,7 @@ const previewVideo = (data: string | null) => {
 	position: relative;
 	margin-top: 1%;
 	height: 88%;
-    padding: 5px;
+	padding: 5px;
 }
 ::v-deep .h-card .title .titltText {
 	margin-bottom: 0%;