diff --git a/src/api/flow/index.js b/src/api/flow/index.js index e9edb4f..09f6d33 100644 --- a/src/api/flow/index.js +++ b/src/api/flow/index.js @@ -84,6 +84,13 @@ const findFormDatasByProcInsId=(procInsId)=> { }) } +const findFlowLabourGroupCountByApprove=(deptId,projectId)=> { + return request({ + url: `bgscreen/flow/findFlowLabourGroupCountByApprove?projectId=${projectId}&deptId=${deptId}`, + method: 'get' + }) +} + export default{ groupByCategory, @@ -95,5 +102,6 @@ export default{ groupByProject, findSafetyWorkList, findFormDatasByProcInsId, - listByCategory + listByCategory, + findFlowLabourGroupCountByApprove } diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue index 4247d35..d5c4533 100644 --- a/src/pages/projectDetail.vue +++ b/src/pages/projectDetail.vue @@ -1,517 +1,916 @@ - + \ No newline at end of file + +.my-svg-icon-blue, +.my-svg-icon-green, +.my-svg-icon-red { + width: 28px; + height: 28px; + position: relative; + top: -13px; +} + +.my-svg-icon-green * { + fill: #63f8bc; +} + +.fgreen { + color: #63f8bc !important; +} + +.my-svg-icon { + width: 40px; + height: 40px; + margin-bottom: 20px; +} + +.my-svg-icon-blue * { + fill: #389de3; +} + +.my-svg-icon-red * { + fill: red; +} +