From 33ce5012d7e09ac5b6fd8985451818321ca0d23d Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sat, 25 May 2024 19:55:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                         | 7 ++-----
 pages/login/login.vue                           | 2 +-
 pages/projectEnd/laborManage/workerAnalysis.vue | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/main.js b/main.js
index 18ffa21e..ff312815 100644
--- a/main.js
+++ b/main.js
@@ -46,9 +46,9 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
 	// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
 	// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
-	// Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
+	Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
 	// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
-	Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
+	// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
 	// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
 	// Vue.prototype.url_config = 'http://139.9.66.234:5173/'
 	// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
@@ -308,8 +308,6 @@ Vue.prototype.sendRequest = function(param) {
 // 判断权限的函数
 Vue.prototype.checkPermission = function(permission) {
 	var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList;
-	console.log(permission,'我的测试指令1')
-	console.log(permissions,'我的测试指令2')
 	// var permissions = store.state.userInfo.menuAuthority.menuList;
 	permissions = permissions.filter(
 		(x) => x.path == permission.menuPath
@@ -320,7 +318,6 @@ Vue.prototype.checkPermission = function(permission) {
 	let index = permissions.actionList.findIndex(
 		(x) => x.actionCode == permission.key
 	)
-	console.log(index,'我的测试指令3')
 	return index != -1 ? true : false;
 }
 const app = new Vue({
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5e278b3b..a0dbf1b0 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -7,7 +7,7 @@
 		<view class="loginBox">
 			<view class="loginTitle">
 				<image class="loginLogo" src="@/static/login/logo.pic.jpg" mode="heightFix"></image>
-				智慧工地服务平台
+				智慧安全
 			</view>
 			<view class="btns">
 				<view class="user feedback" @click="goto('user')">用户登录</view>
diff --git a/pages/projectEnd/laborManage/workerAnalysis.vue b/pages/projectEnd/laborManage/workerAnalysis.vue
index 9848faf4..d72fa20d 100644
--- a/pages/projectEnd/laborManage/workerAnalysis.vue
+++ b/pages/projectEnd/laborManage/workerAnalysis.vue
@@ -98,6 +98,7 @@
 		data() {
 			return {
 				pieChartData: {
+					categories: [],
 					title: {
 						name: "",
 						color: '#7cb5ec',