diff --git a/.gitignore b/.gitignore index 380349c..d928aee 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ pnpm-debug.log* *.njsproj *.sln *.sw? +*.zip diff --git a/src/App.vue b/src/App.vue index 3aba393..afb1e35 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,21 +14,21 @@ export default { methods: { enterFullscreen() { // 请求全屏模式 - // const element = document.documentElement; - // if (!this.isLoding) { - // if (element.webkitRequestFullscreen) { - // // Chrome, Safari and Opera - // element.webkitRequestFullscreen(); - // } else if (element.msRequestFullscreen) { - // // IE/Edge - // element.msRequestFullscreen(); - // } else if (element.mozRequestFullScreen) { - // // Firefox - // element.mozRequestFullScreen(); - // } else if (element.requestFullscreen) { - // element.requestFullscreen(); - // } - // } + const element = document.documentElement; + if (!this.isLoding) { + if (element.webkitRequestFullscreen) { + // Chrome, Safari and Opera + element.webkitRequestFullscreen(); + } else if (element.msRequestFullscreen) { + // IE/Edge + element.msRequestFullscreen(); + } else if (element.mozRequestFullScreen) { + // Firefox + element.mozRequestFullScreen(); + } else if (element.requestFullscreen) { + element.requestFullscreen(); + } + } }, }, }; diff --git a/src/assets/img/Operation/LeftTop/Box.png b/src/assets/img/Operation/LeftTop/Box.png new file mode 100644 index 0000000..28b4152 Binary files /dev/null and b/src/assets/img/Operation/LeftTop/Box.png differ diff --git a/src/assets/img/Schedule/Box.png b/src/assets/img/Schedule/Box.png new file mode 100644 index 0000000..498fd45 Binary files /dev/null and b/src/assets/img/Schedule/Box.png differ diff --git a/src/assets/svg/Room/LeftBottom/Box.svg b/src/assets/svg/Room/LeftBottom/Box.svg index 3e13e33..ae941b8 100644 --- a/src/assets/svg/Room/LeftBottom/Box.svg +++ b/src/assets/svg/Room/LeftBottom/Box.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg/Room/LeftTop/Box.svg b/src/assets/svg/Room/LeftTop/Box.svg index 55794f6..592ed9f 100644 --- a/src/assets/svg/Room/LeftTop/Box.svg +++ b/src/assets/svg/Room/LeftTop/Box.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg/Room/RightMid/Box.svg b/src/assets/svg/Room/RightMid/Box.svg index 807ddae..adc290c 100644 --- a/src/assets/svg/Room/RightMid/Box.svg +++ b/src/assets/svg/Room/RightMid/Box.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 143d90a..72b8e55 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -5,7 +5,7 @@ Vue.use(Vuex); export default new Vuex.Store({ state: { - isMock: true, + isMock: false, intervalTime: 30000, // 请求间隔时间 }, getters: { diff --git a/src/views/pageMonitor/bottomLeft/index.vue b/src/views/pageMonitor/bottomLeft/index.vue index 9159461..64e3089 100644 --- a/src/views/pageMonitor/bottomLeft/index.vue +++ b/src/views/pageMonitor/bottomLeft/index.vue @@ -57,9 +57,6 @@ export default { }); }, updateChart() { - if (!this.myChart) { - this.myChart = echarts.init(document.getElementById("chartBottomLeft")); - } let categories = ['择期手术', '急诊手术', '日间手术', '门诊手术'] let maxVal = 10 if (Math.max(...this.getDataList) > 0) { @@ -132,10 +129,14 @@ export default { }, }, mounted() { + this.myChart = echarts.init(document.getElementById("chartBottomLeft")); this.onGetPageData(); setInterval(() => { this.changeActive() }, this.$store.getters.intervalTime); + window.addEventListener("resize", () => { + this.myChart.resize(); + }); }, }; diff --git a/src/views/pageMonitor/bottomRight/eLeft.vue b/src/views/pageMonitor/bottomRight/eLeft.vue index 19f3ca8..875ca7b 100644 --- a/src/views/pageMonitor/bottomRight/eLeft.vue +++ b/src/views/pageMonitor/bottomRight/eLeft.vue @@ -42,10 +42,6 @@ export default { }); }, updateChart() { - if (!this.myChart) { - this.myChart = echarts.init(document.getElementById("chartBottomMidLeft")); - } - const total = this.pageList.reduce((sum, item) => sum + item.value, 0); // 每个数据后面插入一个透明块，用来制造断开效果 @@ -111,7 +107,11 @@ export default { } }, mounted() { + this.myChart = echarts.init(document.getElementById("chartBottomMidLeft")); this.onGetPageData(); + window.addEventListener("resize", () => { + this.myChart.resize(); + }); }, }; diff --git a/src/views/pageMonitor/bottomRight/eMid.vue b/src/views/pageMonitor/bottomRight/eMid.vue index b247d8c..de31ca7 100644 --- a/src/views/pageMonitor/bottomRight/eMid.vue +++ b/src/views/pageMonitor/bottomRight/eMid.vue @@ -48,10 +48,6 @@ export default { }); }, updateChart() { - if (!this.myChart) { - this.myChart = echarts.init(document.getElementById("chartBottomMid")); - } - const total = this.pageList.reduce((sum, item) => sum + item.value, 0); // 每个数据后面插入一个透明块，用来制造断开效果 @@ -117,7 +113,11 @@ export default { } }, mounted() { + this.myChart = echarts.init(document.getElementById("chartBottomMid")); this.onGetPageData(); + window.addEventListener("resize", () => { + this.myChart.resize(); + }); }, }; diff --git a/src/views/pageMonitor/bottomRight/eRight.vue b/src/views/pageMonitor/bottomRight/eRight.vue index 012043d..5f4c303 100644 --- a/src/views/pageMonitor/bottomRight/eRight.vue +++ b/src/views/pageMonitor/bottomRight/eRight.vue @@ -58,9 +58,6 @@ export default { }); }, updateChart() { - if (!this.myChart) { - this.myChart = echarts.init(document.getElementById("chartBottomRight")); - } let categories = ['骨科', '普外科', '内科', '神经外科', '肿瘤科'] let values = [0, 0, 0, 0, 0] let maxVal = 20; @@ -128,10 +125,14 @@ export default { }, }, mounted() { + this.myChart = echarts.init(document.getElementById("chartBottomRight")); this.onGetPageData(); setInterval(() => { this.changeActive() }, this.$store.getters.intervalTime); + window.addEventListener("resize", () => { + this.myChart.resize(); + }); }, }; diff --git a/src/views/pageOperation/leftBottom/index.vue b/src/views/pageOperation/leftBottom/index.vue index a1fafb4..c66f7fc 100644 --- a/src/views/pageOperation/leftBottom/index.vue +++ b/src/views/pageOperation/leftBottom/index.vue @@ -97,6 +97,9 @@ export default { setInterval(() => { this.onGetPageData(); }, this.$store.getters.intervalTime); + window.addEventListener("resize", () => { + chart.resize(); + }); }, }; @@ -107,7 +110,7 @@ export default { width: vw(560); height: vh(358); background-image: url('@/assets/svg/Operation/LeftBottom/Box.svg'); - background-size: auto; + background-size: 107%; background-position: center; background-repeat: no-repeat; } diff --git a/src/views/pageOperation/leftTop/index.scss b/src/views/pageOperation/leftTop/index.scss index 27e64f3..abab891 100644 --- a/src/views/pageOperation/leftTop/index.scss +++ b/src/views/pageOperation/leftTop/index.scss @@ -3,7 +3,7 @@ box-sizing: border-box; padding: vh(20) vw(20); background-image: url('@/assets/svg/Operation/LeftTop/Box.svg'); - background-size: auto; + background-size: 107%; background-position: center; background-repeat: no-repeat; diff --git a/src/views/pageOperation/leftTop/index.vue b/src/views/pageOperation/leftTop/index.vue index e90e646..02a90c1 100644 --- a/src/views/pageOperation/leftTop/index.vue +++ b/src/views/pageOperation/leftTop/index.vue @@ -165,6 +165,9 @@ export default { setInterval(() => { this.onGetPageData(); }, this.$store.getters.intervalTime); + window.addEventListener("resize", () => { + chart.resize(); + }); }, }; diff --git a/src/views/pageOperation/rightMid/index.scss b/src/views/pageOperation/rightMid/index.scss index 387df0f..57b453c 100644 --- a/src/views/pageOperation/rightMid/index.scss +++ b/src/views/pageOperation/rightMid/index.scss @@ -2,7 +2,7 @@ width: vw(1270); height: vh(904); background-image: url('@/assets/svg/Operation/RightMid/Box.svg'); - background-size: auto; + background-size: 103%; background-position: center; background-repeat: no-repeat; diff --git a/src/views/pageRoom/index.vue b/src/views/pageRoom/index.vue index e3ab60e..65a62bd 100644 --- a/src/views/pageRoom/index.vue +++ b/src/views/pageRoom/index.vue @@ -1,6 +1,6 @@