diff --git a/src/common/index.styl b/src/common/index.styl index 73ed138..357d399 100644 --- a/src/common/index.styl +++ b/src/common/index.styl @@ -21,6 +21,7 @@ height: 100.64px; left: 1.5%; top: 0; + z-index: 9; } .wrap .bg-top .animation{ diff --git a/src/components/Duration/Duration.js b/src/components/Duration/Duration.js index 4e9ee92..940eacf 100644 --- a/src/components/Duration/Duration.js +++ b/src/components/Duration/Duration.js @@ -88,11 +88,11 @@ const mixin = { // symbol: 'star', data: this.pointTimeHospital, color: 'rgb(18, 131, 227)', - lineStyle: { - shadowColor: '#5cfbff', - shadowBlur: 8, - width: 4, - }, + // lineStyle: { + // shadowColor: '#5cfbff', + // shadowBlur: 8, + // width: 4, + // }, }, { name: '国际水准', @@ -102,11 +102,11 @@ const mixin = { symbolSize: 6, data: this.pointTimeInternation, color: 'rgb(30, 231, 231)', - lineStyle: { - shadowColor: '#5cfbff', - shadowBlur: 8, - width: 4, - }, + // lineStyle: { + // shadowColor: '#5cfbff', + // shadowBlur: 8, + // width: 4, + // }, }, { name: '当前数据', @@ -116,11 +116,11 @@ const mixin = { symbolSize: 6, data: this.pointTimeCurrentList, color: 'rgb(227, 18, 187)', - lineStyle: { - shadowColor: '#5cfbff', - shadowBlur: 8, - width: 4, - }, + // lineStyle: { + // shadowColor: '#5cfbff', + // shadowBlur: 8, + // width: 4, + // }, }, ], }; diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js index dedfdd3..1f5ea58 100644 --- a/src/components/Map/Map.js +++ b/src/components/Map/Map.js @@ -15,7 +15,7 @@ var option = { label: { show: true, //是否显示市 textStyle: { - color: '#aaa', //文字颜色 + color: '#c8ced5', //文字颜色 fontSize: 12, //文字大小 backgroundColor: 'rgba(0,0,0,0)', //透明度0清空文字背景 }, @@ -43,11 +43,11 @@ var option = { //高亮市区 echarts bug 不生效 // regions: [ // { - // name: '运城市', - // value: 0, + // name: '运城', // itemStyle: { + // borderWidth: 3, // areaColor: 'red', - // label: { show: false }, + // color: 'red', // }, // }, // ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index d4999a9..7281f7a 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -22,8 +22,6 @@ export default { let hg = window.innerHeight; this.width = wh + 'px'; this.height = hg + 'px'; - console.log(this.width); - console.log(this.height); window.onresize = () => { return (() => { wh = window.innerWidth; diff --git a/src/components/RFID/RFID.styl b/src/components/RFID/RFID.styl index a4b1644..280ae31 100644 --- a/src/components/RFID/RFID.styl +++ b/src/components/RFID/RFID.styl @@ -3,24 +3,35 @@ } .list { -width: 4.4rem; + width: 4.4rem; height: 4.4rem; - line-height: 4.4rem; - text-align: center; - font-size: 12px; - color: #C8CED5; - background: url('~assets/rfid-bg.png') no-repeat center; - background-size: contain; - position: absolute; + font-size: 12px; + color: #C8CED5; + background: url('~assets/rfid-bg.png') no-repeat center; + background-size: contain; + position: absolute; +} + +.list span{ + display: inline-block; + position: relative; + top: 25%; + width: 100%; + height: 50%; + text-align: center; } .active { - width: 5rem; - height: 5rem; - line-height: 5rem; + width: 5.4rem; + height: 5.4rem; font-size: 12px; background: url('~assets/rfid-bg-active.png') no-repeat center; background-size: contain; + text-align: center; +} + +.list.active span{ + width: 80%; } .list1 { diff --git a/src/components/RFID/RFID.vue b/src/components/RFID/RFID.vue index a03461c..d82d833 100644 --- a/src/components/RFID/RFID.vue +++ b/src/components/RFID/RFID.vue @@ -18,22 +18,14 @@ export default { data() { return { lists: [ - { id: 1, active: false, name: '专科护士' }, - { id: 2, active: false, name: '专科医生' }, - { id: 3, active: false, name: '采血推车' }, - { id: 4, active: false, name: '心电图推车' }, - { id: 5, active: false, name: '介入室' }, - { id: 6, active: false, name: 'CT室' }, - { id: 7, active: false, name: '急救室' }, - { id: 8, active: false, name: '急诊医生' }, - { id: 9, active: false, name: '专科护士' }, - { id: 10, active: false, name: '专科医生' }, - { id: 11, active: false, name: '采血推车' }, - { id: 12, active: false, name: '心电图推车' }, - { id: 13, active: false, name: '介入室' }, - { id: 14, active: false, name: 'CT室' }, - { id: 15, active: false, name: '急救室' }, - { id: 16, 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: 8, active: false, name: '抢救室' }, + { code: 8, active: false, name: '抢救室' }, ], num: 0, //当前正在展示的div }; @@ -55,7 +47,7 @@ export default { // 翻页 for (let a = 0; a < this.newArr.length; a++) { const arr = this.newArr[a]; - const item = arr.find(item => item.id === element.id); + const item = arr.find(item => item.name === element.name); if (item) { this.num = a; } diff --git a/src/config/api.js b/src/config/api.js index 844c0e1..a05d9b5 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -12,6 +12,9 @@ const statistics = `${wisdomcar}/statistics`; // 盐湖医院相关接口 // websocket基础地址 export const WS_BASE_URL = msgUrl; +// 按钮模拟信息发送 +export const record = params => axios.post(`${wisdomcar}/debug/record`, params); + // 急救数量统计图数据 export const selResult = params => axios.post(`${statistics}/get/selResult`, params); // 急救市场分析统计图数据 diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue index 1ca651a..b055f4e 100644 --- a/src/views/BtnPage/BtnPage.vue +++ b/src/views/BtnPage/BtnPage.vue @@ -1,48 +1,168 @@