From 4b234ee5602674af27eae8fd8f7e7c88b4e95d5e Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Sun, 18 Feb 2024 17:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 12 ++++++------ src/views/bigScreen1/component/doing.vue | 2 +- src/views/bigScreen1/component/done.vue | 4 ++-- src/views/bigScreen1/component/toDo.vue | 2 +- src/views/order/component/dispatchList.vue | 2 +- src/views/order/handle.vue | 5 +++-- src/views/order/history.vue | 5 +++-- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.env.development b/.env.development index bbae003..356e653 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,10 @@ ENV='development' # base api -VUE_APP_BASE_API=http://192.168.60.78:9001/ -VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file -VUE_APP_OA_URL=http://192.168.60.18:2021 +#VUE_APP_BASE_API=http://192.168.60.78:9001/ +#VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file +#VUE_APP_OA_URL=http://192.168.60.18:2021 -#VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ -#VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file -#VUE_APP_OA_URL=http://suzhouhedaooa.langye.net +VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ +VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file +VUE_APP_OA_URL=http://suzhouhedaooa.langye.net diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue index a6d09a4..1f25c51 100644 --- a/src/views/bigScreen1/component/doing.vue +++ b/src/views/bigScreen1/component/doing.vue @@ -43,7 +43,7 @@
执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
-
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时
+
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true) }}时
diff --git a/src/views/bigScreen1/component/done.vue b/src/views/bigScreen1/component/done.vue index 3074e1c..7e5cbc5 100644 --- a/src/views/bigScreen1/component/done.vue +++ b/src/views/bigScreen1/component/done.vue @@ -43,7 +43,7 @@
实际执行时间：{{ timeFormat(item.act_start_time) }}至{{ timeFormat(item.act_end_time,'HH:mm') }}
-
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时
+
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true) }}时
@@ -303,7 +303,7 @@ $list-height: calc(#{$container-height} - 5.33rem); text-align: center; } &__last { - flex-basis: 7.8%; + flex-basis: 9%; text-align: center; } &__operate { diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue index 45a550d..1bec6b5 100644 --- a/src/views/bigScreen1/component/toDo.vue +++ b/src/views/bigScreen1/component/toDo.vue @@ -43,7 +43,7 @@
执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
-
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时
+
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours',true) }}小时
diff --git a/src/views/order/component/dispatchList.vue b/src/views/order/component/dispatchList.vue index e24b199..0938e6c 100644 --- a/src/views/order/component/dispatchList.vue +++ b/src/views/order/component/dispatchList.vue @@ -168,7 +168,7 @@ export default { width: 100, align: "center", key: "last", - render: (h,{ row }) => h('span', this.$moment(row.end_time).diff(this.$moment(row.start_time),'minutes') + '分钟') + render: (h,{ row }) => h('span', this.$moment(row.end_time).diff(this.$moment(row.start_time),'hours',true) + '小时') }, { title: "结束时间", diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue index d4a4453..51024ad 100644 --- a/src/views/order/handle.vue +++ b/src/views/order/handle.vue @@ -468,8 +468,9 @@ export default { }], ["shichang",{ formatter: (data) => { - return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours") + "时" - } + return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours",true) + "小时" + }, + width: 120 }] ]) }; diff --git a/src/views/order/history.vue b/src/views/order/history.vue index 319c2ef..78f0c1b 100644 --- a/src/views/order/history.vue +++ b/src/views/order/history.vue @@ -440,8 +440,9 @@ export default { }], ["shichang",{ formatter: (data) => { - return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours") + "时" - } + return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours",true) + "小时" + }, + width: 120 }] ]), equipments: [],