Commit 99153a3f authored by 邓超's avatar 邓超

fix: 流程中心

parent 3d7123dc
Pipeline #65819 passed with stages
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
.pageContent {
margin-top: -12px;
margin-left: -12px;
width: calc(100% + 24px);
height: calc(100% + 24px);
background: url("../../../../assets/images/workFlow/index/bg.png") no-repeat;
background-size: 100% 100%;
display: flex;
flex-direction: column;
padding: 12px;
.headerBox {
height: 50px;
display: flex;
background-color: #e9f0ff;
justify-content: space-between;
.left {
display: flex;
flex: 1;
.allFlows {
width: 176px;
height: 50px;
background: url("../../../../assets/images/workFlow/index/all.png") no-repeat;
background-size: 100% 100%;
cursor: pointer;
}
.allFlowsChoose {
background: url("../../../../assets/images/workFlow/index/allChoose.png") no-repeat;
background-size: 100% 100%;
}
.flows {
flex: 1;
height: 50px;
.ant-tabs-tab {
height: 50px;
background-color: #e9f0ff;
border-bottom: none;
}
.ant-tabs-tab-active {
border-top: 2px solid #3D78FF;
border-bottom: none;
background: linear-gradient(0deg, #BED2F9 0%, #F2F7FF 100%);
color: #3D78FF;
}
}
}
.right {
height: 50px;
display: flex;
align-items: center;
color: #3D78FF;
cursor: pointer;
margin-right: 12px;
.icon {
width: 18px;
height: 15px;
background: url("../../../../assets/images/workFlow/index/add.png") no-repeat;
background-size: 100% 100%;
}
}
}
.controlBox {
height: 65px;
display: flex;
align-items: center;
font-size: 14px;
.left {
margin-right: 490px;
span {
font-size: 18px;
font-weight: 700;
color: #3D78FF;
}
}
.right {
display: flex;
.btn {
display: flex;
margin-right: 5px;
align-items: center;
background: #3D78FF;
box-shadow: 0px 2px 2px 0px rgba(0, 34, 97, 0.1);
border-radius: 15px;
color: #fff;
padding: 3px 16px;
cursor: pointer;
}
.ant-input-affix-wrapper {
background-color: #C2D6FA;
border-radius: 16px 0 0 16px;
.ant-input {
background-color: #C2D6FA;
color: #7E8BA3;
border: none;
}
.ant-input::placeholder {
color: #7E8BA3;
}
}
.ant-input-group-addon {
border-radius: 0 16px 16px 0;
.ant-input-search-button {
border-radius: 0 16px 16px 0;
background-color: #C2D6FA;
border: none;
}
}
}
}
.flowTable {
flex: 1;
overflow-y: scroll;
.flowGroup {
.header {
display: flex;
align-items: center;
height: 45px;
.line {
width: 3px;
height: 12px;
background-color: #3D78FF;
margin-right: 5px;
margin-left: 7px;
}
.name {
font-size: 14px;
color: #2A4260;
}
}
.groupBox {
display: flex;
flex-wrap: wrap;
.flowBox {
width: 350px;
height: 222px;
display: flex;
flex-direction: column;
justify-content: space-between;
cursor: pointer;
transition: transform 0.5s;
margin-bottom: 5px;
.header {
display: flex;
width: 100%;
.title {
width: 200px;
margin-left: 15px;
margin-top: 26px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-left: 5px;
box-sizing: border-box;
}
.delete {
color: #FE5557;
cursor: pointer;
font-size: 16px;
margin-top: 22px;
}
.editBtn {
font-size: 14px;
display: flex;
margin-left: 31px;
width: 67px;
margin-top: 11px;
justify-content: center;
align-items: center;
color: #fff;
cursor: pointer;
}
}
.imgBox {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
margin-top: 1px;
img {
width: 230px;
// height: 125px;
// height: 350px;
}
}
.bottom {
display: flex;
width: 100%;
justify-content: space-between;
padding: 0 18px;
margin-bottom: 8px;
box-sizing: border-box;
}
&[type='1'] {
background: url("../../../../assets/images/workFlow/index/card1.png") no-repeat;
background-size: 100% 100%;
}
&[type='2'] {
background: url("../../../../assets/images/workFlow/index/card2.png") no-repeat;
background-size: 100% 100%;
}
&[type='3'] {
background: url("../../../../assets/images/workFlow/index/card3.png") no-repeat;
background-size: 100% 100%;
}
&[type='4'] {
background: url("../../../../assets/images/workFlow/index/card4.png") no-repeat;
background-size: 100% 100%;
}
&[type='0'] {
background: url("../../../../assets/images/workFlow/index/card5.png") no-repeat;
background-size: 100% 100%;
}
}
.flowBox:hover {
transform: translateY(-10px);
}
}
}
}
}
\ No newline at end of file
import React, { useState, useEffect } from 'react';
import { useHistory } from 'react-router-dom';
import styles from './FlowBoard.less';
import FlowChart from './FlowChartRt';
const FlowBoard = () => {
const history = useHistory();
useEffect(() => {}, []);
const { flowData, flowID, chartLoading, activeKey } = history.location.state;
return (
<div className={styles.flowChartContainer}>
<FlowChart
flowData={flowData}
flowID={flowID}
chartLoading={chartLoading}
activeKey={activeKey}
/>
</div>
);
};
export default FlowBoard;
// 流程图
.flowChartContainer {
position: relative;
width: 100%;
height: calc(100%);
background-color: #fff;
.chartBox {
position: relative;
// display: flex;
height: calc(100% - 52px);
.flowName {
position: absolute;
width: calc(100% - 360px);
top: 10px;
text-align: center;
font-size: 24px;
font-weight: 700;
color: #1585FF;
background-color: transparent;
z-index: 9;
}
.myOverviewDiv {
position: absolute;
height: 150px;
width: 300px;
left: 0;
bottom: 0;
background-color: #ccc;
z-index: 9;
}
}
.control {
display: flex;
justify-content: space-between;
height: 52px;
align-items: center;
padding: 0 10px;
.nodeList {
display: flex;
align-items: center;
.myPaletteSubprocess {
height: 52px;
width: 130px;
canvas {
height: 100%;
width: 1000px;
}
}
.myPaletteDiv {
// margin-right: 20px;
height: 52px;
width: 380px;
canvas {
height: 100%;
width: 1000px;
}
}
.lineBox {
height: 52px;
width: 1px;
background-color: #ccc;
// margin-right: 10px;
}
.nodeBox {
display: flex;
align-items: center;
justify-content: center;
height: 52px;
padding: 0 10px;
border-radius: 10px;
background-color: #D9E0FF;
margin-right: 10px;
.nodeImg {
img {
height: 35px;
}
margin-right: 5px;
}
}
}
.buttonList {
display: flex;
justify-content: flex-start;
margin: 15px 0 15px 0;
.ant-btn {
display: flex;
align-items: center;
justify-content: center;
margin-left: 10px;
}
}
}
canvas {
border: 0px;
outline: none;
}
.myDiagramDiv {
width: calc(100% - 360px);
// flex: 1;
height: 100%;
}
}
\ No newline at end of file
......@@ -34,7 +34,7 @@ const FlowGroupModal = props => {
return;
}
if (validate.name === msg.name) {
onSubumit();
onSubumit(validate.name);
return;
}
if (!msg.isOld) {
......@@ -46,7 +46,7 @@ const FlowGroupModal = props => {
newName: validate.name,
}).then(res => {
if (res.code === 0) {
onSubumit();
onSubumit(validate.name);
notification.success({
message: '提示',
duration: 3,
......
......@@ -31,7 +31,7 @@ const FlowModal = props => {
if (validate) {
let obj = {};
if (modalType === 'add') {
obj = validate;
obj = { ...validate, CreateUser: sessionStorage.getItem('userType') };
} else {
obj = { ...validate, flowID: msg.FlowID };
}
......
......@@ -93,6 +93,12 @@ const DatabaseConnectConfig = asyncComponent(() =>
// 用户中心
const UserManage = asyncComponent(() => import('@/pages/userCenter/userManage/UserManage'));
const Workflow = asyncComponent(() => import('@/pages/bsmanager/workOrder/workflowEdit/Workflow'));
const WorkflowHomePage = asyncComponent(() =>
import('@/pages/bsmanager/workOrder/workflowEdit/WorkflowHomePage'),
);
const FlowBoard = asyncComponent(() =>
import('@/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowBoard'),
);
const RoleManage = asyncComponent(() => import('@/pages/userCenter/roleManage/RoleManage'));
const SiteManage = asyncComponent(() => import('@/pages/userCenter/siteManage/SiteManage'));
// 数据中心
......@@ -108,6 +114,9 @@ const PanoramaConfig = asyncComponent(() =>
import('@/pages/platformCenter/gis/panoramaConfig/index'),
);
const MessageManager = asyncComponent(() => import('@/pages/platformCenter/messageManage'));
// const SchemeDetail = asyncComponent(() =>
// import('@/pages/platformCenter/messageManage/schemeDetails/schemeDetails'),
// );
const SchemeDetail = asyncComponent(() =>
import('@/pages/platformCenter/messageManage/schemeDetail/schemeDetail'),
);
......@@ -329,6 +338,17 @@ export default {
name: '工作流编辑',
component: Workflow,
},
{
path: '/biz/workflow/center',
name: '流程中心',
component: WorkflowHomePage,
},
{
path: '/biz/workflow/flowBoard',
name: '流程画板',
component: FlowBoard,
hideMenu: true,
},
{
path: '/biz/workflow/holidays',
name: '节假日管理',
......
......@@ -35,3 +35,6 @@ export const FlowNodeSave = param =>
export const DeleteFlowNode = param => get(`${PUBLISH_SERVICE}/WorkFlow/DeleteFlowNode`, param);
// 批量删除
export const DeleteFlowNodes = param => post(`${PUBLISH_SERVICE}/WorkFlow/DeleteFlowNodes`, param);
// 保存basde65
export const SaveWorkFlowImage = param =>
post(`${PUBLISH_SERVICE}/FileCenter/SaveWorkFlowImage`, param);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment