diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 18cd6450a..b23886d27 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -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'; diff --git a/src/views/designPlatform/trainingMenu.vue b/src/views/designPlatform/trainingMenu.vue index df4047ddf..368d12e85 100644 --- a/src/views/designPlatform/trainingMenu.vue +++ b/src/views/designPlatform/trainingMenu.vue @@ -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) { diff --git a/src/views/designPlatform/trainingPositionTip.vue b/src/views/designPlatform/trainingPositionTip.vue index da1d3f00f..0edb941ca 100644 --- a/src/views/designPlatform/trainingPositionTip.vue +++ b/src/views/designPlatform/trainingPositionTip.vue @@ -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, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index a7f96821a..4d66a10ac 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -101,7 +101,7 @@