From 99275eb3ea4f9a074be2e905907f00cfe77148a1 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Dec 2020 18:30:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest/project.http | 18 +- src/common/index.styl | 4 +- src/components/Panel/Panel.vue | 35 +++- src/components/Sensor/Sensor.js | 256 +++++++++++++++++----------- src/components/Sensor/Sensor.vue | 5 +- src/mixins/socket.js | 20 +-- src/store/modules/messages/state.js | 8 +- 7 files changed, 222 insertions(+), 124 deletions(-) diff --git a/rest/project.http b/rest/project.http index bae2841..e3c6bac 100644 --- a/rest/project.http +++ b/rest/project.http @@ -1,5 +1,6 @@ # @tall = {{url}}/tall/v1.0 -@tall = http://www.sxwikionline.com/gateway/tall/v1.0 +@tall = http://test.tall.wiki/gateway/tall/v1.0 +@bin = https://test.tall.wiki/gateway/wisdomcar/debug/record @greenvalley = http://www.sxwikionline.com/gateway/greenvalley @type = content-type: application/json;charset=utf-8 @@ -54,3 +55,18 @@ Authorization: Bearer {{login.response.body.$.data.token}} "teamName": "" } } + +### 根据团队id查看研发团队相关信息 + +POST {{bin}} +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param": { + "carNumber":"001", + "type":"1", + "value":"70000", + "time":"1607937529000", + } +} diff --git a/src/common/index.styl b/src/common/index.styl index 5d6b91d..73ed138 100644 --- a/src/common/index.styl +++ b/src/common/index.styl @@ -26,8 +26,8 @@ .wrap .bg-top .animation{ position: absolute; top: -1px; - left: 21.5%; - width: 57%; + left: 14%; + width: 72%; height: 162px; } diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue index 2490625..d59f645 100644 --- a/src/components/Panel/Panel.vue +++ b/src/components/Panel/Panel.vue @@ -4,21 +4,21 @@
患者体重(kg) - 60.00 + {{ weightMessage }}
药物剂量(mg) - 55.00 + {{ thrombolyticDose }}
团注剂量(mg) - 5.40 + {{ bolusDose }}
维持剂量(mg) - 48.60 + {{ maintenanceDose }}
@@ -29,13 +29,16 @@
-
123
+
+
{{ item }}
+
- + diff --git a/src/components/Sensor/Sensor.js b/src/components/Sensor/Sensor.js index d36ceec..8691980 100644 --- a/src/components/Sensor/Sensor.js +++ b/src/components/Sensor/Sensor.js @@ -3,8 +3,8 @@ const mixin = { data() { return { series1: [10, 20, 30, 10, 20, 30, 10, 20, 30], // 传感器1 - series2: [20, 30, 10, 20, 30, 10, 20, 30, 10], // 传感器1 - series3: [30, 10, 20, 30, 10, 20, 30, 10, 20], // 传感器1 + series2: [20, 30, 10, 20, 30, 10, 20, 30, 10], // 传感器2 + series3: [30, 10, 20, 30, 10, 20, 30, 10, 20], // 传感器3 }; }, computed: { @@ -13,7 +13,7 @@ const mixin = { return { legend: { x: 'center', - y: 'top', + y: '8%', data: ['传感器1', '传感器2', '传感器3'], textStyle: { fontWeight: 'normal', diff --git a/src/components/Statistics/Statistics.js b/src/components/Statistics/Statistics.js index 71cff98..57fa16f 100644 --- a/src/components/Statistics/Statistics.js +++ b/src/components/Statistics/Statistics.js @@ -17,7 +17,7 @@ const mixin = { legend: [ { x: 'center', - y: 'top', + y: '8%', data: ['本年', '去年'], textStyle: { fontWeight: 'normal', diff --git a/src/router/index.js b/src/router/index.js index 0cd1f16..bd6ac85 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,12 +11,12 @@ const routes = [ name: 'Home', component: Home, }, - // 白框框显示内容界面 - // { - // path: '/Index', - // name: 'Index', - // component: () => import(/* webpackChunkName: "Index" */ 'views/Index/Index.vue'), - // }, + // 模拟按钮界面 + { + path: '/BtnPage', + name: 'BtnPage', + component: () => import(/* webpackChunkName: "Index" */ 'views/BtnPage/BtnPage.vue'), + }, ]; const router = new VueRouter({ diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue new file mode 100644 index 0000000..1ca651a --- /dev/null +++ b/src/views/BtnPage/BtnPage.vue @@ -0,0 +1,49 @@ + + + + +