Skip to content

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

fix: '消息平台配置优化'

parent 0adf9d2f
Pipeline #64697 passed with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 156 additions and 109 deletions
          src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx
          View file @ 0c7c176c
          ......@@ -40,7 +40,22 @@ const patrolFeedback = () => {
          title: '巡检对象',
          dataIndex: 'layerName',
          key: 'layerName',
          width: 150,
          onCell: () => ({
          style: {
          maxWidth: 150,
          overflow: 'hidden',
          whiteSpace: 'nowrap',
          textOverflow: 'ellipsis',
          cursor: 'pointer',
          },
          }),
          align: 'center',
          render: record => (
          <Tooltip placement="topLeft" title={record}>
          {record}
          </Tooltip>
          ),
          },
          {
          title: '分组',
          ......@@ -52,13 +67,43 @@ const patrolFeedback = () => {
          title: 'GIS图层',
          dataIndex: 'gisLayer',
          key: 'gisLayer',
          width: 100,
          onCell: () => ({
          style: {
          maxWidth: 100,
          overflow: 'hidden',
          whiteSpace: 'nowrap',
          textOverflow: 'ellipsis',
          cursor: 'pointer',
          },
          }),
          align: 'center',
          render: record => (
          <Tooltip placement="topLeft" title={record}>
          {record}
          </Tooltip>
          ),
          },
          {
          title: 'GIS条件',
          dataIndex: 'gisFilterValue',
          key: 'gisFilterValue',
          width: 100,
          onCell: () => ({
          style: {
          maxWidth: 100,
          overflow: 'hidden',
          whiteSpace: 'nowrap',
          textOverflow: 'ellipsis',
          cursor: 'pointer',
          },
          }),
          align: 'center',
          render: record => (
          <Tooltip placement="topLeft" title={record}>
          {record}
          </Tooltip>
          ),
          },
          {
          title: '反馈表',
          ......@@ -106,7 +151,7 @@ const patrolFeedback = () => {
          title: '字段集',
          dataIndex: 'fields',
          key: 'fields',
          width: 100,
          width: 50,
          align: 'center',
          },
          // {
          ......@@ -128,7 +173,7 @@ const patrolFeedback = () => {
          dataIndex: 'roles',
          key: 'roles',
          align: 'center',
          width: 100,
          width: 50,
          },
          // {
          // title: '分组',
          ......@@ -187,6 +232,8 @@ const patrolFeedback = () => {
          if (other.length > 0) {
          data.未分组 = other;
          setGroupName(['区域巡检', 'DMA巡检', '未分组']);
          } else {
          setGroupName(['区域巡检', 'DMA巡检']);
          }
          }
          console.log(data);
          ......
          src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.less
          View file @ 0c7c176c
          ......@@ -95,6 +95,8 @@
          position: relative;
          transition: width 0.5s;
          .title {
          margin: 16px 0 10px 16px;
          display: inline-block;
          ......
          src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx
          View file @ 0c7c176c
          ......@@ -171,7 +171,7 @@ const EditModal = props => {
          to_person: template.PushGroup,
          push_mode: template.PushMode === null ? '' : template.PushMode.split(','),
          webIcon: template.WebIcon,
          webTitile: template.WebTitile,
          Title: template.Title,
          app_template: template.AppTemplateID,
          app_path: template.AppFunctionPath,
          wx_template: template.PublicTemplateID ? parseInt(template.PublicTemplateID) : '',
          ......@@ -371,7 +371,7 @@ const EditModal = props => {
          PushGroup: fv.to_person ? fv.to_person.toString() : '',
          WorkWeiXinTemplateId: aa,
          WebIcon: fv.webIcon,
          WebTitile: fv.webTitile,
          Title: fv.Title,
          };
          UpdateMessageConfig(a).then(res => {
          ......@@ -436,7 +436,7 @@ const EditModal = props => {
          PushGroup: fv.to_person ? fv.to_person.toString() : '',
          WorkWeiXinTemplateId: bb,
          WebIcon: fv.webIcon,
          WebTitile: fv.webTitile,
          Title: fv.Title,
          };
          InsertMessageConfig(b).then(res => {
          if (res.code === 0) {
          ......@@ -697,24 +697,33 @@ const EditModal = props => {
          <Form form={form} onFinish={onSubmit}>
          <div className={styles.content}>
          <Card title="方案" style={{ width: '100%' }}>
          <Item
          label="方案名称"
          name="name"
          labelAlign="right"
          rules={[
          {
          required: true,
          message: '请输入方案名称',
          },
          ]}
          >
          <Input
          style={{ width: '25rem' }}
          placeholder="请输入方案名称"
          disabled={!!template.ThemeName}
          onChange={onNameChange}
          />
          </Item>
          <Row>
          <Col span={11}>
          <Item
          label="方案名称"
          name="name"
          labelAlign="right"
          rules={[
          {
          required: true,
          message: '请输入方案名称',
          },
          ]}
          >
          <Input
          style={{ width: '25rem' }}
          placeholder="请输入方案名称"
          disabled={!!template.ThemeName}
          onChange={onNameChange}
          />
          </Item>
          </Col>
          <Col span={12}>
          <Item label="消息标题" name="Title" labelCol={{ span: 6 }}>
          <Input placeholder="请输入标题" style={{ width: '25rem' }} />
          </Item>
          </Col>
          </Row>
          <Item label="方案类型" labelAlign="right" style={{ marginLeft: '12px' }}>
          <div className={styles.cardList}>
          {listType.map(item => (
          ......@@ -834,98 +843,87 @@ const EditModal = props => {
          ))}
          </Select>
          </Item>
          <Row>
          <Col span={15}>
          <Item label="标题" name="webTitile" labelCol={{ span: 8 }}>
          <Input
          placeholder="请输入标题"
          style={{ width: '97%' }}
          disabled={!currentTrench.isWEBShow}
          />
          </Item>
          </Col>
          <Col span={8}>
          <Item
          label="图标"
          name="WebIcon"
          style={{ height: '82px' }}
          labelCol={{ span: 12 }}
          <Item
          label="图标"
          name="WebIcon"
          style={{ height: '82px' }}
          labelCol={{ span: 5 }}
          >
          {imageUrl ? (
          <div
          style={{
          width: '74px',
          height: '74px',
          border: '1px solid #d9d9d9',
          borderRadius: '2px',
          padding: '8px',
          position: 'relative',
          }}
          onMouseEnter={() => setShow('visible')}
          onMouseLeave={() => setShow('hidden')}
          >
          {imageUrl ? (
          <div
          style={{
          width: '74px',
          height: '74px',
          border: '1px solid #d9d9d9',
          borderRadius: '2px',
          padding: '8px',
          position: 'relative',
          }}
          onMouseEnter={() => setShow('visible')}
          onMouseLeave={() => setShow('hidden')}
          >
          <img
          src={imageUrl}
          alt="singleFile"
          <img
          src={imageUrl}
          alt="singleFile"
          style={{
          width: '100%',
          backgroundColor: '#bfbfbf',
          }}
          />
          {show == 'visible' && currentTrench.isWEBShow ? (
          <>
          <div className={styles.imgg} />
          <DeleteOutlined
          onClick={() => {
          setImageUrl('');
          setIm('');
          setKeepImgeUrl('');
          form.setFieldsValue({ webIcon: '' });
          }}
          style={{
          width: '100%',
          backgroundColor: '#bfbfbf',
          position: 'absolute',
          fontSize: '18px',
          left: '12px',
          top: '25px',
          color: 'white',
          zIndex: '999',
          }}
          />
          {show == 'visible' && currentTrench.isWEBShow ? (
          <>
          <div className={styles.imgg} />
          <DeleteOutlined
          onClick={() => {
          setImageUrl('');
          setIm('');
          setKeepImgeUrl('');
          form.setFieldsValue({ webIcon: '' });
          }}
          style={{
          position: 'absolute',
          fontSize: '18px',
          left: '12px',
          top: '25px',
          color: 'white',
          zIndex: '999',
          }}
          />
          <PictureOutlined
          onClick={pictruePreview}
          style={{
          position: 'absolute',
          fontSize: '18px',
          left: '40px',
          top: '25px',
          color: 'white',
          zIndex: '999',
          }}
          />
          </>
          ) : (
          <></>
          )}
          </div>
          <PictureOutlined
          onClick={pictruePreview}
          style={{
          position: 'absolute',
          fontSize: '18px',
          left: '40px',
          top: '25px',
          color: 'white',
          zIndex: '999',
          }}
          />
          </>
          ) : (
          <Image
          width="74px"
          // height={100}
          src="error"
          onClick={
          currentTrench.isWEBShow
          ? () => {
          pictruePreview();
          }
          : ''
          }
          fallback="data:image/png;base64,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"
          />
          <></>
          )}
          </Item>
          </Col>
          </Row>
          </div>
          ) : (
          <Image
          width="74px"
          // height={100}
          src="error"
          onClick={
          currentTrench.isWEBShow
          ? () => {
          pictruePreview();
          }
          : ''
          }
          fallback="data:image/png;base64,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"
          />
          )}
          </Item>
          <Item label="功能路径" name="web_path" labelCol={{ span: 5 }}>
          {/* <TextArea
          rows={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