Skip to content

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

fix: '角色管理bug修复'

parent 312aa015
Pipeline #78925 passed with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 43 additions and 4 deletions
          src/pages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
          View file @ 93474318
          ...@@ -863,7 +863,20 @@ const AddModal = props => { ...@@ -863,7 +863,20 @@ const AddModal = props => {
          </Col> </Col>
          {form.getFieldsValue().accountName ? ( {form.getFieldsValue().accountName ? (
          <Col span={24}> <Col span={24}>
          <Item label="父业务模板" name="parentId" labelCol={{ span: 5 }}> <Item
          label={
          <span>
          <Tooltip title="针对组合设备的反馈模板方式，可独立配置模板并挂接父子关系，批量反馈">
          <InfoCircleOutlined
          style={{ color: 'rgb(24, 144, 255)', marginLeft: '5px', marginTop: '3px' }}
          />
          </Tooltip>
          父业务模板
          </span>
          }
          name="parentId"
          labelCol={{ span: 5 }}
          >
          <Select placeholder="选择父业务模板" showSearch allowClear> <Select placeholder="选择父业务模板" showSearch allowClear>
          {parentList {parentList
          ? parentList.map((item, index) => ( ? parentList.map((item, index) => (
          ...@@ -877,8 +890,21 @@ const AddModal = props => { ...@@ -877,8 +890,21 @@ const AddModal = props => {
          </Col> </Col>
          ) : ( ) : (
          <Col span={24}> <Col span={24}>
          <Item label="父业务模板" name="parentId" labelCol={{ span: 5 }}> <Item
          <Select placeholder="请先选择维保设备" disabled> label={
          <span>
          <Tooltip title="针对组合设备的反馈模板方式，可独立配置模板并挂接父子关系，批量反馈">
          <InfoCircleOutlined
          style={{ color: 'rgb(24, 144, 255)', marginLeft: '5px', marginTop: '3px' }}
          />
          </Tooltip>
          父业务模板
          </span>
          }
          name="parentId"
          labelCol={{ span: 5 }}
          >
          <Select placeholder="选择父业务模板" disabled>
          {parentList {parentList
          ? parentList.map((item, index) => ( ? parentList.map((item, index) => (
          <Option key={index.ID} value={item.ID}> <Option key={index.ID} value={item.ID}>
          ......
          src/pages/userCenter/roleManage/RoleManage.jsx
          View file @ 93474318
          ...@@ -284,7 +284,20 @@ const SiteManage = () => { ...@@ -284,7 +284,20 @@ const SiteManage = () => {
          {afterStr} {afterStr}
          </div> </div>
          ) : ( ) : (
          <div className={styles.titleTop}>{i.title}</div> <div className={styles.titleTop}>
          {i.title}
          {i.description && (
          <Tooltip title={i.description}>
          <InfoCircleOutlined
          style={{
          color: 'rgb(24, 144, 255)',
          marginLeft: '5px',
          marginTop: '3px',
          }}
          />
          </Tooltip>
          )}
          </div>
          )} )}
          <div className={styles.tip}> <div className={styles.tip}>
          {i.roleID && ( {i.roleID && (
          ......
          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