Commit abc21d8b authored by 周宏民's avatar 周宏民

fix: 修改集成登录

parent 43e1eb2f
Pipeline #89735 waiting for manual action with stages
......@@ -147,8 +147,6 @@ const AddModal = props => {
};
const pickFiled1 = fileds => {
const values = form.getFieldValue(fileds);
console.log('🚀 ~ values:', values);
if (form.getFieldValue(fileds)) {
setCheckedList1(form.getFieldValue(fileds).split(','));
setPick(fileds);
......@@ -311,10 +309,6 @@ const AddModal = props => {
wrapperCol: { span: 18 },
};
const onChange = e => {
setRadio(e);
};
const beforeUpload = file => {
const isJpgOrPng =
file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/gif';
......
......@@ -36,28 +36,16 @@ const colorList = [
color: '#00A295',
// headerColor: 'linear-gradient(0deg, #00845D 0%, #02BF87 100%)',
},
// {
// key: '科技蓝',
// color: '#1890FF',
// // headerColor: 'linear-gradient(0deg, #0066D6 0%, #39A9FF 100%)',
// },
// {
// key: '环保绿',
// color: '#00B496',
// // headerColor: 'linear-gradient(0deg, #00845D 0%, #02BF87 100%)',
// },
];
const Master = props => {
const { callBackSubmit = () => {}, visible, onCancel, type, isPanda } = props;
const [loading, setLoading] = useState(false);
const [form] = Form.useForm();
const [imgBed, setImgBed] = useState();
const [imageUrl, setImageUrl] = useState();
const [im, setIm] = useState();
const [previewModal, setPreviewModal] = useState(false);
const [keepImgeUrl, setKeepImgeUrl] = useState('');
const [options, setOptions] = useState([]);
const [radio, setRadio] = useState();
const [flag, setFlag] = useState(0);
const [keepSettings, setKeepSettings] = useState([]);
......@@ -72,12 +60,10 @@ const Master = props => {
});
return oType;
}, [isPanda]);
console.log(optionsTemp, 'optionsTemp');
useEffect(() => {
if (visible) {
appService.GetIntegratedloginSetting().then(res => {
if (res.code === 0) {
console.log(res.data);
const aa = res.data.title.split('<br/>');
const bb = res.data.qrCodeConfig.split('|');
const displayMode = res.data.displayMode || 'default';
......@@ -143,7 +129,6 @@ const Master = props => {
if (obj.titlebr) {
obj.title = `${obj.title}<br/>${obj.titlebr}`;
}
console.log(obj.qrCodename || obj.qrCodeurl);
if (validate) {
if (!obj.logo) {
message.error('请选择登录Logo!');
......@@ -191,7 +176,6 @@ const Master = props => {
}
});
}
console.log(obj);
};
const layout = {
......@@ -232,19 +216,6 @@ const Master = props => {
setImageUrl('');
setLoading(false);
}
// if (info.file.status === 'done') {
// DownLoadFiles({ module: '图库\\第三方图标', filePath: info.file.response.data }).then(res => {
// let reader = new FileReader();
// reader.readAsDataURL(res);
// reader.onload = function() {
// setImageUrl(reader.result);
// };
// });
// getBase64(info.file.originFileObj, url => {
// setLoading(false);
// setImageUrl(url);
// });
};
const getBase64 = (img, callback) => {
......@@ -281,7 +252,6 @@ const Master = props => {
};
const onChange = e => {
console.log(e);
setRadio(e.target.value);
if (e.target.value == '地图') {
setFlag(1);
......@@ -408,17 +378,7 @@ const Master = props => {
<Select placeholder="请选择颜色" style={{ marginLeft: '3px' }}>
{colorList.map(item => (
<Option value={item.color} key={item.color}>
<div style={{ display: 'flex', alignItems: 'center' }}>
{/* <div
style={{
height: '10px',
width: '10px',
background: item.color,
marginRight: '5px',
}}
/> */}
{`${item.key}`}
</div>
<div style={{ display: 'flex', alignItems: 'center' }}>{`${item.key}`}</div>
</Option>
))}
</Select>
......@@ -451,40 +411,6 @@ const Master = props => {
</Item>
</Col>
</Row>
{/* <Item label="展示方式" name="displayMode">
<Radio.Group onChange={onChange} value={radio}>
<Radio value="卡片">卡片</Radio>
<Radio value="地图">地图</Radio>
</Radio.Group>
</Item> */}
{/* {flag == 1 ? (
<Item
label="地区选择"
name="mapSettings"
rules={[
{
required: true,
message: '地区选择为必填项',
},
]}
>
<Cascader
fieldNames={{
label: 'name',
value: 'adcode',
children: 'districtList',
}}
multiple
showSearch
options={options}
placeholder="请选择行政区"
changeOnSelect
allowClear={false}
/>
</Item>
) : (
<></>
)} */}
<Row>
<Col span={8}>
<Item name="qrCodename" label="二维码" labelCol={{ span: 12 }}>
......
......@@ -18,8 +18,6 @@ const PreviewModal = props => {
const [keepGroupName, setKeepGroupName] = useState([]);
const update = () => {
console.log(keepImgeUrl);
console.log(imageUrl);
appService
.GetIntegrationConfigIcon()
.then(res => {
......
......@@ -723,7 +723,6 @@ const RMSComponents = props => {
});
setSelected(hhh);
}
console.log(checkedListArr);
setCheckDataRole(list);
setSaveCheckValue(checkedListArr);
setCheckedList(checkedListArr);
......
......@@ -6,9 +6,6 @@ import {
EditTwoTone,
DeleteOutlined,
PlusOutlined,
SyncOutlined,
FilePdfOutlined,
OrderedListOutlined,
LockOutlined,
UnlockOutlined,
DownOutlined,
......@@ -22,7 +19,7 @@ import Master from './components/Master';
const path = require('path');
const IntegratedLogin = props => {
let isPanda = props.params?.isPanda || 'true';
let isPanda = props.params?.isPanda || 'false';
isPanda = isPanda === 'true';
const [loading, setLoading] = useState(false);
const [tableData, setTableData] = useState([]);
......@@ -33,7 +30,6 @@ const IntegratedLogin = props => {
const [type, setType] = useState('');
const [masterVisible, setMasterVisible] = useState(false);
const [keepSystemName, setKeepSystemName] = useState([]);
const [sortVisible, setSortVisible] = useState(false);
const [groupList, setGroupList] = useState([]); // 分组列表
const [targetType, setTargetType] = useState('');
const [migrationLoading, setMigrationLoading] = useState(false);
......@@ -126,9 +122,7 @@ const IntegratedLogin = props => {
key: 'action',
width: 200,
align: 'center',
render: (record, text, index) => {
console.log(record, text, index);
return (
render: (record, text, index) => (
<Space size="middle">
{index ? (
<Tooltip title="上升">
......@@ -198,8 +192,7 @@ const IntegratedLogin = props => {
</Popconfirm>
</Tooltip>
</Space>
);
},
),
},
];
......@@ -335,7 +328,6 @@ const IntegratedLogin = props => {
id: l,
index: lIndex,
}));
console.log(list, 'list');
SaveIntegrationIndex(list).then(res => {
if (res.code === 0) {
message.success('调整成功');
......@@ -344,7 +336,6 @@ const IntegratedLogin = props => {
res.msg && message.error(res.msg);
}
});
console.log('🚀 ~ list:', list);
};
const migration = () => {
// 调用迁移接口
......
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