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 c776097d..b40ff174 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -86,7 +86,6 @@ if (process.env.NODE_ENV == 'development') { // 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.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 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/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 ae635488..d434b6fe 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,21 +48,23 @@ 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/", //正式环境 + 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..f55938ab 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); 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 @@ + + + + +