Skip to content

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

fix: '维保模板删除数据列表不刷新bug修复'

parent ce889955
Pipeline #75671 waiting for manual action with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 87 additions and 275 deletions
          src/pages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
          View file @ 44706b3a
          ...@@ -148,7 +148,7 @@ const AddModal = props => { ...@@ -148,7 +148,7 @@ const AddModal = props => {
          getParentList(); getParentList();
          if (type === 'add') { if (type === 'add') {
          setChee('否'); setChee('否');
          form.setFieldsValue({ isSubmit: '否', docycle: '一周一次' }); form.setFieldsValue({ isSubmit: '否', docycle: '一周一次', feedbackRule: '' });
          getGetTaskSyncField(); getGetTaskSyncField();
          setType1(''); setType1('');
          setType2(''); setType2('');
          ...@@ -184,6 +184,7 @@ const AddModal = props => { ...@@ -184,6 +184,7 @@ const AddModal = props => {
          setChee(''); setChee('');
          form.resetFields(); form.resetFields();
          formAdd.resetFields(); formAdd.resetFields();
          setKeepAll([]);
          setKeepTree([]); setKeepTree([]);
          setKeepData([]); setKeepData([]);
          setKeep([]); setKeep([]);
          ...@@ -689,7 +690,6 @@ const AddModal = props => { ...@@ -689,7 +690,6 @@ const AddModal = props => {
          newData.push(i); newData.push(i);
          }); });
          setKeepData(newData); setKeepData(newData);
          debugger;
          setKeep(newData); setKeep(newData);
          if (str) { if (str) {
          // 编辑初次回显处理过滤下拉款数据 // 编辑初次回显处理过滤下拉款数据
          ...@@ -1057,24 +1057,51 @@ const AddModal = props => { ...@@ -1057,24 +1057,51 @@ const AddModal = props => {
          </div> </div>
          </Item> </Item>
          </Col> </Col>
          <Col span={24}> {form.getFieldsValue().feedbackRule !== '' ? (
          <Item label="关联事件" name="relationEvent" labelCol={{ span: 5 }}> <Col span={24}>
          <Select <Item
          placeholder="选择关联事件类型" label="关联事件"
          showSearch name="relationEvent"
          onChange={e => onChangeEvent(e)} labelCol={{ span: 5 }}
          allowClear rules={[{ required: true, message: '请选择关联事件类型' }]}
          > >
          {eventData <Select
          ? eventData.map((item, index) => ( placeholder="选择关联事件类型"
          <Option key={index} value={item}> showSearch
          {item} onChange={e => onChangeEvent(e)}
          </Option> allowClear
          )) >
          : ''} {eventData
          </Select> ? eventData.map((item, index) => (
          </Item> <Option key={index} value={item}>
          </Col> {item}
          </Option>
          ))
          : ''}
          </Select>
          </Item>
          </Col>
          ) : (
          <Col span={24}>
          <Item label="关联事件" name="relationEvent" labelCol={{ span: 5 }}>
          <Select
          placeholder="选择关联事件类型"
          showSearch
          onChange={e => onChangeEvent(e)}
          allowClear
          >
          {eventData
          ? eventData.map((item, index) => (
          <Option key={index} value={item}>
          {item}
          </Option>
          ))
          : ''}
          </Select>
          </Item>
          </Col>
          )}
          <Col span={23}> <Col span={23}>
          <span style={{ fontSize: '12px', color: '#bfbcbc', marginLeft: '114px' }}> <span style={{ fontSize: '12px', color: '#bfbcbc', marginLeft: '114px' }}>
          当配置了关联事件后，可配置字段映射规则 当配置了关联事件后，可配置字段映射规则
          ...@@ -1111,12 +1138,13 @@ const AddModal = props => { ...@@ -1111,12 +1138,13 @@ const AddModal = props => {
          { required: true, message: '请填写字段名' }, { required: true, message: '请填写字段名' },
          { {
          validator: (rule, value) => { validator: (rule, value) => {
          let filterValue = formAdd.getFieldsValue().parmars; if (value) {
          let num = filterValue.findIndex(i => i.fromField === value); let filterValue = formAdd.getFieldsValue().parmars;
          let index = rule.field.split('.')[1]; let num = filterValue.findIndex(i => i.fromField === value);
          // debugger let index = rule.field.split('.')[1];
          if (num !== undefined && num !== Number(index)) { if (num !== undefined && num !== Number(index)) {
          return Promise.reject('字段重复'); return Promise.reject('字段重复');
          }
          } }
          return Promise.resolve(); return Promise.resolve();
          }, },
          ......
          src/pages/bsmanager/patrolMaintenance/maintenance/maintenance.jsx
          View file @ 44706b3a
          ...@@ -34,260 +34,45 @@ const maintenance = () => { ...@@ -34,260 +34,45 @@ const maintenance = () => {
          const [keepTableData, setKeepTableData] = useState([]); const [keepTableData, setKeepTableData] = useState([]);
          const [activeName, setActiveName] = useState('template'); const [activeName, setActiveName] = useState('template');
          // const columns = [
          // {
          // title: '业务名称',
          // dataIndex: 'businessName',
          // key: 'businessName',
          // 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: '业务类型',
          // dataIndex: 'businessType',
          // key: 'businessType',
          // 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: '执行周期',
          // dataIndex: 'docycle',
          // key: 'docycle',
          // width: 100,
          // align: 'center',
          // },
          // {
          // title: '维保设备',
          // dataIndex: 'accountName',
          // key: 'accountName',
          // width: 200,
          // onCell: () => ({
          // style: {
          // maxWidth: 200,
          // overflow: 'hidden',
          // whiteSpace: 'nowrap',
          // textOverflow: 'ellipsis',
          // cursor: 'pointer',
          // },
          // }),
          // align: 'center',
          // render: record => (
          // <Tooltip placement="topLeft" title={record}>
          // {record}
          // </Tooltip>
          // ),
          // },
          // {
          // title: '反馈名称',
          // dataIndex: 'feedbackName',
          // key: 'feedbackName',
          // onCell: () => ({
          // style: {
          // maxWidth: 200,
          // overflow: 'hidden',
          // whiteSpace: 'nowrap',
          // textOverflow: 'ellipsis',
          // cursor: 'pointer',
          // },
          // }),
          // align: 'center',
          // render: record => (
          // <Tooltip placement="topLeft" title={record}>
          // {record}
          // </Tooltip>
          // ),
          // },
          // {
          // title: '执行角色',
          // dataIndex: 'doRole',
          // key: 'doRole',
          // align: 'center',
          // onCell: () => ({
          // style: {
          // maxWidth: 200,
          // overflow: 'hidden',
          // whiteSpace: 'nowrap',
          // textOverflow: 'ellipsis',
          // cursor: 'pointer',
          // },
          // }),
          // render: record => (
          // <Tooltip placement="topLeft" title={record}>
          // {record}
          // </Tooltip>
          // ),
          // },
          // {
          // title: '预生成天数',
          // dataIndex: 'produceDays',
          // key: 'produceDays',
          // width: 90,
          // align: 'center',
          // onCell: () => ({
          // style: {
          // maxWidth: 80,
          // overflow: 'hidden',
          // whiteSpace: 'nowrap',
          // textOverflow: 'ellipsis',
          // cursor: 'pointer',
          // },
          // }),
          // },
          // {
          // title: '在线任务量',
          // dataIndex: 'onLines',
          // key: 'onLines',
          // width: 90,
          // align: 'center',
          // onCell: () => ({
          // style: {
          // maxWidth: 80,
          // overflow: 'hidden',
          // whiteSpace: 'nowrap',
          // textOverflow: 'ellipsis',
          // cursor: 'pointer',
          // },
          // }),
          // render: record => (
          // <Tooltip placement="topLeft" title={record}>
          // {record}
          // </Tooltip>
          // ),
          // },
          // // {
          // // title: '启停',
          // // dataIndex: 'doNot',
          // // key: 'doNot',
          // // width: 80,
          // // align: 'center',
          // // },
          // {
          // title: '是否送审',
          // dataIndex: 'isSubmit',
          // key: 'isSubmit',
          // width: 80,
          // align: 'center',
          // render: record => {
          // if (record === '是') {
          // return <Tag color="success">是</Tag>;
          // } else {
          // return <Tag color="processing">否</Tag>;
          // }
          // },
          // },
          // {
          // title: '台账过滤条件',
          // dataIndex: 'filterCondition',
          // key: 'filterCondition',
          // 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: '操作',
          // ellipsis: true,
          // key: 'action',
          // align: 'center',
          // render: (text, record) => (
          // <Space>
          // <Tooltip title="修改">
          // <EditTwoTone onClick={() => editEventType(record)} style={{ fontSize: '16px' }} />
          // </Tooltip>
          // <Tooltip title="删除">
          // <Popconfirm
          // placement="bottomRight"
          // title={<p>是否确认删除？</p>}
          // okText="确认"
          // cancelText="取消"
          // onConfirm={() => deleteEventType(record)}
          // >
          // <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
          // </Popconfirm>
          // </Tooltip>
          // </Space>
          // ),
          // },
          // ];
          useEffect(() => { useEffect(() => {
          setTreeLoading(true); setTreeLoading(true);
          if (activeName === 'template') { if (activeName === 'template') {
          CM_XWBPlan_DataList().then(res => { getDataList();
          setTreeLoading(false);
          if (res.msg === 'Ok') {
          setTableData(res.data);
          let list = [];
          res.data.map(i => {
          list.push(i.businessName);
          });
          setKeepTableData(list);
          }
          });
          } else { } else {
          GetDeviceConfigList().then(res => { getConfigList();
          setTreeLoading(false);
          if (res.msg === 'Ok') {
          setTableData(res.data);
          // let list = [];
          // res.data.map(i => {
          // list.push(i.AccountName);
          // });
          // setKeepTableData(list);
          } else {
          setTableData([]);
          notification.error({
          message: '提示',
          duration: 3,
          description: res.msg,
          });
          }
          });
          } }
          }, [flag, activeName]); }, [flag, activeName]);
          const getDataList = () => {
          CM_XWBPlan_DataList().then(res => {
          setTreeLoading(false);
          if (res.msg === 'Ok') {
          setTableData(res.data);
          let list = [];
          res.data.map(i => {
          list.push(i.businessName);
          });
          setKeepTableData(list);
          }
          });
          };
          const getConfigList = () => {
          GetDeviceConfigList().then(res => {
          setTreeLoading(false);
          if (res.msg === 'Ok') {
          setTableData(res.data);
          } else {
          setTableData([]);
          notification.error({
          message: '提示',
          duration: 3,
          description: res.msg,
          });
          }
          });
          };
          const columns = useMemo(() => { const columns = useMemo(() => {
          if (activeName === 'template') { if (activeName === 'template') {
          return [ return [
          ...@@ -680,13 +465,13 @@ const maintenance = () => { ...@@ -680,13 +465,13 @@ const maintenance = () => {
          }; };
          const deleteEventType = record => { const deleteEventType = record => {
          CM_XWBPlan_RemovePlan({ planId: record.id }).then(res => { CM_XWBPlan_RemovePlan({ planId: record.id }).then(res => {
          if (res.msg === '') { if (res.code === 0) {
          notification.success({ notification.success({
          message: '提示', message: '提示',
          duration: 3, duration: 3,
          description: '删除成功', description: '删除成功',
          }); });
          setFlag(flag + 1); getDataList();
          } else { } else {
          notification.error({ notification.error({
          message: '提示', message: '提示',
          ...@@ -712,7 +497,6 @@ const maintenance = () => { ...@@ -712,7 +497,6 @@ const maintenance = () => {
          const onOK = prop => { const onOK = prop => {
          setSortVisible(false); setSortVisible(false);
          let aa = prop.str.toString(); let aa = prop.str.toString();
          console.log(aa);
          CM_XWBPlan_ChangeOrder(aa).then(res => { CM_XWBPlan_ChangeOrder(aa).then(res => {
          if (res.code === 0) { if (res.code === 0) {
          notification.success({ notification.success({
          ......
          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