Browse Source

环节修改

master
aBin 4 years ago
parent
commit
6508e47dd0
  1. 6
      .env.development
  2. 2
      .env.production
  3. 162
      package-lock.json
  4. 20
      src/components/Duration/Duration.js
  5. 24
      src/components/Panel/Panel.vue
  6. 32
      src/components/RFID/RFID.vue
  7. 13
      src/components/Sensor/Sensor.vue
  8. 9
      src/config/api.js
  9. 97
      src/views/BtnPage/BtnPage.vue

6
.env.development

@ -1,10 +1,10 @@
VUE_APP_MODE=development
VUE_APP_NODE_ENV=development
VUE_APP_SCENE=wisdomcar
VUE_APP_BASE_URL=http://test.tall.wiki/
VUE_APP_API_URL=http://test.tall.wiki/wisdomcar
VUE_APP_BASE_URL=http://www.tall.wiki/
VUE_APP_API_URL=http://www.tall.wiki/gateway
VUE_APP_PROXY_URL=/gateway
VUE_APP_PUBLIC_PATH=/wisdomcar
VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
VUE_APP_TITLE=盐湖区人民医院数字看板
VUE_APP_DESCRIPTION=盐湖区人民医院数字看板

2
.env.production

@ -2,7 +2,7 @@ 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/wisdomcar
VUE_APP_API_URL=http://www.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

162
package-lock.json

@ -1808,16 +1808,6 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792302448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"cacache": {
"version": "13.0.1",
"resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@ -1850,34 +1840,6 @@
"integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
"dev": true
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
"integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true,
"optional": true
},
"css-loader": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@ -1931,13 +1893,6 @@
"universalify": "^0.1.0"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"icss-utils": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz",
@ -2052,16 +2007,6 @@
"minipass": "^3.1.1"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1606205010380&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"terser-webpack-plugin": {
"version": "2.3.8",
"resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@ -2078,32 +2023,6 @@
"terser": "^4.6.12",
"webpack-sources": "^1.4.3"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.1.1",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.1.tgz?cache=0&sync_timestamp=1607093652138&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.1.tgz",
"integrity": "sha1-9bKG1grGiGaExjoXoYQ5HMngGZo=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
}
}
},
@ -12655,6 +12574,87 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.2.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
"integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-ref": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/vue-ref/download/vue-ref-2.0.0.tgz",

20
src/components/Duration/Duration.js

@ -31,25 +31,7 @@ const mixin = {
xAxis: {
type: 'category',
boundaryGap: false,
data: [
'呼叫',
'到场',
'评估',
'采血',
'CT',
'谈话',
'签字',
'注射',
'介入',
'手术',
'穿刺',
'DSA',
'溶栓',
'再通',
'支架',
'解脱',
'结束',
],
data: ['呼叫', '分诊', '一线', '采血', '心电', 'CT', '二线', '谈话', '签字', '团注', '介入', '置鞘', '病房'],
axisLabel: {
textStyle: {
fontWeight: 'normal',

24
src/components/Panel/Panel.vue

@ -52,25 +52,7 @@ export default {
from: '#1362B8',
to: '#06D0CA',
},
lists: [
'呼叫',
'到场',
'评估',
'采血',
'CT',
'谈话',
'签字',
'注射',
'介入',
'手术',
'穿刺',
'DSA',
'溶栓',
'再通',
'支架',
'解脱',
'结束',
],
lists: ['呼叫', '分诊', '一线', '采血', '心电', 'CT', '二线', '谈话', '签字', '团注', '介入', '置鞘', '病房'],
info: '呼叫',
};
},
@ -83,9 +65,9 @@ export default {
this.info = '呼叫';
this.setStartMessages(false);
} else {
if (val.step && val.step - 0 > (this.percent * 16) / 100 && val.step - 0 <= 16) {
if (val.step && val.step - 0 > (this.percent * 13) / 100 && val.step - 0 <= 13) {
console.log(val.step - 0, this.percent);
this.percent = ((val.step - 0) * 100) / 16;
this.percent = ((val.step - 0) * 100) / 12;
this.percentA = (this.percent * 100) / 120 + '%';
this.info = this.lists[val.step - 0];
}

32
src/components/RFID/RFID.vue

@ -1,12 +1,7 @@
<template>
<div class="flex-1 flex-column rfid">
<div :key="i + 1" v-for="(arr, i) in newArr" v-show="i === num">
<div
:class="`list${index + 1} ${item.active ? 'active' : ''}`"
:key="index"
class="list"
v-for="(item, index) in arr"
>
<div :class="`list${index + 1} ${item.active ? 'active' : ''}`" :key="index" class="list" v-for="(item, index) in arr">
<span>{{ item.name }}</span>
</div>
</div>
@ -20,12 +15,25 @@ export default {
data() {
return {
lists: [
{ code: '1', active: false, name: '急救护士到场' },
{ code: '1', active: false, name: '急救医生到场' },
{ code: '3', active: false, name: '护士采血' },
{ code: '3', active: false, name: '采血车到场' },
{ code: '4', active: false, name: 'CT室' },
{ code: '8', active: false, name: '介入室' },
{ code: '0', active: false, name: '呼叫' },
{ code: '1', active: false, name: '分诊' },
{ code: '2', active: false, name: '一线' },
{ code: '3', active: false, name: '采血' },
{ code: '4', active: false, name: '心电' },
{ code: '5', active: false, name: 'CT' },
{ code: '6', active: false, name: '二线' },
{ code: '7', active: false, name: '谈话' },
{ code: '8', active: false, name: '签字' },
{ code: '9', active: false, name: '团注' },
{ code: '10', active: false, name: '介入' },
{ code: '11', active: false, name: '置鞘' },
{ code: '12', active: false, name: '病房' },
// { code: '1', active: false, name: '' },
// { code: '1', active: false, name: '' },
// { code: '3', active: false, name: '' },
// { code: '3', active: false, name: '' },
// { code: '4', active: false, name: 'CT' },
// { code: '8', active: false, name: '' },
{ code: '17', active: false, name: '分诊区' },
{ code: '18', active: false, name: '平车停放点' },
{ code: '19', active: false, name: '卒中中心' },

13
src/components/Sensor/Sensor.vue

@ -1,3 +1,10 @@
<!--
* @Author: aBin
* @email: binbin0314@126.com
* @Date: 2021-06-05 12:16:54
* @LastEditors: aBin
* @LastEditTime: 2021-06-05 14:27:55
-->
<template>
<!-- <div>数据统计组件</div> -->
<div :style="{ width: 'width', height: 'height' }" class="chart-box">
@ -18,7 +25,7 @@ export default {
},
watch: {
vibrationSensor(val) {
console.log(val.value);
// console.log(val.value);
if (val.type === 7) {
var vibList = val.value.split(',');
this.series1 = this.series1.concat(parseInt(vibList[0]));
@ -26,7 +33,7 @@ export default {
this.series3 = this.series3.concat(parseInt(vibList[2]));
this.drawLine();
}
console.log(this.series1, this.series2, this.series3);
// console.log(this.series1, this.series2, this.series3);
},
},
mounted() {
@ -35,7 +42,7 @@ export default {
let hg = window.innerHeight;
this.width = wh + 'px';
this.height = hg + 'px';
console.log(this.height);
// console.log(this.height);
window.onresize = () => {
return (() => {
wh = window.innerWidth;

9
src/config/api.js

@ -1,3 +1,10 @@
/*
* @Author: aBin
* @email: binbin0314@126.com
* @Date: 2021-06-05 12:16:54
* @LastEditors: aBin
* @LastEditTime: 2021-06-05 12:23:17
*/
/*
* Copyright (c) 2019.
* author: wally
@ -6,7 +13,7 @@
import axios from 'axios';
let { proxyUrl, msgUrl } = require('@/config/setting');
const wisdomcar = `${proxyUrl}/wisdomcar`; // 盐湖医院分路径
const wisdomcar = `${proxyUrl}/wisdomcar2`; // 盐湖医院分路径
const statistics = `${wisdomcar}/statistics`; // 盐湖医院相关接口
// websocket基础地址

97
src/views/BtnPage/BtnPage.vue

@ -1,12 +1,8 @@
<template>
<div class="wrap">
<a-button @click="sendData(20)" type="primary">呼叫</a-button>
<a-button
:key="index"
@click="sendData(index)"
type="primary"
v-for="(item, index) in nameList"
>{{ item.name }}</a-button>
<div class="ml-3">平车: (必填,默认平车Id : 146)<a-input style="width: 150px" class="mx-2" v-model="carNum" /></div>
<a-button @click="sendData(20)" type="primary">开始</a-button>
<a-button :key="index" @click="sendData(index)" type="primary" v-for="(item, index) in nameList">{{ item.name }}</a-button>
<a-button @click="sendData(21)" type="primary">震动传感器</a-button>
<a-button @click="sendData(25)" type="primary">药物剂量</a-button>
<a-button @click="sendData(26)" type="primary">团注剂量</a-button>
@ -23,29 +19,81 @@ export default {
str: '模拟按钮界面',
nameList: [
{
name: '分诊区',
value: '1',
name: '呼叫',
value: '0',
},
{
name: '急救护士',
value: '11',
name: '分诊',
value: '1',
},
{
name: '急救医生',
value: '11',
name: '一线',
value: '2',
},
{
name: '采血',
value: '12',
name: '采血',
value: '3',
},
{
name: 'CT室',
value: '3',
name: '心电',
value: '4',
},
{
name: '介入室',
name: 'CT',
value: '5',
},
{
name: '二线',
value: '6',
},
{
name: '谈话',
value: '7',
},
{
name: '签字',
value: '8',
},
{
name: '团注',
value: '9',
},
{
name: '介入',
value: '10',
},
{
name: '置鞘',
value: '11',
},
{
name: '病房',
value: '12',
},
// {
// name: '',
// value: '1',
// },
// {
// name: '',
// value: '11',
// },
// {
// name: '',
// value: '11',
// },
// {
// name: '',
// value: '12',
// },
// {
// name: 'CT',
// value: '3',
// },
// {
// name: '',
// value: '5',
// },
{
name: '平车停放点',
value: '32',
@ -83,6 +131,7 @@ export default {
value: '40',
},
],
carNum: 146,
};
},
methods: {
@ -93,7 +142,7 @@ export default {
if (index === 20) {
params = {
param: {
authId: '1',
authId: this.carNum,
type: '0',
value: '80000',
time: new Date().getTime(),
@ -102,7 +151,7 @@ export default {
} else if (index === 21) {
params = {
param: {
authId: '1',
authId: this.carNum,
type: '7',
value: '10,20,30',
time: new Date().getTime(),
@ -111,7 +160,7 @@ export default {
} else if (index === 25) {
params = {
param: {
authId: '1',
authId: this.carNum,
type: '8',
value: '50.2',
time: new Date().getTime(),
@ -120,7 +169,7 @@ export default {
} else if (index === 26) {
params = {
param: {
authId: '1',
authId: this.carNum,
type: '9',
value: '6.4',
time: new Date().getTime(),
@ -129,7 +178,7 @@ export default {
} else if (index === 27) {
params = {
param: {
authId: '1',
authId: this.carNum,
type: '10',
value: '60.1',
time: new Date().getTime(),
@ -138,7 +187,7 @@ export default {
} else if (index < 20) {
params = {
param: {
authId: '1',
authId: this.carNum,
type: '2',
value: this.nameList[index].value,
time: new Date().getTime(),

Loading…
Cancel
Save