修改

src/pages/platformCenter/integratedLogin/AddModal.jsx

@@ -97,7 +97,7 @@ const AddModal = props => {
       getMap();
       if (type === 'edit') {
         setRadio(pickItem.target != 0);
-        setRadio2(pickItem.controlBar != 'hide');
+     //   setRadio2(pickItem.controlBar != 'hide');
         setRadio1(pickItem.isMaster);
         setIdentity(pickItem.siteType);
         setAccount(pickItem.accountType);
@@ -114,7 +114,7 @@ const AddModal = props => {
           subtitle: pickItem.Subtitle,
           accountType: pickItem.accountType,
           target: pickItem.target != 0,
-          controlBar:pickItem.controlBar != 'hide',
+        //  controlBar:pickItem.controlBar != 'hide',
           isMaster: pickItem.isMaster,
           images: pickItem.images,
           siteDescription: pickItem.siteDescription,
@@ -173,7 +173,7 @@ const AddModal = props => {
         form.setFieldsValue({
           accountParamValue: '熊猫ticket',
           target: 0,
-          controlBar:true,
+       //   controlBar:true,
           isMaster: false,
           mapSetting: '',
           coordinate: '',
@@ -424,7 +424,7 @@ const AddModal = props => {
             accountType: account,
             isHide: false,
             target: radio ? 1 : 0,
-            controlBar:radio2?'dock':'hide',
+          //  controlBar:radio2?'dock':'hide',
             isMaster: obj.isMaster,
             images: dataList,
             mapSetting: obj.mapSetting,
@@ -469,7 +469,7 @@ const AddModal = props => {
             iconUrl: obj.iconUrl,
             accountType: account,
             target: radio ? 1 : 0,
-            controlBar:radio2?'dock':'hide',
+         //   controlBar:radio2?'dock':'hide',
             isMaster: obj.isMaster,
             images: dataList,
             siteType: obj.siteType,
@@ -775,9 +775,9 @@ const AddModal = props => {
         <Item label="新标签" name="target">
           <Switch checkedChildren="是" unCheckedChildren="否" checked={radio} onChange={onChange} />
         </Item>
-        <Item label="控制台" name="controlBar">
+       {/* <Item label="控制台" name="controlBar">
           <Switch checkedChildren="停靠" unCheckedChildren="隐藏" checked={radio2} onChange={onChange2} />
-        </Item>
+        </Item> */}
         <Row>
           <Col span={10}>
             <Item

src/pages/platformCenter/integratedLogin/Master.jsx

@@ -16,6 +16,7 @@ import {
   Radio,
   AutoComplete,
   InputNumber,
+  Switch
 } from 'antd';
 import {
   AddIntegratedloginSetting,
@@ -64,7 +65,7 @@ const Master = props => {
   const [flag, setFlag] = useState(0);
   const [keepSettings, setKeepSettings] = useState([]);
   const [isFromLocal, setIsFromLocal] = useState(false);
-
+  const [radio2, setRadio2] = useState();
   useEffect(() => {
     if (visible) {
       // 获取城市选择器列表
@@ -105,6 +106,7 @@ const Master = props => {
             primaryColor: res.data.primaryColor,
             displayMode: res.data.displayMode || '卡片',
             // subtitle: res.data.subtitle,
+            controlBar:res.data.controlBar != 'hide',
             title: aa[0],
             titlebr: aa[1],
             loginTemplate: res.data.loginTemplate,
@@ -119,6 +121,7 @@ const Master = props => {
           } else {
             setFlag(1);
           }
+          setRadio2(res.data.controlBar != 'hide');
           let data = res.data.displayMode || '卡片';
           setRadio(data);
           setImageUrl(window.location.origin + `/${res.data.logo}`);
@@ -182,6 +185,7 @@ const Master = props => {
             title: obj.title,
             displayMode: obj.displayMode,
             loadingTime: obj.loadingTime,
+           controlBar: radio2?'dock':'hide',
             mapSettings: obj.displayMode == '卡片' ? keepSettings : obj.mapSettings,
             qrCodeConfig: obj.qrCodename && obj.qrCodeurl && `${obj.qrCodename}|${obj.qrCodeurl}`,
           })
@@ -274,7 +278,9 @@ const Master = props => {
     reader.addEventListener('load', () => callback(reader.result));
     reader.readAsDataURL(img);
   };
-
+  const onChange2 = e => {
+    setRadio2(e);
+  };
   const uploadButton = (
     <div>
       {loading ? <LoadingOutlined /> : <PlusOutlined />}
@@ -479,6 +485,12 @@ const Master = props => {
             <Radio value="卡片">卡片</Radio>
             <Radio value="地图">地图</Radio>
           </Radio.Group>
+
+       
+
+        </Item>
+        <Item label="控制台" name="controlBar">
+          <Switch checkedChildren="停靠" unCheckedChildren="隐藏" checked={radio2} onChange={onChange2} />
         </Item>
         {flag == 1 ? (
           <Item