diff --git a/src/App.vue b/src/App.vue index 8e886b3..348e045 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,7 @@ export default { enterFullscreen() { const element = document.documentElement; // 请求全屏模式 - if (!this.isLoding) { + if (this.isLoding) { if (element.webkitRequestFullscreen) { // Chrome, Safari and Opera element.webkitRequestFullscreen(); diff --git a/src/components/comHeader/index.vue b/src/components/comHeader/index.vue index 4e6b3e2..63b6589 100644 --- a/src/components/comHeader/index.vue +++ b/src/components/comHeader/index.vue @@ -5,7 +5,7 @@
{{ $route.meta.title }}
- {{ curTime }} + {{ curTime }} @@ -97,7 +97,7 @@ Header { height: 3vh; font-size: 1.8vh; font-weight: 400; - right: 19vh; + right: 17vh; top: 4.2vh; span { margin: 0 8px; diff --git a/src/views/pageOperation/leftBottom/index.vue b/src/views/pageOperation/leftBottom/index.vue index 05bf3d9..e4ab671 100644 --- a/src/views/pageOperation/leftBottom/index.vue +++ b/src/views/pageOperation/leftBottom/index.vue @@ -22,6 +22,7 @@ export default { data: ['3月', '4月', '5月', '6月', '7月', '8月'], axisLabel: { color: '#fff', + fontFamily: 'DIN-Bold,Microsoft YaHei', }, }, yAxis: { @@ -29,12 +30,22 @@ export default { axisLabel: { formatter: '{value}%', color: '#fff', + fontFamily: 'DIN-Bold,Microsoft YaHei', + }, + splitLine: { + lineStyle: { + color: 'rgba(0,142,114,0.3)', + width: 0.5, + }, }, }, series: [ { data: [95, 97, 96, 98, 99, 96], type: 'line', + itemStyle: { + color: '#30FDFF', + }, areaStyle: { color: { type: 'linear', diff --git a/src/views/pageOperation/rightMiddle/index.vue b/src/views/pageOperation/rightMiddle/index.vue index 634226d..948b156 100644 --- a/src/views/pageOperation/rightMiddle/index.vue +++ b/src/views/pageOperation/rightMiddle/index.vue @@ -8,7 +8,7 @@ diff --git a/src/views/pageRoom/leftBottom/index.vue b/src/views/pageRoom/leftBottom/index.vue new file mode 100644 index 0000000..5c1caba --- /dev/null +++ b/src/views/pageRoom/leftBottom/index.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/pageRoom/leftMiddle/index.vue b/src/views/pageRoom/leftMiddle/index.vue deleted file mode 100644 index fc88fae..0000000 --- a/src/views/pageRoom/leftMiddle/index.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/src/views/pageRoom/leftTop/index.vue b/src/views/pageRoom/leftTop/index.vue new file mode 100644 index 0000000..7fea319 --- /dev/null +++ b/src/views/pageRoom/leftTop/index.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/views/pageRoom/rightMiddle/index.vue b/src/views/pageRoom/rightMiddle/index.vue index b961a86..296ce35 100644 --- a/src/views/pageRoom/rightMiddle/index.vue +++ b/src/views/pageRoom/rightMiddle/index.vue @@ -27,28 +27,28 @@ export default { name: '入手术室', icon: 'rect', itemStyle: { - color: '#fce94e', + color: '#92CC76', }, }, { name: '开始手术', icon: 'rect', itemStyle: { - color: '#e889a8', + color: '#EF6666', }, }, { name: '手术结束', icon: 'rect', itemStyle: { - color: '#efb763', + color: '#FAC858', }, }, { name: '出手术室', icon: 'rect', itemStyle: { - color: '#64cfb7', + color: '#5470C6', }, }, ], @@ -58,6 +58,7 @@ export default { textStyle: { color: '#fff', fontSize: 14, + fontFamily: 'DIN-Bold,Microsoft YaHei', }, }, xAxis: { @@ -65,8 +66,9 @@ export default { position: 'top', splitNumber: 24, axisLabel: { - color: '#fff', - fontSize: 14, + color: '#B7BDBF', + fontSize: 12, + margin: 16, formatter: function (value) { var date = new Date(value); var hours = date.getHours(); @@ -83,8 +85,10 @@ export default { type: 'category', data: [], axisLabel: { - color: '#fff', - fontSize: 14, + color: '#B7BDBF', + fontSize: 12, + margin: 16, + fontFamily: 'DIN-Bold,Microsoft YaHei', }, }, series: [], @@ -106,7 +110,7 @@ export default { const timeArr = []; // 生成手术间 for (let index = num; index >= 1; index--) { - this.chartOptions.yAxis.data.push(`手术间${String(index).padStart(2, '0')}`); + this.chartOptions.yAxis.data.push(`手术间${String(index).padStart(3, '0')}`); const isUseArr = this.getUseTime(); for (let j = 1; j < isUseArr.length; j += 2) { if (isUseArr[j] <= hours) { @@ -114,7 +118,7 @@ export default { startTime: `${currentDate} ${isUseArr[j - 1]}:00:00`, endTime: `${currentDate} ${isUseArr[j]}:00:00`, yValue: index - 1, - color: '#64cfb7', + color: '#5470C6', diff: dayjs(`${currentDate} ${isUseArr[j]}:00:00`).diff( dayjs(`${currentDate} ${isUseArr[j - 1]}:00:00`), 'minute' @@ -127,7 +131,7 @@ export default { startTime: `${currentDate} ${isUseArr[j - 1]}:00:00`, endTime: `${currentDate} ${detailMin}`, yValue: index - 1, - color: '#e889a8', + color: '#EF6666', diff: dayjs(`${currentDate} ${detailMin}`).diff( dayjs(`${currentDate} ${isUseArr[j - 1]}:00:00`), 'minute' @@ -139,7 +143,7 @@ export default { startTime: `${currentDate} ${isUseArr[j - 1]}:00:00`, endTime: `${currentDate} ${detailMin}`, yValue: index - 1, - color: '#efb763', + color: '#FAC858', diff: dayjs(`${currentDate} ${detailMin}`).diff( dayjs(`${currentDate} ${isUseArr[j - 1]}:00:00`), 'minute' @@ -152,7 +156,7 @@ export default { startTime: `${currentDate} ${sevenMinutesAgo}`, endTime: `${currentDate} ${detailMin}`, yValue: index - 1, - color: '#fce94e', + color: '#92CC76', diff: '7', name: '入手术室', }); @@ -195,8 +199,8 @@ export default { position: [textX, textY], style: { text: `${item.diff} min`, - fill: '#fff', - textSize: '14px', + fill: '#B7BDBF', + textSize: '12px', textAlign: 'center', }, }, @@ -231,10 +235,6 @@ export default { const chartContainer = this.$refs.echartsContainer; const chart = echarts.init(chartContainer); this.initData(); - // console.group('group'); - // console.log(this.chartOptions); - // console.log(JSON.stringify(this.chartOptions)); - // console.groupEnd(); chart.setOption(this.chartOptions); }, }; @@ -243,6 +243,7 @@ export default {