diff --git a/public/js/config.js b/public/js/config.js index 95b2d36b..ec532902 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,5 +1,5 @@ //-------项目配置标识------- -// var COMPANY = ""; //通用 +var COMPANY = ""; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -18,7 +18,7 @@ // COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj' //上海张江 // COMPANY = 'shjg'//上海优益(上海建工) -COMPANY = "agjt"; //鞍钢集团 +// COMPANY = "agjt"; //鞍钢集团 // COMPANY = 'zkax' //中科安信 // COMPANY = 'hfqc' //乌丹站舍(合肥启程) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 11bebe0a..f13ba440 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -192,6 +192,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/components/header.vue b/src/components/header.vue index b9c0df0c..8342c4c5 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -638,8 +638,8 @@ export default { console.log("当前跳转链接", this.newBigScreen); //-------------------- 跳转新版七参数 this.jumpToken = localStorage.getItem("jumpToken"); - window.open(this.newBigScreen + "?token=" + this.jumpToken, "_self"); - // + '&sn=' + this.$store.state.projectSn + let userId = this.$store.state.userInfo.userId; + window.open(this.newBigScreen + "?userId=" + userId + '&sn=' + this.$store.state.projectSn, "_self"); // window.open('http://192.168.34.138:8081/#/large?token=' + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self")//这里是后台跳到大屏的操作,携带token过去 } // if (this.newBigScreen != null) { diff --git a/src/store/index.js b/src/store/index.js index 7aa78407..b0e9c48b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -58,6 +58,7 @@ export default new Vuex.Store({ // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) @@ -73,6 +74,10 @@ export default new Vuex.Store({ // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + + // UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工 + // FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工 + // WORKFLOWURL: 'http://jxj.zhgdyun.com:18003/#/workspace/forms', //包头化工工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index 46eb426c..4d2677c1 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -1105,6 +1105,14 @@ :label="i.moduleId" >{{ i.moduleName }} +
新项目看板模块
+ {{ i.moduleName }}