From ce23baf47cb2cd35d3dfbfc7ac1a82537375f676 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 28 May 2024 19:58:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= 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 | 10 +++---- .../projectFront/carManage/carManage.vue | 27 ++++++++++--------- .../projectFront/configManage/roleManage.vue | 2 +- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 0b75e66a..6778e31c 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://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 diff --git a/src/store/index.js b/src/store/index.js index ad6c5ac6..db289337 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,13 +48,13 @@ 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/',// 郭圣雄本地 - // 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", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 3db1274a..e7e38d0d 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -141,19 +141,19 @@ {{ $t("message.carManage.isBlackArr")[scope.row.isBlack] }} + @@ -768,7 +768,7 @@ :placeholder="$t('message.deviceManage.placeholder')"> --> - + 是否黑名单： {{ - entityDetail.isBlack === 0 ? "是" : "否" + entityDetail.isBlack === 1 ? "是" : "否" }} @@ -1464,6 +1464,7 @@ export default { ], addEditForm: { // uDevId: [], + isBlack: 0 }, pagInfo: { pageNo: 1, //页数 @@ -1858,7 +1859,7 @@ export default { if (valid) { if (this.Popup.type === "add") { // 默认白名单 - params.isBlack = 0; + // params.isBlack = 0; addCarInfoApi(params).then((result) => { if (result.success) { this.$message.success(result.message); @@ -1930,7 +1931,9 @@ export default { }); }, close() { - this.addEditForm = {}; + this.addEditForm = { + isBlack: 0 + }; this.fileList = []; this.fileList2 = []; this.fileList3 = []; diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue index 17057ba5..f58ef9a4 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -50,7 +50,7 @@