admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-xiaomi' into 'master'

Browse Source 
Dev xiaomi

See merge request !26
This commit is contained in:
杜海鹏 2022-06-30 17:37:50 +08:00
commit a99a934914
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

1
src/assets/js/http.js
View File

@ -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/'; // 鹤洲

20
src/pages/equipmentCenter/equipmentCenter.js
View File

@ -103,19 +103,19 @@ 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) {
// 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) {
// router.push("/projectIndex");
// } else {
// router.push("/projectV2/taskList");
// }
store.commit("setProjectSn", data.sn);
break;
}

22
src/pages/index/index.js
View File

@ -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;
}