From c4e54711fc2588ace79b38c28c8fd998004cf445 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sat, 6 Apr 2024 12:31:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9agjt=E5=8A=B3=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laborManagement/circularGraph.vue         |  2 +-
 .../laborManagement/rightCenter.vue           | 25 ++++++++++++++++---
 .../videoManagement/index.vue                 | 16 +++++++++---
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/views/sevenLargeScreen/laborManagement/circularGraph.vue b/src/views/sevenLargeScreen/laborManagement/circularGraph.vue
index 3aa03be..0ae11c2 100644
--- a/src/views/sevenLargeScreen/laborManagement/circularGraph.vue
+++ b/src/views/sevenLargeScreen/laborManagement/circularGraph.vue
@@ -434,7 +434,7 @@ const getEnterpriseInfoList = async () => {
 	const res: any = await getEnterpriseInfoApi({
 		projectSn: store.sn,
 		pageNo: 1,
-		pageSize: 10
+		pageSize: 999
 	});
 	if(res.result.total !== '0'){
 		console.log("获取劳务班组公司数据1", res);
diff --git a/src/views/sevenLargeScreen/laborManagement/rightCenter.vue b/src/views/sevenLargeScreen/laborManagement/rightCenter.vue
index f171d15..53ed15c 100644
--- a/src/views/sevenLargeScreen/laborManagement/rightCenter.vue
+++ b/src/views/sevenLargeScreen/laborManagement/rightCenter.vue
@@ -257,11 +257,28 @@ function initOption() {
 				var dataValue = data.value.find(function (item) {
 					return item.name === name;
 				});
-				if (dataValue) {
-					return name + "   " + dataValue.value;
-				} else {
-					return name;
+				let tip1 = "";
+				let tip = "";
+				let le = name.length  //图例文本的长度
+				if(le > 14){   //几个字换行大于几就可以了
+					let l = Math.ceil(le/14)  //有些不能整除，会有余数，向上取整
+					for(let i = 1;i <= l;i++){ //循环
+						if(i < l){ //最后一段字符不能有\n
+							tip1 += name.slice(i*14-14,i*14)+'\n'; //字符串拼接
+						}else if(i === l){  //最后一段字符不一定够9个
+							tip = tip1 + name.slice((l-1)*14,le) //最后的拼接在最后
+						}
+					}
+					return tip + "   " + dataValue.value;
+				}else{
+					tip = name  //前面定义了tip为空，这里要重新赋值，不然会替换为空
+					return tip + "   " + dataValue.value;
 				}
+				// if (dataValue) {
+				// 	return name + "   " + dataValue.value;
+				// } else {
+				// 	return name;
+				// }
 			
 			}
 			
diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue
index 7966d12..51472b1 100644
--- a/src/views/sevenLargeScreen/videoManagement/index.vue
+++ b/src/views/sevenLargeScreen/videoManagement/index.vue
@@ -106,10 +106,18 @@ const goToSafeHelmet = async () => {
 };
 
 let objData = ref({
-	appkey: "24017757", //海康提供的appkey
-	ip: "182.101.141.23", //海康提供的ip
-	secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
-	port: 18443,
+	// appkey: "24017757", //海康提供的appkey
+	appkey: "23071374", //anjt的appkey
+	// appkey: "", //anjt的appkey
+	// ip: "182.101.141.23", //海康提供的ip
+	ip: "10.168.1.100", //anjt的ip
+	// ip: "", //anjt的ip
+	// secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
+	secret: "skaSIHSYPRIynnxz7o57", //anjt的secret
+	// secret: "", //anjt的secret
+	// port: 18443,
+	port: 443,//anjt的端口
+	// port: '',//anjt的端口
 	playMode: 0, // 0 预览 1回放
 	layout: "1x1" //页面展示的模块数【16】
 });