diff --git a/public/js/config.js b/public/js/config.js index 802d4761..c3bbabdb 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -14,7 +14,7 @@ var COMPANY = '' //通用 // COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 // COMPANY = 'sccr'//四川成润 -// COMPANY = 'pssh'//坪山沙湖项目 +COMPANY = 'pssh'//坪山沙湖项目 // COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj'//上海张江 // COMPANY = 'shjg'//上海优益(上海建工) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 51e2a95b..6adee500 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -79,11 +79,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 // axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖 + axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖(最新)地址 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 diff --git a/src/router/largeScreen/forth.js b/src/router/largeScreen/forth.js index 17585984..b95ab0fb 100644 --- a/src/router/largeScreen/forth.js +++ b/src/router/largeScreen/forth.js @@ -57,7 +57,8 @@ export default { //坪山沙湖项目 { path: 'robot', - name: '机器人管理', + // name: '机器人管理', + name: '云端建造', component: () => import('@/views/projectAdmin/fourEngin/robot') }, ] diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue index 9fe05852..9a817ea4 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue @@ -1,12 +1,30 @@