From 5f716b82dfb905cc24690c0b9a64e61180c7f2b5 Mon Sep 17 00:00:00 2001 From: jiayu Date: Wed, 24 Jul 2024 17:55:07 +0800 Subject: [PATCH 1/3] fix --- public/js/config.js | 2 +- src/assets/js/http.js | 1 + src/store/index.js | 7 ++++++- src/views/jxjadmin/moduleMenuManage.vue | 2 +- vue.config.js | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index 3f9b1735..ec532902 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var COMPANY = ""; //通用 // 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 dd433e33..222e4f65 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -190,6 +190,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 // 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/store/index.js b/src/store/index.js index 6917b901..6231c278 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -56,8 +56,9 @@ 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", //罗峰工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 @@ -70,6 +71,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/jxjadmin/moduleMenuManage.vue b/src/views/jxjadmin/moduleMenuManage.vue index 92a36a45..f99ef511 100644 --- a/src/views/jxjadmin/moduleMenuManage.vue +++ b/src/views/jxjadmin/moduleMenuManage.vue @@ -740,7 +740,7 @@ export default { ] }, btnList: [], - moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理','工作台'], + moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理','工作台', '新项目看板'], searchModuleType: 2, styleTypeArr: [ '普通项目级版本', diff --git a/vue.config.js b/vue.config.js index e74599ba..e5900b2d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -71,6 +71,7 @@ module.exports = { }), ], }, + devtool: 'source map' }, // configureWebpack: (config) => { From fcf8473070f57e639316baad9f78c64885af5d6f Mon Sep 17 00:00:00 2001 From: jiayu Date: Sat, 27 Jul 2024 15:12:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header.vue | 3 ++- src/views/companyAdmin/companyDiagram.vue | 8 ++++++++ src/views/home/login_v2.vue | 1 + src/views/jxjadmin/registerAudit.vue | 6 +++++- src/views/projectFront/aiAnalysis/reduceRulesManage.vue | 2 +- src/views/projectFront/configManage/roleManage.vue | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/header.vue b/src/components/header.vue index 069ea113..fe623cb2 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -522,7 +522,8 @@ export default { console.log("当前跳转链接", this.newBigScreen); //-------------------- 跳转新版七参数 this.jumpToken = localStorage.getItem("jumpToken"); - window.open(this.newBigScreen + "?token=" + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self"); + 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/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 }}
{{ i.moduleName }} +
新项目看板模块
+ {{ + i.moduleName + }} @@ -553,7 +557,7 @@ export default { }) this.brHtm = brHtm // console.log('查看要换行的位置',brHtm) - // console.log('列表查询所有模块信息',this.companyArr) + console.log('列表查询所有模块信息',this.companyArr) } }) }, diff --git a/src/views/projectFront/aiAnalysis/reduceRulesManage.vue b/src/views/projectFront/aiAnalysis/reduceRulesManage.vue index 23338783..a9662694 100644 --- a/src/views/projectFront/aiAnalysis/reduceRulesManage.vue +++ b/src/views/projectFront/aiAnalysis/reduceRulesManage.vue @@ -383,7 +383,7 @@ export default { getProjectMenu() { getProjectModuleGroupMenuListApi({ projectSn: this.$store.state.projectSn, - moduleTypes: "2,4,7", + moduleTypes: "2,4,7,8", }).then((res) => { var DATA = res.result; // DATA.forEach((element,i) => { diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue index f58ef9a4..90046108 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -358,7 +358,7 @@ export default { getProjectMenu() { getProjectModuleGroupMenuListApi({ projectSn: this.$store.state.projectSn, - moduleTypes:'2,4,7', + moduleTypes:'2,4,7,8', }).then(res => { var DATA = res.result; // DATA.forEach((element,i) => { From d48a58c2f97910f04de0d1eb0e87390ede8c0de5 Mon Sep 17 00:00:00 2001 From: jiayu Date: Sat, 27 Jul 2024 15:56:27 +0800 Subject: [PATCH 3/3] fix --- public/js/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/config.js b/public/js/config.js index 045653cd..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'; //南昌地铁、衢州