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

fix: 修改集成登录

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