From 5974b6575bfe8ef180e8357a1ffb7655d327cfad Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Thu, 4 Aug 2022 11:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=AE=A1=E7=90=86)=EF=BC=9A=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=B6=8B=E5=8A=BF=E5=9B=BE=E8=A1=A8=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectHuScreen/components/Card.vue       | 37 ++++++++++
 .../jChart/line/JLineChart.vue                |  2 +-
 .../qualityManage/rightBottom.vue             |  1 -
 .../safeManage/rightBottom.vue                | 67 +++++++++++--------
 4 files changed, 78 insertions(+), 29 deletions(-)
 create mode 100644 src/views/projectAdmin/dataBoard/projectHuScreen/components/Card.vue

diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/components/Card.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/components/Card.vue
new file mode 100644
index 00000000..c6ec0c44
--- /dev/null
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/components/Card.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="h-card">
+    <div class="title">{{ title }}</div>
+    <div class="content">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.h-card {
+  width: 100%;
+  height: 100%;
+  border: 1px solid #0081c3;
+  .title {
+    padding-left: 6px;
+    height: 30px;
+    line-height: 30px;
+    font-size: 18px;
+    color: #6ee4f0;
+  }
+  .content {
+    height: calc(100% - 30px);
+  }
+}
+</style>
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/line/JLineChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/line/JLineChart.vue
index bd630865..8b974d04 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/line/JLineChart.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/line/JLineChart.vue
@@ -16,7 +16,7 @@ export default {
     },
     color: {
       type: Array,
-      default: () => ['#FAC915', '#61D2B9', '#F67F51', '#7851F6']
+      default: () => ['#FAC915', '#ff6c7f', '#6ee4f0', '#F67F51', '#7851F6']
     },
     xData: {
       required: true,
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/qualityManage/rightBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/qualityManage/rightBottom.vue
index d256d25b..e31c6334 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/qualityManage/rightBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/qualityManage/rightBottom.vue
@@ -1,5 +1,4 @@
 <template>
-  <!-- 问题占比 -->
   <div class="problemTrend">
     <div class="title">{{ title }}</div>
     <div class="content">
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/safeManage/rightBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/safeManage/rightBottom.vue
index 05e8990c..c86cc76b 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/safeManage/rightBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/safeManage/rightBottom.vue
@@ -1,42 +1,55 @@
 <template>
-<!-- 隐患趋势 -->
-<div class="container">
-    <div class="titleTxt">{{ title }}</div>
-
-</div>
+  <Card :title="title">
+    <JLineChart :xData="xData" :series="series" />
+  </Card>
 </template>
 
 <script>
+import Card from '../components/Card.vue'
+import JLineChart from '../jChart/line/JLineChart.vue'
 export default {
-
+  components: { Card, JLineChart },
   props: {
     title: {
       type: String,
-      default: "default title"
+      default: 'default title'
     }
   },
   data() {
     return {
-
-    };
-  },
-
-
+      xData: ['地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师'],
+      series: [
+        {
+          data: [100, 235, 232, 532, 112, 532, 449, 269, 998, 33],
+          areaColor: ['rgba(250, 201, 21, .3)', 'rgba(250, 201, 21, .1)'],
+          emphasis: {
+            color: '#FAC915',
+            borderColor: '#FAC915',
+            borderWidth: 10
+          }
+        },
+        {
+          data: [22, 432, 44, 55, 123, 433, 369, 269, 436, 203],
+          areaColor: ['rgba(255, 108, 127, .3)', 'rgba(255, 108, 127, .1)'],
+          emphasis: {
+            color: '#ff6c7f',
+            borderColor: '#ff6c7f',
+            borderWidth: 10
+          }
+        },
+        {
+          data: [655, 111, 224, 152, 65, 541, 334, 556, 326, 203],
+          areaColor: ['rgba(102, 212, 224, .3)', 'rgba(102, 212, 224, .1)'],
+          emphasis: {
+            color: '#6ee4f0',
+            borderColor: '#6ee4f0',
+            borderWidth: 10
+          }
+        }
+      ]
+    }
+  }
 }
 </script>
 
-<style lang="less" scoped>
-.container {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #0081c3;
-
-  .titleTxt {
-    font-size: 18px;
-    color: #6ee4f0;
-    margin-top: 5px;
-    margin-left: 5px;
-  }
-}
-</style>
-
+<style lang="less" scoped></style>