From 2044684c26a8229a919503096a46b5d571756104 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 19 Aug 2024 14:06:29 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/passwordForm.vue | 10 ++++++---- src/views/login/components/phoneForm.vue | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 81bcb0d4..7db5fb74 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -133,10 +133,12 @@ export default { that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; - if (this.redirect) { - base_dashboard = this.redirect; - } - else if (base_dashboard == null || base_dashboard == undefined) { + // 去除重定向因客户不理解 + // if (this.redirect) { + // base_dashboard = this.redirect; + // } + // else + if (base_dashboard == null || base_dashboard == undefined) { base_dashboard = '/dashboard' } if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) { diff --git a/src/views/login/components/phoneForm.vue b/src/views/login/components/phoneForm.vue index 47483181..0d30dd3b 100644 --- a/src/views/login/components/phoneForm.vue +++ b/src/views/login/components/phoneForm.vue @@ -102,10 +102,11 @@ export default { that.$TOOL.data.set("USER_INFO", res1); that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; - if (this.redirect) { - base_dashboard = this.redirect; - } - else if (base_dashboard == null || base_dashboard == undefined) { + // if (this.redirect) { + // base_dashboard = this.redirect; + // } + // else + if (base_dashboard == null || base_dashboard == undefined) { base_dashboard = '/dashboard' } if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) { From be467d3f93ec610380c8195f4e6335fa56c84d24 Mon Sep 17 00:00:00 2001 From: Li xia <2309368887@qq.com> Date: Mon, 19 Aug 2024 14:14:34 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=E2=80=9D=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/enpComponents/carlist.vue | 9 ++-- src/views/bigScreen/enpComponents/cems.vue | 27 ++++++----- .../enpComponents/smartg_carwash.vue | 9 +++- .../bigScreen/enpComponents/transport.vue | 46 ++++++++++++++----- src/views/bigScreen/index_enp_blue.vue | 44 ++++++++++-------- 5 files changed, 89 insertions(+), 46 deletions(-) diff --git a/src/views/bigScreen/enpComponents/carlist.vue b/src/views/bigScreen/enpComponents/carlist.vue index 0edd325a..b64d0d17 100644 --- a/src/views/bigScreen/enpComponents/carlist.vue +++ b/src/views/bigScreen/enpComponents/carlist.vue @@ -150,8 +150,8 @@ export default { }], activeName:10, tabOptions:[ - { label: "进出厂车辆运输台账", name: 10 }, - { label: "进出厂车辆运输台账", name: 20 }, + { label: "进出厂运输车辆台账", name: 10 }, + { label: "厂内运输车辆台账", name: 20 }, { label: "非道路移动机械电子台账", name: 30 }, ] @@ -160,7 +160,10 @@ export default { methods: { - + //返回地图 + backtoMap() { + this.$emit('close') + }, } } diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index bd36168b..029859da 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -21,25 +21,30 @@ runningStateEnum[scope.row.running_state]?.text }} - - - - + + - + + 23% + + - + + 36% + + + + + 45%