From ddff66dcaf1f10c13ac9d494ffeec2129dacdbc5 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 3 Jun 2024 09:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index d6e8f68b..ffb72122 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -61,7 +61,6 @@ export default new Vuex.Store({ // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试 -<<<<<<< .mine // BASEURL: baseUrl ? // baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 @@ -86,32 +85,6 @@ export default new Vuex.Store({ // tag: 部署河南项目时，需要打开这两行代码 -======= - 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", //鞍钢测试平台工作流地址 - //--------------------------------------------------------------------------------------------- - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/api/upload/image", //金林湾部署地址 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 - // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', - // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', - /* 2022-05-16 */ - // tag: 部署河南项目时，需要打开这两行代码 ->>>>>>> .theirs // UPLOADURL: 'http://139.9.66.234:6324/upload/image', // FILEURL: 'http://139.9.66.234:6324/image/',