From f3c90cca4bd428a1a9d2685fa5a8ebbbdfb5efa4 Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 30 Apr 2024 21:45:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?dev:=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/laborPerson.js | 1 + src/assets/js/http.js | 4 +-- src/store/index.js | 26 +++++++------- .../configManage/groupStructureManagement.vue | 36 +++++++++++++++++-- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index 4b2a02e2..78704edf 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -3,6 +3,7 @@ */ import {post, get, put} from '../http' // 劳务管理 ------ 人员管理 +export const getProjectChilderSystemUserListApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); //查询项目子系统用户 export const getEnterpriseInfoList = data => post('xmgl/enterpriseInfo/list', data); //劳务公司列表 export const getEnterpriseTypeList = data => get('xmgl/enterpriseType/list', data); //新增企业 -- 企业类型下拉 export const setEnterpriseInfo = data => post('xmgl/enterpriseInfo/add', data); //新增企业 -- 确认 新增 企业 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index ac0287b0..b40ff174 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,9 +84,9 @@ if (process.env.NODE_ENV == 'development') { // 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:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 + 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/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 diff --git a/src/store/index.js b/src/store/index.js index 0c936efe..d434b6fe 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,22 +48,22 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 - // WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址 // WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址 diff --git a/src/views/projectFront/configManage/groupStructureManagement.vue b/src/views/projectFront/configManage/groupStructureManagement.vue index f62d5b6c..c12c1938 100644 --- a/src/views/projectFront/configManage/groupStructureManagement.vue +++ b/src/views/projectFront/configManage/groupStructureManagement.vue @@ -167,11 +167,22 @@
+ - + + + + + { + console.log("==========查询项目子账号=========",res) + this.projectChildUesrList = res.result + }) + }, // 树形控件点击 treeClick(data) { console.log(data); @@ -408,7 +438,9 @@ export default { }, edit(obj) { console.log("编辑", obj); + this.getProjectChilderSystemUserList(obj) this.title = "编辑组织"; + this.addEditForm = JSON.parse(JSON.stringify(obj)); if (this.addEditForm.parentObj) { this.selectTreeData = JSON.parse(this.addEditForm.parentObj); From d646db9e90e936b347c41730be9e587c77a59e9c Mon Sep 17 00:00:00 2001 From: "@wpf" <15514537552@163.com> Date: Tue, 30 Apr 2024 22:31:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=80=BB=E8=A7=88=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 + src/store/index.js | 2 +- .../projectganttChart.vue | 1886 +++++++++++++++++ 3 files changed, 1895 insertions(+), 1 deletion(-) create mode 100644 src/views/projectFront/progressManagementAg/projectganttChart.vue diff --git a/src/router/index.js b/src/router/index.js index e8a03755..c35b72e0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2491,6 +2491,14 @@ const routes2 = [ ], resolve), }, // 鞍钢项目进度管理 + { + path: "/project/progressManagementAg/projectganttChart", + name: "进度管理_项目进度总览", + component: (resolve) => + require([ + "@/views/projectFront/progressManagementAg/projectganttChart.vue", + ], resolve), + }, { path: "/project/progressManagementAg/ganttChart", name: "进度管理_甘特图2", diff --git a/src/store/index.js b/src/store/index.js index 0c936efe..45517bff 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,7 +50,7 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) + WORKFLOWURL: 'http://192.168.34.126:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 diff --git a/src/views/projectFront/progressManagementAg/projectganttChart.vue b/src/views/projectFront/progressManagementAg/projectganttChart.vue new file mode 100644 index 00000000..cc584dd1 --- /dev/null +++ b/src/views/projectFront/progressManagementAg/projectganttChart.vue @@ -0,0 +1,1886 @@ + + + + + From fb72b10f76177de5aed607b02ba364ee30d2a1b6 Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 30 Apr 2024 23:05:38 +0800 Subject: [PATCH 3/3] dev --- .../projectFront/configManage/groupStructureManagement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectFront/configManage/groupStructureManagement.vue b/src/views/projectFront/configManage/groupStructureManagement.vue index c12c1938..f55938ab 100644 --- a/src/views/projectFront/configManage/groupStructureManagement.vue +++ b/src/views/projectFront/configManage/groupStructureManagement.vue @@ -170,7 +170,7 @@ - +