Skip to content

C
CivManage
Commit f64506bc authored by 张烨's avatar 张烨
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

parents a7fe4be9 615852f9
Show whitespace changes
Inline Side-by-side
Showing with 680 additions and 54 deletions
src/pages/appConfig/index.js
View file @ f64506bc
import React from 'react'; import React, { useState, useEffect, useCallback } from 'react';
import {
Tree,
Table,
Space,
message,
Modal,
Form,
Input,
notification,
Tooltip,
Row,
Col,
Divider,
Tabs,
Checkbox,
Button,
Select,
} from 'antd';
import { PageContainer } from '@ant-design/pro-layout'; import { PageContainer } from '@ant-design/pro-layout';
import { get, post } from '../../services';
const AppConfigPage = props => <PageContainer>appConfigPage</PageContainer>; const AppConfigPage = props => {
const { TabPane } = Tabs;
const { Option } = Select;
// const [transParams, setTransParams] = useState({});
// 根据转换类型 transType 渲染 输入框参数 params
const [transType, setTransType] = useState('1');
const [sevenForm] = Form.useForm();
const ellipseTypeChange = value => {
console.log(`selected ${value}`);
};
const transTypeChange = value => {
console.log(`selected ${value}`);
setTransType(value);
get(`/Cityinterface/rest/services/OMS.svc/M_GetSevenParamsByTransType`, {
_version: 9999,
_dc: new Date().getTime(),
transType: value,
})
.then(res => {
if (res) {
sevenForm.setFieldsValue({
// transType 1 2
angle: res.angle,
m: res.m,
// transType 1 3 5 6
x_off: res.x_off,
y_off: res.y_off,
// transType 2
x0_gps: res.x0_gps,
x0_local: res.x0_local,
y0_gps: res.y0_gps,
y0_local: res.y0_local,
// transType 3 4 6
seven_m: res.seven_m,
seven_x_angle: res.seven_x_angle,
seven_x_off: res.seven_x_off,
seven_y_angle: res.seven_y_angle,
seven_y_off: res.seven_y_off,
seven_z_angle: res.seven_z_angle,
seven_z_off: res.seven_z_off,
// transType 4
four_angle: res.four_angle,
four_m: res.four_m,
four_x_off: res.four_x_off,
four_y_off: res.four_y_off,
});
}
})
.catch(err => {
message.error(err);
});
};
const submitSevenParams = () => {
const sevenFormData = new FormData();
sevenFormData.append('ellipseType', sevenForm.getFieldValue('ellipseType'));
sevenFormData.append('transType', sevenForm.getFieldValue('transType'));
sevenFormData.append('middleLine', sevenForm.getFieldValue('middleLine'));
sevenFormData.append('rev', sevenForm.getFieldValue('rev'));
if (transType === '1') {
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
sevenFormData.append('angle', sevenForm.getFieldValue('angle'));
sevenFormData.append('m', sevenForm.getFieldValue('m'));
}
if (transType === '2') {
sevenFormData.append('angle', sevenForm.getFieldValue('angle'));
sevenFormData.append('m', sevenForm.getFieldValue('m'));
sevenFormData.append('x0_local', sevenForm.getFieldValue('x0_local'));
sevenFormData.append('y0_local', sevenForm.getFieldValue('y0_local'));
sevenFormData.append('x0_gps', sevenForm.getFieldValue('x0_gps'));
sevenFormData.append('y0_gps', sevenForm.getFieldValue('y0_gps'));
}
if (transType === '3') {
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
sevenFormData.append(
'seven_x_off',
sevenForm.getFieldValue('seven_x_off'),
);
sevenFormData.append(
'seven_y_off',
sevenForm.getFieldValue('seven_y_off'),
);
sevenFormData.append(
'seven_z_off',
sevenForm.getFieldValue('seven_z_off'),
);
sevenFormData.append(
'seven_x_angle',
sevenForm.getFieldValue('seven_x_angle'),
);
sevenFormData.append(
'seven_y_angle',
sevenForm.getFieldValue('seven_y_angle'),
);
sevenFormData.append(
'seven_z_angle',
sevenForm.getFieldValue('seven_z_angle'),
);
sevenFormData.append('seven_m', sevenForm.getFieldValue('seven_m'));
}
if (transType === '4') {
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
sevenFormData.append(
'seven_x_off',
sevenForm.getFieldValue('seven_x_off'),
);
sevenFormData.append(
'seven_y_off',
sevenForm.getFieldValue('seven_y_off'),
);
sevenFormData.append(
'seven_z_off',
sevenForm.getFieldValue('seven_z_off'),
);
sevenFormData.append(
'seven_x_angle',
sevenForm.getFieldValue('seven_x_angle'),
);
sevenFormData.append(
'seven_y_angle',
sevenForm.getFieldValue('seven_y_angle'),
);
sevenFormData.append(
'seven_z_angle',
sevenForm.getFieldValue('seven_z_angle'),
);
sevenFormData.append('seven_m', sevenForm.getFieldValue('seven_m'));
sevenFormData.append('four_x_off', sevenForm.getFieldValue('four_x_off'));
sevenFormData.append('four_y_off', sevenForm.getFieldValue('four_y_off'));
sevenFormData.append('four_angle', sevenForm.getFieldValue('four_angle'));
sevenFormData.append('four_m', sevenForm.getFieldValue('four_m'));
}
if (transType === '5') {
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
}
if (transType === '6') {
sevenFormData.append(
'seven_x_off',
sevenForm.getFieldValue('seven_x_off'),
);
sevenFormData.append(
'seven_y_off',
sevenForm.getFieldValue('seven_y_off'),
);
sevenFormData.append(
'seven_z_off',
sevenForm.getFieldValue('seven_z_off'),
);
sevenFormData.append(
'seven_x_angle',
sevenForm.getFieldValue('seven_x_angle'),
);
sevenFormData.append(
'seven_y_angle',
sevenForm.getFieldValue('seven_y_angle'),
);
sevenFormData.append(
'seven_z_angle',
sevenForm.getFieldValue('seven_z_angle'),
);
sevenFormData.append('seven_m', sevenForm.getFieldValue('seven_m'));
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
}
post(
`/Cityinterface/rest/services/OMS.svc/M_SetSevenParams?_version=9999`,
sevenFormData,
)
.then(res => {
if (res.success) {
notification.success({
message: '提交成功',
});
} else {
notification.error({
message: '提交失败',
description: res.message,
});
}
})
.catch(err => {
message.error(err);
});
};
useEffect(() => {
get(`/Cityinterface/rest/services/OMS.svc/M_GetSevenParams`, {
_version: 9999,
_dc: new Date().getTime(),
})
.then(res => {
if (res.success) {
sevenForm.setFieldsValue({
middleLine: res.transParams.middleLine,
rev: res.transParams.rev,
x_off: res.params.x_off,
y_off: res.params.y_off,
angle: res.params.angle,
m: res.params.m,
});
}
})
.catch(err => {
message.error(err);
});
}, []);
return (
<PageContainer>
<Tabs defaultActiveKey="1">
<TabPane tab="七参数" key="1">
<Form
form={sevenForm}
labelCol={{ span: 4, offset: 4 }}
wrapperCol={{ span: 16, offset: 1 }}
style={{ width: '900px' }}
onFinish={submitSevenParams}
initialValues={{ ellipseType: '1', transType: '1' }}
>
<Form.Item name="ellipseType" label="椭球类型">
<Select onChange={ellipseTypeChange}>
<Option value="1">54椭球</Option>
<Option value="2">80椭球</Option>
<Option value="3">84椭球</Option>
<Option value="4">2000椭球</Option>
</Select>
</Form.Item>
<Form.Item name="transType" label="转换类型">
<Select onChange={transTypeChange}>
<Option value="1">四参数</Option>
<Option value="2">六参数</Option>
<Option value="3">七参数</Option>
<Option value="4">七参数+四参数</Option>
<Option value="5">中央经线投影（二参数）</Option>
<Option value="6">七参数+二参数反转</Option>
</Select>
</Form.Item>
<Form.Item
name="middleLine"
label="中央经线"
rules={[{ required: true, message: '不能为空' }]}
>
<Input placeholder="请输入中央经线" />
</Form.Item>
<Form.Item
name="rev"
label="rev"
rules={[{ required: true, message: '不能为空' }]}
>
<Input placeholder="请输入rev" />
</Form.Item>
{(transType === '1' || transType === '2') && (
<>
<Form.Item name="angle" label="angle">
<Input placeholder="请输入旋转角度" />
</Form.Item>
<Form.Item name="m" label="m">
<Input placeholder="请输入尺度因子" />
</Form.Item>
</>
)}
{(transType === '1' ||
transType === '3' ||
transType === '5' ||
transType === '6') && (
<>
<Form.Item name="x_off" label="x_off">
<Input placeholder="请输入x坐标平移量" />
</Form.Item>
<Form.Item name="y_off" label="y_off">
<Input placeholder="请输入y坐标平移量" />
</Form.Item>
</>
)}
{transType === '2' && (
<>
<Form.Item name="x0_gps" label="x0_gps">
<Input placeholder="请输入gps-x坐标" />
</Form.Item>
<Form.Item name="y0_gps" label="y0_gps">
<Input placeholder="请输入gps-y坐标" />
</Form.Item>
<Form.Item name="x0_local" label="x0_local">
<Input placeholder="请输入local-x坐标" />
</Form.Item>
<Form.Item name="y0_local" label="y0_local">
<Input placeholder="请输入local-y坐标" />
</Form.Item>
</>
)}
{(transType === '3' || transType === '4' || transType === '6') && (
<>
<Form.Item name="seven_m" label="seven_m">
<Input placeholder="请输入尺度因子" />
</Form.Item>
<Form.Item name="seven_x_off" label="seven_x_off">
<Input placeholder="请输入x方向偏移量" />
</Form.Item>
<Form.Item name="seven_y_off" label="seven_y_off">
<Input placeholder="请输入y方向偏移量" />
</Form.Item>
<Form.Item name="seven_z_off" label="seven_z_off">
<Input placeholder="请输入z方向偏移量" />
</Form.Item>
<Form.Item name="seven_x_angle" label="seven_x_angle">
<Input placeholder="请输入x方向偏转角度" />
</Form.Item>
<Form.Item name="seven_y_angle" label="seven_y_angle">
<Input placeholder="请输入y方向偏转角度" />
</Form.Item>
<Form.Item name="seven_z_angle" label="seven_z_angle">
<Input placeholder="请输入z方向偏转角度" />
</Form.Item>
</>
)}
{transType === '4' && (
<>
<Form.Item name="four_x_off" label="four_x_off">
<Input placeholder="请输入x方向偏移量" />
</Form.Item>
<Form.Item name="four_y_off" label="four_y_off">
<Input placeholder="请输入y方向偏移量" />
</Form.Item>
<Form.Item name="four_angle" label="four_angle">
<Input placeholder="请输入偏转角度" />
</Form.Item>
<Form.Item name="four_m" label="four_m">
<Input placeholder="请输入尺度因子" />
</Form.Item>
</>
)}
<Form.Item
wrapperCol={{
sm: {
span: 16,
offset: 16,
},
}}
>
<Button type="primary" htmlType="submit">
提交
</Button>
</Form.Item>
</Form>
</TabPane>
<TabPane tab="菜单管理" key="2">
123
</TabPane>
</Tabs>
</PageContainer>
);
};
export default AppConfigPage; export default AppConfigPage;
src/pages/database/CurrentSolution.jsx
View file @ f64506bc
...@@ -28,7 +28,6 @@ const CurrentSolution = () => { ...@@ -28,7 +28,6 @@ const CurrentSolution = () => {
}, []); }, []);
const handleSelect = e => { const handleSelect = e => {
setCurrentData(e); setCurrentData(e);
console.log(e);
}; };
const submit = params => { const submit = params => {
setLoading(true); setLoading(true);
...@@ -56,7 +55,11 @@ const CurrentSolution = () => { ...@@ -56,7 +55,11 @@ const CurrentSolution = () => {
}) })
.catch(err => { .catch(err => {
setLoading(false); setLoading(false);
console.error(err); notification.error({
message: '提示',
description: err,
duration: 3,
});
}); });
}; };
return ( return (
...@@ -65,7 +68,7 @@ const CurrentSolution = () => { ...@@ -65,7 +68,7 @@ const CurrentSolution = () => {
<Spin tip="Loading..." spinning={loading} className={styles.tAlign}> <Spin tip="Loading..." spinning={loading} className={styles.tAlign}>
<Row> <Row>
<Col span={2} className={styles.divbox}> <Col span={2} className={styles.divbox}>
<div>切换解决方案:</div> <div>切换解决方案：</div>
</Col> </Col>
<Col span={21}> <Col span={21}>
{currentData && ( {currentData && (
......
src/pages/database/InitDataBase.jsx
View file @ f64506bc
...@@ -11,11 +11,17 @@ import { ...@@ -11,11 +11,17 @@ import {
Modal, Modal,
Row, Row,
Col, Col,
Popconfirm,
} from 'antd'; } from 'antd';
import { PageContainer } from '@ant-design/pro-layout'; import { PageContainer } from '@ant-design/pro-layout';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { get, post } from '../../services'; import { get, post } from '../../services';
import { setTableSQLDirName, deleteConn } from '@/services/database/api'; import {
setTableSQLDirName,
deleteConn,
initDBv4,
getInitDBLog,
} from '@/services/database/api';
import styles from './InitDataBase.less'; import styles from './InitDataBase.less';
const { Option } = Select; const { Option } = Select;
...@@ -42,7 +48,8 @@ const InitDataBase = props => { ...@@ -42,7 +48,8 @@ const InitDataBase = props => {
const [allSqlDir, setAllSqulDir] = useState([]); // 修改产品方案 const [allSqlDir, setAllSqulDir] = useState([]); // 修改产品方案
const [defaultSqlDir, setDefaultSqlDir] = useState(''); // 修改产品方案默认值 const [defaultSqlDir, setDefaultSqlDir] = useState(''); // 修改产品方案默认值
const [modalVisible, setModalVisible] = useState(false); const [modalVisible, setModalVisible] = useState(false);
console.log(window.location.host); const [initVisible, setInitVisible] = useState(false);
const [initContent, setInitContent] = useState('');
// 获取数据库链接记录 // 获取数据库链接记录
useEffect(() => { useEffect(() => {
setTableLoading(true); setTableLoading(true);
...@@ -89,7 +96,33 @@ const InitDataBase = props => { ...@@ -89,7 +96,33 @@ const InitDataBase = props => {
}); });
}, []); }, []);
// 数据库初始化 // 数据库初始化
const initClick = () => {}; const initClick = () => {
let obj = form.getFieldsValue();
initDBv4({
_version: 9999,
_dc: Date.now(),
...obj,
}).then(res => {
if (res.GetMe) {
getInitDBLog({
_version: 9999,
_dc: Date.now(),
}).then(res => {
if (res.success) {
setInitVisible(true);
setInitContent(res.content);
}
console.log(res.content.split(/[(\r\n)\r\n]+/));
});
} else {
notification.error({
message: '提示',
duration: 3,
description: res.Say.Message || '初始化失败',
});
}
});
};
const onValuesChange = (value, b) => { const onValuesChange = (value, b) => {
form.setFieldsValue(value); form.setFieldsValue(value);
}; };
...@@ -137,8 +170,6 @@ const InitDataBase = props => { ...@@ -137,8 +170,6 @@ const InitDataBase = props => {
const onCheck = e => { const onCheck = e => {
// 测试连接 // 测试连接
console.log(dbForm); console.log(dbForm);
console.log(form.getFieldValue());
console.log(form.getFieldsValue());
const obj = form.getFieldsValue(); const obj = form.getFieldsValue();
get('/Cityinterface/rest/services/OMS.svc/S_GetConnectionTest', { get('/Cityinterface/rest/services/OMS.svc/S_GetConnectionTest', {
_version: 9999, _version: 9999,
...@@ -268,9 +299,9 @@ const InitDataBase = props => { ...@@ -268,9 +299,9 @@ const InitDataBase = props => {
}); });
}; };
// 删除数据库连接记录 // 删除数据库连接记录
const delConn = value => { const delConfirm = value => {
setTableLoading(true);
const { key = '' } = value; const { key = '' } = value;
setTableLoading(true);
deleteConn({ deleteConn({
rowIndex: key, rowIndex: key,
_version: 9999, _version: 9999,
...@@ -339,9 +370,18 @@ const InitDataBase = props => { ...@@ -339,9 +370,18 @@ const InitDataBase = props => {
> >
修改描述 修改描述
</Button> </Button>
<Button size="small" danger onClick={() => delConn(record)}> <Popconfirm
title="是否删除该连接的历史记录？"
okText="确认"
cancelText="取消"
onConfirm={() => {
delConfirm(record);
}}
>
<Button size="small" danger>
删除 删除
</Button> </Button>
</Popconfirm>
</Space> </Space>
), ),
}, },
...@@ -360,16 +400,16 @@ const InitDataBase = props => { ...@@ -360,16 +400,16 @@ const InitDataBase = props => {
onFinish={onFinish} onFinish={onFinish}
onValuesChange={onValuesChange} onValuesChange={onValuesChange}
> >
<Form.Item label={`${formLables.ip}:`} name="ip"> <Form.Item label={`${formLables.ip}：`} name="ip">
<Input placeholder="请输入服务器名或IP地址" /> <Input placeholder="请输入服务器名或IP地址" />
</Form.Item> </Form.Item>
<Form.Item label={`${formLables.userName}:`} name="userName"> <Form.Item label={`${formLables.userName}：`} name="userName">
<Input placeholder="请输入用户名称" /> <Input placeholder="请输入用户名称" />
</Form.Item> </Form.Item>
<Form.Item label={`${formLables.password}:`} name="password"> <Form.Item label={`${formLables.password}：`} name="password">
<Input placeholder="请输入用户密码" /> <Input placeholder="请输入用户密码" />
</Form.Item> </Form.Item>
<Form.Item label={`${formLables.dbName}:`} name="dbName"> <Form.Item label={`${formLables.dbName}：`} name="dbName">
<Select <Select
showSearch showSearch
placeholder="请选择数据库" placeholder="请选择数据库"
...@@ -397,7 +437,8 @@ const InitDataBase = props => { ...@@ -397,7 +437,8 @@ const InitDataBase = props => {
</Form.Item> </Form.Item>
<Form.Item> <Form.Item>
<div className={styles.tCenter}> <div className={styles.tCenter}>
<Space size="large"> <Space size="large" className={styles.btnBox}>
<Space>
<Button onClick={onCheck}>测试连接</Button> <Button onClick={onCheck}>测试连接</Button>
<Button <Button
type="primary" type="primary"
...@@ -406,16 +447,19 @@ const InitDataBase = props => { ...@@ -406,16 +447,19 @@ const InitDataBase = props => {
> >
保存连接 保存连接
</Button> </Button>
<Button </Space>
type="primary" <Space>
danger <Popconfirm
htmlType="reset" title="是否执行数据库初始化"
onClick={() => { okText="确认"
cancelText="取消"
onConfirm={() => {
initClick(); initClick();
}} }}
> >
数据库初始化 <Button type="primary">数据库初始化</Button>
</Button> </Popconfirm>
{defaultSqlDir && ( {defaultSqlDir && (
<Select <Select
placeholder="请选择解决方案" placeholder="请选择解决方案"
...@@ -426,17 +470,14 @@ const InitDataBase = props => { ...@@ -426,17 +470,14 @@ const InitDataBase = props => {
}} }}
> >
{allSqlDir && {allSqlDir &&
allSqlDir.map((item, index) => { allSqlDir.map((item, index) => (
console.log(defaultSqlDir);
return (
<Option value={item} key={index}> <Option value={item} key={index}>
{item} {item}
</Option> </Option>
); ))}
})}
</Select> </Select>
)} )}
{/* <span>{dbForm.inUse}</span> */} </Space>
</Space> </Space>
</div> </div>
</Form.Item> </Form.Item>
...@@ -459,10 +500,32 @@ const InitDataBase = props => { ...@@ -459,10 +500,32 @@ const InitDataBase = props => {
})} })}
/> />
</Card> </Card>
<Modal
title="初始化数据库"
visible={initVisible}
onCancel={() => {
setInitVisible(false);
setInitContent('');
}}
width="600px"
footer={[
<Button
onClick={() => {
setInitVisible(false);
setInitContent('');
}}
type="primary"
>
关闭窗口
</Button>,
]}
>
{initContent}
</Modal>
<Modal <Modal
title="修改链接描述" title="修改链接描述"
visible={modalVisible} visible={modalVisible}
maskClosable
onOk={() => modalOkCallback()} onOk={() => modalOkCallback()}
onCancel={() => setModalVisible(false)} onCancel={() => setModalVisible(false)}
width="800px" width="800px"
...@@ -475,7 +538,7 @@ const InitDataBase = props => { ...@@ -475,7 +538,7 @@ const InitDataBase = props => {
> >
<Row> <Row>
<Col span={2} className={styles.decsBox}> <Col span={2} className={styles.decsBox}>
描述: 描述：
</Col> </Col>
<Col span={22}> <Col span={22}>
<Input <Input
......
src/pages/database/InitDataBase.less
View file @ f64506bc
...@@ -11,3 +11,7 @@ ...@@ -11,3 +11,7 @@
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
} }
.btnBox {
display: flex;
justify-content: space-around;
}
\ No newline at end of file
src/pages/database/ManagementDataBase.jsx
View file @ f64506bc
...@@ -199,7 +199,7 @@ const ManagementDataBase = () => { ...@@ -199,7 +199,7 @@ const ManagementDataBase = () => {
<Card className={styles.mgTop20}> <Card className={styles.mgTop20}>
<div className={styles.tableTitle}> <div className={styles.tableTitle}>
表字段手动修复 表字段手动修复
(字段长度不统一,请手动修改差异,数据可能会截断,请谨慎操作) （字段长度不统一，请手动修改差异，数据可能会截断，请谨慎操作）
</div> </div>
<Table <Table
className={styles.mgTop20} className={styles.mgTop20}
......
src/pages/mobileConfig/SiteConfig.jsx 0 → 100644
View file @ f64506bc
import React, { useState, useEffect } from 'react';
import { Form, Select, Input, Button, Row, Col, Radio } from 'antd';
import { editWebsite, getWebsite } from '@/services/mobileConfig/api';
const { Item } = Form;
const { Option } = Select;
const SiteConfig = props => {
const [config, setConfig] = useState(''); // 网站配置信息
const [loginList, setLoginList] = useState([
{ text: '默认界面', value: 'default' },
]); // 系统登陆页
const [styleList, setStyleList] = useState([
{ text: '默认风格', value: 'default' },
]); // 系统风格
const [themeList, setThemeList] = useState([
{ text: '默认皮肤', value: 'default' },
]); // 系统皮肤
const [form] = Form.useForm();
const layout = {
layout: 'horizontal',
labelCol: { span: 2 },
wrapperCol: { span: 14 },
};
useEffect(() => {
getWebsite({
_version: 9999,
_dc: Date.now(),
title: '新运维测试小程序',
}).then(res => {
console.log(res);
let obj = { ...form.getFieldsValue() };
let arr = Object.keys({ ...form.getFieldsValue() });
console.log(arr);
arr.map(k => {
obj[k] = res[k];
});
form.setFieldsValue(obj);
console.log(form.getFieldsValue(), '36/');
});
}, []);
// 单选值改变
const radioChange = e => {};
// 提交选择
const submit = value => {
console.log(form.getFieldsValue());
};
return (
<Form form={form} {...layout}>
<Item label="应用名称：" name="title">
<Input placeholder="请输入应用名称" allowClear />
</Item>
<Item label="系统图标：" name="shortcutIcon">
<Row gutter={16}>
<Col span={21}>
<Input placeholder="请输入系统图标名称" allowClear />
</Col>
<Col span={2}>
<Button type="primary">按路径选择</Button>
</Col>
</Row>
</Item>
<Item label="系统图标预览：" />
<Item label="登陆页面：" name="loginTemplate">
<Select placeholder="请选择登陆页面">
{loginList &&
loginList.map((item, index) => (
<Option value={item.value} key={`item${index}`}>
{item.text}
</Option>
))}
</Select>
</Item>
<Item label="系统皮肤：" name="theme">
<Select placeholder="请选择系统皮肤">
{themeList &&
themeList.map((item, index) => (
<Option value={item.value} key={`item${index}`}>
{item.text}
</Option>
))}
</Select>
</Item>
<Item label="系统风格：" name="style">
<Select placeholder="请选择系统风格">
{styleList &&
styleList.map((item, index) => (
<Option value={item.value} key={`item${index}`}>
{item.text}
</Option>
))}
</Select>
</Item>
<Item label="开启云登陆：" name="cloudLogin">
<Radio.Group onChange={radioChange} defaultValue={false}>
<Radio value>是</Radio>
<Radio value={false}>否</Radio>
</Radio.Group>
</Item>
<Item style={{ textAlign: 'center' }}>
<Button type="primary" onClick={submit}>
提交
</Button>
</Item>
</Form>
);
};
export default SiteConfig;
src/pages/mobileConfig/index.js
View file @ f64506bc
import React from 'react'; import React, { useState, useEffect } from 'react';
import { Card } from 'antd'; import { Card, Tabs } from 'antd';
import { PageContainer } from '@ant-design/pro-layout'; import { PageContainer } from '@ant-design/pro-layout';
import { miniAppSiteTree } from '@/services/mobileConfig/api';
const MobileConfigPage = props => ( import SiteConfig from './SiteConfig';
const { TabPane } = Tabs;
const MobileConfigPage = props => {
const [activeKey, setActiveKey] = useState('0'); // tabs活动页
useEffect(() => {
miniAppSiteTree({
userMode: 'admin',
select: '',
_version: 9999,
_dc: new Date().getTime(),
node: -2,
}).then(res => {
console.log(res);
});
}, []);
// 修改选中的tab
const handleChange = key => {
setActiveKey(key);
};
return (
<PageContainer> <PageContainer>
<Card>MobileConfigPage</Card> <Card>
<Tabs activeKey={activeKey} type="card" onChange={handleChange}>
<TabPane tab="网站配置" key="0">
<SiteConfig />
</TabPane>
<TabPane tab="菜单管理" key="1">
<div>菜单管理</div>
</TabPane>
</Tabs>
</Card>
</PageContainer> </PageContainer>
); );
};
export default MobileConfigPage; export default MobileConfigPage;
src/pages/orgnazation/ListCard.jsx
View file @ f64506bc
...@@ -6,7 +6,7 @@ import { orgTest } from '@/services/orgnazation/api'; ...@@ -6,7 +6,7 @@ import { orgTest } from '@/services/orgnazation/api';
const tip = 'loading...'; const tip = 'loading...';
const ListCard = props => { const ListCard = props => {
const { ouid, searchWord, valueCallback } = props; const { ouid, searchWord, valueCallback, onCommit = () => {} } = props;
const [valueList, setValueList] = useState({}); const [valueList, setValueList] = useState({});
const [dataList, setdataList] = useState([]); const [dataList, setdataList] = useState([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
...@@ -82,7 +82,7 @@ const ListCard = props => { ...@@ -82,7 +82,7 @@ const ListCard = props => {
{true && !loading && dataList && ( {true && !loading && dataList && (
<Button <Button
type="primary" type="primary"
onClick={() => valueCallback()} onClick={() => onCommit()}
style={{ marginTop: '20px' }} style={{ marginTop: '20px' }}
> >
提交 提交
......
src/pages/userCenter/RoleManage/RoleManage.jsx
View file @ f64506bc
...@@ -21,7 +21,6 @@ const SiteManage = () => { ...@@ -21,7 +21,6 @@ const SiteManage = () => {
const [stationObj, setStationObj] = useState({}); // 选择的站点 const [stationObj, setStationObj] = useState({}); // 选择的站点
const [delVisible, setDelVisible] = useState(false); // 删除弹窗 const [delVisible, setDelVisible] = useState(false); // 删除弹窗
const [editVisible, setEditVisible] = useState(false); // 修改弹窗 const [editVisible, setEditVisible] = useState(false); // 修改弹窗
const now = new Date().getTime();
// 点击树的回调 // 点击树的回调
const handleTreeSelect = e => { const handleTreeSelect = e => {
console.log(e); console.log(e);
...@@ -38,7 +37,7 @@ const SiteManage = () => { ...@@ -38,7 +37,7 @@ const SiteManage = () => {
userMode: 'super', userMode: 'super',
select: '', select: '',
_version: 9999, _version: 9999,
_dc: now, _dc: Date.now(),
node: -2, node: -2,
}) })
.then(res => { .then(res => {
......
src/pages/userCenter/siteManage/SiteManage.jsx
View file @ f64506bc
...@@ -11,9 +11,9 @@ import EditModal from './EditModal'; ...@@ -11,9 +11,9 @@ import EditModal from './EditModal';
const { Search } = Input; const { Search } = Input;
const placeholder = '请输入人员姓名'; const placeholder = '请输入人员姓名';
const SiteManage = () => { const SiteManage = () => {
const [treeData, setTreeData] = useState([]); const [treeData, setTreeData] = useState([]); // 树结构数据
const [searchWord, setSearchWord] = useState(''); const [searchWord, setSearchWord] = useState(''); // 关键字
const [ouid, setOuid] = useState(''); const [ouid, setOuid] = useState(''); // 站点id
const [saveTreeId, setSaveTreeId] = useState(''); // 保存点击回调的id const [saveTreeId, setSaveTreeId] = useState(''); // 保存点击回调的id
const [modalVisible, setModalVisible] = useState(false); // 新增弹窗 const [modalVisible, setModalVisible] = useState(false); // 新增弹窗
const [flag, setFlag] = useState(1); const [flag, setFlag] = useState(1);
...@@ -21,6 +21,7 @@ const SiteManage = () => { ...@@ -21,6 +21,7 @@ const SiteManage = () => {
const [stationObj, setStationObj] = useState({}); // 选择的站点 const [stationObj, setStationObj] = useState({}); // 选择的站点
const [delVisible, setDelVisible] = useState(false); // 删除弹窗 const [delVisible, setDelVisible] = useState(false); // 删除弹窗
const [editVisible, setEditVisible] = useState(false); // 修改弹窗 const [editVisible, setEditVisible] = useState(false); // 修改弹窗
const [subList, setSubList] = useState([]);
const now = new Date().getTime(); const now = new Date().getTime();
// 点击树的回调 // 点击树的回调
const handleTreeSelect = e => { const handleTreeSelect = e => {
...@@ -136,6 +137,10 @@ const SiteManage = () => { ...@@ -136,6 +137,10 @@ const SiteManage = () => {
}; };
const valueCallback = valueOBJ => { const valueCallback = valueOBJ => {
console.log(valueOBJ); console.log(valueOBJ);
setSubList(valueOBJ);
};
const handleCommit = value => {
console.log(subList);
}; };
return ( return (
<PageContainer> <PageContainer>
...@@ -187,6 +192,7 @@ const SiteManage = () => { ...@@ -187,6 +192,7 @@ const SiteManage = () => {
ouid={ouid} ouid={ouid}
searchWord={searchWord} searchWord={searchWord}
valueCallback={valueCallback} valueCallback={valueCallback}
onCommit={handleCommit}
/> />
)} )}
</Card> </Card>
......
src/routes/config.js
View file @ f64506bc
...@@ -18,7 +18,7 @@ import InitDataBase from '../pages/database/InitDataBase'; ...@@ -18,7 +18,7 @@ import InitDataBase from '../pages/database/InitDataBase';
import ManagementDataBase from '../pages/database/ManagementDataBase'; import ManagementDataBase from '../pages/database/ManagementDataBase';
import CurrentSolution from '@/pages/database/CurrentSolution'; import CurrentSolution from '@/pages/database/CurrentSolution';
import UserManage from '../pages/userCenter/UserManage'; import UserManage from '../pages/userCenter/UserManage';
import RoleManage from '../pages/userCenter/roleManage/RoleManage'; import RoleManage from '@/pages/userCenter/roleManage/RoleManage';
import SiteManage from '../pages/userCenter/siteManage/SiteManage'; import SiteManage from '../pages/userCenter/siteManage/SiteManage';
// import DefaultComponent from '../pages/orgnazation/DefaultComponent'; // import DefaultComponent from '../pages/orgnazation/DefaultComponent';
import TestTable from '../pages/orgnazation/TestTable'; import TestTable from '../pages/orgnazation/TestTable';
...@@ -62,6 +62,12 @@ export default { ...@@ -62,6 +62,12 @@ export default {
component: BlankLayout, component: BlankLayout,
authority: adminAuthority, authority: adminAuthority,
routes: [ routes: [
{
path: '/dbm/solution',
name: '数据库解决方案',
authority: superAuthority,
component: CurrentSolution,
},
{ {
path: '/dbm/dbInit', path: '/dbm/dbInit',
name: '数据库初始化', name: '数据库初始化',
...@@ -74,12 +80,6 @@ export default { ...@@ -74,12 +80,6 @@ export default {
authority: superAuthority, authority: superAuthority,
component: ManagementDataBase, component: ManagementDataBase,
}, },
{
path: '/dbm/solution',
name: '数据库解决方案',
authority: superAuthority,
component: CurrentSolution,
},
], ],
}, },
{ {
......
src/services/database/api.js
View file @ f64506bc
import { get, post } from '@/services/index'; import { get, post } from '@/services/index';
// 数据库初始化
export const initDBv4 = params =>
get('/Cityinterface/rest/services/OMS.svc/S_InitDBv4', params);
// 获取日志
export const getInitDBLog = params =>
get('/Cityinterface/rest/services/OMS.svc/S_GetInitDBLog', params);
// 修改产品解决方案 // 修改产品解决方案
export const setTableSQLDirName = params => export const setTableSQLDirName = params =>
get('/Cityinterface/rest/services/OMS.svc/S_SetTableSQLDirName', params); get('/Cityinterface/rest/services/OMS.svc/S_SetTableSQLDirName', params);
......
src/services/mobileConfig/api.js 0 → 100644
View file @ f64506bc
import { get, post } from '@/services/index';
/**
* @param {*} params
*/
export const miniAppSiteTree = params =>
get('/Cityinterface/rest/services/OMS.svc/MiniAppSiteTree', params);
/**
* 获取网站配置
* @param {*} params
* title:'名称'
*/
export const getWebsite = params =>
get('/Cityinterface/rest/services/OMS.svc/MiniApp_GetWebsite', params);
/**
* 编辑网站配置
* @param {*} params
* title:"节水平台",
* "shortcutIcon":"assets/images/icon/小程序logo/gck.png",
"style":"default",
"mode":"single",
"client":"miniapp",
"loginTemplate":"default",
"theme":"default",
"cloudLogin":false
*/
export const editWebsite = params =>
post(
'/Cityinterface/rest/services/OMS.svc/MiniApp_EditWebsite?_version=9999',
params,
);
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