Skip to content

C
CivManage
Commit ccc95cf5 authored by 田翔's avatar 田翔
Browse files
Options

fix: 代码修复

parent 9305538f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 91 deletions
src/components/PeopleSelector/index.jsx
View file @ ccc95cf5
......@@ -396,8 +396,6 @@ const PeopleSelector = props => {
selected.delete(val.roleID);
}
});
console.log(list);
debugger;
let arr = [];
selected.forEach((val, key) => {
arr.push({ label: val.roleName, value: val.roleId });
......@@ -442,55 +440,55 @@ const PeopleSelector = props => {
<div className={styles.childs}>
{v.child.length
? v.child.map((item, index) => (
<div className={styles.checkGroupContent}>
<div className={styles.topCheckbox}>
<Checkbox
checked={item.isChecked}
indeterminate={item.indeterminate}
onChange={e => {
selectChangeAll(e, index, item, '2', i);
}}
>
{item.visibleTitle}
</Checkbox>
</div>
<div className={styles.bottomCheckbox}>
{item.roleList.length
? item.roleList.map((items, indexC) => (
<div
key={items.roleID}
className={styles.check}
title={items.name}
>
<Checkbox
checked={items.isChecked}
onChange={e => {
selectChange(e, indexC, items, 'child', i, index);
}}
>
{items.roleName}
</Checkbox>
</div>
))
: null}
</div>
<div className={styles.checkGroupContent}>
<div className={styles.topCheckbox}>
<Checkbox
checked={item.isChecked}
indeterminate={item.indeterminate}
onChange={e => {
selectChangeAll(e, index, item, '2', i);
}}
>
{item.visibleTitle}
</Checkbox>
</div>
))
<div className={styles.bottomCheckbox}>
{item.roleList.length
? item.roleList.map((items, indexC) => (
<div
key={items.roleID}
className={styles.check}
title={items.name}
>
<Checkbox
checked={items.isChecked}
onChange={e => {
selectChange(e, indexC, items, 'child', i, index);
}}
>
{items.roleName}
</Checkbox>
</div>
))
: null}
</div>
</div>
))
: null}
<div className={styles.checkContent1}>
{v.roleList.length
? v.roleList.map((item, index) => (
<div key={item.roleID} className={styles.check} title={item.name}>
<Checkbox
checked={item.isChecked}
onChange={e => {
selectChange(e, index, item, '', i);
}}
>
{item.roleName}
</Checkbox>
</div>
))
<div key={item.roleID} className={styles.check} title={item.name}>
<Checkbox
checked={item.isChecked}
onChange={e => {
selectChange(e, index, item, '', i);
}}
>
{item.roleName}
</Checkbox>
</div>
))
: null}
</div>
</div>
......
src/components/PersonnelSelector/index.jsx
View file @ ccc95cf5
......@@ -87,8 +87,6 @@ const SelectUser = props => {
// }
// console.log(checkValueList);
let listCheck = [];
console.log(checkValueList);
debugger;
checkValueList &&
checkValueList.map(item => {
let data = item.userId || item.value;
......
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx
View file @ ccc95cf5
......@@ -168,7 +168,6 @@ const FlowChart = props => {
currentNode.current = nodeData;
setNodeKey(nodeData.key);
setEditMsg(nodeData);
debugger;
setModalType('edit');
setVisible(true);
});
......@@ -327,7 +326,7 @@ const FlowChart = props => {
onOk() {
delNode(val);
},
onCancel() {},
onCancel() { },
});
};
// 删除节点
......@@ -725,9 +724,8 @@ const FlowChart = props => {
{ margin: 4 },
new go.Binding('text', 'nodeDetail', v => {
const obj = JSON.parse(v);
return `节点名称:${obj.NodeName}\n${
obj.roleList.length > 0 ? '承办:' : ''
}${obj.roleList.map(item => item.roleName).join(',')}`;
return `节点名称:${obj.NodeName}\n${obj.roleList.length > 0 ? '承办:' : ''
}${obj.roleList.map(item => item.roleName).join(',')}`;
}),
),
),
......@@ -1109,8 +1107,6 @@ const FlowChart = props => {
};
// 节点数据改边
const nodeChage = (key, value) => {
console.log(key, value);
debugger;
let obj = JSON.parse(JSON.stringify(currentNode.current));
obj[key] = value;
const nodeDetail = JSON.stringify(obj);
......
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/AddGIS.jsx
View file @ ccc95cf5
......@@ -180,7 +180,6 @@ const AddModal = props => {
} else {
obj = { ...validate, key: msg.ID || msg.key, ...arr };
}
debugger
onSubumit(obj, modalType, tableType, tableName, tableShape);
}
});
......
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigGIS.jsx
View file @ ccc95cf5
......@@ -81,8 +81,6 @@ const ConfigGIS = (props, ref) => {
let obj = {};
if (item.Config) {
let newConfig = JSON.parse(item.Config);
console.log(newConfig);
debugger
if (newConfig.mapping) {
let users = [];
newConfig.mapping[0].toData.map((x, y) => {
......@@ -193,8 +191,6 @@ const ConfigGIS = (props, ref) => {
list[edtiIndex] = { ...val, key: newKey, tableType, TableName, tableShape };
}
tableData.current = list;
console.log(list);
debugger
nodeChage('FlowNodeBackfillConfigs', tableData.current);
setViewModal(false);
};
......
src/pages/platformCenter/gis/schemeConfig/VectorData/VectorPreviewModal.jsx
View file @ ccc95cf5
......@@ -54,8 +54,6 @@ const VectorPreviewModal = props => {
getCondition(str1, id, val);
} else {
let list = `${str1},${val}`;
console.log(list);
debugger;
handle(`${str1},${val}`);
}
}
......@@ -128,7 +126,7 @@ const VectorPreviewModal = props => {
console.log(viewObject);
};
const onSubmit = () => {};
const onSubmit = () => { };
return (
<SiteModal
{...props}
......
src/pages/productCenter/webConfig/components/HomeConfigModal.jsx
View file @ ccc95cf5
......@@ -263,7 +263,7 @@ const HomeConfigModal = props => {
</Form.Item> */}
<Form.Item label="主页Url" name="homePage">
{/* <Input placeholder="请输入主页路径" autoComplete="off" /> */}
<TreeSelect menuChange={val => {}} userMode={userMode} curWeb={curWeb} />
<TreeSelect menuChange={val => { }} userMode={userMode} curWeb={curWeb} />
</Form.Item>
</Form>
<div className={styles.roleCheck}>{checkRender(checkList)}</div>
......
src/pages/productCenter/webConfig/components/siteConfigDrawer.js
View file @ ccc95cf5
......@@ -28,7 +28,7 @@ import {
import RMSComponents from '@/components/RolePmSite/index';
import PersonnelSelector from '@/components/PersonnelSelector/index';
import { PlusOutlined, InfoCircleOutlined } from '@ant-design/icons';
import TreeSelect from '../menuconfig/TreeSelect';
import TreeSelect from '../menuconfig/NewTreeSelect';
import WebConfigForm from './webConfigForm';
import ColorLinear from './ColorLinear';
import Upload from '@/components/Upload';
......@@ -118,7 +118,7 @@ export default props => {
} else {
setIndeterminate(
!!config.topMenu.split(',').length &&
config.topMenu.split(',').length < plainOptions.length,
config.topMenu.split(',').length < plainOptions.length,
);
}
......@@ -164,8 +164,6 @@ export default props => {
config.menuState == false;
setVisibleChecked5(false);
}
console.log(config);
debugger;
setVisibleChecked(config.navTheme == 'light');
setVisibleChecked2(config.hideMap);
setVisibleChecked4(config.messageVoice);
......@@ -422,8 +420,6 @@ export default props => {
};
const rolCallBack = useCallback(list => {
console.log(list);
debugger;
setCheckValueList(list.checkList);
setAddVisible(false);
setAftercare(list.text === '' ? '请勾选不显示售后服务的用户' : list.text);
......@@ -554,18 +550,8 @@ export default props => {
<Divider orientation="left" style={{ borderTopColor: '#99bbe8' }}>
主页配置
</Divider>
{/* <Form.Item label="产品类型(默认)" name="productType">
<Select placeholder="请选择主页产品类型">
{productList.map(item => (
<Option value={item.PackageName} key={item.PackageName}>
{`${item.ProductName}（${item.PackageName}）`}
</Option>
))}
</Select>
</Form.Item> */}
<Form.Item label="主页地址(默认)" name="homePage">
{/* <Input placeholder="请输入主页路径" autoComplete="off" /> */}
<TreeSelect menuChange={val => {}} />
<TreeSelect menuChange={val => { }} userMode={userMode} curWeb={curWeb} />
</Form.Item>
<HomePageConfigs
ref={homepageConfigRef}
......
src/pages/productCenter/webConfig/menuconfig/ParmarsModal.jsx
View file @ ccc95cf5
......@@ -171,7 +171,6 @@ const ParmarsModal = props => {
});
setCount(finalArray.length);
setDataSource(newList);
debugger;
setSelectedRowKeys(select);
} else {
setDataSource([]);
......
src/pages/productCenter/webConfig/menuconfig/TreeSelect.jsx
View file @ ccc95cf5
......@@ -5,6 +5,7 @@ import lodash from 'lodash';
import { FolderFilled, FileOutlined, InfoCircleOutlined, HomeOutlined } from '@ant-design/icons';
import styles from './TreeSelect.less';
const TreeSelect = (props, ref) => {
console.log('treeSelect', props)
const { value, onChange, menuChange, code, initCurrentMenu, keepParams } = props;
const [menuWebList, setMenuWebList] = useState({});
const [treeList, setTreeList] = useState({});
......@@ -12,7 +13,6 @@ const TreeSelect = (props, ref) => {
const [expandedKeys, setExpandedKeys] = useState([]);
const [curretnMenuParmar, setCurrentMenuParmar] = useState();
useEffect(() => {
console.log(333333);
getMenu();
}, []);
useImperativeHandle(ref, () => ({ getParmar }));
......@@ -135,8 +135,6 @@ const TreeSelect = (props, ref) => {
setVisible(true);
};
const onSelect = (selectedKeysValue, info) => {
console.log(info);
debugger;
menuChange(info.selectedNodes[0].param);
let str = info.selectedNodes[0].param.path.split('|')[0];
let newStr = `${str}|${keepParams}`;
......
src/pages/productCenter/webConfig/menuconfig/editForm.jsx
View file @ ccc95cf5
......@@ -44,7 +44,7 @@ const EditForm = props => {
infoAll,
checkList,
configFiles,
valueCallback = () => {},
valueCallback = () => { },
productList,
allProductList,
} = props;
......@@ -194,7 +194,7 @@ const EditForm = props => {
}
setShowParmarModal(true);
};
const radioChange = e => {};
const radioChange = e => { };
// 一级复选框改变事件
const selectChange = (e, index, value) => {
let list = [];
......@@ -335,8 +335,6 @@ const EditForm = props => {
};
const menuChange = val => {
console.log(keepParams);
debugger;
if (!val) {
return;
}
......@@ -358,7 +356,6 @@ const EditForm = props => {
setConfigContent(val.configContent);
setCurrentMenu(val);
setMenuParmar(val?.param);
debugger;
};
// 编辑完配置文件后回调
const wrapperFinish = val => {
......@@ -384,7 +381,6 @@ const EditForm = props => {
if (keys.includes('pageUrl')) {
let str = values.pageUrl.split('|')[1];
setKeepParams(str);
debugger;
}
};
......
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