diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 45962ba2..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/public/js/config.js b/public/js/config.js index 081a2924..d1257709 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -6,7 +6,7 @@ var COMPANY = ''; //通用 // var COMPANY='zhengwu' // var COMPANY='shenbai'; //沈白高铁 // COMPANY = 'henan' -// COMPANY = 'xingxuan' +COMPANY = 'xingxuan' var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 0a8f9c47..5cd6f84f 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -42,6 +42,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 + // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 diff --git a/src/pages/index/index.js b/src/pages/index/index.js index fee8429f..642e214b 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -117,19 +117,21 @@ if (COMPANY == 'xingxuan') { router.push(companyModule[0].modulePath); break; case 5: - if (data.styleType == 1 || !data.styleType) { - router.push("/projectIndex"); - } else { - router.push("/projectV2/taskList"); - } + // if (data.styleType == 1 || !data.styleType) { + // debugger + // router.push("/projectIndex"); + // } else { + // router.push("/projectV2/taskList"); + // } store.commit("setProjectSn", data.sn); break; case 6: - if (data.styleType == 1 || !data.styleType) { - router.push("/projectIndex"); - } else { - router.push("/projectV2/taskList"); - } + // if (data.styleType == 1 || !data.styleType) { + // debugger + // router.push("/projectIndex"); + // } else { + // router.push("/projectV2/taskList"); + // } store.commit("setProjectSn", data.sn); break; }