From f6e2b5dbf68d1d6d502e8e94345473057dfa7174 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 6 Jun 2022 09:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=87=E6=8F=9B=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java      | 5 ++++-
 .../src/views/projectManagement/projectStatusBoard/index.vue | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 62900e426..31dba0885 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -614,7 +614,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
 
 		//验证当前用户在该项目中是什么角色
-		int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), "");
+		//int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), "");
+		//if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+
 		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
 			projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{
 				queryWrapper.eq("regulation_owner_id",currentUser.getId()).
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index a2b1d93dd..918228ca2 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -281,7 +281,7 @@
           for (let j = 0; j < timeDataList.length; j++) {
             let time = JSON.stringify(timeDataList[j].time).slice(1, 11)
             if (time == list[i]) {
-              data.push([i, timeDataList[j].index, 14, j])
+              data.push([i, timeDataList[j].index, 12, j])
             }
           }
         }
@@ -368,6 +368,7 @@
           series: [
             {
               type: 'scatter',
+              color:['#21c9cc'],
               symbolSize: function(val) {
                 return val[2] * 2
               },