forked from huge/frontEnd/hugeOA
parent: 2d0e6009 | patch | commit | ignore whitespace
liyj
2020-06-01 9628c86a6607380dbc7c0191a6055e07c6334657 
Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
2 files modified
6 ■■■■■ changed files
src/api/httpurl.js 4 ●●●●● patch | view | raw | blame | history
src/components/oa/merits/meritsDetail/index.jsx 2 ●●●●● patch | view | raw | blame | history 
 src/api/httpurl.js


@@ -1,6 +1,6 @@


//内网测试地址


let StagingUrl = 'http://192.168.3.12:9072';


// let StagingUrl = "http://120.79.193.119:9072";


// let StagingUrl = 'http://192.168.3.12:9072';


let StagingUrl = "http://120.79.193.119:9072";


// let StagingUrl = "http://120.79.193.119:9075";




//mock地址




 src/components/oa/merits/meritsDetail/index.jsx


@@ -175,7 +175,7 @@


      url: `api/merits/assess/findMeritsDetail`,


      formData: {


        ...formData,


        userId: this.props.match.params.userId || JSON.parse(window.localStorage.getItem('loginUser'))


        userId: this.props.match.params.userId || JSON.parse(window.localStorage.getItem('loginUser')).userId


      },


      key: formData.__key,


      columns: this.renderColumns(),