对接劳务管理右下角今日-实时数据。

src/views/sevenLargeScreen/distributionMonitoring/bottomLeft.vue

@@ -267,7 +267,7 @@ function initOption() {
 
 function drawChart() {
 	initOption();
-	console.log("绘制前数据", yData.value)
+	console.log("绘制前数据", yData.value);
 	let EchartsTime = echarts.init(document.getElementById("EchartsTime"));
 	EchartsTime.setOption(option.value);
 }

src/views/sevenLargeScreen/distributionMonitoring/topCenter.vue

@@ -63,7 +63,12 @@ import { getRealTimeDataApi, getDevListApi } from "@/api/modules/distribution";
 import mitts from "@/utils/bus"; //兄弟组件传值
 // import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
-const store = GlobalStore();
+
+function selectChange(e: any) {
+	//发送设备编号
+	mitts.emit("devSn", e);
+}
+
 // 下拉框存放的value
 let devValue = ref(1 as any);
 let noiseList = ref([
@@ -76,18 +81,14 @@ let noiseList = ref([
 		label: "电箱2"
 	}
 ]);
-function selectChange(e: any) {
+const store = GlobalStore();
-	//发送设备编号
-	mitts.emit("devSn", e);
-}
-
 const getDevOption = async () => {
 	const res: any = await getDevListApi({
 		projectSn: store.sn
 	});
 	if (res.result) {
 		devValue.value = res.result[0].devSn;
-		noiseList.value = res.result.map(item => {
+		noiseList.value = res.result.map((item: any) => {
 			return {
 				value: item.devSn,
 				label: item.devName
@@ -98,7 +99,7 @@ const getDevOption = async () => {
 };
 
 // let devSn = ref("" as any);
-let realTimeData = ref(null as any)
+let realTimeData = ref(null as any);
 const getRealTimeList = async () => {
 	const res: any = await getRealTimeDataApi({
 		projectSn: store.sn,

src/views/sevenLargeScreen/laborManagement/rightBottom.vue

@@ -1,14 +1,14 @@
 <template>
 	<Card title="按分包单位分析">
 		<div class="rightHeader">
-			<div class="day Selected">实时</div>
+			<div class="day Selected" @click="getNowData">实时</div>
-			<div class="year Selected">今日</div>
+			<div class="year Selected" @click="getTodayData">今日</div>
 		</div>
 		<div id="echartsBottom" style="width: 100%; height: 100%"></div>
 	</Card>
 </template>
 
-<script>
+<script lang="ts" setup>
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import * as echarts from "echarts";
 import { getComapnyWorkTotalListApi } from "@/api/modules/labor";
@@ -16,14 +16,9 @@ import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
 const store = GlobalStore();
 
-export default {
+const labelimg = ref(new URL("@/assets/images/larborManagement/greenX.png", import.meta.url).href);
-	components: {
+const labelimg2 = ref(new URL("@/assets/images/larborManagement/orangeX.png", import.meta.url).href);
-		Card
+let option = ref({
-	},
-	setup() {
-		const labelimg = ref(new URL("@/assets/images/larborManagement/greenX.png", import.meta.url).href);
-		const labelimg2 = ref(new URL("@/assets/images/larborManagement/orangeX.png", import.meta.url).href);
-		let option = ref({
 	grid: {
 		left: "10%",
 		top: "25%",
@@ -63,7 +58,7 @@ export default {
 			width: 10,
 			show: true,
 			rotate: 0,
-					interval: 0,
+			interval: 2,
 			textStyle: {
 				// padding: [14, 0, 0, 0],
 				fontSize: 12,
@@ -304,49 +299,70 @@ export default {
 			symbol: "path://M0,10 L10,10 C5.5,10 5.5,5 5,0 C4.5,5 4.5,10 0,10 z"
 		}
 	]
-		});
+});
-		function draw() {
+function draw() {
 	let echartsTest = echarts.init(document.getElementById("echartsBottom"));
 	console.log("按分包单位分析绘图数据", option.value);
 	echartsTest.setOption(option.value);
-		}
+}
-		//获取按分包单位分析数据
+//获取按分包单位分析数据
-		// let timer = null
+// let timer = null
 
-		onMounted(async () => {
+onMounted(async () => {
 	await getProjectWorkerList();
 	draw();
-		});
+});
 
-		async function getProjectWorkerList() {
+function getNowData() {
-			let res = await getComapnyWorkTotalListApi({
+	yData.value = companyWorkTotalData.value.map((item: any) => item.presencePersonNum);
-				projectSn: store.sn
-			});
-			let xData = [];
-			let yData = [];
-			console.log("按分包单位分析数据", res);
-			if (res.result) {
-				res.result.forEach(item => {
-					// 只取有数据的工种
-					if (item.totalPersonNum > 0) {
-						xData.push(item.enterpriseName);
-						yData.push(item.totalPersonNum);
-						// 计算工人总和
-						// max.value = max.value + item.totalPersonNum;
-						// projectWorkerTypeOption.push({
-						// 	value: item.totalPersonNum,
-						// 	name: item.enterpriseName
-						// });
-					}
-				});
-				console.log(option.value.series[0].data, `series_old`);
 	option.value.series[0].data = option.value.series[0].data.map((item, index) => {
 		return {
 			...item,
-						value: yData[index]
+			value: yData.value[index]
 		};
 	});
-				option.value.xAxis.data = xData;
+	draw();
+	// option.value.xAxis.data = xData.value;
+	// presencePersonNum
+}
+function getTodayData() {
+	yData.value = companyWorkTotalData.value.map((item: any) => item.attendancePersonNum);
+	option.value.series[0].data = option.value.series[0].data.map((item, index) => {
+		return {
+			...item,
+			value: yData.value[index]
+		};
+	});
+	draw();
+	// option.value.xAxis.data = xData.value;
+	// attendancePersonNum
+}
+
+let companyWorkTotalData = ref([] as any);
+let xData = ref([] as any);
+let yData = ref([] as any);
+async function getProjectWorkerList() {
+	let res = await getComapnyWorkTotalListApi({
+		projectSn: store.sn
+	});
+	if (res.result) {
+		res.result.forEach((item: any) => {
+			// 只取有数据的工种
+			if (item.totalPersonNum > 0) {
+				companyWorkTotalData.value.push(item);
+				xData.value.push(item.enterpriseName);
+				yData.value.push(item.totalPersonNum);
+			}
+		});
+		console.log("按分包单位分析数据", companyWorkTotalData.value);
+		// console.log(option.value.series[0].data, `series_old`);
+		option.value.series[0].data = option.value.series[0].data.map((item, index) => {
+			return {
+				...item,
+				value: yData.value[index]
+			};
+		});
+		option.value.xAxis.data = xData.value;
 		// option.value.yAxis.data = yData;
 		// 接口成功获取新值
 		// optionData.value = getData(data);
@@ -358,9 +374,7 @@ export default {
 	// let res: any = await getComapnyWorkTotalListApi({
 	// 	projectSn: store.sn
 	// });
-		}
+}
-	}
-};
 </script>
 
 <style lang="scss" scoped>

src/views/sevenLargeScreen/laborManagement/rightTop.vue

@@ -1,10 +1,10 @@
 <template>
 	<Card title="按工种分析">
 		<div class="rightHeader">
-			<!-- <div class="day Selected">实时</div> -->
+			<!-- <div class="day Selected" @click="getNowData">实时</div> -->
-			<!-- <div class="year Selected">今日</div> -->
+			<!-- <div class="year Selected" @click="getTodayData">今日</div> -->
 		</div>
-		<div class="num">{{max}}</div>
+		<div class="num">{{ max }}</div>
 		<div id="echartTop" style="width: 100%; height: 100%"></div>
 	</Card>
 </template>
@@ -31,42 +31,8 @@ let data = reactive(
 		return b.value - a.value;
 	})
 );
-// let data = reactive(
-// 	[
-// 		{
-// 			name: "塔吊司机",
-// 			value: 1969
-// 		},
-// 		{
-// 			name: "架子工",
-// 			value: 1476
-// 		},
-// 		{
-// 			name: "电焊工",
-// 			value: 1500
-// 		},
-// 		{
-// 			name: "钢筋工",
-// 			value: 1476
-// 		},
-// 		{
-// 			name: "抹灰工",
-// 			value: 2997
-// 		}
-// 	].sort(function (a, b) {
-// 		return b.value - a.value;
-// 	})
-// );
 
-// function array2obj(array, key) {
+function getData(data: any) {
-// 	let resObj = {};
-// 	for (let i = 0; i < array.length; i++) {
-// 		resObj[array[i][key]] = array[i];
-// 	}
-// 	return resObj;
-// }
-
-function getData(data) {
 	let res = {
 		series: [],
 		yAxis: []
@@ -114,7 +80,7 @@ function getData(data) {
 	return res;
 }
 // let objData = array2obj(data, "name");
-let option = ref({} as any)
+let option = ref({} as any);
 let optionData = ref(null as any);
 
 // 初始化option 绘制图表
@@ -123,8 +89,8 @@ function initOption() {
 		legend: {
 			show: true,
 			itemGap: 20,
-			itemWidth: 40,
+			itemWidth: 15,
-			itemHeight: 10,
+			itemHeight: 15,
 			icon: "rect",
 			orient: "horizontal",
 			// x: "right",
@@ -174,8 +140,8 @@ function draw() {
 	// console.log('绘图数据',option.value);
 }
 // 存储最大值
-let max = ref(0 as any)
+let max = ref(0 as any);
-
+let projectWorkerTypeData = ref([] as any);
 //获取工种分析数据
 // let timer = null
 const getProjectWorkerList = async () => {
@@ -190,6 +156,9 @@ const getProjectWorkerList = async () => {
 			if (item.workerNum > 0) {
 				// 计算工人总和
 				max.value = max.value + item.workerNum;
+				// 所有数据
+				projectWorkerTypeData.value.push(item);
+				// 取
 				projectWorkerTypeOption.push({
 					value: item.workerNum,
 					name: item.typeName