Skip to content

C
CivManage
Commit 0adf9d2f authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

fix: '消息平台界面优化'

parent efc0a225
Pipeline #64683 passed with stages
          Show whitespace changes
          Inline Side-by-side
          Showing with 44 additions and 31 deletions
          src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
          View file @ 0adf9d2f
          ...@@ -14,6 +14,7 @@ import { ...@@ -14,6 +14,7 @@ import {
          message, message,
          Tooltip, Tooltip,
          Spin, Spin,
          notification,
          } from 'antd'; } from 'antd';
          import { import {
          PlusCircleOutlined, PlusCircleOutlined,
          ...@@ -364,6 +365,7 @@ const ProjectManage = props => { ...@@ -364,6 +365,7 @@ const ProjectManage = props => {
          setTreeLoading(true); setTreeLoading(true);
          GetMessageConfigList(params).then(res => { GetMessageConfigList(params).then(res => {
          setTreeLoading(false); setTreeLoading(false);
          if (res.code === 0) {
          let mesList = []; let mesList = [];
          if (res.code === 0) { if (res.code === 0) {
          res.data.MessageConfigModels.map(item => { res.data.MessageConfigModels.map(item => {
          ...@@ -380,6 +382,13 @@ const ProjectManage = props => { ...@@ -380,6 +382,13 @@ const ProjectManage = props => {
          setDataList(mesList); setDataList(mesList);
          } }
          } else {
          notification.error({
          message: '提示',
          duration: 3,
          description: res.msg,
          });
          }
          }); });
          }; };
          ......
          src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx
          View file @ 0adf9d2f
          ...@@ -720,12 +720,16 @@ const EditModal = props => { ...@@ -720,12 +720,16 @@ const EditModal = props => {
          {listType.map(item => ( {listType.map(item => (
          <div key={item.title} className={styles.cardListItem}> <div key={item.title} className={styles.cardListItem}>
          {item.title != '自定义' && item.title != '定时推送' ? ( {item.title != '自定义' && item.title != '定时推送' ? (
          <Button <span
          type={item.title === btnType ? 'primary' : 'default'} style={{
          style={{ cursor: 'not-allowed', marginRight: '1rem', width: '88px' }} display: 'inline-block',
          width: '88px',
          marginLeft: '16px',
          }}
          > >
          {item.title} {item.title}：
          </Button> </span>
          ) : ( ) : (
          <Button <Button
          type={item.title === btnType ? 'primary' : 'default'} type={item.title === btnType ? 'primary' : 'default'}
          ...@@ -750,7 +754,7 @@ const EditModal = props => { ...@@ -750,7 +754,7 @@ const EditModal = props => {
          {btnType === '定时推送' ? ( {btnType === '定时推送' ? (
          <Card title="推送计划" style={{ width: '100%', marginTop: '1rem' }}> <Card title="推送计划" style={{ width: '100%', marginTop: '1rem' }}>
          <div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Item labelCol={{ span: 6 }}> <Item labelCol={{ span: 5 }}>
          <div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
          <Item <Item
          label="推送组" label="推送组"
          ...@@ -810,7 +814,7 @@ const EditModal = props => { ...@@ -810,7 +814,7 @@ const EditModal = props => {
          )} )}
          <div className={styles.push_trench}> <div className={styles.push_trench}>
          <Row> <Row>
          <Col xxl={8} xl={12} sm={24} xs={40}> <Col xxl={8} xl={12} sm={24} xs={24}>
          { {
          <div className={styles.trench_card}> <div className={styles.trench_card}>
          <div className={styles.card_title}> <div className={styles.card_title}>
          ...@@ -821,7 +825,7 @@ const EditModal = props => { ...@@ -821,7 +825,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="web_template" labelCol={{ span: 6 }}> <Item label="模板" name="web_template" labelCol={{ span: 5 }}>
          <Select style={{ width: '97%' }} disabled={!currentTrench.isWEBShow}> <Select style={{ width: '97%' }} disabled={!currentTrench.isWEBShow}>
          {WEB_ITEMS.map((item, idx) => ( {WEB_ITEMS.map((item, idx) => (
          <Select.Option value={item.Id} key={idx}> <Select.Option value={item.Id} key={idx}>
          ...@@ -831,8 +835,8 @@ const EditModal = props => { ...@@ -831,8 +835,8 @@ const EditModal = props => {
          </Select> </Select>
          </Item> </Item>
          <Row> <Row>
          <Col span={16}> <Col span={15}>
          <Item label="标题" name="webTitile" labelCol={{ span: 9 }}> <Item label="标题" name="webTitile" labelCol={{ span: 8 }}>
          <Input <Input
          placeholder="请输入标题" placeholder="请输入标题"
          style={{ width: '97%' }} style={{ width: '97%' }}
          ...@@ -844,14 +848,14 @@ const EditModal = props => { ...@@ -844,14 +848,14 @@ const EditModal = props => {
          <Item <Item
          label="图标" label="图标"
          name="WebIcon" name="WebIcon"
          style={{ height: '112px' }} style={{ height: '82px' }}
          labelCol={{ span: 6 }} labelCol={{ span: 12 }}
          > >
          {imageUrl ? ( {imageUrl ? (
          <div <div
          style={{ style={{
          width: '104px', width: '74px',
          height: '104px', height: '74px',
          border: '1px solid #d9d9d9', border: '1px solid #d9d9d9',
          borderRadius: '2px', borderRadius: '2px',
          padding: '8px', padding: '8px',
          ...@@ -882,8 +886,8 @@ const EditModal = props => { ...@@ -882,8 +886,8 @@ const EditModal = props => {
          style={{ style={{
          position: 'absolute', position: 'absolute',
          fontSize: '18px', fontSize: '18px',
          left: '24px', left: '12px',
          top: '45px', top: '25px',
          color: 'white', color: 'white',
          zIndex: '999', zIndex: '999',
          }} }}
          ...@@ -893,8 +897,8 @@ const EditModal = props => { ...@@ -893,8 +897,8 @@ const EditModal = props => {
          style={{ style={{
          position: 'absolute', position: 'absolute',
          fontSize: '18px', fontSize: '18px',
          left: '54px', left: '40px',
          top: '45px', top: '25px',
          color: 'white', color: 'white',
          zIndex: '999', zIndex: '999',
          }} }}
          ...@@ -906,7 +910,7 @@ const EditModal = props => { ...@@ -906,7 +910,7 @@ const EditModal = props => {
          </div> </div>
          ) : ( ) : (
          <Image <Image
          width="104px" width="74px"
          // height={100} // height={100}
          src="error" src="error"
          onClick={ onClick={
          ...@@ -922,7 +926,7 @@ const EditModal = props => { ...@@ -922,7 +926,7 @@ const EditModal = props => {
          </Item> </Item>
          </Col> </Col>
          </Row> </Row>
          <Item label="功能路径" name="web_path" labelCol={{ span: 6 }}> <Item label="功能路径" name="web_path" labelCol={{ span: 5 }}>
          {/* <TextArea {/* <TextArea
          rows={1} rows={1}
          style={{ width: '97%' }} style={{ width: '97%' }}
          ...@@ -966,7 +970,7 @@ const EditModal = props => { ...@@ -966,7 +970,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="app_template" labelCol={{ span: 6 }}> <Item label="模板" name="app_template" labelCol={{ span: 5 }}>
          <Select style={{ width: '97%' }} disabled={!currentTrench.isAPPShow}> <Select style={{ width: '97%' }} disabled={!currentTrench.isAPPShow}>
          {APP_ITEMS.map((item, idx) => ( {APP_ITEMS.map((item, idx) => (
          <Select.Option value={item.Id} key={idx}> <Select.Option value={item.Id} key={idx}>
          ...@@ -975,7 +979,7 @@ const EditModal = props => { ...@@ -975,7 +979,7 @@ const EditModal = props => {
          ))} ))}
          </Select> </Select>
          </Item> </Item>
          <Item label="功能路径" name="app_path" labelCol={{ span: 6 }}> <Item label="功能路径" name="app_path" labelCol={{ span: 5 }}>
          {/* <TextArea {/* <TextArea
          rows={1} rows={1}
          style={{ width: '97%' }} style={{ width: '97%' }}
          ...@@ -1018,7 +1022,7 @@ const EditModal = props => { ...@@ -1018,7 +1022,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="wx_template" labelCol={{ span: 6 }}> <Item label="模板" name="wx_template" labelCol={{ span: 5 }}>
          <Select style={{ width: '97%' }} disabled={!currentTrench.isWXShow}> <Select style={{ width: '97%' }} disabled={!currentTrench.isWXShow}>
          {WX_ITEMS.map((item, idx) => ( {WX_ITEMS.map((item, idx) => (
          <Select.Option value={item.Id} key={idx}> <Select.Option value={item.Id} key={idx}>
          ...@@ -1027,14 +1031,14 @@ const EditModal = props => { ...@@ -1027,14 +1031,14 @@ const EditModal = props => {
          ))} ))}
          </Select> </Select>
          </Item> </Item>
          <Item label="H5路由" name="h5_path" labelCol={{ span: 6 }}> <Item label="H5路由" name="h5_path" labelCol={{ span: 5 }}>
          <Input <Input
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isWXShow} disabled={!currentTrench.isWXShow}
          placeholder="请输入功能路径" placeholder="请输入功能路径"
          /> />
          </Item> </Item>
          <Item label="小程序路由" name="miniprogram_path" labelCol={{ span: 6 }}> <Item label="小程序路由" name="miniprogram_path" labelCol={{ span: 5 }}>
          <Input <Input
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isWXShow} disabled={!currentTrench.isWXShow}
          ...@@ -1057,7 +1061,7 @@ const EditModal = props => { ...@@ -1057,7 +1061,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="message_template" labelCol={{ span: 6 }}> <Item label="模板" name="message_template" labelCol={{ span: 5 }}>
          <Select style={{ width: '97%' }} disabled={!currentTrench.isMessageShow}> <Select style={{ width: '97%' }} disabled={!currentTrench.isMessageShow}>
          {MES_ITEMS.map((item, idx) => ( {MES_ITEMS.map((item, idx) => (
          <Select.Option value={item.Id} key={idx}> <Select.Option value={item.Id} key={idx}>
          ...@@ -1081,7 +1085,7 @@ const EditModal = props => { ...@@ -1081,7 +1085,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="enterprise_template" labelCol={{ span: 6 }}> <Item label="模板" name="enterprise_template" labelCol={{ span: 5 }}>
          <Select <Select
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isEnterpriseWXShow} disabled={!currentTrench.isEnterpriseWXShow}
          ......
          src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.less
          View file @ 0adf9d2f
          ...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
          margin-top: 10px; margin-top: 10px;
          width: 100%; width: 100%;
          padding: 10px; padding: 10px;
          height: 16rem; height: 14rem;
          display: flex; display: flex;
          flex-direction: column; flex-direction: column;
          overflow: hidden; overflow: hidden;
          ...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
          margin-right: 0.5rem; margin-right: 0.5rem;
          } }
          .ant-form-item { .ant-form-item {
          margin-left: 1.3rem; margin-left: 0;
          } }
          } }
          } }
          ...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
          position: relative; position: relative;
          top: -95px; top: -95px;
          left: -9px; left: -9px;
          height: 104px; height: 74px;
          width: 104px; width: 74px;
          background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
          border-radius: 2px; border-radius: 2px;
          z-index: 1; z-index: 1;
          ......
          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