diff --git a/src/store/index.js b/src/store/index.js index 645e4bb9..73647a14 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,22 +44,22 @@ export default new Vuex.Store({ }), ], - state: { - 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://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", //坤工作流地址(本地) - 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/',//郭圣雄远程 - // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 - // FILEURL:'http://42.180.188.17:11211/image/',//测试 + state: { + 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://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", //坤工作流地址(本地) + 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/',//郭圣雄远程 + // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 + // FILEURL:'http://42.180.188.17:11211/image/',//测试 // BASEURL: baseUrl // ? baseUrl 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 3fbb4be2..f58ef9a4 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -50,8 +50,7 @@