修改消息平台界面跳转逻辑

src/pages/platformCenter/bsmanager/tablemanager/index.jsx

@@ -139,6 +139,7 @@ const TableManager = () => {
                     Object.keys(groupData).map((item, index) => {
                         newArr.push({ type: item, key: index })
                     })
+                    console.log('groupData',groupData);
                     setAllData(groupData)
                     setGroupArr(newArr)
                 }
@@ -301,7 +302,7 @@ const TableManager = () => {
         {
             title: '类型', dataIndex: 'type', key: 'type',
             render: text => {
-                return (<div style={{ color: '#3764a0' }}>{text}({allData?[text].length:0}个)</div>)
+                return (<div style={{ color: '#3764a0' }}>{text}({allData&&allData[text]?allData[text].length:0}个)</div>)
             }
         },
 

src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx

@@ -7,9 +7,10 @@ import {
     Button,
     Select,
     Popconfirm,
-    message
+    message,
+    Tooltip
 } from 'antd';
-import { PlusCircleOutlined } from '@ant-design/icons';
+import { PlusCircleOutlined, EditTwoTone, DeleteOutlined, FundViewOutlined } from '@ant-design/icons';
 import { useHistory } from 'react-router-dom';
 const { Search } = Input;
 const { Option } = Select;
@@ -72,24 +73,16 @@ const ProjectManage = () => {
             ellipsis: true,
             render: (text, record) => (
                 <Space>
-                    <Button
-                        type="primary"
-                        size="small"
-                        onClick={() => {
+                    <Tooltip title="测试">
+                        <FundViewOutlined   style={{ fontSize: '16px', color: '#1890FF' }} onClick={() => {
                             TestDesc(record);
-                        }}
-                    >
-                        测试
-                    </Button>
-                    <Button
-                        type="primary"
-                        size="small"
-                        onClick={() => {
+                        }} />
+                    </Tooltip>
+                    <Tooltip title="编辑">
+                        <EditTwoTone style={{ fontSize: '16px', color: '#e86060' }} onClick={() => {
                             changeDesc(record);
-                        }}
-                    >
-                        编辑
-                    </Button>
+                        }}></EditTwoTone>
+                    </Tooltip>
 
                     {
                         record.name != "通用报警"
@@ -104,9 +97,8 @@ const ProjectManage = () => {
                                     DeleteProject(record)
                                 }}
                             >
-                                <Button size="small" danger>
-                                    删除
-                                </Button>
+
+                                <DeleteOutlined  style={{ fontSize: '16px', color: '#e86060' }}></DeleteOutlined>
                             </Popconfirm>
                         </div>)
                     }
@@ -121,8 +113,8 @@ const ProjectManage = () => {
     }
     const changeDesc = (record) => {
         setCurrentTempalte(record)
-        // history.push({ pathname: `/platformCenter/schemeDetail`, state: { template: record } })
-        handleShowModal("editVisible", true)
+        history.push({ pathname: `/platformCenter/schemeDetail`, state: { template: record } })
+        // handleShowModal("editVisible", true)
     }
     const TestDesc = (record) => {
         if (record.ThemeName)
@@ -188,6 +180,7 @@ const ProjectManage = () => {
         setvisibleParams({ ...visibleParams, [key]: value });
     };
     const editModal = () => {
+
         handleShowModal("editVisbile", false)
         setFlag(flag + 1)
     }
@@ -197,7 +190,8 @@ const ProjectManage = () => {
     }
     const onAddClick = () => {
         setCurrentTempalte({})
-        handleShowModal("addVisible", true)
+        // handleShowModal("addVisible", true)
+        history.push({ pathname: `/platformCenter/schemeDetail`, state: { template: {} } })
     }
     const onTypeChange = (value) => {
         if (value == "全部") {
@@ -236,7 +230,7 @@ const ProjectManage = () => {
             res => {
                 let mesList = []
                 if (res.code === 0) {
-                    console.log('res.data.MessageConfigModels',res.data.MessageConfigModels);
+                    console.log('res.data.MessageConfigModels', res.data.MessageConfigModels);
                     res.data.MessageConfigModels.map((item) => {
                         mesList.push({
                             name: item.MessageConfig.MsgType,

src/pages/platformCenter/messageManage/projectManage/ProjectManage.less

@@ -20,8 +20,8 @@
             align-items: center;
 
             .title {
-                margin-left: 5px;
-                margin-right: 5px;
+                margin-left: 18px;
+                margin-right: 10px;
             }
         }
 
@@ -34,8 +34,8 @@
             align-items: center;
 
             .title {
-                margin-left: 20px;
-                margin-right: 5px;
+                margin-left: 25px;
+                margin-right: 10px;
             }
         }
     }

src/pages/platformCenter/messageManage/projectManage/components/EditModal.jsx

@@ -105,12 +105,13 @@ const EditModal = props => {
         console.log(form.getFieldValue())
         let fv = form.getFieldValue()
         if (template.ThemeName) {
-
+            console.log('fv.wx_template',fv.wx_template);
+            console.log('fv.push_mode.toString()',fv.push_mode.toString());
             let a = {
                 ID: template.ID,
                 ThemeName: template.ThemeName,
                 MsgType: fv.name,
-                PublicTemplateID: fv.wx_template,
+                PublicTemplateID: fv.wx_template.toString(),
                 PublicConfig: template.PublicConfig,
                 PublicPath: fv.h5_path,
                 MsgTemplateName: template.MsgTemplateName,
@@ -157,6 +158,7 @@ const EditModal = props => {
             )
 
         } else {
+            console.log('fv.push_mode.toString()',fv.push_mode.toString());
             let b = {
                 ThemeName: "定时推送",
                 MsgType: fv.name,
@@ -209,7 +211,6 @@ const EditModal = props => {
 
     }
     const onTypeChange = (value) => {
-        console.log(value)
         setCurrentTrench({
             isAPPShow: value.indexOf("平台弹框") > -1 ? true : false,
             isWXShow: value.indexOf("公众号推送") > -1 ? true : false,

src/pages/platformCenter/messageManage/projectManage/components/IISAgentConfig/VisibleIISAgentConfig.jsx

@@ -6,6 +6,7 @@ import DayOfWeekSelect from './DayOfWeekSelect'
 import styles from './VisibleIISAgentConfig.less'
 import moment from 'moment'
 import { tr } from 'voca';
+import {EditOutlined } from '@ant-design/icons';
 const { Item } = Form;
 
 
@@ -164,8 +165,7 @@ const VisibleIISAgentConfig = props => {
     return (
         <div className={styles.agent_container}>
             <Input value={selectRole} disabled={true} />
-            <div className={styles.select_btn} onClick={handleClick}>推送计划</div>
-
+            <div className={styles.select_btn} onClick={handleClick}><EditOutlined style={{fontSize:'18px'}}/></div>
             <SiteModal
                 {...props}
                 title="编辑定时任务"

src/pages/platformCenter/messageManage/projectManage/components/IISAgentConfig/VisibleIISAgentConfig.less

@@ -4,12 +4,10 @@
     width: 80%;
     .select_btn {
         display: inline-block;
-        color: #2f54eb;
         cursor: pointer;
-        border-bottom: 1px solid #2f54eb;
-        width: 6rem;
         text-align: center;
-        margin-left: 20px;
+        padding: 0 0.8rem;
+        color: rgba(22,133,255,1);
     }
 
     .select_result {}

src/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal.jsx

@@ -24,7 +24,7 @@ const VisibleRoleModal = props => {
     const [dataTree, setDataTree] = useState([])
     const [dataLeafs, setDataLeafs] = useState([])
     const [selectValues, setSelectValues] = useState([])
-    const { onSubmit, title, operate,initValues } = props
+    const { onSubmit, title, operate, initValues, selectValue } = props
 
 
     const GetRoleGroupList = () => {
@@ -50,11 +50,11 @@ const VisibleRoleModal = props => {
                             // for (const id of initValues) {
                             //     if(id == roleItem.roleID){
                             //         leafNode.checked = true
-                                   
+
                             //     }
                             // }
                             return leafNode
-                            
+
                         })
                     })
                 })
@@ -66,6 +66,7 @@ const VisibleRoleModal = props => {
 
     useEffect(() => {
         setSelectRole(props.value)
+        selectValue && setSelectRole(selectValue)
         GetRoleGroupList()
     }, [])
 
@@ -110,7 +111,7 @@ const VisibleRoleModal = props => {
 
             <SiteModal
                 {...props}
-                title={title ? `选择${title}` : "关联角色"}
+                title={title && Object.prototype.toString.call(title) !== '[object Object]' ? `选择${title}` : "关联角色"}
                 bodyStyle={{ width: '100%', minHeight: '100px' }}
                 style={{ top: 200, borderRadius: '20px' }}
                 width="800px"
@@ -124,7 +125,7 @@ const VisibleRoleModal = props => {
 
             >
                 <div className={styles.list_card}>
-                    <ListCard {...props} onChange2={onChange2} data={dataTree} dataLeafs={dataLeafs} initValues={initValues}/>
+                    <ListCard {...props} onChange2={onChange2} data={dataTree} dataLeafs={dataLeafs} initValues={initValues} />
                 </div>
             </SiteModal>
         </div>
@@ -147,7 +148,7 @@ const checkChildrenByCondition = (
 const ListCard = props => {
 
 
-    const { onChange, onChange2, data, dataLeafs,initValues } = props
+    const { onChange, onChange2, data, dataLeafs, initValues } = props
 
     const [changedItem, setChangedItem] = useState({ item: {} });
     const [valueList, setValueList] = useState([]);
@@ -219,7 +220,7 @@ const ListCard = props => {
     }
 
     useEffect(() => {
-        initValues&&setValueList(initValues)
+        initValues && setValueList(initValues)
     }, [])
     return (
         <div>

src/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal.less

@@ -4,12 +4,10 @@
   width: 80%;
   .select_btn {
     display: inline-block;
-    color: #2f54eb;
     cursor: pointer;
-    border-bottom: 1px solid #2f54eb;
-    width: 6rem;
     text-align: center;
-    margin-left: 20px;
+    padding: 0 0.8rem;
+    color: rgba(22,133,255,1);
   } 
 }
 .list_card{

src/pages/platformCenter/schemeDetail/schemeDetail.less

@@ -4,6 +4,14 @@
     height: calc(100% - 20px);
     display: flex;
     flex-direction: column;
+    button[ant-click-animating-without-extra-node]:after {
+        border: 0 none;
+        
+        opacity: 0;
+        
+        animation:none 0 ease 0 1 normal;
+        
+        }
     .content{
         height: calc(100vh - 140px);
         overflow-y: scroll;
@@ -13,8 +21,9 @@
         flex-wrap: wrap;
         .cardListItem{
             width: 50%;
-            line-height: 3rem;
+            margin-bottom: 1rem;
         }
+ 
     }
     .ant-card-bordered {
         border-right: none;
@@ -28,7 +37,7 @@
         justify-content: space-between;
         .trench_card{
             margin-top: 1rem;
-            width: 49.6%;
+            width: 49.2%;
             border-width: 1px;
             border-color: #EEEEEE;
             border-style: solid;
@@ -46,7 +55,7 @@
                 display: flex;
                 flex-direction: row;
                 justify-content:space-between;
-                padding: 0 1rem;
+                padding: 0 1.6rem;
                 align-items: center;
                 .lable{
                     font-size: large;

src/pages/platformCenter/standingBook/standingBook.jsx

@@ -50,8 +50,8 @@ const standingBook = props => {
     const columns = [
         {
             title: '台账类型',
-            dataIndex: 'type',
-            key: 'type',
+            dataIndex: 'AccountType',
+            key: 'AccountType',
             width: 100,
         },
         {