From 0872796ec1c1bee212a13722902b4be4536a7146 Mon Sep 17 00:00:00 2001 From: binbin0314 Date: Fri, 11 Jun 2021 18:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=E7=9B=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- .env.production | 6 +++--- src/components/Panel/Panel.vue | 7 ++++--- src/views/BtnPage/BtnPage.vue | 26 +++++++++++++------------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.env.development b/.env.development index 56a4118..41c0621 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ VUE_APP_MODE=development VUE_APP_NODE_ENV=development VUE_APP_SCENE=wisdomcar -VUE_APP_BASE_URL=http://www.tall.wiki/ -VUE_APP_API_URL=http://www.tall.wiki/gateway +VUE_APP_BASE_URL=http://test.tall.wiki/ +VUE_APP_API_URL=http://test.tall.wiki/gateway VUE_APP_PROXY_URL=/gateway VUE_APP_PUBLIC_PATH=/wisdomcar -VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws +VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_TITLE=盐湖区人民医院数字看板 VUE_APP_DESCRIPTION=盐湖区人民医院数字看板 diff --git a/.env.production b/.env.production index 9fd34d3..bcc19d6 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ VUE_APP_MODE=production VUE_APP_NODE_ENV=production VUE_APP_SCENE=wisdomcar -VUE_APP_BASE_URL=http://www.tall.wiki/ -VUE_APP_API_URL=http://www.tall.wiki/gateway +VUE_APP_BASE_URL=http://test.tall.wiki/ +VUE_APP_API_URL=http://test.tall.wiki/gateway VUE_APP_PROXY_URL=/gateway VUE_APP_PUBLIC_PATH=/wisdomcar -VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws +VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_TITLE=盐湖区人民医院数字看板 VUE_APP_DESCRIPTION=盐湖区人民医院数字看板 diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue index 2c4147e..1b806be 100644 --- a/src/components/Panel/Panel.vue +++ b/src/components/Panel/Panel.vue @@ -65,11 +65,12 @@ export default { this.info = '呼叫'; this.setStartMessages(false); } else { - if ((val.step || val.step === '0') && val.step - 0 >= (this.percent * 13) / 100 && val.step - 0 <= 13) { + if ((val.step || val.step === '0') && val.step - 0 >= (this.percent * 12) / 100 && val.step - 0 <= 12) { console.log(val.step - 0, this.percent); - this.percent = ((val.step - 0 + 1) * 100) / 12; + this.percent = ((val.step - 0) * 100) / 12; + console.log(this.percent); this.percentA = (this.percent * 100) / 120 + '%'; - this.info = this.lists[val.step - 0 + 1]; + this.info = this.lists[val.step - 0]; } } }, diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue index 09fa1ea..85770ad 100644 --- a/src/views/BtnPage/BtnPage.vue +++ b/src/views/BtnPage/BtnPage.vue @@ -20,55 +20,55 @@ export default { nameList: [ { name: '呼叫', - value: '0', + value: '1', }, { name: '分诊', - value: '1', + value: '2', }, { name: '一线', - value: '2', + value: '3', }, { name: '采血', - value: '3', + value: '4', }, { name: '心电', - value: '4', + value: '5', }, { name: 'CT', - value: '5', + value: '6', }, { name: '二线', - value: '6', + value: '7', }, { name: '谈话', - value: '7', + value: '8', }, { name: '签字', - value: '8', + value: '9', }, { name: '团注', - value: '9', + value: '10', }, { name: '介入', - value: '10', + value: '11', }, { name: '置鞘', - value: '11', + value: '12', }, { name: '病房', - value: '12', + value: '13', }, // { // name: '分诊区',