Skip to content

C
CivWeb
Commit 9f6f935a authored by 崔佳豪's avatar 崔佳豪
Browse files
Options

Merge branch 'master' into dev-cloud

parents eef78f4c d712ac5e
Pipeline #45291 passed with stages
        in 2 minutes 17 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        config/proxy.js
        View file @ 9f6f935a
        /* eslint-disable */ /* eslint-disable */
        // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
        const proxyURL = 'http://192.168.12.101:8123'; const proxyURL = 'http://192.168.10.150:8686';
        module.exports = { module.exports = {
        assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
        ......
        src/pages/iframe/index.js
        View file @ 9f6f935a
        ...@@ -11,7 +11,7 @@ const ShareFrame = props => { ...@@ -11,7 +11,7 @@ const ShareFrame = props => {
        return ( return (
        <Iframe <Iframe
        url={`${state.linkUrl}/report/manageView/638220756398120960?token=${token}&loginName=${userInfo.loginName}`} url={`${state.linkUrl}?token=${token}&loginName=${userInfo.loginName}`}
        width="100%" width="100%"
        height="100%" height="100%"
        id="myId" id="myId"
        ......
        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