- {{ $t('teach.courseName') }}: {{ courseModel.name }}
+ {{ project ==='cgy'?'项目名称': $t('teach.courseName') }}: {{ courseModel.name }}
-
+
{{ $t('teach.permissionDistribute') }}
- {{ $t('teach.returnCourseList') }}
+ {{ project ==='cgy'?'返回项目列表': $t('teach.returnCourseList') }}
退出
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index 5ad4fcf72..febec83d0 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -4,23 +4,23 @@
-
草稿课程管理
+
草稿课程管理
-
+
{{ item }}
-
+
- {{ $t('teach.enterTheCourse') }}
+ {{ project === 'cgy'?'进入项目':$t('teach.enterTheCourse') }}
编辑
- 下架
- 删除课程
+
+ {{ project === 'cgy'?'删除项目':'删除课程' }}
@@ -48,7 +48,6 @@ export default {
return {
tableData: [],
loading: false,
- project: '',
mapId: '',
prdType: '',
cityCode: ''
@@ -58,6 +57,9 @@ export default {
isGzbShow() {
return getSessionStorage('project').startsWith('gzb');
},
+ project() {
+ return getSessionStorage('project');
+ },
userId() {
return this.$store.state.user.id;
},
@@ -75,7 +77,6 @@ export default {
},
mounted() {
this.loadInitPage();
- this.project = getSessionStorage('project');
},
methods: {
loadInitPage() {
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index adf064867..d2dbf1c17 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -122,18 +122,18 @@ export default {
this.toNextPage(isReplace, router);
break;
case 'Simulation':
- if (resp.data.prdType == '08') {
- //运行图编辑工作站
- getPublishMapInfo(this.mapId).then(rest => {
- this.setLocalRoute(`${UrlConfig.trainingPlatform.runPlan}/${this.mapId}?lineCode=${rest.data.lineCode}`);
- router = { path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: { lineCode: rest.data.lineCode}};
- this.toNextPage(isReplace, router);
- });
- } else {
- this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
- router = { path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}};
- this.toNextPage(isReplace, router);
- }
+ if (resp.data.prdType == '08') {
+ // 运行图编辑工作站
+ getPublishMapInfo(this.mapId).then(rest => {
+ this.setLocalRoute(`${UrlConfig.trainingPlatform.runPlan}/${this.mapId}?lineCode=${rest.data.lineCode}`);
+ router = { path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: { lineCode: rest.data.lineCode}};
+ this.toNextPage(isReplace, router);
+ });
+ } else {
+ this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
+ router = { path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}};
+ this.toNextPage(isReplace, router);
+ }
break;
}
}).catch((error) => {
@@ -173,6 +173,24 @@ export default {
item.key = item.id;
this.forTree(item);
});
+ if (this.project === 'cgy') {
+ this.treeList = [];
+ res.data.forEach(item => {
+ const childList = [];
+ item && item.children && item.children.forEach(elem => {
+ if (elem.id === 'Lesson') {
+ childList[0] = elem;
+ } else if (elem.id === 'Exam') {
+ childList[1] = elem;
+ } else if (elem.id === 'Simulation') {
+ childList[3] = elem;
+ } else {
+ childList[2] = elem;
+ }
+ });
+ item.children = childList;
+ });
+ }
this.treeList = res.data;
this.getExpandList(filterSelect);
this.$nextTick(() => {
From ee7b19de57671a3baeb0077268bef855f1c0aa11 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 1 Mar 2021 17:51:14 +0800
Subject: [PATCH 08/28] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E8=81=8C?=
=?UTF-8?q?=E9=99=A2=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trainingPlatform/demonList.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index d2dbf1c17..0469aadea 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -181,9 +181,9 @@ export default {
if (elem.id === 'Lesson') {
childList[0] = elem;
} else if (elem.id === 'Exam') {
- childList[1] = elem;
- } else if (elem.id === 'Simulation') {
childList[3] = elem;
+ } else if (elem.id === 'Simulation') {
+ childList[1] = elem;
} else {
childList[2] = elem;
}
From 4241e019fbff71ab0102af0311fd5dda15c16a5d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 5 Mar 2021 17:44:32 +0800
Subject: [PATCH 09/28] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/scripts/ProjectConfig.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 258eb3c43..7a05c2060 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -192,7 +192,7 @@ export const loginInfo = {
systemType: '014'
},
cgy: {
- title: '成都工业职业技术学院轨道交通虚拟仿真实训中心',
+ title: '成都工业职业技术学院线网车站运营虚拟仿真实训中心',
loginPath: '/login?project=cgy',
loginParam: 'CGY',
titleDistance: '-150px',
From 4f9bd398acdbf138fb2554b92eaa7bfd82ebaf16 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Sat, 6 Mar 2021 14:29:02 +0800
Subject: [PATCH 10/28] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B6=8A=E6=88=98=20?=
=?UTF-8?q?=E9=9D=9E=E5=AE=89=E5=85=A8=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4aa524c79..c361e2037 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -750,7 +750,7 @@ export default {
position: relative;
}
.text-box{
- font-size: 40px;
+ font-size: 39px;
font-weight: bold;
top: 150px;
width: 1050px;
From c30c809bf1fce18e5920ad25d82c3b493fa4a91a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 11 Mar 2021 10:58:03 +0800
Subject: [PATCH 11/28] =?UTF-8?q?iscs=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../iscsSystem/config/canvas/iscsCanvas.vue | 1 -
src/views/iscs/iscsSystem/groupNav.vue | 27 ++++++++++++++++---
src/views/iscs/iscsSystem/nav.vue | 6 ++---
src/views/iscs/iscsSystem/stationNav.vue | 9 +++++--
4 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
index 0070088bb..d2cb6443a 100644
--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@@ -80,7 +80,6 @@ export default {
methods: {
async getDetail(mode, system, part) {
const params = {
- // lineCode: this.$route.query.lineCode,
mapId:this.$route.query.mapId,
totalSystem: mode,
system: system,
diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue
index cbd86420a..3e0e39530 100644
--- a/src/views/iscs/iscsSystem/groupNav.vue
+++ b/src/views/iscs/iscsSystem/groupNav.vue
@@ -356,7 +356,14 @@ export default {
this.selectChildIndex = 0;
if (item.children.length) {
this.type = item.children[0].type;
- const query = {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group, lineCode:this.lineCode };
+ const query = {
+ currentSystem:this.currentSystem,
+ stationName: this.stationList[this.selectStationIndex].name,
+ stationId: this.stationList[this.selectStationIndex].id,
+ group: this.group,
+ lineCode:this.lineCode,
+ mapId: this.$route.query.mapId
+ };
if (this.projectDevice) {
query.projectDevice = this.$route.query.projectDevice;
query.type = this.$route.query.type;
@@ -368,7 +375,14 @@ export default {
selectChildren(item, index, isReplace = false) { // 选择菜单
this.selectChildIndex = index;
this.type = item.type;
- const query = {currentSystem: this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group, lineCode:this.lineCode };
+ const query = {
+ currentSystem: this.currentSystem,
+ stationName: this.stationList[this.selectStationIndex].name,
+ stationId: this.stationList[this.selectStationIndex].id,
+ group: this.group,
+ lineCode:this.lineCode,
+ mapId: this.$route.query.mapId
+ };
if (this.projectDevice) {
query.projectDevice = this.$route.query.projectDevice;
query.type = this.$route.query.type;
@@ -385,7 +399,14 @@ export default {
if (!this.type) {
this.type = this.$route.params.mode;
}
- const query = {currentSystem: this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group, lineCode:this.lineCode };
+ const query = {
+ currentSystem: this.currentSystem,
+ stationName: this.stationList[this.selectStationIndex].name,
+ stationId: this.stationList[this.selectStationIndex].id,
+ group: this.group,
+ lineCode:this.lineCode,
+ mapId: this.$route.query.mapId
+ };
if (this.projectDevice) {
query.projectDevice = this.$route.query.projectDevice;
query.type = this.$route.query.type;
diff --git a/src/views/iscs/iscsSystem/nav.vue b/src/views/iscs/iscsSystem/nav.vue
index 55f621338..666d6b72e 100644
--- a/src/views/iscs/iscsSystem/nav.vue
+++ b/src/views/iscs/iscsSystem/nav.vue
@@ -334,18 +334,18 @@ export default {
this.selectChildIndex = 0;
if (item.children.length) {
this.type = item.children[0].type;
- this.$router.push({ path: `/iscs/system/config/${item.children[0].type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
+ this.$router.push({ path: `/iscs/system/config/${item.children[0].type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, mapId: this.$route.query.mapId} });
}
}
},
selectChildren(item, index) { // 选择菜单
this.selectChildIndex = index;
this.type = item.type;
- this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
+ this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, mapId: this.$route.query.mapId } });
},
selectStation(item, index) { // 选择子菜单
this.selectStationIndex = index;
- this.$router.push({ path: `/iscs/system/config/${this.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
+ this.$router.push({ path: `/iscs/system/config/${this.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, mapId: this.$route.query.mapId } });
},
back() {
this.$router.push({ path: `/design/home` });
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index 8369846d0..f84d814ac 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -438,8 +438,13 @@ export default {
if (station) {
stationName = station.name;
}
- const query = {stationName: stationName, stationId: this.selectStation, group: this.group, mapId: this.$route.query.mapId, noPreLogout:this.$route.query.noPreLogout };
-
+ const query = {
+ stationName: stationName,
+ stationId: this.selectStation,
+ group: this.group,
+ mapId: this.$route.query.mapId,
+ noPreLogout:this.$route.query.noPreLogout
+ };
if (isReplace) {
this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query });
} else {
From 7a3f46a3a663b3963e9e68146abb255764b1d271 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 18 Mar 2021 10:25:41 +0800
Subject: [PATCH 12/28] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/management/user.js | 8 --------
src/store/modules/user.js | 19 -------------------
src/views/login/index.vue | 2 +-
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/src/api/management/user.js b/src/api/management/user.js
index 9d6334f93..1155ce85a 100644
--- a/src/api/management/user.js
+++ b/src/api/management/user.js
@@ -1,13 +1,5 @@
import request from '@/utils/request';
-/** 查询用户参数*/
-export function getUserConfigInfo() {
- return request({
- url: '/api/user/config',
- method: 'get'
- });
-}
-
/** 获取销售列表*/
export function getSellerList() {
return request({
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 10e7cf012..cfbf3a86e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,5 @@
-import { setSessionStorage } from '@/utils/auth';
import { login, logout, getInfo, preLogout } from '@/api/login';
import { getToken, setToken, removeToken } from '@/utils/auth';
-import { getUserConfigInfo } from '@/api/management/user';
import { LoginParams } from '@/utils/login';
import { creatSubscribe, clearSubscribe, perpetualTopic, disconnect} from '@/utils/stomp';
import Cookies from 'js-cookie';
@@ -115,12 +113,6 @@ const user = {
setToken(tokeninfo.value);
commit(mutAction, mutParams);
commit('SUBSCRIBE', {header, type});
- // 获取用户参数
- dispatch('GetUserConfigInfo').then(response => {
- resolve(response);
- }).catch(error => {
- reject(error);
- });
});
},
// 获取用户信息
@@ -149,17 +141,6 @@ const user = {
});
});
},
-
- // 获取用户参数
- GetUserConfigInfo() {
- getUserConfigInfo().then(resp => {
- if (resp.data) {
- resp.data.forEach(elem => {
- setSessionStorage(elem.code, elem.val);
- });
- }
- });
- },
// 前端登出
FedLogOut({ commit }) {
commit('SUBSCRIBE_UN');
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3ae87dd27..0f1e605f9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -306,7 +306,7 @@ export default {
},
mounted() {
document.title = loginInfo[this.project].browserTitle || loginInfo[this.project].title;
- if (!(this.syncLogin || this.noQrcodeList.includes(this.project))) {
+ if (this.syncLogin || !this.noQrcodeList.includes(this.project)) {
this.loginRefresh();
}
},
From 94645b47ec3e8bb8068901e4ff44339be6b02ed5 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 18 Mar 2021 10:57:33 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/user.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cfbf3a86e..8cda25532 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -113,6 +113,7 @@ const user = {
setToken(tokeninfo.value);
commit(mutAction, mutParams);
commit('SUBSCRIBE', {header, type});
+ resolve();
});
},
// 获取用户信息
From 0a0917dd32158f2b1aef38731155090630e7237c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 30 Apr 2021 10:23:21 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/theme/datie_01/menus/menuButton.vue | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/jmapNew/theme/datie_01/menus/menuButton.vue b/src/jmapNew/theme/datie_01/menus/menuButton.vue
index cf5ba2f87..de05fca98 100644
--- a/src/jmapNew/theme/datie_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuButton.vue
@@ -442,14 +442,12 @@ export default {
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
operate.code = deviceList[deviceList.length - 1].code;
operate.param = {routeId: route.code};
- this.deviceList = [];
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
- this.$store.dispatch('training/updateMapState', [{code: deviceList[0].code, _type: deviceList[0]._type, hasSelected: 0}]);
this.deviceTimeNode = 0;
}).catch(() => {
this.deviceTimeNode = 0;
this.$refs.noticeInfo.doShow();
- });
+ }).finally(() => { this.clearOperate(); });
}
}
},
@@ -631,7 +629,7 @@ export default {
} else {
this.clearOperate();
}
- }
+ } else { this.clearOperate(); }
if (this.timeNode) { this.timeNode = 0; }
},
checkSignalBlock(code) { // 校验信号是否锁闭
From 7cd36b7446177d945db140a1b526fbb8ee3c180a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 13 May 2021 13:12:28 +0800
Subject: [PATCH 15/28] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/indexedDb.js | 6 +++---
src/views/newMap/displayCity/menuDemon.vue | 3 ++-
src/views/publish/publishMap/index.vue | 2 ++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/utils/indexedDb.js b/src/utils/indexedDb.js
index 2a882c8a3..1fe60c2b9 100644
--- a/src/utils/indexedDb.js
+++ b/src/utils/indexedDb.js
@@ -1,10 +1,10 @@
import Vue from 'vue';
-import { getBaseUrl } from '@/utils/baseUrl'
+import { getBaseUrl } from '@/utils/baseUrl';
// 创建或者打开数据库
export function openIndexedDB() {
- const baseUrl = getBaseUrl();
- const indexedDBName = baseUrl.replace(/http.?:\/\/(.*)[\/|:].*/, "$1");
+ const baseUrl = getBaseUrl();
+ const indexedDBName = baseUrl.replace(/http.?:\/\/(.*)[\/|:].*/, '$1');
const request = window.indexedDB.open(indexedDBName, 1);
request.onerror = function (event) {
console.log('数据库打开报错');
diff --git a/src/views/newMap/displayCity/menuDemon.vue b/src/views/newMap/displayCity/menuDemon.vue
index c9b5d86d0..dca5cf7a3 100644
--- a/src/views/newMap/displayCity/menuDemon.vue
+++ b/src/views/newMap/displayCity/menuDemon.vue
@@ -54,6 +54,7 @@ import StatusIcon from '@/views/components/StatusIcon/statusIcon';
import { simulationPause, simulationStart } from '../../../api/rtSimulation';
// import Vue from 'vue';
import { getSessionStorage } from '@/utils/auth';
+import { destroySimulation } from '@/api/rtSimulation';
// import { EventBus } from '@/scripts/event-bus';
export default {
@@ -249,7 +250,7 @@ export default {
async back() {
this.isGoback = true;
if (this.projectDevice || this.project === 'wjls') {
- clearSimulation(this.group).then(res=>{
+ destroySimulation(this.group).then(res=>{
this.$store.dispatch('training/over').then(() => {
this.$store.dispatch('LogOut').then(() => {
location.reload();
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index a516eb08c..8a6beadc2 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -378,6 +378,8 @@ export default {
message = message + ( index ? '、' : '' ) + '《' + item.name + '》';
});
this.$messageBox(message);
+ } else {
+ this.$message.success('一键校验地图数据通过！');
}
}).catch(e => {
this.loading = false;
From 78cfce5609266737af8515c4395e2823a4c30163 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 1 Jul 2021 09:41:11 +0800
Subject: [PATCH 16/28] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E5=9C=B0=E9=93=81?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/scripts/ProjectConfig.js | 16 ++++++++--------
src/views/login/index.vue | 3 +++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 1b671bd84..0388cf861 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -280,9 +280,9 @@ export const loginInfo = {
xadt: {
title: '城市轨道交通实训平台',
logoWidth: '60px',
- loginTitle: '调度一部',
- homeTitle: '调度一部',
- browserTitle: '西安地铁调度一部城市轨道交通实训平台',
+ loginTitle: '运营一中心',
+ homeTitle: '运营一中心',
+ browserTitle: '西安地铁运营一中心城市轨道交通实训平台',
loginPath:'/login?project=xadt',
loginParam: 'XADT',
navigationLogoWidth: '40px',
@@ -292,9 +292,9 @@ export const loginInfo = {
designxadt: {
title: '城市轨道交通设计平台',
logoWidth: '60px',
- loginTitle: '调度一部',
- homeTitle: '调度一部',
- browserTitle: '西安地铁调度一部城市轨道交通设计平台',
+ loginTitle: '运营一中心',
+ homeTitle: '运营一中心',
+ browserTitle: '西安地铁运营一中心城市轨道交通设计平台',
loginPath:'/design/login?project=xadt',
loginParam: 'XADT',
navigationLogoWidth: '40px',
@@ -513,8 +513,8 @@ export const ProjectCode = {
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor']; // 底部栏仅展示公司信息不展示备案号
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'richor']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
-export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示
-export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示
+export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角版本开发基于不展示
+export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角主体不展示
export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww']; // 登录页样式
export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4bf5e3659..f239a2209 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -105,6 +105,9 @@
{{ '主体：北京玖琏科技有限公司 备案号：京ICP备18028522号' }}
+
+ 本产品由西安地铁（李乐工作室）与北京玖琏科技有限公司联合开发
+
From 70546bbfb11b3da4ea3ce8adfa2cf04c73bcf138 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 16 Jul 2021 10:50:33 +0800
Subject: [PATCH 17/28] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/graph/Train/EMouse.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js
index 2ea16cdd3..d8af90242 100644
--- a/src/jmapNew/shape/graph/Train/EMouse.js
+++ b/src/jmapNew/shape/graph/Train/EMouse.js
@@ -59,7 +59,7 @@ class EMouse extends Group {
}
const physicalSection = store.getters['map/getDeviceByCode'](this.device.model.model.physicalCode);
let closeDoorTip = '';
- if (physicalSection.standTrack) {
+ if (physicalSection && physicalSection.standTrack) {
const stationStand = store.state.map.map.stationStandList.find(item => item.standTrackCode === physicalSection.code);
if ((stationStand.right && this.device.model.right) || (!stationStand.right && !this.device.model.right)) {
if (stationStand.inside) {
From c425aa572ba36a6b3f504007c4f007ae79ba7379 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 14 Sep 2021 09:52:06 +0800
Subject: [PATCH 18/28] =?UTF-8?q?=E8=B4=B5=E8=A3=85=E5=A4=87=E7=BB=BC?=
=?UTF-8?q?=E5=90=88=E6=BC=94=E7=BB=83=E6=B7=BB=E5=8A=A0cctv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/newMap/jointTrainingNew/menuDemon.vue | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index b7cd67993..efe2fdd3d 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -137,13 +137,11 @@ export default {
return (this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice);
},
isDISPATCHER() {
- console.log('================================');
-
console.log(this.$store.state.training.prdType);
return (this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy');
},
isStationSupervisor() {
- return this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy');
+ return (this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy')) || this.project === 'gzb';
},
isDriver() {
return this.userRole == 'DRIVER' && !this.$route.query.projectDevice;
From 921dda306d058662f9529ed9fbfd4d80cd54f07d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 14 Sep 2021 13:50:59 +0800
Subject: [PATCH 19/28] =?UTF-8?q?=E4=B8=89=E7=BB=B4=E8=99=9A=E6=8B=9FCCTV?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jlmap3d/utils/pathfinder/Pathfinding.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jlmap3d/utils/pathfinder/Pathfinding.js b/src/jlmap3d/utils/pathfinder/Pathfinding.js
index be7925f58..9844d64be 100644
--- a/src/jlmap3d/utils/pathfinder/Pathfinding.js
+++ b/src/jlmap3d/utils/pathfinder/Pathfinding.js
@@ -29,7 +29,7 @@ class Pathfinding {
// not-recommended these days, so go ahead and start warning.
console.warn('[three-pathfinding]: Use BufferGeometry, not Geometry, to create zone.');
} else {
- geometry = new Geometry().fromBufferGeometry(geometry);
+ geometry = new THREE.Geometry().fromBufferGeometry(geometry);
}
return Builder.buildZone(geometry);
From c89e53b68974e14f30ccff954823b21a6c8f83cc Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 14 Sep 2021 15:14:44 +0800
Subject: [PATCH 20/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0logo=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/icon/transparent.png | Bin 0 -> 2029 bytes
src/scripts/ProjectConfig.js | 42 ++++++++++++++++++++++++++------
2 files changed, 34 insertions(+), 8 deletions(-)
create mode 100644 src/assets/icon/transparent.png
diff --git a/src/assets/icon/transparent.png b/src/assets/icon/transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca4324364e026e3dfcd024d8a5b612bbb59dbd8c
GIT binary patch
literal 2029
zcmeHI&u`pB6m}F5ptKTFFMxzJxR+L7&v+hbUdtaAS66ylZ9cacw8N
zn^VOJ{sol3fg4;nv=ZEq5aPrE35f%6sW@>&;(6D*R49#d;J^V(w#PHyeD8hly?Op*
zZ};w%ORrthH0?@nr@IgDht2)M20XvI#lC^pi^a|dm8QLPwYk@{PfuUbw2eDy|DZmI
z-wnCSOeWMon$xTRw5Hv>JuMhNlrsa6%~Z
z0@La^j_<#PD4_%s4_m~bG$ftSwNZQNV67BMxZl0g+Jdi0AJugcVmz5l%!zHPa)_-U
z2r!|TQUef1HOp%@HS+4(lA$XrUZzEzsvI?pY@m+nNC!_B60%}Nn^$d^AYgdP3T&CA
zk+cNH@%hj!TcN9Z`xvaW{+>x(^=E~|`?69;C70XBGOw>KjS0TmTO5_+xl+Ng9Lo$~
z6*y+COcf(lt7@d4p<}hYQd5LmrDU}#`$~Zb2dB(56``9DK|Lu9UnaI8iQ^eQ^&P`=xfGtys1V-V
zFWBEz{HO_ZvwuGmj}uMWpkl9Hh|O>GX`~UChq~?PMf@
z^qk}`V3kVh2`lC15F-6AmLYzY%!(bKFY;m~@}CgdrizbPK9tb5vEInWO@mt`8vnBf
z=4($i!zCO#Y%^T7cKBHR9ApmECA5Cyx7UBtw6(a`-Rw_KpL}nvY3TA}^7zrOZ}7WU
zpNme0zkK({7wbRBhyME4ucB|Y2OA&TZ=bIHeEH?!|5Im1;>YKoOxFMWeE0oX^F!`!
M?{+_X=fjWw0!aUBBme*a
literal 0
HcmV?d00001
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index d8e2e37f2..cf6254ea6 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -21,6 +21,7 @@ import Link_Bxkc from '@/assets/icon/link_bxkc.png';
import Link_Crsc from '@/assets/icon/link_crsc.png';
import Link_Hls from '@/assets/icon/link_hls.png';
import Link_Bjd from '@/assets/icon/link_bjd.png';
+import TransparentIcon from '@/assets/icon/transparent.png';
// title:页面title; loginPath:退出登录跳转路径; loginParam:登录接口参数project;loginTitle:登录页左上角title；logoWidth：登录页左上角logo宽度；
// homeTitle:导航栏title(没有采用title); browserTitle:浏览器窗口title；bottomColumn：底部栏描述；bottomIcon：底部栏Icon;linkIcon:浏览器窗口icon(没有采用ProjectIcon)
@@ -469,6 +470,24 @@ export const loginInfo = {
navigationLogoWidth: '40px',
navigationMarginLeft: '50px',
systemType: '023'
+ },
+ nologo: {
+ title: '城市轨道交通实训平台',
+ loginPath: '/login?project=nologo',
+ loginParam: 'NOLOGO',
+ bottomColumn: '',
+ navigationLogoWidth: '10px',
+ navigationMarginLeft: '10px',
+ systemType: '011'
+ },
+ designnologo: {
+ title: '城市轨道交通设计平台',
+ loginPath: '/design/login?project=nologo',
+ loginParam: 'NOLOGO',
+ bottomColumn: '',
+ navigationLogoWidth: '10px',
+ navigationMarginLeft: '10px',
+ systemType: '011'
}
};
@@ -514,7 +533,9 @@ export const ProjectIcon = {
designcgy: FaviconCgy,
richor:FaviconRichor,
richorjoint: FaviconRichor,
- designrichorjoint: FaviconRichor
+ designrichorjoint: FaviconRichor,
+ nologo: TransparentIcon,
+ designnologo: TransparentIcon
};
export const ProjectCode = {
@@ -547,13 +568,15 @@ export const ProjectCode = {
designcgy: 'CGY',
richor:'RICHOR',
richorjoint: 'RICHOR_JOINT',
- designrichorjoint: 'RICHOR_JOINT'
+ designrichorjoint: 'RICHOR_JOINT',
+ nologo: 'NOLOGO',
+ designnologo: 'NOLOGO'
};
-export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorjoint', 'designrichorjoint']; // 底部栏仅展示公司信息不展示备案号
-export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', 'richorjoint', 'designrichorjoint']; // 实训设计平台通过项目code获取地图列表的项目
+export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 底部栏仅展示公司信息不展示备案号
+export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
-export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角版本开发基于不展示
-export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角主体不展示
+export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'nologo', 'designnologo']; // 登录页右下角版本开发基于不展示
+export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'richor', 'richorjoint', 'nologo', 'designnologo']; // 登录页右下角主体不展示
export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest']; // 登录页样式
export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
@@ -595,7 +618,9 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
// cgy: '/design/login?project=cgy',
// designcgy: '/login?project=cgy'
richorjoint: '/design/login?project=richorjoint',
- designrichorjoint: '/login?project=richorjoint'
+ designrichorjoint: '/login?project=richorjoint',
+ nologo: '/design/login?project=nologo',
+ designnologo: '/login?project=nologo'
};
export const ProjectList = [
{value:'xty', label:'西铁院'},
@@ -614,7 +639,8 @@ export const ProjectList = [
{value: 'zzww', label: '郑州共赢'},
{value: 'zzwwtest', label: '郑州共赢考试'},
{value: 'richor', label: '中航锐创'},
- {value: 'richor_joint', label: '中航锐创（实训室）'}
+ {value: 'richor_joint', label: '中航锐创（实训室）'},
+ {value: 'nologo', label: '无logo' }
];
export const localPackageProject = {
localdesign: 'designheb',
From fdae91c6d773461a05cb677f972ae9ef13dd9b2f Mon Sep 17 00:00:00 2001
From: yuan
Date: Mon, 29 Nov 2021 14:12:35 +0800
Subject: [PATCH 21/28] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BA=BF=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0PSL=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fuzhou_01/menus/menuStationStand.vue | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
index 7b33fd360..bacecb53c 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
@@ -9,6 +9,7 @@
+
@@ -22,6 +23,7 @@ import StandStopTime from './dialog/standStopTime';
import StandDetainTrainAll from './dialog/standDetainTrainAll';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -39,7 +41,8 @@ export default {
StandBackStrategy,
StandStopTime,
StandDetainTrainAll,
- SetFault
+ SetFault,
+ Psl
},
props: {
selected: {
@@ -198,6 +201,16 @@ export default {
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;
}
+ // 非故障模式 且 角色为车站值班员时 增加PSL盘
+ if (this.operatemode !== OperateMode.FAULT && this.$store.state.training.prdType === '01') {
+ this.menu = [
+ ...this.menu,
+ {
+ label: 'PSL',
+ handler: this.openPsl
+ }
+ ];
+ }
// this.menu = MenuContextHandler.covert(this.menu);
},
@@ -334,6 +347,10 @@ export default {
},
triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+ },
+ // 打开PSL面板
+ openPsl() {
+ this.$refs.psl.doShow(this.selected);
}
}
};
From 1be02437eafabf23f1ddb0de5086ef746f7a72bf Mon Sep 17 00:00:00 2001
From: sunzhenyu
Date: Tue, 30 Nov 2021 16:24:31 +0800
Subject: [PATCH 22/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=90=E5=B7=9E?=
=?UTF-8?q?=E4=B8=89=E7=BB=B4=E6=BC=94=E7=A4=BAicon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/scripts/ProjectConfig.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index d3b834b8c..64523f259 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -604,6 +604,7 @@ export const ProjectIcon = {
xty: FaviconXty,
zzww: FaviconZzww,
zzwwtest: FaviconZzww,
+ xzexam:TransparentIcon,
login: Favicon,
design: Favicon,
designxty: FaviconXty,
From 0cb9980778c3f471270dadfefebd826a0af25ff9 Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 6 Dec 2021 23:21:54 +0800
Subject: [PATCH 23/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.env.production b/.env.production
index 6924d751f..7c6996c6e 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
NODE_ENV = 'production'
# base api
-VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+VUE_APP_BASE_API = 'https://139.9.112.245/jlcloud'
+VUE_APP_VOICE_API = 'https://139.9.112.245/oss/joylink'
+VUE_APP_UPLOAD_API = 'https://139.9.112.245'
VUE_APP_BASE_SITE='https://joylink.club/cbtc'
From 6308471990d84e0bfecc242994ba0a428f67db06 Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 6 Dec 2021 23:27:16 +0800
Subject: [PATCH 24/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.env.production b/.env.production
index 7c6996c6e..7836bd1ee 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
NODE_ENV = 'production'
# base api
-VUE_APP_BASE_API = 'https://139.9.112.245/jlcloud'
-VUE_APP_VOICE_API = 'https://139.9.112.245/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://139.9.112.245'
-VUE_APP_BASE_SITE='https://joylink.club/cbtc'
+VUE_APP_BASE_API = 'http://139.9.112.245/jlcloud'
+VUE_APP_VOICE_API = 'http://139.9.112.245/oss/joylink'
+VUE_APP_UPLOAD_API = 'http://139.9.112.245'
+VUE_APP_BASE_SITE='http://119.3.163.89/cbtc'
From 8733b04b50783f1759f3aabb9eb806127d3ac18d Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 6 Dec 2021 23:47:39 +0800
Subject: [PATCH 25/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.env.production b/.env.production
index 7836bd1ee..0e7644547 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
NODE_ENV = 'production'
# base api
-VUE_APP_BASE_API = 'http://139.9.112.245/jlcloud'
-VUE_APP_VOICE_API = 'http://139.9.112.245/oss/joylink'
-VUE_APP_UPLOAD_API = 'http://139.9.112.245'
+VUE_APP_BASE_API = 'http://119.3.163.89/jlcloud'
+VUE_APP_VOICE_API = 'http://119.3.163.89/oss/joylink'
+VUE_APP_UPLOAD_API = 'http://119.3.163.89'
VUE_APP_BASE_SITE='http://119.3.163.89/cbtc'
From 5429192cb2d09a8e86e9d56e1951656d07cdd29d Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Mon, 20 Dec 2021 10:22:17 +0800
Subject: [PATCH 26/28] =?UTF-8?q?=E6=89=93=E5=8C=85ip=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E6=AD=A3=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.env.production b/.env.production
index 0e7644547..6924d751f 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
NODE_ENV = 'production'
# base api
-VUE_APP_BASE_API = 'http://119.3.163.89/jlcloud'
-VUE_APP_VOICE_API = 'http://119.3.163.89/oss/joylink'
-VUE_APP_UPLOAD_API = 'http://119.3.163.89'
-VUE_APP_BASE_SITE='http://119.3.163.89/cbtc'
+VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
+VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
+VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+VUE_APP_BASE_SITE='https://joylink.club/cbtc'
From c5778efeac2ab1cba4bfbe170c3b2dec28699194 Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 20 Dec 2021 11:02:55 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.production b/.env.production
index 6924d751f..023029f36 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
NODE_ENV = 'production'
# base api
-VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
+VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+VUE_APP_UPLOAD_API = 'https://joylink.club/jlfile/'
VUE_APP_BASE_SITE='https://joylink.club/cbtc'
From a877ca3b6136e46b02ebfa8e3e7b61de60020f0d Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 20 Dec 2021 11:06:16 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.staging | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.env.staging b/.env.staging
index 35048ea21..b546dda1f 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,5 +4,5 @@ NODE_ENV = 'test'
# base api
VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+VUE_APP_UPLOAD_API = 'https://joylink.club/jlfile/'
VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'