diff --git a/.env.dev b/.env.dev
index b1305aa6..40a1806e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,12 +1,12 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-12-15 16:28:20
+ # @LastEditTime: 2023-12-18 13:35:00
# @LastEditors: zhp
# @Description:
###
# 开发环境配置
-ENV = 'development'
+ENV = 'development'
# 页面标题
VUE_APP_TITLE = MES系统
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 13b9dfec..3127d186 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -7,6 +7,8 @@
}">
许昌安彩冷端看板
+ 单位：河南汇融科技服务有限公司
+ {{ times }}
-
+ }">
许昌安彩深加工看板
+ 单位：河南汇融科技服务有限公司
+ {{ times }}
@@ -110,19 +98,13 @@
-
+
-
+
-
+
@@ -685,6 +661,7 @@ export default {
beilv2: 1,
beilv: 1,
value: 100,
+ times:'',
// offsetWidth: null,
qualityYearTableProps,
cxNameList,
@@ -742,6 +719,7 @@ export default {
this.init()
},
mounted() {
+ this.getTimes()
this.windowWidth(document.documentElement.clientWidth)
// const _this = this;
// window.onresize = () => {
@@ -768,6 +746,30 @@ export default {
// removeEventListener('resize', resizeFun)
// },
methods: {
+ getTimes() {
+ setInterval(this.getTimesInterval, 1000);
+ },
+ getTimesInterval: function () {
+ let _this = this;
+ let year = new Date().getFullYear(); //获取当前时间的年份
+ let month = new Date().getMonth() + 1; //获取当前时间的月份
+ let day = new Date().getDate(); //获取当前时间的天数
+ let hours = new Date().getHours(); //获取当前时间的小时
+ let minutes = new Date().getMinutes(); //获取当前时间的分数
+ let seconds = new Date().getSeconds(); //获取当前时间的秒数
+ //当小于 10 的是时候，在前面加 0
+ if (hours < 10) {
+ hours = "0" + hours;
+ }
+ if (minutes < 10) {
+ minutes = "0" + minutes;
+ }
+ if (seconds < 10) {
+ seconds = "0" + seconds;
+ }
+ //拼接格式化当前时间
+ this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+ },
windowWidth(value) {
this.clientWidth = value
this.beilv2 = this.clientWidth / 1920
@@ -838,7 +840,19 @@ export default {
background-size: 100% 100%;
color: #00fff0;
text-align: center;
+ .unit {
+ position: absolute;
+ left: 260px;
+ top: 25px;
+ font-size: 20px;
+ }
+ .time {
+ position: absolute;
+ left: 1360px;
+ top: 25px;
+ font-size: 20px;
+ }
.title-button {
color: #00fff0;
font-size: 20px;
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index 4fcb15db..be6ec9c3 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -99,7 +99,8 @@ export default {
rangeSeparator: '-',
startPlaceholder: '开始日期',
endPlaceholder: '结束日期',
- defaultTime: ['00:00:00', '23:59:59'],
+ defaultTime: ['00:00:00', '23:59:59'],
+ defaultSelect: [],
param: 'checkTime',
// width: 350,
},
@@ -263,6 +264,12 @@ export default {
this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
console.log(this.searchBarFormConfig[0].defaultSelect);
}
+ if (this.$route.query.startTime && this.$route.query.endTime) {
+ // console.log(this.$route.query.startTime);
+ this.searchBarFormConfig[2].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
+ this.queryParams.startTime = moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss')
+ this.queryParams.endTime = moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss')
+ }
// if (this.$route.params.startTime && this.$route.params.endTime) {
// this.searchBarFormConfig[0].defaultSelect = [
// this.$route.params.startTime,