Commit da29648e authored by 皮倩雯's avatar 皮倩雯

事件管理模块

parents fbc76097 a347dc0d
Pipeline #33878 skipped with stages
import React, { useState, useEffect } from 'react';
import { Radio } from 'antd';
import styles from './index.less';
const RadioBox = props => {
const {
radioTitle,
radioOptions,
currentVal,
currentIndex,
callBack,
} = props;
useEffect(() => {}, []);
// 选择时通过回调函数传回要改变数据的索引跟选中的值
const onChange = e => {
callBack(currentIndex, e.target.value);
};
return (
<div className={styles.radioBox}>
<div className={styles.radioTitle}>{radioTitle}:</div>
<div className={styles.radioContent}>
<Radio.Group value={currentVal}>
{radioOptions.map((item, num) => (
<Radio
disabled={item.disabled}
value={item.version}
key={num}
className={styles.radio}
onClick={onChange}
>
{item.functionName + item.version}
</Radio>
))}
</Radio.Group>
</div>
</div>
);
};
export default RadioBox;
.radioBox {
display: flex;
justify-content: flex-start;
margin-bottom: 20px;
.radioTitle {
width: 100px;
}
.radioContent {
width: 760px;
.radio {
margin-bottom: 10px;
}
}
}
This diff is collapsed.
.tableTitle{ .tableTitle {
font-size: 16px; font-size: 16px;
} }
.mgTop20{ .mgTop20 {
margin-top: 20px !important; margin-top: 20px !important;
} }
.tCenter{ .tCenter {
text-align: center; text-align: center;
} }
.decsBox{ .decsBox {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
} }
...@@ -15,3 +15,30 @@ ...@@ -15,3 +15,30 @@
display: flex !important; display: flex !important;
justify-content: space-between; justify-content: space-between;
} }
.ant-modal-header {
height: 70px;
}
.cardContainer {
margin-top: 10px;
border: 1px solid #ecf0fa;
border-top: none;
.ant-tabs-nav {
background-color: #f4f6fc;
.ant-tabs-tab {
background-color: transparent;
border: none;
border-top: 2px solid transparent;
box-sizing: content-box;
}
.ant-tabs-tab-active {
border: none;
background-color: #fff;
border-top: 2px solid #1685ff;
}
}
.tabContainer {
padding-left: 20px;
box-sizing: border-box;
}
}
...@@ -16,7 +16,7 @@ import { ...@@ -16,7 +16,7 @@ import {
tableCheckNew, tableCheckNew,
updateDateBase, updateDateBase,
databaseStandardGetLog, databaseStandardGetLog,
databaseStandardGetLogNew databaseStandardGetLogNew,
} from '@/services/database/api'; } from '@/services/database/api';
const ManagementDataBase = () => { const ManagementDataBase = () => {
...@@ -65,7 +65,7 @@ const ManagementDataBase = () => { ...@@ -65,7 +65,7 @@ const ManagementDataBase = () => {
setCheckLoading(false); setCheckLoading(false);
console.log(resnew); console.log(resnew);
if (resnew.code == 0) { if (resnew.code == 0) {
let res = resnew.data let res = resnew.data;
const { Autolist, ManualList } = res; const { Autolist, ManualList } = res;
// 自动检测列表 // 自动检测列表
let arr = Autolist.map((item, index) => { let arr = Autolist.map((item, index) => {
...@@ -112,7 +112,7 @@ const ManagementDataBase = () => { ...@@ -112,7 +112,7 @@ const ManagementDataBase = () => {
.then(resnew => { .then(resnew => {
setLogLoading(false); setLogLoading(false);
if (resnew.code == 0) { if (resnew.code == 0) {
let res = resnew.data.list let res = resnew.data.list;
let arr = []; let arr = [];
res.map((item, index) => { res.map((item, index) => {
item.key = index; item.key = index;
...@@ -138,7 +138,7 @@ const ManagementDataBase = () => { ...@@ -138,7 +138,7 @@ const ManagementDataBase = () => {
setCheckLoading(false); setCheckLoading(false);
setCheckFlag(checkFlag + 1); setCheckFlag(checkFlag + 1);
setUpFlag(upFlag + 1); setUpFlag(upFlag + 1);
if (res.code===0) { if (res.code === 0) {
notification.success({ notification.success({
message: '通知', message: '通知',
duration: 3, duration: 3,
...@@ -166,7 +166,7 @@ const ManagementDataBase = () => { ...@@ -166,7 +166,7 @@ const ManagementDataBase = () => {
setModalVisible(true); setModalVisible(true);
// setContent(text); // setContent(text);
setContent(arr); setContent(arr);
} };
const handleLog = (text, val) => { const handleLog = (text, val) => {
setModalTitle(val); setModalTitle(val);
let arr = []; let arr = [];
...@@ -296,11 +296,11 @@ const ManagementDataBase = () => { ...@@ -296,11 +296,11 @@ const ManagementDataBase = () => {
onClick={() => { onClick={() => {
handleLog(text, '详细信息'); handleLog(text, '详细信息');
}} }}
style={{ backgroundColor: "red" }} style={{ backgroundColor: 'red' }}
> >
错误内容 错误内容
</Button> </Button>
) );
} }
}, },
}, },
...@@ -366,7 +366,6 @@ const ManagementDataBase = () => { ...@@ -366,7 +366,6 @@ const ManagementDataBase = () => {
size="small" size="small"
/> />
</Card> </Card>
</PageContainer> </PageContainer>
<Modal <Modal
...@@ -384,7 +383,11 @@ const ManagementDataBase = () => { ...@@ -384,7 +383,11 @@ const ManagementDataBase = () => {
}} }}
style={{ top: '40px' }} style={{ top: '40px' }}
footer={[ footer={[
<Button type="primary" onClick={() => setModalVisible(false)}> <Button
type="primary"
onClick={() => setModalVisible(false)}
key="back"
>
关闭窗口 关闭窗口
</Button>, </Button>,
]} ]}
......
...@@ -203,6 +203,7 @@ const SQLServerTable = props => { ...@@ -203,6 +203,7 @@ const SQLServerTable = props => {
size="small" size="small"
type="primary" type="primary"
onClick={() => handleCon(val, item)} onClick={() => handleCon(val, item)}
key="testLink"
> >
测试连接 测试连接
</Button>, </Button>,
...@@ -213,12 +214,14 @@ const SQLServerTable = props => { ...@@ -213,12 +214,14 @@ const SQLServerTable = props => {
color: '#faad14', color: '#faad14',
borderColor: '#ffe58f', borderColor: '#ffe58f',
}} }}
key="bntEdit"
size="small" size="small"
onClick={() => handleEdit(val, item)} onClick={() => handleEdit(val, item)}
> >
编辑 编辑
</Button>, </Button>,
<Popconfirm <Popconfirm
key="btnDelete"
title={`是否删除连接${item.name}`} title={`是否删除连接${item.name}`}
cancelText="取消" cancelText="取消"
okText="确认" okText="确认"
...@@ -236,7 +239,7 @@ const SQLServerTable = props => { ...@@ -236,7 +239,7 @@ const SQLServerTable = props => {
<> <>
<ProTable <ProTable
headerTitle="SQL数据库" headerTitle="SQL数据库"
rowKey="key" rowKey="name"
search={false} search={false}
columns={columns} columns={columns}
bordered bordered
......
...@@ -50,7 +50,7 @@ const SiteConfig = props => { ...@@ -50,7 +50,7 @@ const SiteConfig = props => {
let obj = {}; let obj = {};
let arr = Object.keys(form.getFieldsValue()); let arr = Object.keys(form.getFieldsValue());
arr.map(k => { arr.map(k => {
obj[k] = res[k]; obj[k] = res.data[k];
}); });
form.setFieldsValue(obj); form.setFieldsValue(obj);
}) })
...@@ -67,14 +67,10 @@ const SiteConfig = props => { ...@@ -67,14 +67,10 @@ const SiteConfig = props => {
setLoading(true); setLoading(true);
const obj = { ...form.getFieldsValue() }; const obj = { ...form.getFieldsValue() };
let params = { ...obj, mode: 'single', client: clientName }; let params = { ...obj, mode: 'single', client: clientName };
editWebsite(params, { editWebsite(params)
headers: {
'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
},
})
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (res.success) { if (res.code === 0) {
submitCallback(obj.title); submitCallback(obj.title);
notification.success({ notification.success({
message: '提示', message: '提示',
......
...@@ -43,14 +43,10 @@ const AddConfig = props => { ...@@ -43,14 +43,10 @@ const AddConfig = props => {
setLoading(true); setLoading(true);
const obj = { ...form.getFieldsValue() }; const obj = { ...form.getFieldsValue() };
let params = { ...obj, mode: 'single' }; let params = { ...obj, mode: 'single' };
addWebsite(params, { addWebsite(params)
headers: {
'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
},
})
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (res.code===0) { if (res.code === 0) {
addCallback(params.title); addCallback(params.title);
notification.success({ notification.success({
message: '提示', message: '提示',
......
...@@ -141,7 +141,7 @@ const MobileConfigPage = props => { ...@@ -141,7 +141,7 @@ const MobileConfigPage = props => {
}) })
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (res.success) { if (res.code === 0) {
setMiniTitle(''); setMiniTitle('');
setTimeout(() => { setTimeout(() => {
setFlag(flag + 1); setFlag(flag + 1);
......
...@@ -303,7 +303,7 @@ const MiniMenu = props => { ...@@ -303,7 +303,7 @@ const MiniMenu = props => {
}) })
.then(res => { .then(res => {
setSubmitLoading(false); setSubmitLoading(false);
if (res.success) { if (res.code === 0) {
setAddVisible(false); setAddVisible(false);
setAddTwoVisible(false); setAddTwoVisible(false);
setFlag(flag + 1); setFlag(flag + 1);
......
...@@ -34,8 +34,10 @@ const VisibleRoleModal = props => { ...@@ -34,8 +34,10 @@ const VisibleRoleModal = props => {
useEffect(() => { useEffect(() => {
let isUnmount = false let isUnmount = false
console.log('selectValue', selectValue);
if (selectValue) { if (selectValue) {
setSelectRole(selectValue) setSelectRole(selectValue)
}
RoleGroupList().then(async res => { RoleGroupList().then(async res => {
let tree = [] let tree = []
let leafs = [] let leafs = []
...@@ -61,12 +63,12 @@ const VisibleRoleModal = props => { ...@@ -61,12 +63,12 @@ const VisibleRoleModal = props => {
if (!isUnmount) { if (!isUnmount) {
setDataTree(tree) setDataTree(tree)
setDataLeafs(leafs) setDataLeafs(leafs)
return () => isUnmount = true;
} }
} }
) )
}
return () => isUnmount = true;
}, [selectValue]) }, [selectValue])
......
...@@ -128,8 +128,6 @@ const AddModal = props => { ...@@ -128,8 +128,6 @@ const AddModal = props => {
pipeArr.push(item.ServiceName.split(".")[0]) pipeArr.push(item.ServiceName.split(".")[0])
}) })
} }
console.log('pipeArr', pipeArr);
console.log('baseMap', baseMap);
setPipeArr(pipeArr) setPipeArr(pipeArr)
setBaseMap(baseMap) setBaseMap(baseMap)
form.setFieldsValue({ form.setFieldsValue({
......
...@@ -6,7 +6,7 @@ import { ...@@ -6,7 +6,7 @@ import {
PlusOutlined PlusOutlined
} from '@ant-design/icons'; } from '@ant-design/icons';
import { import {
deleteConfig, setServiceType, SetServiceConfig,GetMaplayerByTerminalType deleteConfig, setServiceType, SetServiceConfig, GetMaplayerByTerminalType
} from '@/services/webConfig/api'; } from '@/services/webConfig/api';
import { import {
UserAddOutlined UserAddOutlined
...@@ -57,7 +57,7 @@ const VectorData = props => { ...@@ -57,7 +57,7 @@ const VectorData = props => {
<Space> <Space>
<Space> <Space>
<div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}>
<VisibleRoleModal onSubmit={onPushSubmit} title={"关联角色"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} /> <VisibleRoleModal onSubmit={onPushSubmit} title={"关联角色"} initValues={record.roles != null ? record.roles.split(",") : []} operate={<UserAddOutlined />} />
</div> </div>
</Space> </Space>
</Space> </Space>
...@@ -117,7 +117,7 @@ const VectorData = props => { ...@@ -117,7 +117,7 @@ const VectorData = props => {
render: (text, record, index) => ( render: (text, record, index) => (
<Space> <Space>
<div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}> <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}>
<VisibleRoleModal onSubmit={onPushSubmit} title={"关联角色"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} /> <VisibleRoleModal onSubmit={onPushSubmit} selectValue={[]} title={"关联角色"} initValues={record.roles != null ? record.roles.split(",") : []} operate={<UserAddOutlined />} />
</div> </div>
</Space> </Space>
), ),
...@@ -168,7 +168,7 @@ const VectorData = props => { ...@@ -168,7 +168,7 @@ const VectorData = props => {
else { else {
prompt('fail', '关联角色失败') prompt('fail', '关联角色失败')
} }
}).catch(err=>{ }).catch(err => {
prompt('fail', '网络请求失败') prompt('fail', '网络请求失败')
}) })
...@@ -178,6 +178,7 @@ const VectorData = props => { ...@@ -178,6 +178,7 @@ const VectorData = props => {
} }
//获取角色 //获取角色
const pickRole = (record) => { const pickRole = (record) => {
console.log('recird', record);
setRecord(record) setRecord(record)
} }
//设置web方案 //设置web方案
...@@ -420,8 +421,8 @@ const VectorData = props => { ...@@ -420,8 +421,8 @@ const VectorData = props => {
isBaseMap: false isBaseMap: false
}) })
Promise.all([schemeConfigQueryRequest, webSchemeQueryRequest]).then(res => { Promise.all([schemeConfigQueryRequest, webSchemeQueryRequest]).then(res => {
console.log('res',res); console.log('res', res);
if (res[0].msg==="Ok" && res[0].data.phone) { if (res[0].msg === "Ok" && res[0].data.phone) {
let arr = [] let arr = []
res[0].data.phone.optionalLayer.layers.map((item, index) => { res[0].data.phone.optionalLayer.layers.map((item, index) => {
if (item.isDefault) { if (item.isDefault) {
...@@ -437,7 +438,7 @@ const VectorData = props => { ...@@ -437,7 +438,7 @@ const VectorData = props => {
setHandStatus(arr) setHandStatus(arr)
} }
if (res[1].msg==="Ok" && res[1].data.web) { if (res[1].msg === "Ok" && res[1].data.web) {
let arr = [] let arr = []
res[1].data.web.optionalLayer.layers.map((item, index) => { res[1].data.web.optionalLayer.layers.map((item, index) => {
if (item.type === "pipenet") { if (item.type === "pipenet") {
...@@ -452,7 +453,7 @@ const VectorData = props => { ...@@ -452,7 +453,7 @@ const VectorData = props => {
setWebStatus(arr) setWebStatus(arr)
} }
setCheckLoading(false) setCheckLoading(false)
}).catch(e=>{ }).catch(e => {
setCheckLoading(false) setCheckLoading(false)
}) })
......
...@@ -163,7 +163,8 @@ const standingBook = props => { ...@@ -163,7 +163,8 @@ const standingBook = props => {
}) })
console.log(arr) console.log(arr)
setAllData(arr); setAllData(arr);
setPickItem(newArr[0]) // 第一次进入展示第一页 不是第一次进入根据当前选择的来进行展示
flag === 0 ? setPickItem(newArr[0]) : setPickItem(pickItem);
console.log(newArr, 'newArr'); console.log(newArr, 'newArr');
setTableData(newArr); setTableData(newArr);
} }
......
...@@ -18,7 +18,7 @@ const EditModal = props => { ...@@ -18,7 +18,7 @@ const EditModal = props => {
editStation({ editStation({
stationName: res.stationName, stationName: res.stationName,
description: res.description, description: res.description,
stationID: stationObj, stationID: stationObj.id,
}) })
.then(res => { .then(res => {
setLoading(false); setLoading(false);
......
...@@ -70,6 +70,7 @@ const SiteManageV2 = () => { ...@@ -70,6 +70,7 @@ const SiteManageV2 = () => {
const [treeState, setTreeState] = useState(true); // 树第一次加载 const [treeState, setTreeState] = useState(true); // 树第一次加载
const [treeLoading, setTreeLoading] = useState(false); const [treeLoading, setTreeLoading] = useState(false);
const [currentStation, setCurrentStation] = useState(''); // 当前选中站点 const [currentStation, setCurrentStation] = useState(''); // 当前选中站点
const [currentStationMsg, setCurrentStationMsg] = useState({}); //当前编辑节点信息
const [currentStationOperate, setCurrentStationOperate] = useState(false) const [currentStationOperate, setCurrentStationOperate] = useState(false)
const [flag, setFlag] = useState(1);//操作标致触发界面刷新 const [flag, setFlag] = useState(1);//操作标致触发界面刷新
const [dataList, setdataList] = useState([]);//当前站点对应的分页用户列表 const [dataList, setdataList] = useState([]);//当前站点对应的分页用户列表
...@@ -131,7 +132,10 @@ const SiteManageV2 = () => { ...@@ -131,7 +132,10 @@ const SiteManageV2 = () => {
//编辑当前站点 //编辑当前站点
const editorSite = (e, recode) => { const editorSite = (e, recode) => {
e.stopPropagation(); e.stopPropagation();
setCurrentStation(recode.id); // console.log(recode);
// 保存编辑回显信息
setCurrentStationMsg(recode);
// setCurrentStation(recode.id);
handleShowModal('editVisible', true); handleShowModal('editVisible', true);
} }
// 重新渲染树 // 重新渲染树
...@@ -422,15 +426,10 @@ const SiteManageV2 = () => { ...@@ -422,15 +426,10 @@ const SiteManageV2 = () => {
description: '请至少选择选择一个用户!', description: '请至少选择选择一个用户!',
}); });
chooseUserToStation( chooseUserToStation(
qs.stringify({ {
userList: String(result.flat()), userList: String(result.flat()),
stationID: currentStation, stationID: currentStation,
}), }
{
headers: {
'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
},
},
) )
.then(res => { .then(res => {
handleShowModal('btnLoading', false); handleShowModal('btnLoading', false);
...@@ -537,7 +536,7 @@ const SiteManageV2 = () => { ...@@ -537,7 +536,7 @@ const SiteManageV2 = () => {
/> />
<EditModal <EditModal
visible={visibleParams.editVisible} visible={visibleParams.editVisible}
stationObj={currentStation} stationObj={currentStationMsg}
onCancel={() => handleShowModal('editVisible', false)} onCancel={() => handleShowModal('editVisible', false)}
confirmModal={editModal} confirmModal={editModal}
/> />
......
...@@ -47,13 +47,13 @@ const EditForm = props => { ...@@ -47,13 +47,13 @@ const EditForm = props => {
<Item <Item
label="产品包名:" label="产品包名:"
name="PackageName" name="PackageName"
rules={[ // rules={[
{ // {
required: true, // required: true,
pattern: new RegExp(/^[a-z0-9A-Z]+$/), // pattern: new RegExp(/^[a-z0-9A-Z]+$/),
message: '产品包名必须是英文或者数字', // message: '产品包名必须是英文或者数字',
}, // },
]} // ]}
> >
<Input placeholder="请输入产品包名" allowClear disabled /> <Input placeholder="请输入产品包名" allowClear disabled />
</Item> </Item>
...@@ -86,12 +86,12 @@ const EditForm = props => { ...@@ -86,12 +86,12 @@ const EditForm = props => {
<Item <Item
label="发布状态:" label="发布状态:"
name="PublishState" name="PublishState"
rules={[ // rules={[
{ // {
required: true, // required: true,
message: '请选择发布状态', // message: '请选择发布状态',
}, // },
]} // ]}
> >
<Select placeholder="请选择发布状态" disabled> <Select placeholder="请选择发布状态" disabled>
{environmentList && {environmentList &&
......
...@@ -43,7 +43,7 @@ const WebConfigForm = props => { ...@@ -43,7 +43,7 @@ const WebConfigForm = props => {
const onGetLoginPages = () => { const onGetLoginPages = () => {
if (loginPages.length === 0) { if (loginPages.length === 0) {
getLoginPage().then(res => setLoginPages(res)); getLoginPage().then(res => setLoginPages(res.data));
} }
}; };
......
...@@ -44,7 +44,7 @@ const WebConfigPage = props => { ...@@ -44,7 +44,7 @@ const WebConfigPage = props => {
setLoading(true); setLoading(true);
updateModuleTree(userMode || 'super', canceled); updateModuleTree(userMode || 'super', canceled);
getAllConfigName().then(res => { getAllConfigName().then(res => {
if (!canceled.cancel) setConfigFiles(res); if (!canceled.cancel) setConfigFiles(res.data);
}); });
return () => { return () => {
canceled.cancel = true; canceled.cancel = true;
...@@ -105,7 +105,7 @@ const WebConfigPage = props => { ...@@ -105,7 +105,7 @@ const WebConfigPage = props => {
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (!canceled.cancel) { if (!canceled.cancel) {
setConfigObj(res); setConfigObj(res.data);
// setConfigObj(res.data); // setConfigObj(res.data);
if (webTitle === curWeb.text) { if (webTitle === curWeb.text) {
setToEdit(res); setToEdit(res);
......
...@@ -96,6 +96,7 @@ const AddForm = props => { ...@@ -96,6 +96,7 @@ const AddForm = props => {
rules={[ rules={[
{ {
required: true, required: true,
// pattern: /^[^\s]*$/,
message: '请输入功能路径', message: '请输入功能路径',
}, },
]} ]}
......
...@@ -167,8 +167,8 @@ const MiniMenu = props => { ...@@ -167,8 +167,8 @@ const MiniMenu = props => {
}) })
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (res.success) { if (res.code === 0) {
setInfo({ ...res }); setInfo({ ...res.data });
} else { } else {
notification.error({ notification.error({
message: '提示', message: '提示',
...@@ -197,7 +197,7 @@ const MiniMenu = props => { ...@@ -197,7 +197,7 @@ const MiniMenu = props => {
}) })
.then(res => { .then(res => {
setModalLoading(false); setModalLoading(false);
if (res.success) { if (res.code === 0) {
setDelVisible(false); setDelVisible(false);
setFlag(flag + 1); setFlag(flag + 1);
setNodeType(''); setNodeType('');
...@@ -263,10 +263,11 @@ const MiniMenu = props => { ...@@ -263,10 +263,11 @@ const MiniMenu = props => {
}; };
// 新增提交的回调 // 新增提交的回调
const submitCallback = (prop, item) => { const submitCallback = (prop, item) => {
console.log(subSystemValue, 'subSystemValue');
setSubmitLoading(true); setSubmitLoading(true);
let baseUrl = handleGeturl(prop.imageUrl); let baseUrl = handleGeturl(prop.imageUrl);
let obj = { ...prop, baseUrl }; let obj = { ...prop, baseUrl };
const parentID = item.menuID ? item.menuID : -1; const parentID = item.menuID ? Number(item.menuID) : -1;
addWebMenu({ addWebMenu({
_dc: Date.now(), _dc: Date.now(),
parentID, parentID,
...@@ -275,7 +276,7 @@ const MiniMenu = props => { ...@@ -275,7 +276,7 @@ const MiniMenu = props => {
}) })
.then(res => { .then(res => {
setSubmitLoading(false); setSubmitLoading(false);
if (res.success) { if (res.code === 0) {
setAddVisible(false); setAddVisible(false);
setAddTwoVisible(false); setAddTwoVisible(false);
setFlag(flag + 1); setFlag(flag + 1);
...@@ -307,14 +308,14 @@ const MiniMenu = props => { ...@@ -307,14 +308,14 @@ const MiniMenu = props => {
obj.relatedRoleList = String(roleList) || ''; obj.relatedRoleList = String(roleList) || '';
editWebMenu({ editWebMenu({
_dc: Date.now(), _dc: Date.now(),
menuID, menuID: Number(menuID),
// subSystemValue, // subSystemValue,
...obj, ...obj,
}) })
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (res.success) { if (res.code === 0) {
setFlag(flag + 1); setFlag(flag + 1);
// updateMenuTree('edit'); // updateMenuTree('edit');
notification.success({ notification.success({
...@@ -336,16 +337,20 @@ const MiniMenu = props => { ...@@ -336,16 +337,20 @@ const MiniMenu = props => {
setLoading(false); setLoading(false);
}); });
} else { } else {
pEditWebMenu({ // 新接口改为editWebMenu 原来为pEditWebMenu
editWebMenu({
_dc: Date.now(), _dc: Date.now(),
menuID, menuID: Number(menuID),
// subSystemValue, // subSystemValue,
...obj, ...obj,
product: null,
baseUrl: null,
hideInMenu: false,
}) })
.then(res => { .then(res => {
setLoading(false); setLoading(false);
if (res.success) { if (res.code === 0) {
setFlag(flag + 1); setFlag(flag + 1);
// updateMenuTree('edit'); // updateMenuTree('edit');
notification.success({ notification.success({
...@@ -357,7 +362,7 @@ const MiniMenu = props => { ...@@ -357,7 +362,7 @@ const MiniMenu = props => {
notification.error({ notification.error({
message: '提示', message: '提示',
duration: 3, duration: 3,
description: res.message || '编辑失败', description: res.msg || '编辑失败',
}); });
} }
}) })
...@@ -435,7 +440,7 @@ const MiniMenu = props => { ...@@ -435,7 +440,7 @@ const MiniMenu = props => {
_version: 9999, _version: 9999,
_dc: Date.now(), _dc: Date.now(),
}).then(res => { }).then(res => {
if (res.success) { if (res.code === 0) {
// updateMenuTree(); // updateMenuTree();
setFlag(flag + 1); setFlag(flag + 1);
} else { } else {
......
...@@ -16,7 +16,7 @@ import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index'; ...@@ -16,7 +16,7 @@ import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';
*/ */
// 测试数据库连接 // 测试数据库连接
export const connectionTest = params => export const connectionTest = params =>
get(`${PUBLISH_SERVICE}/DBManager/ConnectionTest`, params); post(`${PUBLISH_SERVICE}/DBManager/TestConnetions`, params);
// 获取数据库配置信息 // 获取数据库配置信息
export const getDataBaseConfigNew = params => export const getDataBaseConfigNew = params =>
...@@ -203,3 +203,16 @@ export const AddUserAuthSetting = params => ...@@ -203,3 +203,16 @@ export const AddUserAuthSetting = params =>
get(`${PUBLISH_SERVICE}/WebSite/AddUserAuthSetting`, params); get(`${PUBLISH_SERVICE}/WebSite/AddUserAuthSetting`, params);
export const GetUserAuthSet = params => export const GetUserAuthSet = params =>
get(`${PUBLISH_SERVICE}/WebSite/GetUserAuthSet`, params); get(`${PUBLISH_SERVICE}/WebSite/GetUserAuthSet`, params);
// 获取产品列表
export const GetProductList = params =>
get(`${PUBLISH_SERVICE}/DBManager/GetProductList`, params);
// 获取产品方案配置
export const GetDbProduct = params =>
post(`${PUBLISH_SERVICE}/DBManager/GetDbProduct`, params);
// 数据库初始化
export const InitAddDataBase = params =>
post(`${PUBLISH_SERVICE}/DBManager/InitAddDataBase`, params);
// 二次初始化
export const InitEditDataBase = params =>
post(`${PUBLISH_SERVICE}/DBManager/InitEditDataBase`, params);
...@@ -3,11 +3,11 @@ import { CITY_SERVICE, get, PUBLISH_SERVICE, post, postForm } from '../index'; ...@@ -3,11 +3,11 @@ import { CITY_SERVICE, get, PUBLISH_SERVICE, post, postForm } from '../index';
// 获取任务列表 // 获取任务列表
export const taskOptionsList = () => export const taskOptionsList = () =>
get(`/PandaCore/OMS/AIConfig/TaskOptionsList`); get(`${PUBLISH_SERVICE}/AIConfig/TaskOptionsList`);
// 获取设备类型 // 获取设备类型
export const getIotDeviceType = () => export const getIotDeviceType = () =>
get(`/PandaCore/OMS/AIConfig/GetIotDeviceType`); get(`${PUBLISH_SERVICE}/AIConfig/GetIotDeviceType`);
// 获取场景列表 // 获取场景列表
export const algorithmList = () => get(`/PandaCore/OMS/AIConfig/AlgorithmList`); export const algorithmList = () => get(`/PandaCore/OMS/AIConfig/AlgorithmList`);
...@@ -42,7 +42,7 @@ export const deleteTaskOptions = params => ...@@ -42,7 +42,7 @@ export const deleteTaskOptions = params =>
// 预测列表 // 预测列表
export const getPredictInfo = () => export const getPredictInfo = () =>
get(`/PandaCore/OMS/AIConfig/GetPredictInfo`); get(`${PUBLISH_SERVICE}/AIConfig/GetPredictInfo`);
// 预测新增 // 预测新增
export const addPredictOptions = params => export const addPredictOptions = params =>
......
...@@ -13,7 +13,7 @@ export const miniAppSiteTree = params => ...@@ -13,7 +13,7 @@ export const miniAppSiteTree = params =>
* title:'名称' * title:'名称'
*/ */
export const getWebsite = params => export const getWebsite = params =>
get(`${CITY_SERVICE}/OMS.svc/MiniApp_GetWebsite`, params); get(`${PUBLISH_SERVICE}/WebSite/MiniApp_GetWebsite`, params);
/** /**
* *
* @param {*} params * @param {*} params
...@@ -29,10 +29,10 @@ export const getWebsite = params => ...@@ -29,10 +29,10 @@ export const getWebsite = params =>
"cloudLogin":false "cloudLogin":false
*/ */
export const editWebsite = (params, options) => { export const editWebsite = (params, options) => {
let strParams = JSON.stringify(params); let strParams = params;
let qsParams = qs.stringify({ config: strParams }); let qsParams = strParams;
return post( return post(
`${CITY_SERVICE}/OMS.svc/MiniApp_EditWebsite?_version=9999`, `${PUBLISH_SERVICE}/WebSite/MiniApp_EditWebsite?_version=9999`,
qsParams, qsParams,
options, options,
); );
...@@ -65,7 +65,7 @@ export const getMiniAppModuleTree = params => ...@@ -65,7 +65,7 @@ export const getMiniAppModuleTree = params =>
} }
*/ */
export const addMenu = params => export const addMenu = params =>
get(`${CITY_SERVICE}/OMS.svc/MiniApp_AddMenu`, params); post(`${PUBLISH_SERVICE}/WebSite/MiniApp_AddMenu`, params);
// 获取菜单详情 // 获取菜单详情
/** /**
...@@ -90,14 +90,14 @@ export const getRoleListPlain = params => ...@@ -90,14 +90,14 @@ export const getRoleListPlain = params =>
// 删除小程序 // 删除小程序
export const deleteWebsite = params => export const deleteWebsite = params =>
get(`${CITY_SERVICE}/OMS.svc/MiniApp_DeleteWebsite`, params); get(`${PUBLISH_SERVICE}/WebSite/MiniApp_DeleteWebsite`, params);
// 新增小程序 // 新增小程序
export const addWebsite = (params, options) => { export const addWebsite = (params, options) => {
let strParams = JSON.stringify(params); // let strParams = JSON.stringify(params);
let qsParams = qs.stringify({ config: strParams }); // let qsParams = qs.stringify({ config: strParams });
return post( return post(
`${CITY_SERVICE}/OMS.svc/MiniApp_AddWebsite?_version=9999`, `${PUBLISH_SERVICE}/WebSite/MiniApp_AddWebsite?_version=9999`,
qsParams, params,
options, options,
); );
}; };
......
...@@ -22,7 +22,7 @@ export const getWebThemes = () => ...@@ -22,7 +22,7 @@ export const getWebThemes = () =>
* 获取登录模板下拉选项 * 获取登录模板下拉选项
*/ */
export const getLoginPage = () => export const getLoginPage = () =>
get(`${CITY_SERVICE}/OMS.svc/W4_GetLoginPage`, { query: '' }); get(`${PUBLISH_SERVICE}/WebSite/GetLoginPage`, { query: '' });
/** /**
* 获取地图配置下拉选项 * 获取地图配置下拉选项
...@@ -54,46 +54,44 @@ export const postEditWebConfig = (config, isAdd = false) => { ...@@ -54,46 +54,44 @@ export const postEditWebConfig = (config, isAdd = false) => {
}); });
return post( return post(
`${PUBLISH_SERVICE}/WebSite/${ `${PUBLISH_SERVICE}/WebSite/${
isAdd ? 'AddWebsite' : 'W4_EditWebsite' isAdd ? 'AddWebsite' : 'EditWebsite'
}?_version=9999`, }?_version=9999`,
qs.stringify({ config: JSON.stringify(obj) }), obj,
{
headers: {
'content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
},
},
); );
}; };
export const postAddWebSite = config => postEditWebConfig(config, true); export const postAddWebSite = config => postEditWebConfig(config, true);
export const deleteWebsite = client => export const deleteWebsite = client =>
get(`${CITY_SERVICE}/OMS.svc/W4_DeleteWebsite?_version=9999`, { client }); get(`${PUBLISH_SERVICE}/WebSite/DeleteWebsite?_version=9999`, { client });
/** /**
* 获取配置文件下拉选项 * 获取配置文件下拉选项
*/ */
export const getAllConfigName = () => export const getAllConfigName = () =>
get(`${CITY_SERVICE}/OMS.svc/W4_GetAllConfigName?_version=9999`); get(`${PUBLISH_SERVICE}/WebSite/GetAllConfigName?_version=9999`);
export const addWebMenu = param => { export const addWebMenu = param => {
const defaultConfig = { pageUrl: '' }; const defaultConfig = { pageUrl: '' };
// eslint-disable-next-line no-return-assign // eslint-disable-next-line no-return-assign
Object.keys(param).forEach(k => (defaultConfig[k] = param[k])); Object.keys(param).forEach(k => (defaultConfig[k] = param[k]));
return get(`${CITY_SERVICE}/OMS.svc/W4_AddMenu?_version=9999`, defaultConfig); return post(
`${PUBLISH_SERVICE}/WebSite/AddMenu?_version=9999`,
defaultConfig,
);
}; };
export const editWebMenu = param => export const editWebMenu = param =>
get(`${CITY_SERVICE}/OMS.svc/W4_EditMenu?_version=9999`, param); post(`${PUBLISH_SERVICE}/WebSite/EditMenu?_version=9999`, param);
export const pEditWebMenu = param => export const pEditWebMenu = param =>
get(`${CITY_SERVICE}/OMS.svc/P_EditMenu?_version=9999`, param); get(`${CITY_SERVICE}/OMS.svc/P_EditMenu?_version=9999`, param);
export const deleteWebMenu = param => export const deleteWebMenu = param =>
get(`${CITY_SERVICE}/OMS.svc/W4_DeleteMenu?_version=9999`, param); get(`${PUBLISH_SERVICE}/WebSite/DeleteMenu?_version=9999`, param);
export const getWebMenuInfo = param => export const getWebMenuInfo = param =>
get(`${CITY_SERVICE}/OMS.svc/P_GetMenuInfo?_version=9999`, param); get(`${PUBLISH_SERVICE}/PlatformCenter/GetMenuInfo?_version=9999`, param);
export const saveConfigContent = (fileName, content) => export const saveConfigContent = (fileName, content) =>
post( post(
...@@ -113,7 +111,7 @@ export const getConfigContent = name => ...@@ -113,7 +111,7 @@ export const getConfigContent = name =>
// 菜单拖拽 // 菜单拖拽
export const dragMenu = params => export const dragMenu = params =>
get(`${CITY_SERVICE}/OMS.svc/P_DragMenu`, params); get(`${PUBLISH_SERVICE}/PlatformCenter/DragMenu`, params);
// 获取产品列表 // 获取产品列表
export const getProductList = params => export const getProductList = 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