导出
diff --git a/src/views/components/PopMenu/index.vue b/src/views/components/PopMenu/index.vue
index 31f0832d3..bdb8f0a54 100644
--- a/src/views/components/PopMenu/index.vue
+++ b/src/views/components/PopMenu/index.vue
@@ -90,126 +90,126 @@ import { checkRectCollision } from '@/utils/index';
import { EventBus } from '@/scripts/event-bus';
export default {
- name: 'PopMenu',
- props: {
- menu: {
- type: Array,
- required: true
- }
- },
- data() {
- return {
- show: false,
- defaultFontSize: 14,
- tPosition: {
- x: -1000,
- y: -1000
- },
- height: 'auto'
- };
- },
- computed: {
- width() {
- let fontNum = 0;
- this.menu.forEach(elem => {
- if (elem.label && elem.label.length > fontNum) {
- fontNum = elem.label.length;
- }
- });
- var width = fontNum * this.defaultFontSize + 40 + 'px';
- return width;
- }
- },
- mounted() {
- EventBus.$on('closeMenu', () => {
- this.$nextTick(() => {
- this.show = false;
- });
- });
- },
- methods: {
- resetShowPosition(point) {
- if (point) {
- this.show = true;
- const self = this;
- this.$nextTick(() => {
- const gutter = 3;
- // 位置
- const height = self.$el.clientHeight;
- const width = self.$el.clientWidth;
- let px = 0;
- let py = 0;
- if (point.x + width > document.documentElement.clientWidth) {
- px = document.documentElement.clientWidth - width - gutter;
- } else {
- px = point.x;
- }
- if (point.y + height > document.documentElement.clientHeight) {
- py = document.documentElement.clientHeight - height - gutter;
- } else {
- py = point.y;
- }
- // 处理和提示框重叠问题
- const popTipDialog = document.getElementById('pop_tip_dialog');
- if (popTipDialog) {
- const tipRect = {
- point: { x: popTipDialog.offsetLeft, y: popTipDialog.offsetTop },
- width: popTipDialog.offsetWidth,
- height: popTipDialog.offsetHeight
- };
- const menuRect = {
- point: { x: px, y: py },
- width: self.$el.offsetWidth,
- height: self.$el.offsetHeight
- };
- const collision = checkRectCollision(tipRect, menuRect);
- // 若重叠，调整位置
- if (collision) {
- px = tipRect.point.x + tipRect.width + gutter;
- if (px + width > document.documentElement.clientWidth) {
- px = tipRect.point.x - menuRect.width - gutter;
- }
- }
- }
- self.tPosition.x = px;
- self.tPosition.y = py;
- });
- }
- },
- close() {
- this.show = false;
- },
- checkIfDisabled(menuObj) {
- return menuObj.disabled === true;
- },
- isShow(menuObj) {
- if (typeof (menuObj.show) == 'undefined') {
- return true;
- } else {
- return menuObj.show;
- }
- },
- calculateSubWidth(item) {
- const children = item.children;
- let width = 0;
- let fontNum = 0;
- children.forEach(elem => {
- if (elem.label.length > fontNum) {
- fontNum = elem.label.length;
- }
- });
- width = fontNum * this.defaultFontSize + 20 + 'px';
- return width;
- },
- openLoadFile(item) {
- const obj = this.$refs[item.label][0];
- if (obj.files) {
- const file = obj.files[0];
- item.handler(file);
- obj.value = '';
- }
- }
- }
+ name: 'PopMenu',
+ props: {
+ menu: {
+ type: Array,
+ required: true
+ }
+ },
+ data() {
+ return {
+ show: false,
+ defaultFontSize: 14,
+ tPosition: {
+ x: -1000,
+ y: -1000
+ },
+ height: 'auto'
+ };
+ },
+ computed: {
+ width() {
+ let fontNum = 0;
+ this.menu.forEach(elem => {
+ if (elem.label && elem.label.length > fontNum) {
+ fontNum = elem.label.length;
+ }
+ });
+ var width = fontNum * this.defaultFontSize + 40 + 'px';
+ return width;
+ }
+ },
+ mounted() {
+ EventBus.$on('closeMenu', () => {
+ this.$nextTick(() => {
+ this.show = false;
+ });
+ });
+ },
+ methods: {
+ resetShowPosition(point) {
+ if (point) {
+ this.show = true;
+ const self = this;
+ this.$nextTick(() => {
+ const gutter = 3;
+ // 位置
+ const height = self.$el.clientHeight;
+ const width = self.$el.clientWidth;
+ let px = 0;
+ let py = 0;
+ if (point.x + width > document.documentElement.clientWidth) {
+ px = document.documentElement.clientWidth - width - gutter;
+ } else {
+ px = point.x;
+ }
+ if (point.y + height > document.documentElement.clientHeight) {
+ py = document.documentElement.clientHeight - height - gutter;
+ } else {
+ py = point.y;
+ }
+ // 处理和提示框重叠问题
+ const popTipDialog = document.getElementById('pop_tip_dialog');
+ if (popTipDialog) {
+ const tipRect = {
+ point: { x: popTipDialog.offsetLeft, y: popTipDialog.offsetTop },
+ width: popTipDialog.offsetWidth,
+ height: popTipDialog.offsetHeight
+ };
+ const menuRect = {
+ point: { x: px, y: py },
+ width: self.$el.offsetWidth,
+ height: self.$el.offsetHeight
+ };
+ const collision = checkRectCollision(tipRect, menuRect);
+ // 若重叠，调整位置
+ if (collision) {
+ px = tipRect.point.x + tipRect.width + gutter;
+ if (px + width > document.documentElement.clientWidth) {
+ px = tipRect.point.x - menuRect.width - gutter;
+ }
+ }
+ }
+ self.tPosition.x = px;
+ self.tPosition.y = py;
+ });
+ }
+ },
+ close() {
+ this.show = false;
+ },
+ checkIfDisabled(menuObj) {
+ return menuObj.disabled === true;
+ },
+ isShow(menuObj) {
+ if (typeof (menuObj.show) == 'undefined') {
+ return true;
+ } else {
+ return menuObj.show;
+ }
+ },
+ calculateSubWidth(item) {
+ const children = item.children;
+ let width = 0;
+ let fontNum = 0;
+ children.forEach(elem => {
+ if (elem.label.length > fontNum) {
+ fontNum = elem.label.length;
+ }
+ });
+ width = fontNum * this.defaultFontSize + 20 + 'px';
+ return width;
+ },
+ openLoadFile(item) {
+ const obj = this.$refs[item.label][0];
+ if (obj.files) {
+ const file = obj.files[0];
+ item.handler(file);
+ obj.value = '';
+ }
+ }
+ }
};
diff --git a/src/views/components/pay/finish.vue b/src/views/components/pay/finish.vue
index d816e6dd2..7cd0b3c8b 100644
--- a/src/views/components/pay/finish.vue
+++ b/src/views/components/pay/finish.vue
@@ -32,50 +32,50 @@
import img_pay_fail from '@/assets/pay_images/PayFail.png';
import img_pay_success from '@/assets/pay_images/PaySuccess.png';
export default {
- name: 'FinishDraft',
- props: {
- finishStatus: {
- type: String,
- required: true
- }
- },
- data() {
- return {
- count: 0,
- maxTime: 5,
- timer: null,
- images: {
- img_pay_fail,
- img_pay_success
- }
- };
- },
- beforeDestroy() {
- this.destroy();
- },
- methods: {
- // 设置计时器，maxTime后返回
- createCountTimer() {
- const that = this;
- // 如果计时器已存在，则先注销
- this.destroy();
- // 重新创建定时器
- if (this.timer == null) {
- this.count = this.maxTime;
- this.timer = setInterval(() => {
- (that.count-- <= 0) && that.finish();
- }, 1000);
- }
- },
- // 返回到课程首页
- finish() {
- this.$emit('finish');
- },
- // 注销计时器
- destroy() {
- clearInterval(this.timer);
- this.timer = null;
- }
- }
+ name: 'FinishDraft',
+ props: {
+ finishStatus: {
+ type: String,
+ required: true
+ }
+ },
+ data() {
+ return {
+ count: 0,
+ maxTime: 5,
+ timer: null,
+ images: {
+ img_pay_fail,
+ img_pay_success
+ }
+ };
+ },
+ beforeDestroy() {
+ this.destroy();
+ },
+ methods: {
+ // 设置计时器，maxTime后返回
+ createCountTimer() {
+ const that = this;
+ // 如果计时器已存在，则先注销
+ this.destroy();
+ // 重新创建定时器
+ if (this.timer == null) {
+ this.count = this.maxTime;
+ this.timer = setInterval(() => {
+ (that.count-- <= 0) && that.finish();
+ }, 1000);
+ }
+ },
+ // 返回到课程首页
+ finish() {
+ this.$emit('finish');
+ },
+ // 注销计时器
+ destroy() {
+ clearInterval(this.timer);
+ this.timer = null;
+ }
+ }
};
diff --git a/src/views/components/progressBar/index.vue b/src/views/components/progressBar/index.vue
index 7df3d9acc..6411e7093 100644
--- a/src/views/components/progressBar/index.vue
+++ b/src/views/components/progressBar/index.vue
@@ -14,8 +14,6 @@
\ No newline at end of file
+
diff --git a/src/views/components/systemTime/point.vue b/src/views/components/systemTime/point.vue
index 6d03098c4..87805cf6e 100644
--- a/src/views/components/systemTime/point.vue
+++ b/src/views/components/systemTime/point.vue
@@ -7,21 +7,21 @@
diff --git a/src/views/components/systemTime/separator.vue b/src/views/components/systemTime/separator.vue
index 555734ca3..34121c49e 100644
--- a/src/views/components/systemTime/separator.vue
+++ b/src/views/components/systemTime/separator.vue
@@ -9,35 +9,35 @@
import Point from './point';
export default {
- name: 'Separator',
- components: {
- Point
- },
- props: {
- zoom: {
- type: Number,
- required: true
- },
- fine: {
- type: Number,
- required: true
- },
- color: {
- type: String,
- required: true
- }
- },
- computed: {
- p() {
- return this.fine * 1;
- },
- w() {
- return this.fine * 4;
- },
- h() {
- return this.zoom * 8 + this.fine * 6 + this.p*2;
- }
- }
+ name: 'Separator',
+ components: {
+ Point
+ },
+ props: {
+ zoom: {
+ type: Number,
+ required: true
+ },
+ fine: {
+ type: Number,
+ required: true
+ },
+ color: {
+ type: String,
+ required: true
+ }
+ },
+ computed: {
+ p() {
+ return this.fine * 1;
+ },
+ w() {
+ return this.fine * 4;
+ },
+ h() {
+ return this.zoom * 8 + this.fine * 6 + this.p * 2;
+ }
+ }
};
diff --git a/src/views/demonstration/deomonTopic/index.vue b/src/views/demonstration/deomonTopic/index.vue
index fee4f6092..30d7a100c 100644
--- a/src/views/demonstration/deomonTopic/index.vue
+++ b/src/views/demonstration/deomonTopic/index.vue
@@ -74,7 +74,7 @@ export default {
async handleJoin() {
try {
this.loading = true;
- const rest = await getPublishMapInfo(this.mapId);
+ await getPublishMapInfo(this.mapId);
launchFullscreen();
const query = { lineCode: this.lineCode, mapId: this.mapId, group: this.group};
this.$router.push({path: `/jointTrainingNew`, query: query});
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index 7568da2c4..d6064243a 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -151,7 +151,7 @@ export default {
name: this.$t('designPlatform.mapPreview'),
type: 'mapPreview',
mapId: elem.id,
- cityCode: elem.cityCode,
+ cityCode: elem.cityCode
}
];
this.isAdministrator() ? elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, cityCode: elem.cityCode, lineCode: elem.lineCode}) : '';
@@ -162,7 +162,7 @@ export default {
type: 'scriptDesign',
mapId: elem.id,
cityCode: elem.cityCode,
- lineCode: elem.lineCode,
+ lineCode: elem.lineCode
// code:elem.children.find(n => { return n.name.includes("行调")})
});
elem.children.push(
@@ -172,7 +172,7 @@ export default {
type: 'runPlanDesign',
mapId: elem.id,
lineCode: elem.lineCode,
- cityCode: elem.cityCode,
+ cityCode: elem.cityCode
}
);
if (process.env.VUE_APP_PRO !== 'local') {
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index c94ad1250..0ccdb6a22 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -15,7 +15,7 @@
{{ message }}
Please check that the URL you entered is correct, or click the button below to
return to the homepage.
-
+
@@ -23,18 +23,18 @@
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index 909c1546f..a3c2effe2 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -123,10 +123,6 @@ import { publishRunPlan, deleteRunPlan } from '@/api/designPlatform';
export default {
name: 'PlanMenuBar',
props: {
- // skinCode: {
- // type: String,
- // default: ''
- // },
planConvert: {
type: Object,
default: function() {
diff --git a/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue b/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue
index defda51df..b729aac41 100644
--- a/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue
+++ b/src/views/planMonitor/editTool/menus/addSmoothRunTime.vue
@@ -13,7 +13,7 @@
- {{$t('global.startTime')+$t('global.colon')}}
+ {{ $t('global.startTime')+$t('global.colon') }}
@@ -21,7 +21,7 @@
- {{$t('global.endTime')+$t('global.colon')}}
+ {{ $t('global.endTime')+$t('global.colon') }}
@@ -29,16 +29,16 @@
- {{$t('planMonitor.trainRunningTimeInterval')+$t('global.colon')}}
+ {{ $t('planMonitor.trainRunningTimeInterval')+$t('global.colon') }}
- {{$t('global.colon')}}
+ {{ $t('global.colon') }}
- {{$t('planMonitor.sizeOfTheLoopTrainProportion')+$t('global.colon')}}
+ {{ $t('planMonitor.sizeOfTheLoopTrainProportion')+$t('global.colon') }}
@@ -48,28 +48,28 @@
- {{$t('planMonitor.applicationRouteSelection')+$t('global.colon')}}
+ {{ $t('planMonitor.applicationRouteSelection')+$t('global.colon') }}
- {{$t('planMonitor.bothway')}}
- {{$t('planMonitor.up')}}
- {{$t('planMonitor.down')}}
+ {{ $t('planMonitor.bothway') }}
+ {{ $t('planMonitor.up') }}
+ {{ $t('planMonitor.down') }}
-
+
- {{$t('global.confirm')}}
- {{$t('global.cancel')}}
+ {{ $t('global.confirm') }}
+ {{ $t('global.cancel') }}