修改移动应用界面bug

src/pages/mobileConfig/menuconfig/editForm.jsx

@@ -21,22 +21,26 @@ const EditForm = props => {
     otherForm.resetFields();
   }, [info]);
   useEffect(() => {
+    if(JSON.stringify(info)!='{}' ){
+      let data =info.data
       if (nodeType === 1 || nodeType === 2) {
         let arr = Object.keys(form.getFieldsValue());
         let obj = {};
         arr.map(i => {
-        obj[i] = info[i];
+          obj[i] = data[i];
         });
-      form.setFieldsValue({ ...obj, shortName: info.menuShortName });
+        form.setFieldsValue({ ...obj, shortName: data.menuShortName });
       }
       if (nodeType === 3 || nodeType === 4) {
         let arr = Object.keys(otherForm.getFieldsValue());
         let obj = {};
         arr.map(i => {
-        obj[i] = info[i];
+          obj[i] = data[i];
         });
-      otherForm.setFieldsValue({ ...obj, shortName: info.menuShortName });
+        otherForm.setFieldsValue({ ...obj, shortName: data.menuShortName });
       }
+    }
+
   }, [info]);
 
   const submit = () => {
@@ -214,7 +218,7 @@ const EditForm = props => {
             <Input />
           </Item>
           <CheckList
-            info={info}
+            info={info.data?info.data:{}}
             nodeType={nodeType}
             valueCallback={valueCallback}
           />

src/pages/platformCenter/filedConfig/fieldEditor.jsx

@@ -33,7 +33,6 @@ const AddModal = props => {
             if (validate) {
                 setLoading(true);
                 let obj = form.getFieldsValue();
-                console.log('obj', obj);
                 let data = [{ Unit: pramData.Unit || '', StoreType: "nvarchar(255)", Group: pramData.Group || '', Shape, ExceptionEvent: pramData.ExceptionEvent || '', RowSpan: pramData.RowSpan || 0, ColSpan: pramData.ColSpan || 0, ReadOnly: pramData.ReadOnly || false, EditableLater: pramData.EditableLater || false, ExceptionValue: pramData.ExceptionValue || '', Preset: pramData.Preset || '', ID: Number(itemData.ID), Name: obj.Name, Alias: obj.Alias, SyncEvent: obj.SyncEvent, ValidationRule: obj.ValidationRule, ExceptionEventFields: characterValue }]
 
                 switch (Shape) {

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

@@ -121,23 +121,22 @@ const ProjectManage = () => {
     }
     const changeDesc = (record) => {
         setCurrentTempalte(record)
-        // history.push({pathname:`/platformCenter/schemeDetail`,state:{template:record}} )
+        // history.push({ pathname: `/platformCenter/schemeDetail`, state: { template: record } })
         handleShowModal("editVisible", true)
     }
     const TestDesc = (record) => {
-
-        if(record.ThemeName)
+        if (record.ThemeName)
             TestPush({
-            theme:record.ThemeName,
-            msgType:record.MsgType,
-            tousers:record.PushGroup,
-            pushPath:record.item.AgentConfig?record.item.AgentConfig.Url:'',
-            msgTypeId:record.ID
+                theme: record.ThemeName,
+                msgType: record.MsgType,
+                tousers: record.PushGroup,
+                pushPath: record.item.AgentConfig ? record.item.AgentConfig.Url : '',
+                msgTypeId: record.ID
             }).then(
-            res =>{
-                if(res.code === 0){
+                res => {
+                    if (res.code === 0) {
                         message.success("测试推送成功")
-                }else{
+                    } else {
                         message.error(res.msg)
                     }
                 }
@@ -158,21 +157,21 @@ const ProjectManage = () => {
                             res3 => {
                                 if (res3.code === 0) {
                                     message.success("删除方案成功")
-                                    setFlag(flag +1)
+                                    setFlag(flag + 1)
                                 }
                             }
                         )
                     }
                 }
             )
-        }else{
+        } else {
             DeleteMessageConfig({
-                id:config.ID
+                id: config.ID
             }).then(
-                res3 =>{
-                    if(res3.code === 0){
+                res3 => {
+                    if (res3.code === 0) {
                         message.success("删除方案成功")
-                        setFlag(flag +1)
+                        setFlag(flag + 1)
                     }
                 }
             )
@@ -189,11 +188,11 @@ const ProjectManage = () => {
         setvisibleParams({ ...visibleParams, [key]: value });
     };
     const editModal = () => {
-        handleShowModal("editVisbile",false)
+        handleShowModal("editVisbile", false)
         setFlag(flag + 1)
     }
     const bddModal = () => {
-        handleShowModal("addVisbile",false)
+        handleShowModal("addVisbile", false)
         setFlag(flag + 1)
     }
     const onAddClick = () => {
@@ -237,6 +236,7 @@ const ProjectManage = () => {
             res => {
                 let mesList = []
                 if (res.code === 0) {
+                    console.log('res.data.MessageConfigModels',res.data.MessageConfigModels);
                     res.data.MessageConfigModels.map((item) => {
                         mesList.push({
                             name: item.MessageConfig.MsgType,
@@ -248,7 +248,7 @@ const ProjectManage = () => {
                             item: item
                         })
                     })
-                    console.log('mesList',mesList);
+                    console.log('mesList', mesList);
                     setDataList(mesList)
                 }
             }
@@ -297,7 +297,7 @@ const ProjectManage = () => {
 
             </div>
             <div className={styles.list_view}>
-                <Table columns={columns} dataSource={dataList} pagination={{ pageSize: '10' }} rowKey='ID'/>
+                <Table columns={columns} dataSource={dataList} pagination={{ pageSize: '10' }} rowKey='ID' />
             </div>
             <EditModal
                 visible={visibleParams.editVisible}

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

@@ -25,7 +25,6 @@ const VisibleIISAgentConfig = props => {
     const [form] = Form.useForm();
     const dateFormat = 'YYYY-MM-DD HH:mm:ss';
     const { agentConfig, value, onIISAgentSubmit } = props
-
     useEffect(() => {
         if (agentConfig) {
             form.setFieldsValue({
@@ -53,11 +52,13 @@ const VisibleIISAgentConfig = props => {
         }
 
 
-
+        if(value){
             form.setFieldsValue({
                 name: value
             })
             setSelectRole(props.value)
+        }
+ 
     }, [props])
 
 
@@ -174,6 +175,7 @@ const VisibleIISAgentConfig = props => {
                 destroyOnClose
                 cancelText="取消"
                 okText="确认"
+                forceRender 
                 visible={previewVisible}
                 onOk={() => handleOk()}
                 confirmLoading={loading}

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

 .agent_container {
     display: flex;
     flex-direction: row;
-    
+    width: 80%;
     .select_btn {
         display: inline-block;
         color: #2f54eb;
         cursor: pointer;
         border-bottom: 1px solid #2f54eb;
-        width: 80px;
+        width: 6rem;
+        text-align: center;
         margin-left: 20px;
     }
 

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

 .role_container {
   display: flex;
   flex-direction: row;
-
+  width: 80%;
   .select_btn {
     display: inline-block;
     color: #2f54eb;
     cursor: pointer;
     border-bottom: 1px solid #2f54eb;
-    width: 80px;
+    width: 6rem;
+    text-align: center;
     margin-left: 20px;
   } 
 }

src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx

@@ -72,11 +72,8 @@ const TemplateManage = () => {
         setOption([]);
         GetThirdpartyTemplates(obj).then(res => {
                 if (res.msg==="Ok") {
-                    console.log(res.data);
                     setOption(res.data);
-                    console.log(2)
                 } else {
-                    console.log(1);
                     notification.error({
                         message: '提示',
                         duration: 15,

src/pages/platformCenter/schemeDetail/schemeDetail.jsx

 import React, { useState, useEffect, useRef } from 'react'
 import SiteModal from '@/components/Modal/SiteModa';
-import { Form, Input, notification, Select, Checkbox, message, Button } from 'antd'
+import { Form, Input, notification, Select, Checkbox, message, Button, Card, Switch as Switchs } from 'antd'
 import BaseForm from '@/components/BaseForm/index';
 import { Switch } from 'react-router';
 import { iteratee } from 'lodash';
@@ -11,12 +11,12 @@ import VisibleIISAgentConfig from '../messageManage/projectManage/components/IIS
 import { GetMessageTemplate } from '@/services/platform/messagemanage'
 import moment from 'moment'
 import { UpdateMessageConfig, InsertMessageConfig, AddIISAgentConfig } from '@/services/platform/messagemanage'
-
+import { useHistory } from 'react-router-dom';
 const { Item } = Form;
 
 const EditModal = props => {
-    console.log(props,'props');
 
+    const history = useHistory();
     const [form] = Form.useForm();
     const [loading, setLoading] = useState(false);
     const [isStart, setIsStart] = useState(false);
@@ -34,7 +34,7 @@ const EditModal = props => {
     const [WEB_ITEMS, setWEB_ITEMS] = useState([])
     const [WX_ITEMS, setWX_ITEMS] = useState([])
     const [MES_ITEMS, setMES_ITEMS] = useState([])
-
+    const [listType, setListType] = useState([{ title: '定时推送', desc: '用于周期性简报的定时推送，如智能巡检、运行周报。' }, { title: '监控报警', desc: '设备硬件故障，阈值超限，状态突变，采集超时等异常情况报警。' }, { title: '工单办理', desc: '在工单系统中，针对特定人员的通知，包括工作办理、审核、会签、回退等操作。' }, { title: '平台公告', desc: '由运维人员向所有用户或特定用户发送的事务公告，如系统升级、维护。' }])
 
     useEffect(() => {
         GetMessageTemplate().then(
@@ -89,8 +89,8 @@ const EditModal = props => {
             setCurrentTrench({
                 isAPPShow: template.PushMode && template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
                 isWXShow: template.PushMode && template.PushMode.split(",").indexOf("公众号推送") > -1 ? true : false,
-                isWEBShow: template.PushMode &&template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
-                isMessageShow: template.PushMode &&template.PushMode.split(",").indexOf("短信推送") > -1 ? true : false,
+                isWEBShow: template.PushMode && template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
+                isMessageShow: template.PushMode && template.PushMode.split(",").indexOf("短信推送") > -1 ? true : false,
             })
         }
 
@@ -216,7 +216,6 @@ const EditModal = props => {
         })
     }
     const onIISAgentSubmit = (value) => {
-        console.log(value, "IIS配置")
         setIISConfig(value)
 
     }
@@ -224,11 +223,33 @@ const EditModal = props => {
     const onPushSubmit = (value) => {
         console.log(value, "onPushSubmit")
     }
+    const layout = {
+        layout: 'horizontal',
+        labelCol: {
+            span: 2,
+        },
+        wrapperCol: {
+            span: 24,
+        },
+    };
+    const onChange = () => {
 
+    }
+    const back = () => {
+        history.push('/platformCenter/notify')
+    }
+    const tailLayout = {
+        wrapperCol: { offset: 21, span: 24 },
+    };
+    const onFinish = (values) => {
+        console.log(values,'123');
+    }
     return (
 
         <div className={styles.editModal_container}>
-                <Form form={form} labelCol={{ span: 4 }}>
+            <Form form={form}  {...layout} onFinish={onFinish}>
+                <div className={styles.content}>
+                    <Card title="方案" style={{ width: '100%' }}>
                         <Item
                             label="方案名称"
                             name="name"
@@ -239,62 +260,58 @@ const EditModal = props => {
                                 },
                             ]}
                         >
-                        <Input placeholder="请输入方案名称" disabled={template.ThemeName ? true : false} onChange={onNameChange} />
+                            <Input style={{ width: '25rem' }} placeholder="请输入方案名称" disabled={template.ThemeName ? true : false} onChange={onNameChange} />
                         </Item>
                         <Item
-                        label="是否开启"
-                        name="isStart"
+                            label="方案类型"
 
                         >
-                        <Select >
-                            <Option value="1">开启</Option>
-                            <Option value="0">关闭</Option>
-                        </Select>
+                            <div className={styles.cardList}>
+                                {listType.map(item => {
+                                    return <div key={item.title} className={styles.cardListItem}><Button style={{ marginRight: '1rem' }} disabled  >{item.title}</Button> <span>{item.desc}</span></div>
+                                })}
+
+                            </div>
                         </Item>
-                    <Item
-                        label="推送人"
-                        name="to_person"
 
-                    >
+                    </Card>
+                    <Card title="推送信息" style={{ width: '100%', marginTop: '1rem' }}>
+
+                        <div style={{ display: 'flex', marginLeft: '5rem', alignItems: 'center' }}>
+                            <div style={{ display: 'flex', width: '35rem', alignItems: 'center' }}>
+                                <span>推送组： </span>
                                 <VisibleRoleModal
                                     onSubmit={onPushSubmit}
-                            title={"推送人员"}
-
-                        />
-                    </Item>
-                    <Item
-                        label="定时计划"
-                        name="push_plan"
-                    >
-                        <VisibleIISAgentConfig agentConfig={template.item && template.item.AgentConfig} onIISAgentSubmit={onIISAgentSubmit} />
-                    </Item>
-                    <Item
-                        label="推送方式"
-                        name="push_mode"
-                    >
-                        <Checkbox.Group
-                            options={plainOptions}
-                            onChange={onTypeChange}
+                                    title={"推送人员"} />
+                            </div>
+                            <div style={{ display: 'flex', width: '35rem', margin: '0 2rem', alignItems: 'center' }}>
+                                推送计划： <VisibleIISAgentConfig agentConfig={template.item && template.item.AgentConfig} value={form.getFieldValue('name')} onIISAgentSubmit={onIISAgentSubmit} />
+                            </div>
+                            <span>
+                                是否启用：<Switchs defaultChecked onChange={onChange} />
+                            </span>
+                        </div>
 
-                        />
-                    </Item>
+                    </Card>
                     <div className={styles.push_trench}>
                         {
-                            currentTrench.isAPPShow && (
+
                             <div className={styles.trench_card}>
                                 <div className={styles.card_title}>
                                     <div className={styles.lable}>APP</div>
+                                    <Switchs checked={currentTrench.isAPPShow} />
                                 </div>
                                 <div className={styles.card_body}>
                                     <Item
                                         label="模板"
                                         name="app_template"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Select >
                                             {
                                                 APP_ITEMS.map((item, idx) => {
                                                     return (
-                                                            <Option value={item.Id} key={idx}>{item.LikeName}</Option>
+                                                        <Select.Option value={item.Id} key={idx}>{item.LikeName}</Select.Option>
                                                     )
                                                 })
                                             }
@@ -303,29 +320,32 @@ const EditModal = props => {
                                     <Item
                                         label="功能路径"
                                         name="app_path"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Input placeholder="请输入功能路径" />
                                     </Item>
                                 </div>
                             </div>
-                            )
+
                         }
                         {
-                            currentTrench.isWXShow && (
+
                             <div className={styles.trench_card}>
                                 <div className={styles.card_title}>
                                     <div className={styles.lable}>微信</div>
+                                    <Switchs checked={currentTrench.isWXShow} />
                                 </div>
                                 <div className={styles.card_body}>
                                     <Item
                                         label="模板"
                                         name="wx_template"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Select >
                                             {
                                                 WX_ITEMS.map((item, idx) => {
                                                     return (
-                                                            <Option value={item.Id} key={idx}>{item.LikeName}</Option>
+                                                        <Select.Option value={item.Id} key={idx}>{item.LikeName}</Select.Option>
                                                     )
                                                 })
                                             }
@@ -334,35 +354,39 @@ const EditModal = props => {
                                     <Item
                                         label="H5路由"
                                         name="h5_path"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Input placeholder="请输入功能路径" />
                                     </Item>
                                     <Item
                                         label="小程序路由"
                                         name="miniprogram_path"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Input placeholder="请输入功能路径" />
                                     </Item>
                                 </div>
                             </div>
-                            )
+
                         }
                         {
-                            currentTrench.isWEBShow && (
+
                             <div className={styles.trench_card}>
                                 <div className={styles.card_title}>
                                     <div className={styles.lable}>WEB</div>
+                                    <Switchs checked={currentTrench.isWEBShow} />
                                 </div>
                                 <div className={styles.card_body}>
                                     <Item
                                         label="模板"
                                         name="web_template"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Select >
                                             {
                                                 WEB_ITEMS.map((item, idx) => {
                                                     return (
-                                                            <Option value={item.Id} key={idx}>{item.LikeName}</Option>
+                                                        <Select.Option value={item.Id} key={idx}>{item.LikeName}</Select.Option>
                                                     )
                                                 })
                                             }
@@ -371,30 +395,33 @@ const EditModal = props => {
                                     <Item
                                         label="功能路径"
                                         name="web_path"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Input placeholder="请输入功能路径" />
                                     </Item>
                                 </div>
                             </div>
-                            )
+
                         }
 
                         {
-                            currentTrench.isMessageShow && (
+
                             <div className={styles.trench_card}>
                                 <div className={styles.card_title}>
                                     <div className={styles.lable}>短信推送</div>
+                                    <Switchs checked={ currentTrench.isMessageShow} />
                                 </div>
                                 <div className={styles.card_body}>
                                     <Item
                                         label="模板"
                                         name="message_template"
+                                        labelCol={{ span: 4 }}
                                     >
                                         <Select >
                                             {
                                                 MES_ITEMS.map((item, idx) => {
                                                     return (
-                                                            <Option value={item.Id} key={idx}>{item.LikeName}</Option>
+                                                        <Select.Option value={item.Id} key={idx}>{item.LikeName}</Select.Option>
                                                     )
                                                 })
                                             }
@@ -402,10 +429,22 @@ const EditModal = props => {
                                     </Item>
                                 </div>
                             </div>
-                            )
+
                         }
                     </div>
+
+                </div>
+                <Item  {...tailLayout} style={{ marginTop: '1rem' }}>
+                    <Button htmlType="button" onClick={back} style={{ marginRight: '2rem' }}>
+                        返回
+                    </Button>
+                    <Button type="primary" htmlType="submit">
+                        确定
+                    </Button>
+                </Item>
             </Form>
+            <div>
+            </div>
         </div>
     )
 }

src/pages/platformCenter/schemeDetail/schemeDetail.less

 .editModal_container{
     width: 100%;
-    background-color: #FFFFFF;
-    overflow-y: scroll;
+    overflow-y: hidden;
+    height: calc(100% - 20px);
     display: flex;
     flex-direction: column;
+    .content{
+        height: calc(100vh - 140px);
+        overflow-y: scroll;
+    }
+    .cardList{
+        display: flex;
+        flex-wrap: wrap;
+        .cardListItem{
+            width: 50%;
+            line-height: 3rem;
+        }
+    }
+    .ant-card-bordered {
+        border-right: none;
+    }
     .push_trench{
         width: 100%;
         height: fit-content;
         display: flex;
         flex-direction:row;
         flex-wrap: wrap;
-        
+        justify-content: space-between;
         .trench_card{
-            width: 500px;
-            margin: 20px;
+            margin-top: 1rem;
+            width: 49.6%;
             border-width: 1px;
             border-color: #EEEEEE;
             border-style: solid;
             border-radius: 5px;
             display: flex;
             flex-direction: column;
-            justify-content: space-around;
             align-items: center;
+            background-color: #ffffff;
             .card_title{
                 border-bottom-style: solid;
                 border-bottom-width: 1px;
@@ -30,7 +45,8 @@
                 width: 100%;
                 display: flex;
                 flex-direction: row;
-                justify-content: flex-start;
+                justify-content:space-between;
+                padding: 0 1rem;
                 align-items: center;
                 .lable{
                     font-size: large;
@@ -41,7 +57,10 @@
                 margin-top: 10px;
                 width: 100%;
                 padding: 10px;
-
+                height: 18rem;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
             }
             
         }

src/pages/platformCenter/standingBook/editorModal.jsx

@@ -223,7 +223,7 @@ const AddModal = props => {
                                 </Input>
                                 <Dropdown
                                     placement='bottomRight'
-                                    style={{width:'10rem'}}
+                                    style={{width:'20rem'}}
                                     overlay={<Menu>
                                          {tableData.length ? tableData.map((item, index) => { return  <Menu.Item onClick={()=>{setType(item); form.setFieldsValue({ Type:item})}} style={{width:'26.6rem'}} key={index}>{item}</Menu.Item> }) : ''}
                                     </Menu>} >

src/pages/platformCenter/standingBook/standingBook.jsx

@@ -303,6 +303,12 @@ const standingBook = props => {
                         size="small"
                         rowKey='ID'
                         bordered
+                        onRow={record => {
+                            return {
+                              onDoubleClick: event => {event.stopPropagation(); editor(record)}, //双击
+                            };
+                          }}
+                
                         columns={columns}
                         dataSource={allData[pickItem]}
                         // loading={tableLoading}

src/pages/platformCenter/standingBook/standingBook.less

@@ -331,7 +331,7 @@
     }
   }
 .formData{
-    height: 26rem;
+    height: 38rem;
     overflow-y: scroll;
     .ant-form-item-label > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before{
         display: none;