From f6223062de6d49f14c8851752d50a4a498374a86 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 30 May 2024 11:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E7=A7=BB=E5=8A=A8=E8=87=B3=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- src/store/index.js | 24 ++++----- .../personModule/administration.vue | 51 +++++++++++++++++++ 3 files changed, 65 insertions(+), 14 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 0b75e66a..4486d203 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -86,7 +86,7 @@ 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://182.90.224.237:51234' //郭圣雄远程 + // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 @@ -97,7 +97,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址 + axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index ad6c5ac6..1608ac1e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,8 +48,8 @@ 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://182.90.224.237:51234/upload/image/', - FILEURL:'http://182.90.224.237:51234/image/', + // UPLOADURL:'http://182.90.224.237:51234/upload/image/', + // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 @@ -61,19 +61,19 @@ export default new Vuex.Store({ // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // FILEURL:'http://42.180.188.17:11211/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://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // 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',//鞍钢测试平台工作流地址 + WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 3eddce30..3893f7ff 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -1767,6 +1767,33 @@ label-position="top" label-width="80px" > + + + + + + + { this.$refs["batchMoveForm"].clearValidate(); }, 120); }, + //选择批量移动的 公司时 + changeMoveCompany(value) { + this.batchMoveForm.departmentId = ""; + let data = { + enterpriseId: value, + projectSn: this.projectSn, + }; + getDepartmentInfoList(data).then((res) => { + console.log("移动时，部门列表数据=====：", res); + if (res.code == 200) { + // this.checkedTeamId = 0; + // this.checkedTeamId = type !== 1 ? 0 : this.checkedTeamId; + this.teamListData = res.result; + // this.getTableData(); + } + }); + // getTeamInfoList(data).then((res) => { + // if (res.code == 200) { + // this.moveTeamList = res.result; + // } + // }); + }, //批量移动 保存按钮 saveBatchMove(formName) {