更新一版

2 years ago · 3061e33d46
parent dd08e3be54
commit 3061e33d46
10 changed files with 50 additions and 46 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -19,6 +19,7 @@ export default {
  mounted() {
    setTimeout(() => {
      this.isLoding = false;
+      this.enterFullscreen();
    }, 1000);
  },
  methods: {
--- a/src/views/pageMonitor/bottomLeft/index.vue
+++ b/src/views/pageMonitor/bottomLeft/index.vue
@ -23,38 +23,29 @@ export default {
        series: [
          {
            type: 'pie',
-            radius: ['40%', '55%'],
-            itemStyle: {
-              borderRadius: 10,
-              borderColor: '#fff',
-              borderWidth: 2,
-            },
+            radius: ['32%', '44%'],
            data: [
              {
                name: '一级',
-                value: 300,
+                value: 148,
              },
              {
                name: '二级',
-                value: 250,
+                value: 87,
              },
              {
                name: '三级',
-                value: 250,
+                value: 75,
              },
              {
                name: '四级',
-                value: 100,
-              },
-              {
-                name: '五级',
-                value: 80,
+                value: 40,
              },
            ],
            outsideLabel: {
              formatter: '{name}{value}',
              labelLineBendGap: '8%',
-              labelLineEndLength: 8,
+              labelLineEndLength: 10,
              style: {
                fontSize: 16,
              },
@ -66,29 +57,33 @@ export default {
        series: [
          {
            type: 'pie',
-            radius: ['40%', '55%'],
+            radius: ['32%', '44%'],
            data: [
              {
                name: 'I级',
-                value: 80,
+                value: 137,
              },
              {
                name: 'II级',
-                value: 50,
+                value: 105,
              },
              {
                name: 'III级',
-                value: 10,
+                value: 58,
              },
              {
                name: 'IV级',
-                value: 20,
+                value: 37,
+              },
+              {
+                name: 'V级',
+                value: 13,
              },
            ],
            outsideLabel: {
              formatter: '{name}{value}',
              labelLineBendGap: '8%',
-              labelLineEndLength: 8,
+              labelLineEndLength: 10,
              style: {
                fontSize: 16,
              },
@ -103,7 +98,7 @@ export default {

 <style lang="scss" scoped>
 .bottomLeft {
-  flex-basis: 40%;
+  flex-basis: 38%;
  .chartsBox {
    width: 100%;
    height: 100%;
--- a/src/views/pageMonitor/bottomMiddle/index.vue
+++ b/src/views/pageMonitor/bottomMiddle/index.vue
@ -41,7 +41,7 @@ export default {
        },
        yAxis: {
          type: 'category',
-          data: ['择期手术', '急诊手术', '门诊手术', '无痛手术', '日间手术', '外科手术'],
+          data: ['无痛手术', '门诊手术', '日间手术', '急诊手术', '择期手术'],
          axisLabel: {
            style: {
              stroke: '#fff',
@ -56,7 +56,7 @@ export default {
        series: [
          {
            type: 'bar',
-            data: [10, 20, 25, 30, 40, 80],
+            data: [160, 238, 326, 352, 724],
            barWidth: '40%',
            label: {
              show: true,
@ -84,7 +84,7 @@ export default {

 <style lang="scss" scoped>
 .bottomMiddle {
-  flex-basis: 28%;
+  flex-basis: 30%;
  .chartsBox {
    width: 100%;
    height: 100%;
--- a/src/views/pageMonitor/bottomRight/index.vue
+++ b/src/views/pageMonitor/bottomRight/index.vue
@ -38,6 +38,7 @@ export default {
          type: 'value',
          data: 'value',
          max: '1%',
+          min: 0,
          axisLabel: {
            style: {
              stroke: '#fff',
@ -50,7 +51,7 @@ export default {
        series: [
          {
            type: 'bar',
-            data: [200, 150, 120, 80, 70],
+            data: [180, 165, 155, 148, 137],
            barWidth: '40%',
            label: {
              show: true,
@ -75,7 +76,7 @@ export default {

 <style lang="scss" scoped>
 .bottomRight {
-  flex-basis: 28%;
+  flex-basis: 30%;
  .chartsBox {
    width: 100%;
    height: 100%;
--- a/src/views/pageMonitor/index.vue
+++ b/src/views/pageMonitor/index.vue
@ -6,8 +6,8 @@
        <topRight></topRight>
      </div>
      <div class="bottomBox">
-        <bottomLeft></bottomLeft>
        <bottomMiddle></bottomMiddle>
+        <bottomLeft></bottomLeft>
        <bottomRight></bottomRight>
      </div>
    </section>
@ -42,6 +42,7 @@ export default {
  }
  .topBox {
    display: flex;
+    justify-content: space-between;
  }
  .bottomBox {
    display: flex;
--- a/src/views/pageMonitor/topLeft/index.vue
+++ b/src/views/pageMonitor/topLeft/index.vue
@ -11,12 +11,12 @@
          <p>手术间利用率</p>
        </dv-border-box-2>
        <dv-border-box-2 class="item">
-          <p>总人数 <span class="numFont">400</span></p>
-          <p>进行中 <span class="numFont">180</span></p>
+          <p>总人数 <span class="numFont">350</span></p>
+          <p>进行中 <span class="numFont">50</span></p>
          <p>待进行 <span class="numFont">220</span></p>
        </dv-border-box-2>
        <dv-border-box-2 class="item">
-          <p class="active numFont">80个</p>
+          <p class="active numFont">50个</p>
          <p>急诊患者</p>
        </dv-border-box-2>
      </div>
@ -34,7 +34,7 @@ export default {

 <style lang="scss" scoped>
 .topLeft {
-  flex-basis: 32%;
+  flex-basis: 30%;
  .box {
    height: 100%;
    display: flex;
@ -75,6 +75,12 @@ export default {
        }
      }
    }
+    .item:nth-child(3) {
+      p {
+        min-width: 13vh;
+        text-align: left;
+      }
+    }
  }
 }
 </style>
--- a/src/views/pageMonitor/topRight/index.vue
+++ b/src/views/pageMonitor/topRight/index.vue
@ -6,7 +6,7 @@
          <template v-for="(item1, index) in 21">
            <div class="item" :key="item1">
              <dv-border-box-2>
-                <p class="numFont">WK{{ String(index + 1).padStart(2, '0') }}</p>
+                <p class="numFont">{{ String(index + 1).padStart(3, '0') }}</p>
                <p v-if="index % 3" style="color: #f00">手术中</p>
                <p v-else-if="index % 5" style="color: #ff0">麻醉结束</p>
                <p v-else style="color: #fff">空置中</p>
@ -31,8 +31,7 @@ export default {

 <style lang="scss" scoped>
 .topRight {
-  flex-basis: 65%;
-  margin-left: 3%;
+  flex-basis: 69%;
  :deep(.el-carousel) {
    height: 100%;
    .el-carousel__container {
--- a/src/views/pageOperation/leftTop/index.vue
+++ b/src/views/pageOperation/leftTop/index.vue
@ -3,8 +3,8 @@
    <dv-border-box-13>
      <dv-charts :option="option"></dv-charts>
      <section class="dataSection">
-        <p>总人数<span class="numFont">400</span></p>
-        <p>进行中<span class="numFont">180</span></p>
+        <p>总人数<span class="numFont">350</span></p>
+        <p>进行中<span class="numFont">50</span></p>
        <p>待进行<span class="numFont">220</span></p>
      </section>
    </dv-border-box-13>
@ -23,7 +23,7 @@ export default {
            endAngle: Math.PI * 1.5,
            arcLineWidth: 35,
            center: ['50%', '45%'],
-            data: [{ name: 'itemA', value: 80, gradient: ['#03c2fd', '#1ed3e5', '#2fded6'] }],
+            data: [{ name: 'itemA', value: 86, gradient: ['#03c2fd', '#1ed3e5', '#2fded6'] }],
            axisLabel: {
              show: false,
            },
@ -69,15 +69,16 @@ export default {
    }
  }
  .dataSection {
-    width: 100%;
    position: absolute;
    bottom: 1.2vh;
+    left: 50%;
+    transform: translateX(-50%);
    p {
      color: #fff;
      font-size: 2.4vh;
-      text-align: center;
      letter-spacing: .2vh;
      line-height: 4vh;
+      text-align: left;
      span {
        font-size: 2.6vh;
        color: aqua;
--- a/src/views/pageRoom/leftMiddle/index.vue
+++ b/src/views/pageRoom/leftMiddle/index.vue
@ -4,7 +4,7 @@
      <dv-border-box-2 class="item">
        <dv-charts :option="option"></dv-charts>
        <section class="dataSection">
-          <p>手术间数<span class="numFont">100</span></p>
+          <p>手术间数<span class="numFont">60</span></p>
        </section>
      </dv-border-box-2>
      <dv-decoration-2 />
@ -30,7 +30,7 @@ export default {
            endAngle: Math.PI * 1.5,
            arcLineWidth: 35,
            center: ['50%', '45%'],
-            data: [{ name: 'itemA', value: 80, gradient: ['#03c2fd', '#1ed3e5', '#2fded6'] }],
+            data: [{ name: 'itemA', value: 86, gradient: ['#03c2fd', '#1ed3e5', '#2fded6'] }],
            axisLabel: {
              show: false,
            },
--- a/src/views/pageRoom/rightMiddle/index.vue
+++ b/src/views/pageRoom/rightMiddle/index.vue
@ -25,7 +25,7 @@ export default {
          type: 'scroll',
          data: ['手术准备', '手术中', '完成手术'],
          top: 10,
-          left: 10,
+          right: 1,
          textStyle: {
            color: '#fff',
            fontSize: 14,