diff --git a/mes-ui/mes-echarts/src/assets/image/img/order-title.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-26.png similarity index 100% rename from mes-ui/mes-echarts/src/assets/image/img/order-title.png rename to mes-ui/mes-echarts/src/assets/image/img/order/order-26.png diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-27.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-27.png new file mode 100644 index 00000000..b6dd5340 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-27.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-28.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-28.png new file mode 100644 index 00000000..ae07d15f Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-28.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-29.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-29.png new file mode 100644 index 00000000..6d820857 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-29.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-30.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-30.png new file mode 100644 index 00000000..281f246e Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-30.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-31.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-31.png new file mode 100644 index 00000000..4d243cb0 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-31.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-32.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-32.png new file mode 100644 index 00000000..6663d624 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-32.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-33.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-33.png new file mode 100644 index 00000000..bb853473 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-33.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-34.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-34.png new file mode 100644 index 00000000..2391a173 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-34.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order/order-35.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-35.png new file mode 100644 index 00000000..47f684e9 Binary files /dev/null and b/mes-ui/mes-echarts/src/assets/image/img/order/order-35.png differ diff --git a/mes-ui/mes-echarts/src/assets/image/img/order-bg.png b/mes-ui/mes-echarts/src/assets/image/img/order/order-bg.png similarity index 100% rename from mes-ui/mes-echarts/src/assets/image/img/order-bg.png rename to mes-ui/mes-echarts/src/assets/image/img/order/order-bg.png diff --git a/mes-ui/mes-echarts/src/utils/requestConfig.js b/mes-ui/mes-echarts/src/utils/requestConfig.js index 797d2c5e..e669b463 100644 --- a/mes-ui/mes-echarts/src/utils/requestConfig.js +++ b/mes-ui/mes-echarts/src/utils/requestConfig.js @@ -9,7 +9,7 @@ const devBaseURL = 'http://218.75.46.166:8889' // const devBaseURL = 'http://192.168.0.169:9002/' // const proBaseURL = 'http://192.168.0.169:9002/' // const devBaseURL = 'http://218.75.46.166:8889/' -// const proBaseURL = 'http://218.75.46.166:8889/' +const proBaseURL = 'http://218.75.46.166:8889/' export const BASE_URL = process.env.NODE_ENV === 'development' ? devBaseURL : proBaseURL export const TIMEOUT = 5000 diff --git a/mes-ui/mes-echarts/src/views/largebox/centerbox.vue b/mes-ui/mes-echarts/src/views/largebox/centerbox.vue index 5e07d14e..4d5831d2 100644 --- a/mes-ui/mes-echarts/src/views/largebox/centerbox.vue +++ b/mes-ui/mes-echarts/src/views/largebox/centerbox.vue @@ -2,7 +2,7 @@
- +
@@ -50,6 +50,7 @@ export default { orderData: {}, yearData: {}, intervalId: null, // 初始化定时器ID,防止undefined + orderTitleSrc: require('../../assets/image/img/order/order-26.png'), }; }, directives: { @@ -71,8 +72,10 @@ export default { }, }, mounted() { + this.yearorderData(); this.setData(); // 首次加载立即请求 this.startInterval(); // 开启定时器(取消注释) + }, // 组件销毁时清理定时器,防止内存泄漏 beforeDestroy() { @@ -82,9 +85,15 @@ export default { } }, methods: { + yearorderData() { + const currentYear = new Date().getFullYear(); + let yearSuffix = '35'; + yearSuffix = String(currentYear).slice(-2); + this.orderTitleSrc = require(`../../assets/image/img/order/order-${yearSuffix}.png`); + }, startInterval() { const _this = this; - const time = 5 * 60 * 1000; + const time = 5 * 60 * 1000; // 先清理旧定时器(避免重复创建) if (this.intervalId) { clearInterval(this.intervalId); @@ -143,7 +152,7 @@ export default { width: 895px; .center-top { - background: url('../../assets/image/img/order-bg.png') no-repeat; + background: url('../../assets/image/img/order/order-bg.png') no-repeat; background-size: 100% 100%; width: 895px; height: 56px;