joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
dong 2022-09-19 13:23:30 +08:00
commit 847c388fae
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/baseUrl.js
View File

@ -25,11 +25,11 @@ export function handlerUrl(data) {
// const data = null;
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.233/rtss-server';
BASE_API = 'http://192.168.3.233/rtss-server';
// BASE_API = 'http://114.116.51.125/jlcloud';
// BASE_API = 'http://192.168.3.90:9100'; // 周寅
// BASE_API = 'http://192.168.3.94:9000'; // 旭强
BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
// BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';

7
src/views/designPlatform/trainingMenu.vue
View File

@ -111,12 +111,7 @@ export default {
this.showSumbit = false;
},
shrink() {
// const height = this.$refs.dragBody.offsetHeight + 40;
// const top = this.$refs.drapBox.style.top;
if (this.isShrink) {
//
// this.$refs.drapBox.style.height = '40px';
// this.$refs.drapBox.style.top = '';
this.isShrink = false;
} else {
this.isShrink = true;
@ -126,8 +121,6 @@ export default {
document.querySelector('.reminder-drag').style.bottom = `${document.body.clientHeight - 300}px`;
}
});
// this.$refs.drapBox.style.height = height + 'px';
// this.$refs.drapBox.style.top = top;
}
},
changeMode(val) {

4
src/views/designPlatform/trainingPositionTip.vue
View File

@ -65,20 +65,18 @@ export default {
},
methods: {
tipInit() {
if (this.$store.state.trainingNew.teachMode === ScriptMode.TEACH) {
if (this.teachMode === ScriptMode.TEACH) {
this.tipShow = true;
const offset = this.$store.state.config.canvasOffset;
const trainingDetail = this.$store.state.trainingNew.trainingDetail;
const stepOrder = this.$store.state.trainingNew.stepOrder;
const steps = JSON.parse(trainingDetail.stepJson);
console.log(steps, steps[stepOrder - 1]);
if (steps && steps.length) {
const step = steps[stepOrder - 1];
const distance = 5;
this.tip = this.$store.state.socket.trainingStepTip.content;
if (step && step.tipPosition && step.tipPosition.deviceCode) {
const position = this.getShapeTipPoint(step.tipPosition);
console.log(position, '1111');
if (position) {
this.position = {
x: position.x + offset.x,

8
src/views/login/index.vue
View File

@ -101,7 +101,7 @@
</el-button>
</el-form-item>
<div style="display: inline-block;width: 100%;">
<div class="popover_box active" style="bottom: 50px;" @click="forgetPassword">忘记密码</div>
<div class="popover_box active" style="bottom: 50px;" @click="forgetPassword">忘记密码？</div>
</div>
</el-form>
</div>
@ -286,7 +286,7 @@ export default {
LSW: '检测教员机登录中',
ILW: '检测教员机登录中',
PIS_TRAIN: '检测教员机登录中',
PIS_STAND: '检测教员机登录中',
PIS_STAND: '检测教员机登录中'
};
return this.$route.query.type ? textMap[this.$route.query.type] : '';
}
@ -552,8 +552,8 @@ export default {
} else if (this.$route.query.type === 'ILW') {
this.$router.push({ path: `/jointTrainingNew`, query: query });
} else if (this.$route.query.type === 'PIS_STAND' || this.$route.query.type === 'PIS_TRAIN') {
const config = JSON.parse(res.data.deviceVO.config)
this.$router.push({ path: `/pis`, query: {...query, ...config}})
const config = JSON.parse(res.data.deviceVO.config);
this.$router.push({ path: `/pis`, query: {...query, ...config}});
} else {
this.$router.push({ path: `/jointTrainingNew`, query: query });
}