Skip to content

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

fix: '消息平台编辑界面样式重构'

parent cf0ce85a
Pipeline #43019 skipped with stages
          Show whitespace changes
          Inline Side-by-side
          Showing with 64 additions and 68 deletions
          src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
          View file @ dcd38827
          ...@@ -85,9 +85,7 @@ const ProjectManage = props => { ...@@ -85,9 +85,7 @@ const ProjectManage = props => {
          ) : ( ) : (
          <div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title={text}> <Tooltip title={text}>
          <AlertTwoTone <AlertTwoTone style={{ fontSize: '16px', marginRight: '0.1rem' }} />
          style={{ fontSize: '16px', marginRight: '0.1rem' }}
          />
          </Tooltip> </Tooltip>
          {searchStyle(text)} {searchStyle(text)}
          </div> </div>
          ...@@ -140,9 +138,7 @@ const ProjectManage = props => { ...@@ -140,9 +138,7 @@ const ProjectManage = props => {
          /> />
          </Tooltip> </Tooltip>
          {record.name != '通用报警' && {record.name != '通用报警' && record.name != '工单提醒' && record.name != '系统通知' && (
          record.name != '工单提醒' &&
          record.name != '系统通知' && (
          <div onClick={e => e.stopPropagation()}> <div onClick={e => e.stopPropagation()}>
          <Popconfirm <Popconfirm
          title="是否删除方案？" title="是否删除方案？"
          ...@@ -152,9 +148,7 @@ const ProjectManage = props => { ...@@ -152,9 +148,7 @@ const ProjectManage = props => {
          DeleteProject(record); DeleteProject(record);
          }} }}
          > >
          <DeleteOutlined <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
          style={{ fontSize: '16px', color: '#e86060' }}
          />
          </Popconfirm> </Popconfirm>
          </div> </div>
          )} )}
          ...@@ -167,10 +161,7 @@ const ProjectManage = props => { ...@@ -167,10 +161,7 @@ const ProjectManage = props => {
          const searchStyle = val => { const searchStyle = val => {
          let n; let n;
          if (showSearchStyle) { if (showSearchStyle) {
          n = val.replace( n = val.replace(new RegExp(value, 'g'), `<span style='color:red'>${value}</span>`);
          new RegExp(value, 'g'),
          `<span style='color:red'>${value}</span>`,
          );
          } else { } else {
          n = val; n = val;
          } }
          ......
          src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx
          View file @ dcd38827
          ...@@ -11,6 +11,8 @@ import { ...@@ -11,6 +11,8 @@ import {
          message, message,
          Button, Button,
          Card, Card,
          Row,
          Col,
          Switch as Switchs, Switch as Switchs,
          } from 'antd'; } from 'antd';
          import BaseForm from '@/components/BaseForm/index'; import BaseForm from '@/components/BaseForm/index';
          ...@@ -384,12 +386,13 @@ const EditModal = props => { ...@@ -384,12 +386,13 @@ const EditModal = props => {
          return ( return (
          <div className={styles.editModal_container}> <div className={styles.editModal_container}>
          <Form form={form} {...layout} onFinish={onSubmit}> <Form form={form} onFinish={onSubmit}>
          <div className={styles.content}> <div className={styles.content}>
          <Card title="方案" style={{ width: '100%' }}> <Card title="方案" style={{ width: '100%' }}>
          <Item <Item
          label="方案名称" label="方案名称"
          name="name" name="name"
          labelAlign="right"
          rules={[ rules={[
          { {
          required: true, required: true,
          ...@@ -404,7 +407,7 @@ const EditModal = props => { ...@@ -404,7 +407,7 @@ const EditModal = props => {
          onChange={onNameChange} onChange={onNameChange}
          /> />
          </Item> </Item>
          <Item label="方案类型"> <Item label="方案类型" labelAlign="right" style={{ marginLeft: '12px' }}>
          <div className={styles.cardList}> <div className={styles.cardList}>
          {listType.map(item => ( {listType.map(item => (
          <div key={item.title} className={styles.cardListItem}> <div key={item.title} className={styles.cardListItem}>
          ...@@ -425,7 +428,11 @@ const EditModal = props => { ...@@ -425,7 +428,11 @@ const EditModal = props => {
          <div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Item labelCol={{ span: 6 }}> <Item labelCol={{ span: 6 }}>
          <div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
          <Item label="推送组" name="to_person" style={{ marginTop: '50px' }}> <Item
          label="推送组"
          name="to_person"
          style={{ marginTop: '50px', marginLeft: '32px' }}
          >
          <Input disabled /> <Input disabled />
          </Item> </Item>
          <IdcardOutlined <IdcardOutlined
          ...@@ -480,6 +487,8 @@ const EditModal = props => { ...@@ -480,6 +487,8 @@ const EditModal = props => {
          </Card> </Card>
          )} )}
          <div className={styles.push_trench}> <div className={styles.push_trench}>
          <Row>
          <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}>
          ...@@ -490,7 +499,7 @@ const EditModal = props => { ...@@ -490,7 +499,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" labelAlign="left" name="app_template" labelCol={{ span: 3 }}> <Item label="模板" name="app_template" labelCol={{ span: 6 }}>
          <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}>
          ...@@ -499,9 +508,9 @@ const EditModal = props => { ...@@ -499,9 +508,9 @@ const EditModal = props => {
          ))} ))}
          </Select> </Select>
          </Item> </Item>
          <Item label="功能路径" name="app_path" labelAlign="left" labelCol={{ span: 3 }}> <Item label="功能路径" name="app_path" labelCol={{ span: 6 }}>
          <TextArea <TextArea
          rows={4} rows={1}
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isAPPShow} disabled={!currentTrench.isAPPShow}
          placeholder="请输入功能路径" placeholder="请输入功能路径"
          ...@@ -510,6 +519,8 @@ const EditModal = props => { ...@@ -510,6 +519,8 @@ const EditModal = props => {
          </div> </div>
          </div> </div>
          } }
          </Col>
          <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}>
          ...@@ -520,7 +531,7 @@ const EditModal = props => { ...@@ -520,7 +531,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="wx_template" labelAlign="left" labelCol={{ span: 4 }}> <Item label="模板" name="wx_template" labelCol={{ span: 6 }}>
          <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}>
          ...@@ -529,19 +540,14 @@ const EditModal = props => { ...@@ -529,19 +540,14 @@ const EditModal = props => {
          ))} ))}
          </Select> </Select>
          </Item> </Item>
          <Item label="H5路由" name="h5_path" labelAlign="left" labelCol={{ span: 4 }}> <Item label="H5路由" name="h5_path" labelCol={{ span: 6 }}>
          <Input <Input
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isWXShow} disabled={!currentTrench.isWXShow}
          placeholder="请输入功能路径" placeholder="请输入功能路径"
          /> />
          </Item> </Item>
          <Item <Item label="小程序路由" name="miniprogram_path" labelCol={{ span: 6 }}>
          label="小程序路由"
          name="miniprogram_path"
          labelAlign="left"
          labelCol={{ span: 4 }}
          >
          <Input <Input
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isWXShow} disabled={!currentTrench.isWXShow}
          ...@@ -551,6 +557,8 @@ const EditModal = props => { ...@@ -551,6 +557,8 @@ const EditModal = props => {
          </div> </div>
          </div> </div>
          } }
          </Col>
          <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}>
          ...@@ -561,7 +569,7 @@ const EditModal = props => { ...@@ -561,7 +569,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item label="模板" name="web_template" labelCol={{ span: 3 }} labelAlign="left"> <Item label="模板" name="web_template" labelCol={{ span: 6 }}>
          <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}>
          ...@@ -570,9 +578,9 @@ const EditModal = props => { ...@@ -570,9 +578,9 @@ const EditModal = props => {
          ))} ))}
          </Select> </Select>
          </Item> </Item>
          <Item label="功能路径" name="web_path" labelAlign="left" labelCol={{ span: 3 }}> <Item label="功能路径" name="web_path" labelCol={{ span: 6 }}>
          <TextArea <TextArea
          rows={4} rows={1}
          style={{ width: '97%' }} style={{ width: '97%' }}
          disabled={!currentTrench.isWEBShow} disabled={!currentTrench.isWEBShow}
          placeholder="请输入功能路径" placeholder="请输入功能路径"
          ...@@ -581,7 +589,8 @@ const EditModal = props => { ...@@ -581,7 +589,8 @@ const EditModal = props => {
          </div> </div>
          </div> </div>
          } }
          </Col>
          <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}>
          ...@@ -592,12 +601,7 @@ const EditModal = props => { ...@@ -592,12 +601,7 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item <Item label="模板" name="message_template" labelCol={{ span: 6 }}>
          label="模板"
          labelAlign="left"
          name="message_template"
          labelCol={{ span: 2 }}
          >
          <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}>
          ...@@ -609,7 +613,8 @@ const EditModal = props => { ...@@ -609,7 +613,8 @@ const EditModal = props => {
          </div> </div>
          </div> </div>
          } }
          </Col>
          <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}>
          ...@@ -620,13 +625,11 @@ const EditModal = props => { ...@@ -620,13 +625,11 @@ const EditModal = props => {
          /> />
          </div> </div>
          <div className={styles.card_body}> <div className={styles.card_body}>
          <Item <Item label="模板" name="enterprise_template" labelCol={{ span: 6 }}>
          label="模板" <Select
          labelAlign="left" style={{ width: '97%' }}
          name="enterprise_template" disabled={!currentTrench.isEnterpriseWXShow}
          labelCol={{ span: 2 }}
          > >
          <Select style={{ width: '97%' }} disabled={!currentTrench.isEnterpriseWXShow}>
          {EN_ITEMS.map((item, idx) => ( {EN_ITEMS.map((item, idx) => (
          <Select.Option value={item.Id} key={idx}> <Select.Option value={item.Id} key={idx}>
          {item.LikeName} {item.LikeName}
          ...@@ -637,16 +640,22 @@ const EditModal = props => { ...@@ -637,16 +640,22 @@ const EditModal = props => {
          </div> </div>
          </div> </div>
          } }
          </Col>
          </Row>
          </div> </div>
          </div> </div>
          <Item {...tailLayout} style={{ marginTop: '1rem' }}> <Row>
          <Col span={24}>
          <div style={{ marginTop: '1rem', display: 'flex', justifyContent: 'flex-end' }}>
          <Button htmlType="button" onClick={back} style={{ marginRight: '2rem' }}> <Button htmlType="button" onClick={back} style={{ marginRight: '2rem' }}>
          返回 返回
          </Button> </Button>
          <Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
          确定 确定
          </Button> </Button>
          </Item> </div>
          </Col>
          </Row>
          </Form> </Form>
          <div /> <div />
          <RoleModal <RoleModal
          ......
          src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.less
          View file @ dcd38827
          .editModal_container{ .editModal_container {
          width: 100%; width: 100%;
          overflow-y: hidden; overflow-y: hidden;
          height: calc(100% - 20px); height: calc(100% - 20px);
          ...@@ -9,61 +9,59 @@ ...@@ -9,61 +9,59 @@
          opacity: 0; opacity: 0;
          animation:none 0 ease 0 1 normal; animation: none 0 ease 0 1 normal;
          } }
          .content{ .content {
          height: calc(100vh - 140px); height: calc(100vh - 140px);
          overflow-y: scroll; overflow-y: scroll;
          } }
          .cardList{ .cardList {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          .cardListItem{ .cardListItem {
          width: 50%; width: 50%;
          margin-bottom: 1rem; margin-bottom: 1rem;
          } }
          } }
          .ant-card-bordered { .ant-card-bordered {
          border-right: none; border-right: none;
          } }
          .push_trench{ .push_trench {
          width: 100%; width: 100%;
          height: fit-content; height: fit-content;
          display: flex; display: flex;
          flex-direction:row; flex-direction: row;
          flex-wrap: wrap; flex-wrap: wrap;
          justify-content: flex-start; justify-content: flex-start;
          .trench_card{ .trench_card {
          margin-top: 1rem; margin-top: 1rem;
          margin-right: 0.5rem; margin-right: 0.5rem;
          width: 32%; min-width: 400px;
          border-width: 1px; border-width: 1px;
          border-color: #EEEEEE; border-color: #eeeeee;
          border-style: solid; border-style: solid;
          border-radius: 5px; border-radius: 5px;
          display: flex; display: flex;
          flex-direction: column; flex-direction: column;
          align-items: center; align-items: center;
          background-color: #ffffff; background-color: #ffffff;
          .card_title{ .card_title {
          border-bottom-style: solid; border-bottom-style: solid;
          border-bottom-width: 1px; border-bottom-width: 1px;
          border-bottom-color:#F6F7F9; border-bottom-color: #f6f7f9;
          height:50px; height: 50px;
          width: 100%; width: 100%;
          display: flex; display: flex;
          flex-direction: row; flex-direction: row;
          justify-content:space-between; justify-content: space-between;
          padding: 0 24px; padding: 0 24px;
          align-items: center; align-items: center;
          .lable{ .lable {
          font-size: large; font-size: large;
          margin-left: 10px; margin-left: 10px;
          } }
          } }
          .card_body{ .card_body {
          margin-top: 10px; margin-top: 10px;
          width: 100%; width: 100%;
          padding: 10px; padding: 10px;
          ...@@ -71,14 +69,12 @@ ...@@ -71,14 +69,12 @@
          display: flex; display: flex;
          flex-direction: column; flex-direction: column;
          } }
          .ant-switch{ .ant-switch {
          margin-right: 0.5rem; margin-right: 0.5rem;
          } }
          .ant-form-item{ .ant-form-item {
          margin-left: 1.3rem; margin-left: 1.3rem;
          } }
          } }
          } }
          } }
          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