Commit f5a738ac authored by 邓超's avatar 邓超

fix: 修改二级路由可以直接访问,修改地图配置管网url

parent 76fe826b
Pipeline #50973 passed with stages
in 7 minutes 44 seconds
...@@ -65,7 +65,7 @@ const BasicLayout = props => { ...@@ -65,7 +65,7 @@ const BasicLayout = props => {
return ( return (
<> <>
{getQueryVariable('isSandbox') == 'true' ? ( {sessionStorage.getItem('isSandbox') == 'true' ? (
<>{renderRoutes(props.route.routes)}</> <>{renderRoutes(props.route.routes)}</>
) : ( ) : (
<ProLayout <ProLayout
......
...@@ -25,7 +25,7 @@ const SchemeConfig = () => { ...@@ -25,7 +25,7 @@ const SchemeConfig = () => {
<TabPane tab="方案管理" key="3"> <TabPane tab="方案管理" key="3">
<ProjectMessage /> <ProjectMessage />
</TabPane> </TabPane>
<TabPane tab="方案配置" key="4"> <TabPane tab="权限配置" key="4">
<SolutionConfig /> <SolutionConfig />
</TabPane> </TabPane>
<TabPane tab="范围设置" key="5"> <TabPane tab="范围设置" key="5">
......
...@@ -147,7 +147,8 @@ const AddModal = props => { ...@@ -147,7 +147,8 @@ const AddModal = props => {
const handleService = value => { const handleService = value => {
form.setFieldsValue({ form.setFieldsValue({
label: value, label: value,
url: `http://{IP}/PandaGIS/MapServer/Export?mapServerName=${value}`, // url: `http://{IP}/PandaGIS/MapServer/Export?mapServerName=${value}`,
url: `http://{IP}/CityInterface/rest/services/MapServer.svc/${value}`,
}); });
}; };
......
...@@ -217,7 +217,7 @@ const ProductConfig = props => { ...@@ -217,7 +217,7 @@ const ProductConfig = props => {
<Spin spinning={loading} tip="loading..."> <Spin spinning={loading} tip="loading...">
<div className={styles.box}> <div className={styles.box}>
<Card className={classnames(`${styles.leftList}`)}> <Card className={classnames(`${styles.leftList}`)}>
<div className={styles.listTop}>产品选择</div> <div className={styles.listTop}>可用产品</div>
{productList && productList.length > 0 ? ( {productList && productList.length > 0 ? (
productList.map(item => renderListItem(item)) productList.map(item => renderListItem(item))
) : ( ) : (
......
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
routes: [ routes: [
{ {
path: '/productCenter/product', path: '/productCenter/product',
name: '产品配置', name: '产品授权',
component: ProductConfig, component: ProductConfig,
}, },
{ {
......
...@@ -44,14 +44,19 @@ export default Authorized; ...@@ -44,14 +44,19 @@ export default Authorized;
// use localStorage to store the authority info, which might be sent from server in actual project. // use localStorage to store the authority info, which might be sent from server in actual project.
export function getAuthority(str) { export function getAuthority(str) {
const isSandBox = getQueryVariable('isSandbox'); const isSandBox = getQueryVariable('isSandbox');
const sandbox = sessionStorage.getItem('isSandbox');
if (!isDev) { if (!isDev) {
// return [...auth]; // return [...auth];
// 支持可以指直接访问 // 支持可以指直接访问
if (isSandBox == 'true') { if (isSandBox == 'true') {
sessionStorage.setItem('isSandbox', isSandBox);
return ['LOGIN', 'admin']; return ['LOGIN', 'admin'];
} else {
return [...auth];
} }
if (sandbox == 'true') {
return ['LOGIN', 'admin'];
}
return [...auth];
} }
const authorityString = const authorityString =
typeof str === 'undefined' && localStorage ? localStorage.getItem('panda-oms-authority') : str; typeof str === 'undefined' && localStorage ? localStorage.getItem('panda-oms-authority') : str;
......
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