Skip to content

C
CivManage
Commit b70a5514 authored by 邓超's avatar 邓超
Browse files
Options

fix: 解决冲突提交

parents e8376731 a6cba482
Pipeline #39088 skipped with stages
        Expand all Show whitespace changes
        Inline Side-by-side
        Showing with 245 additions and 203 deletions
        src/pages/platformCenter/bsmanager/maintenance/maintenance.jsx
        View file @ b70a5514
        /* eslint-disable react-hooks/rules-of-hooks */
        /* eslint-disable camelcase */
        import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
        import styles from './maintenance.less' import { Space, Table, Popconfirm, Tooltip, Button, notification } from 'antd';
        import { import {
        Space, CM_XWBPlan_DataList,
        Table, CM_XWBPlan_RemovePlan,
        Popconfirm, } from '@/services/maintenance/api';
        Tooltip, import { EditTwoTone, DeleteOutlined, PlusOutlined } from '@ant-design/icons';
        Button, import styles from './maintenance.less';
        notification import AddModal from './AddModal';
        } from 'antd';
        import {CM_XWBPlan_DataList, CM_XWBPlan_RemovePlan} from '@/services/maintenance/api';
        import {
        EditTwoTone,
        DeleteOutlined,
        PlusOutlined
        } from '@ant-design/icons';
        import AddModal from './AddModal'
        const maintenance = () => { const maintenance = () => {
        const [addVisible, setAddVisible] = useState(false) const [addVisible, setAddVisible] = useState(false);
        const [type, setType] = useState('') const [type, setType] = useState('');
        const [formObj, setFormObj] = useState('') const [formObj, setFormObj] = useState('');
        const [treeLoading, setTreeLoading] = useState(false); const [treeLoading, setTreeLoading] = useState(false);
        const [flag, setFlag] = useState(0); const [flag, setFlag] = useState(0);
        const [tableData, setTableData] = useState([]) const [tableData, setTableData] = useState([]);
        const columns = [ const columns = [
        { {
        ...@@ -30,7 +24,7 @@ const maintenance = () => { ...@@ -30,7 +24,7 @@ const maintenance = () => {
        dataIndex: 'businessName', dataIndex: 'businessName',
        key: 'businessName', key: 'businessName',
        width: 100, width: 100,
        align:'center', align: 'center',
        }, },
        { {
        title: '业务类型', title: '业务类型',
        ...@@ -38,14 +32,14 @@ const maintenance = () => { ...@@ -38,14 +32,14 @@ const maintenance = () => {
        key: 'businessType', key: 'businessType',
        width: 100, width: 100,
        ellipsis: true, ellipsis: true,
        align:'center', align: 'center',
        }, },
        { {
        title: '执行周期', title: '执行周期',
        dataIndex: 'docycle', dataIndex: 'docycle',
        key: 'docycle', key: 'docycle',
        width: 100, width: 100,
        align:'center', align: 'center',
        }, },
        { {
        title: '台账名称', title: '台账名称',
        ...@@ -53,14 +47,14 @@ const maintenance = () => { ...@@ -53,14 +47,14 @@ const maintenance = () => {
        key: 'accountName', key: 'accountName',
        width: 200, width: 200,
        ellipsis: true, ellipsis: true,
        align:'center', align: 'center',
        }, },
        { {
        title: '反馈名称', title: '反馈名称',
        dataIndex: 'feedbackName', dataIndex: 'feedbackName',
        key: 'feedbackName', key: 'feedbackName',
        width: 200, width: 200,
        align:'center', align: 'center',
        }, },
        { {
        title: '台账过滤条件', title: '台账过滤条件',
        ...@@ -68,14 +62,14 @@ const maintenance = () => { ...@@ -68,14 +62,14 @@ const maintenance = () => {
        key: 'filterCondition', key: 'filterCondition',
        width: 200, width: 200,
        ellipsis: true, ellipsis: true,
        align:'center', align: 'center',
        }, },
        { {
        title: '是否送审', title: '是否送审',
        dataIndex: 'isSubmit', dataIndex: 'isSubmit',
        key: 'isSubmit', key: 'isSubmit',
        width: 100, width: 100,
        align:'center', align: 'center',
        }, },
        { {
        title: '执行角色', title: '执行角色',
        ...@@ -83,14 +77,14 @@ const maintenance = () => { ...@@ -83,14 +77,14 @@ const maintenance = () => {
        key: 'doRole', key: 'doRole',
        width: 200, width: 200,
        ellipsis: true, ellipsis: true,
        align:'center', align: 'center',
        }, },
        { {
        title: '预生成天数', title: '预生成天数',
        dataIndex: 'produceDays', dataIndex: 'produceDays',
        key: 'produceDays', key: 'produceDays',
        width: 100, width: 100,
        align:'center', align: 'center',
        }, },
        { {
        title: '在线任务量', title: '在线任务量',
        ...@@ -98,14 +92,14 @@ const maintenance = () => { ...@@ -98,14 +92,14 @@ const maintenance = () => {
        key: 'onLines', key: 'onLines',
        width: 100, width: 100,
        ellipsis: true, ellipsis: true,
        align:'center', align: 'center',
        }, },
        { {
        title: '启停', title: '启停',
        dataIndex: 'doNot', dataIndex: 'doNot',
        key: 'doNot', key: 'doNot',
        width: 100, width: 100,
        align:'center', align: 'center',
        }, },
        { {
        title: '操作', title: '操作',
        ...@@ -123,11 +117,7 @@ const maintenance = () => { ...@@ -123,11 +117,7 @@ const maintenance = () => {
        <Tooltip title="删除"> <Tooltip title="删除">
        <Popconfirm <Popconfirm
        placement="bottomRight" placement="bottomRight"
        title={ title={<p>是否确认删除？</p>}
        <p>
        是否确认删除？
        </p>
        }
        okText="确认" okText="确认"
        cancelText="取消" cancelText="取消"
        onConfirm={() => deleteEventType(record)} onConfirm={() => deleteEventType(record)}
        ...@@ -138,37 +128,36 @@ const maintenance = () => { ...@@ -138,37 +128,36 @@ const maintenance = () => {
        </Space> </Space>
        ), ),
        }, },
        ];
        ] useEffect(() => {
        useEffect(()=>{
        setTreeLoading(true); setTreeLoading(true);
        CM_XWBPlan_DataList().then(res=>{ CM_XWBPlan_DataList().then(res => {
        setTreeLoading(false); setTreeLoading(false);
        if(res.msg == 'Ok'){ if (res.msg === 'Ok') {
        setTableData(res.data) setTableData(res.data);
        } }
        }) });
        },[flag]) }, [flag]);
        const add =()=>{ const add = () => {
        setAddVisible(true) setAddVisible(true);
        setType('add') setType('add');
        } };
        const editEventType =record=>{ const editEventType = record => {
        setAddVisible(true) setAddVisible(true);
        setType('edit') setType('edit');
        setFormObj(record); setFormObj(record);
        } };
        const deleteEventType = record =>{ const deleteEventType = record => {
        CM_XWBPlan_RemovePlan({planId:record.id}).then(res =>{ CM_XWBPlan_RemovePlan({ planId: record.id }).then(res => {
        if (res.msg === '') { if (res.msg === '') {
        notification.success({ notification.success({
        message: '提示', message: '提示',
        duration: 3, duration: 3,
        description: '删除成功', description: '删除成功',
        }); });
        setFlag(flag + 1) setFlag(flag + 1);
        } else { } else {
        notification.error({ notification.error({
        message: '提示', message: '提示',
        ...@@ -176,19 +165,27 @@ const maintenance = () => { ...@@ -176,19 +165,27 @@ const maintenance = () => {
        description: res.msg, description: res.msg,
        }); });
        } }
        }) });
        } };
        const onSubmit =()=>{ const onSubmit = () => {
        setAddVisible(false) setAddVisible(false);
        setFlag(flag + 1) setFlag(flag + 1);
        } };
        return ( return (
        <div className={styles.maintenanceContainer}> <div className={styles.maintenanceContainer}>
        <div className={styles.contentContainers}> <div className={styles.contentContainers}>
        <div style={{ height: '50px', backgroundColor: 'white' }}> <div style={{ height: '50px', backgroundColor: 'white' }}>
        <span style={{ float: 'right', marginRight: '10px' }}> <span style={{ float: 'right', marginRight: '10px' }}>
        <Button icon={<PlusOutlined className={styles.icon} />} onClick={add} style={{ marginLeft: '30px', verticalAlign: 'middle', marginTop: '10px' }}> <Button
        icon={<PlusOutlined className={styles.icon} />}
        onClick={add}
        style={{
        marginLeft: '30px',
        verticalAlign: 'middle',
        marginTop: '10px',
        }}
        >
        添加 添加
        </Button> </Button>
        </span> </span>
        ...@@ -196,17 +193,18 @@ const maintenance = () => { ...@@ -196,17 +193,18 @@ const maintenance = () => {
        <Table <Table
        // rowClassName={setRowClassName} // rowClassName={setRowClassName}
        size="small" size="small"
        rowKey='ID' rowKey="ID"
        bordered bordered
        loading={treeLoading} loading={treeLoading}
        onRow={record => { onRow={record => ({
        return { onDoubleClick: event => {
        onDoubleClick: event => { event.stopPropagation(); editEventType(record) }, //双击 event.stopPropagation();
        }; editEventType(record);
        }} }, // 双击
        })}
        columns={columns} columns={columns}
        dataSource={tableData} dataSource={tableData}
        scroll={{ y: 'calc(100vh - 215px)' }} scroll={{ y: 'calc(100vh - 215px)', x: 'max-content' }}
        pagination={{ pagination={{
        showTotal: (total, range) => showTotal: (total, range) =>
        `第${range[0]}-${range[1]} 条/共 ${total} 条`, `第${range[0]}-${range[1]} 条/共 ${total} 条`,
        ...@@ -227,7 +225,7 @@ const maintenance = () => { ...@@ -227,7 +225,7 @@ const maintenance = () => {
        /> />
        </div> </div>
        </div> </div>
        ) );
        }; };
        export default maintenance export default maintenance;
        \ No newline at end of file
        src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
        View file @ b70a5514
        This source diff could not be displayed because it is too large. You can view the blob instead.
        src/pages/platformCenter/bsmanager/workOrder/incident.less
        View file @ b70a5514
        ...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
        line-height: 35px; line-height: 35px;
        } }
        .ant-btn .anticon.anticon-plus > svg { .ant-btn .anticon.anticon-plus > svg {
        margin-top:-5px; margin-top: -5px;
        } }
        .incidentContainer{ .incidentContainer {
        .ant-card-body { .ant-card-body {
        padding: 12px 24px 24px 24px; padding: 12px 24px 24px 24px;
        } }
        .linkDrowp{ .linkDrowp {
        position: absolute; position: absolute;
        left: 93.5%; left: 93.5%;
        width: 1rem; width: 1rem;
        ...@@ -17,25 +17,25 @@ ...@@ -17,25 +17,25 @@
        display: flex; display: flex;
        align-items: center; align-items: center;
        } }
        .listItem{ .listItem {
        display: flex; display: flex;
        justify-content: space-between; justify-content: space-between;
        font-size: 14px; font-size: 14px;
        font-weight: 400; font-weight: 400;
        color: #414E65; color: #414e65;
        cursor: pointer; cursor: pointer;
        line-height: 28px; line-height: 28px;
        align-items: center; align-items: center;
        padding: 8px 14px; padding: 8px 14px;
        } }
        .ant-btn .anticon.anticon-plus > svg, .ant-btn .anticon.anticon-minus > svg { .ant-btn .anticon.anticon-plus > svg,
        .ant-btn .anticon.anticon-minus > svg {
        margin-top: -5px; margin-top: -5px;
        } }
        .pickItem{ .pickItem {
        background-color: #F5F6F9; background-color: #f5f6f9;
        } }
        .contentContainers{ .contentContainers {
        display: flex; display: flex;
        width: 100%; width: 100%;
        position: relative; position: relative;
        ...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
        overflow-x: hidden; overflow-x: hidden;
        border: none; border: none;
        } }
        .orgContainer{ .orgContainer {
        height: calc(100vh - 74px); height: calc(100vh - 74px);
        width: 250px; width: 250px;
        left: 0; left: 0;
        ...@@ -53,33 +53,33 @@ ...@@ -53,33 +53,33 @@
        overflow-x: hidden; overflow-x: hidden;
        margin-right: 10px; margin-right: 10px;
        position: relative; position: relative;
        transition-property:width,left; transition-property: width, left;
        transition-duration: 0.5s; transition-duration: 0.5s;
        white-space: nowrap; white-space: nowrap;
        .ant-tree{ .ant-tree {
        padding-top: 6px; padding-top: 6px;
        .ant-tree-switcher{ .ant-tree-switcher {
        line-height: 1; line-height: 1;
        margin-right: 0px !important; margin-right: 0px !important;
        color:#1890FF; color: #1890ff;
        .ant-tree-switcher-line-icon{ .ant-tree-switcher-line-icon {
        margin-left: 5px; margin-left: 5px;
        } }
        } }
        } }
        .switcher{ .switcher {
        display: block; display: block;
        position: absolute; position: absolute;
        font-size: 18px; font-size: 18px;
        color: #1890FF!important; color: #1890ff !important;
        top: 50%; top: 50%;
        right: 2px; right: 2px;
        transform: translate(0%,-50%); transform: translate(0%, -50%);
        z-index: 1; z-index: 1;
        } }
        } }
        .orgContainerHide{ .orgContainerHide {
        // transform: translateX(-230px); // transform: translateX(-230px);
        left: 0px; left: 0px;
        top: 0; top: 0;
        ...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
        .ant-popover-message-title { .ant-popover-message-title {
        padding-left: 20px; padding-left: 20px;
        } }
        .userContainer{ .userContainer {
        height: calc(100vh - 74px) !important; height: calc(100vh - 74px) !important;
        z-index: 999; z-index: 999;
        min-width: 800px; min-width: 800px;
        ...@@ -96,72 +96,73 @@ ...@@ -96,72 +96,73 @@
        width: 100%; width: 100%;
        position: relative; position: relative;
        transition: width 0.5s; transition: width 0.5s;
        .title{ .title {
        margin: 16px 0 10px 16px; margin: 16px 0 10px 16px;
        display: inline-block; display: inline-block;
        width: 270px; width: 270px;
        cursor: pointer; cursor: pointer;
        overflow: hidden; overflow: hidden;
        text-overflow:ellipsis; text-overflow: ellipsis;
        white-space: nowrap; white-space: nowrap;
        } }
        .ant-table-pagination{ .ant-table-pagination {
        padding-right: 12px; padding-right: 12px;
        background: white; background: white;
        margin: 1px 0; margin: 1px 0;
        padding: 8px; padding: 8px;
        padding-right: 20px; padding-right: 20px;
        } }
        .ant-btn{ .ant-btn {
        margin: 0px 10px; margin: 0px 10px;
        .ant-btn-primary{ .ant-btn-primary {
        background: #50aefc; background: #50aefc;
        } }
        } }
        .ant-input-search-button{ .ant-input-search-button {
        margin-left: 0px !important; margin-left: 0px !important;
        } }
        .ant-table-thead tr th{ .ant-table-thead tr th {
        font-weight: 600; font-weight: 600;
        color:rgba(0,0,0,0.85); color: rgba(0, 0, 0, 0.85);
        background-color:#F6F9FE; background-color: #f6f9fe;
        } }
        .ant-table-cell{ .ant-table-cell {
        text-align:center; text-align: center;
        overflow: hidden; overflow: hidden;
        // text-overflow:ellipsis; // text-overflow:ellipsis;
        white-space: nowrap; white-space: nowrap;
        } }
        .ant-table-body{ .ant-table-body {
        height:calc(100vh - 210px); height: calc(100vh - 210px);
        border-right: white; border-right: white;
        overflow: auto !important; overflow: auto !important;
        } }
        .clickRowStyle{ .clickRowStyle {
        background: #cfe7fd; background: #cfe7fd;
        } }
        .ant-pagination{ .ant-pagination {
        z-index: 999; z-index: 999;
        border-top: 1px solid #f0eded; border-top: 1px solid #f0eded;
        } }
        } }
        } }
        .icon{ .icon {
        margin-top: -5px !important; margin-top: -5px !important;
        vertical-align: text-bottom; vertical-align: text-bottom;
        } }
        } }
        .formData{ .formData {
        height: 38rem; height: 38rem;
        overflow-y: scroll; overflow-y: scroll;
        .ant-form-item-label > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before{ .ant-form-item-label
        > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
        display: none; display: none;
        } }
        .formData_label{ .formData_label {
        display: flex; display: flex;
        align-items: center; align-items: center;
        } }
        .filed_listItem{ .filed_listItem {
        display: flex; display: flex;
        height: 3.6rem; height: 3.6rem;
        .ant-btn-icon-only { .ant-btn-icon-only {
        ...@@ -176,21 +177,48 @@ ...@@ -176,21 +177,48 @@
        justify-content: center; justify-content: center;
        } }
        } }
        .ant-modal-root .ant-checkbox-group .ant-checkbox-group-item {
        margin-right: 0px !important;
        min-width: 200px !important;
        }
        } }
        .listCard{ .listCard {
        display: flex; display: flex;
        .cardItem{ justify-content: space-around;
        width: 100%;
        .cardItem {
        padding: 0.5rem; padding: 0.5rem;
        width: 50%;
        } }
        .cardContent{ .cardContent {
        height: 30rem; height: 30rem;
        overflow-y: scroll; overflow-y: scroll;
        width: 19rem; width: 19rem;
        } }
        .cardItemData{ .cardItemData {
        padding: 1rem;
        border: 1px solid #b5b8c8;
        margin-bottom: 1rem;
        overflow-x: hidden;
        }
        }
        .listCard1 {
        display: flex;
        .cardItem1 {
        padding: 0.5rem;
        }
        .cardContent1 {
        height: 33rem;
        overflow-y: scroll;
        width: 1350px;
        display: flex;
        justify-content: space-around;
        }
        .cardItemData1 {
        padding: 1rem; padding: 1rem;
        border: 1px solid #b5b8c8; border: 1px solid #b5b8c8;
        margin-bottom: 1rem; margin-bottom: 1rem;
        width: 33.3%;
        overflow-x: hidden; overflow-x: hidden;
        } }
        } }
        ...@@ -205,39 +233,37 @@ ...@@ -205,39 +233,37 @@
        thead { thead {
        tr { tr {
        font-weight: 600; font-weight: 600;
        background: #FAFAFA; background: #fafafa;
        } }
        } }
        tbody{ tbody {
        tr:hover{ tr:hover {
        background-color:#ededed ; background-color: #ededed;
        } }
        } }
        } }
        }
        .ant-checkbox-group-item {
        width: 260px;
        } }
        .ant-drawer-footer { .ant-drawer-footer {
        display:flex; display: flex;
        justify-content: flex-end; justify-content: flex-end;
        } }
        .config{ .config {
        display: flex; display: flex;
        padding: 1rem 0 0.5rem 0.5rem; padding: 1rem 0 0.5rem 0.5rem;
        justify-content: space-between; justify-content: space-between;
        width: calc(100% - 10px); width: calc(100% - 10px);
        .title{ .title {
        font-size: 18px; font-size: 18px;
        color: rgba(0, 114, 255, 1); color: rgba(0, 114, 255, 1);
        font-weight: bold; font-weight: bold;
        } }
        .btn{ .btn {
        display: flex; display: flex;
        justify-content: flex-end; justify-content: flex-end;
        width: 20rem; width: 20rem;
        } }
        .ant-btn{ .ant-btn {
        display: flex; display: flex;
        align-items: center; align-items: center;
        margin-left: 20px; margin-left: 20px;
        ...@@ -245,22 +271,25 @@ ...@@ -245,22 +271,25 @@
        } }
        .containerBox { .containerBox {
        width: 100vm; width: 100vm;
        height: calc(100vh - 90px) ; height: calc(100vh - 90px);
        background: #ffffff; background: #ffffff;
        .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table{ .ant-table.ant-table-small
        .ant-table-tbody
        .ant-table-wrapper:only-child
        .ant-table {
        margin-left: 0; margin-left: 0;
        } }
        .ant-table.ant-table-bordered > .ant-table-container{ .ant-table.ant-table-bordered > .ant-table-container {
        border: none; border: none;
        } }
        .clickRowStyle{ .clickRowStyle {
        background: #cfe7fd; background: #cfe7fd;
        } }
        .ant-table-thead tr th{ .ant-table-thead tr th {
        font-weight: 600; font-weight: 600;
        color:rgba(0,0,0,0.85); color: rgba(0, 0, 0, 0.85);
        } }
        } }
        .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem{ .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem {
        display:flex display: flex;
        } }
        src/pages/platformCenter/bsmanager/workOrder/incidentFlow.jsx
        View file @ b70a5514
        /* eslint-disable react-hooks/rules-of-hooks */
        /* eslint-disable camelcase */
        import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
        import { Modal, Table, Tooltip, notification, Space, Popconfirm, Spin, Button } from 'antd'; import {
        Modal,
        Table,
        Tooltip,
        notification,
        Space,
        Popconfirm,
        Spin,
        Button,
        } from 'antd';
        import { import {
        PlusSquareFilled, PlusSquareFilled,
        EditTwoTone, EditTwoTone,
        DeleteOutlined, DeleteOutlined,
        PlusSquareOutlined, PlusSquareOutlined,
        RollbackOutlined RollbackOutlined,
        } from '@ant-design/icons'; } from '@ant-design/icons';
        import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
        import styles from './incident.less'; import styles from './incident.less';
        import { GetCM_Event_LoadEvenFlows, CM_Event_RemoveEvenFlow } from '@/services/standingBook/api'; import {
        import AddFlowsModal from './AddFlowsModal' GetCM_Event_LoadEvenFlows,
        const incidentFlow = (props) => { CM_Event_RemoveEvenFlow,
        const [tableData, setTableData] = useState([]) } from '@/services/standingBook/api';
        import AddFlowsModal from './AddFlowsModal';
        const incidentFlow = props => {
        const [tableData, setTableData] = useState([]);
        const history = useHistory(); const history = useHistory();
        const [addVisible, setAddVisible] = useState(false) const [addVisible, setAddVisible] = useState(false);
        const [treeLoading, setTreeLoading] = useState(false); const [treeLoading, setTreeLoading] = useState(false);
        const [isType, setIsType] = useState(''); // 弹窗类型 const [isType, setIsType] = useState(''); // 弹窗类型
        const [record1, setRecord1] = useState('') const [record1, setRecord1] = useState('');
        const [obj, setObj] = useState('') const [obj, setObj] = useState('');
        const [flag, setFlag] = useState(0) const [flag, setFlag] = useState(0);
        const columns = [ const columns = [
        { {
        title: () => (<span style={{ fontWeight: 'bold' }}>流程名称</span>), title: () => <span style={{ fontWeight: 'bold' }}>流程名称</span>,
        dataIndex: 'FlowName', dataIndex: 'FlowName',
        key: 'FlowName', key: 'FlowName',
        width: 250, width: 250,
        ellipsis: true, ellipsis: true,
        } },
        ,
        { {
        title: () => (<span style={{ fontWeight: 'bold' }}>受理权限</span>), title: () => <span style={{ fontWeight: 'bold' }}>受理权限</span>,
        dataIndex: 'FlowRoles', dataIndex: 'FlowRoles',
        key: 'FlowRoles', key: 'FlowRoles',
        ellipsis: true, ellipsis: true,
        }, },
        { {
        title: () => (<span style={{ fontWeight: 'bold' }}>操作</span>), title: () => <span style={{ fontWeight: 'bold' }}>操作</span>,
        key: 'action', key: 'action',
        width: 150, width: 150,
        aligin: 'center', aligin: 'center',
        ...@@ -53,11 +65,7 @@ const incidentFlow = (props) => { ...@@ -53,11 +65,7 @@ const incidentFlow = (props) => {
        <Tooltip title="删除"> <Tooltip title="删除">
        <Popconfirm <Popconfirm
        placement="bottomRight" placement="bottomRight"
        title={ title={<p>即将删除事件流程，是否确认删除？</p>}
        <p>
        即将删除事件流程，是否确认删除？
        </p>
        }
        okText="确认" okText="确认"
        cancelText="取消" cancelText="取消"
        onConfirm={() => deleteEventType(record)} onConfirm={() => deleteEventType(record)}
        ...@@ -66,53 +74,53 @@ const incidentFlow = (props) => { ...@@ -66,53 +74,53 @@ const incidentFlow = (props) => {
        </Popconfirm> </Popconfirm>
        </Tooltip> </Tooltip>
        </Space> </Space>
        ) ),
        },
        } ];
        ]
        useEffect(() => { useEffect(() => {
        console.log(props) console.log(props);
        console.log(props.location.state.title1) console.log(props.location.state.title1);
        setTreeLoading(true); setTreeLoading(true);
        GetCM_Event_LoadEvenFlows({ eventTypeId: props.location.state.formObj.ID }).then(res => { GetCM_Event_LoadEvenFlows({
        eventTypeId: props.location.state.formObj.ID,
        }).then(res => {
        setTreeLoading(false); setTreeLoading(false);
        if (res.msg === 'Ok') { if (res.msg === 'Ok') {
        console.log(res.data) console.log(res.data);
        setTableData(res.data) setTableData(res.data);
        } }
        }) });
        }, [flag]) }, [flag]);
        const addIncident = () => { const addIncident = () => {
        console.log(props.location.state.formObj.ID) console.log(props.location.state.formObj.ID);
        setObj(props.location.state.formObj.ID) setObj(props.location.state.formObj.ID);
        setAddVisible(true) setAddVisible(true);
        setIsType('add') setIsType('add');
        } };
        const editEventType = record => { const editEventType = record => {
        setObj(props.location.state.formObj.ID) setObj(props.location.state.formObj.ID);
        setRecord1(record) setRecord1(record);
        setIsType('edit'); setIsType('edit');
        setAddVisible(true) setAddVisible(true);
        } };
        const back = () => { const back = () => {
        let rember = props.location.state.rember; let { rember } = props.location.state;
        history.push({ history.push({
        pathname: '/platformCenter/bsmanger/incident', pathname: '/platformCenter/bsmanger/incident',
        state: { rember }, state: { rember },
        }); });
        }; };
        const deleteEventType = record => { const deleteEventType = record => {
        console.log(record) console.log(record);
        CM_Event_RemoveEvenFlow({ eventFlowIds: record.ID }).then(res => { CM_Event_RemoveEvenFlow({ eventFlowIds: record.ID }).then(res => {
        if (res.msg === '') { if (res.msg === '') {
        notification.success({ notification.success({
        message: '提示', message: '提示',
        duration: 3, duration: 3,
        description: '删除成功', description: '删除成功',
        }); });
        setFlag(flag + 1) setFlag(flag + 1);
        } else { } else {
        notification.error({ notification.error({
        message: '提示', message: '提示',
        ...@@ -120,24 +128,28 @@ const incidentFlow = (props) => { ...@@ -120,24 +128,28 @@ const incidentFlow = (props) => {
        description: res.msg, description: res.msg,
        }); });
        } }
        }) });
        } };
        const onOK = () => { const onOK = () => {
        setAddVisible(false) setAddVisible(false);
        GetCM_Event_LoadEvenFlows({ eventTypeId: props.location.state.formObj.ID }).then(res => { GetCM_Event_LoadEvenFlows({
        eventTypeId: props.location.state.formObj.ID,
        }).then(res => {
        if (res.msg === 'Ok') { if (res.msg === 'Ok') {
        console.log(res.data) console.log(res.data);
        setTableData(res.data) setTableData(res.data);
        }
        })
        } }
        });
        };
        return ( return (
        <> <>
        <Spin tip="loading..." spinning={treeLoading}> <Spin tip="loading..." spinning={treeLoading}>
        <div className={styles.containerBox}> <div className={styles.containerBox}>
        <div className={styles.config}> <div className={styles.config}>
        <div className={styles.title}>{`${props.location.state.title1}受理流程和权限`}</div> <div className={styles.title}>{`${
        props.location.state.title1
        }受理流程和权限`}</div>
        <div className={styles.btn}> <div className={styles.btn}>
        <Button <Button
        type="primary" type="primary"
        ...@@ -147,7 +159,11 @@ const incidentFlow = (props) => { ...@@ -147,7 +159,11 @@ const incidentFlow = (props) => {
        新增 新增
        </Button> </Button>
        <Button type="primary" icon={<RollbackOutlined />} onClick={()=>back()}> <Button
        type="primary"
        icon={<RollbackOutlined />}
        onClick={() => back()}
        >
        返回 返回
        </Button> </Button>
        </div> </div>
        ...@@ -155,17 +171,19 @@ const incidentFlow = (props) => { ...@@ -155,17 +171,19 @@ const incidentFlow = (props) => {
        <Table <Table
        size="small" size="small"
        rowKey='ID' rowKey="ID"
        bordered bordered
        style={{ overflowY: 'scroll'}} style={{ overflowY: 'scroll' }}
        onRow={record => { onRow={record => ({
        return { onDoubleClick: event => {
        onDoubleClick: event => { event.stopPropagation(); editEventType(record); }, //双击 event.stopPropagation();
        }; editEventType(record);
        }} }, // 双击
        })}
        columns={columns} columns={columns}
        dataSource={tableData} dataSource={tableData}
        pagination={false} /> pagination={false}
        />
        </div> </div>
        </Spin> </Spin>
        <AddFlowsModal <AddFlowsModal
        ...@@ -180,8 +198,6 @@ const incidentFlow = (props) => { ...@@ -180,8 +198,6 @@ const incidentFlow = (props) => {
        placement="right" placement="right"
        /> />
        </> </>
        );
        };
        )
        }
        export default incidentFlow; export default incidentFlow;
        src/pages/webConfig/menuconfig/webMenu.jsx
        View file @ b70a5514
        This diff is collapsed.
        src/routes/config.js
        View file @ b70a5514
        This diff is collapsed.
        src/services/userCenter/userManage/api.js
        View file @ b70a5514
        This diff is collapsed.
        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