fix: 修改集成登录

src/pages/integratedLogin/components/AddModal.js

@@ -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';

src/pages/integratedLogin/components/Master.js

@@ -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 }}>

src/pages/integratedLogin/components/PreviewModal.js

@@ -18,8 +18,6 @@ const PreviewModal = props => {
   const [keepGroupName, setKeepGroupName] = useState([]);
 
   const update = () => {
-    console.log(keepImgeUrl);
-    console.log(imageUrl);
     appService
       .GetIntegrationConfigIcon()
       .then(res => {

src/pages/integratedLogin/components/RolePmSite/index.js

@@ -723,7 +723,6 @@ const RMSComponents = props => {
       });
       setSelected(hhh);
     }
-    console.log(checkedListArr);
     setCheckDataRole(list);
     setSaveCheckValue(checkedListArr);
     setCheckedList(checkedListArr);

src/pages/integratedLogin/index.js

@@ -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,80 +122,77 @@ const IntegratedLogin = props => {
       key: 'action',
       width: 200,
       align: 'center',
-      render: (record, text, index) => {
-        console.log(record, text, index);
-        return (
-          <Space size="middle">
-            {index ? (
-              <Tooltip title="上升">
-                <Button icon={<SortDescendingOutlined />} type="text" onClick={() => onSort('up', index)} />
-              </Tooltip>
-            ) : null}
-
-            {index < tableData.length - 1 ? (
-              <Tooltip title="下移">
-                <Button icon={<SortAscendingOutlined />} type="text" onClick={() => onSort('down', index)} />
-              </Tooltip>
-            ) : null}
+      render: (record, text, index) => (
+        <Space size="middle">
+          {index ? (
+            <Tooltip title="上升">
+              <Button icon={<SortDescendingOutlined />} type="text" onClick={() => onSort('up', index)} />
+            </Tooltip>
+          ) : null}
 
-            <Tooltip title="编辑">
-              <EditTwoTone onClick={() => edit(record)} style={{ fontSize: '16px' }} />
+          {index < tableData.length - 1 ? (
+            <Tooltip title="下移">
+              <Button icon={<SortAscendingOutlined />} type="text" onClick={() => onSort('down', index)} />
             </Tooltip>
-            {!record.isEnable ? (
-              <Tooltip title="停用">
-                <Popconfirm
-                  placement="left"
-                  title={
-                    <p>
-                      启用站点
-                      <span className={styles.redText}>{record.name}</span>
-                    </p>
-                  }
-                  okText="确认"
-                  cancelText="取消"
-                  onConfirm={() => freezeUser(record)}
-                >
-                  <LockOutlined style={{ fontSize: '16px', color: '#e86060' }} />
-                </Popconfirm>
-              </Tooltip>
-            ) : (
-              <Tooltip title="启用">
-                <Popconfirm
-                  placement="left"
-                  title={
-                    <p>
-                      停用站点
-                      <span className={styles.redText}>{record.name}</span>
-                    </p>
-                  }
-                  okText="确认"
-                  cancelText="取消"
-                  onConfirm={() => freezeUser(record)}
-                >
-                  <UnlockOutlined style={{ fontSize: '16px', color: '#1890ff' }} />
-                </Popconfirm>
-              </Tooltip>
-            )}
+          ) : null}
 
-            <Tooltip title="删除">
+          <Tooltip title="编辑">
+            <EditTwoTone onClick={() => edit(record)} style={{ fontSize: '16px' }} />
+          </Tooltip>
+          {!record.isEnable ? (
+            <Tooltip title="停用">
               <Popconfirm
-                placement="bottomRight"
+                placement="left"
                 title={
                   <p>
-                    即将删除 <span>{record.loginName}</span>
-                    ，是否确认删除？
+                    启用站点
+                    <span className={styles.redText}>{record.name}</span>
                   </p>
                 }
                 okText="确认"
                 cancelText="取消"
-                onConfirm={() => dele(record)}
+                onConfirm={() => freezeUser(record)}
               >
-                <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
+                <LockOutlined style={{ fontSize: '16px', color: '#e86060' }} />
               </Popconfirm>
             </Tooltip>
-          </Space>
-        );
-      },
+          ) : (
+            <Tooltip title="启用">
+              <Popconfirm
+                placement="left"
+                title={
+                  <p>
+                    停用站点
+                    <span className={styles.redText}>{record.name}</span>
+                  </p>
+                }
+                okText="确认"
+                cancelText="取消"
+                onConfirm={() => freezeUser(record)}
+              >
+                <UnlockOutlined style={{ fontSize: '16px', color: '#1890ff' }} />
+              </Popconfirm>
+            </Tooltip>
+          )}
+
+          <Tooltip title="删除">
+            <Popconfirm
+              placement="bottomRight"
+              title={
+                <p>
+                  即将删除 <span>{record.loginName}</span>
+                  ，是否确认删除？
+                </p>
+              }
+              okText="确认"
+              cancelText="取消"
+              onConfirm={() => dele(record)}
+            >
+              <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
+            </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 = () => {
     // 调用迁移接口