From e82050343df32fcc35c0e93aaf7f904a58adc2c3 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 8 Aug 2024 15:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E8=B5=84=E4=BA=A7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/propertynum/propertynum.html     | 181 +++++++++++++++++-
 .../templates/system/trainnum/trainnum.html   |   6 +-
 .../templates/system/usernum/usernum.html     |   7 +-
 3 files changed, 177 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
index f712829..2b075d0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
@@ -3,9 +3,90 @@
 <head>
     <th:block th:include="include :: header('涉密资产统计')" />
 </head>
+<style>
+    .echart{
+        width: 100%;
+        height: 43%;
+        background-color: white;
+        margin-top: 10px;
+        border-radius: 10px;
+        box-shadow: 1px 1px 3px rgba(0, 0, 0, .2);
+        display: flex;
+        justify-content: space-between;
+        overflow: hidden;
+    }
+    .children_echarts{
+        width: 49%;
+        height: 100%;
+
+    }
+    .statuList{
+        width: 100%;
+        height: 100px;
+        margin-bottom: 10px;
+    }
+    .statuList p{
+        width: 100%;
+        height: 50px;
+        line-height: 50px;
+        margin: 0;
+        color: #000000;
+        font-size: 16px;
+    }
+    .statuList p:nth-of-type(1){
+        border-bottom: 1px solid #cccccc;
+    }
+    .statuList p:nth-of-type(1)::before{
+        content: '';
+        display: inline-block;
+        width: 10px;
+        height: 10px;
+        background-color: #FF5722;
+        border-radius: 50%;
+        margin-right: 10px;
+    }
+    .statuList p:nth-of-type(2)::before{
+        content: '';
+        display: inline-block;
+        width: 10px;
+        height: 10px;
+        background-color: #009688;
+        border-radius: 50%;
+        margin-right: 10px;
+    }
+    .statuList p:nth-of-type(2) span{
+        color: #009688;
+    }
+    .statuList p span{
+        float: right;
+        font-size: 18px;
+        color: #FF5722;
+        border-left: 1px solid #cccccc;
+        border-right: 1px solid #cccccc;
+        height: 20px;
+        line-height: 20px;
+        margin-top: 14px;
+        margin-right: 14px;
+        padding: 0 10px 0 10px;
+        font-weight: bold;
+    }
+</style>
 <body class="gray-bg">
 <div class="container-div" id="app">
     <div class="row">
+        <div class="echart">
+            <div class="children_echarts left_echarts" style="width: 60%">
+                <div id="leftMain" style="width: 800px;height:310px"></div>
+            </div>
+            <div class="children_echarts right_echarts" style="width: 40%">
+                <div class="statuList">
+                    <p v-for="item in statusList">
+                        {{item.name}}<span>{{item.value}}</span>
+                    </p>
+                </div>
+                <div id="rightMain" style="width: 580px;height:200px"></div>
+            </div>
+        </div>
         <div class="col-sm-12 search-collapse">
             <form id="formId">
                 <div class="select-list">
@@ -35,16 +116,13 @@
                 </div>
             </form>
         </div>
-
-        <div class="btn-group-sm" id="toolbar" role="group">
-
-        </div>
-        <div class="col-sm-12 select-table table-striped">
+        <div class="col-sm-12 select-table table-striped" style="min-height: 44%;">
             <table id="bootstrap-table"></table>
         </div>
     </div>
 </div>
 <th:block th:include="include :: footer" />
+<th:block th:include="include :: echarts-js" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:property:edit')}]];
     var printFlag = [[${@permission.hasPermi('system:propertynum:print')}]];
@@ -69,7 +147,12 @@
             Area:'',
             params:{
                 parentId:'',
-            }
+            },
+            statusList:[],
+        },
+        created(){
+            // 初始化状态列表
+            this.getStatusList();
         },
         mounted(){
             // 初始化地市列表
@@ -79,6 +162,14 @@
             }
         },
         methods:{
+            getStatusList(){
+                axios.post(prefix+'/countXH').then((res)=>{
+                    if (res.data.code == web_status.SUCCESS){
+                        console.log(res)
+                        this.statusList = res.data.data
+                    }
+                })
+            },
             getCityList(){
                 $.ajax({
                     url: ctx + "system/area/getSysAreaList",
@@ -99,13 +190,14 @@
                         this.AreaList = res.data
                     }) ,
                 });
-            }
+            },
         }
     })
     $(function() {
         var options = {
             url: prefix + "/list",
             modalName: "资产登记",
+            pageSize:'5',
             columns: [
                 {
                     field: 'useId',
@@ -158,7 +250,80 @@
         var url = prefix + '/print/' + useId;
         $.modal.openTab("打印", url);
     }
-
+    var myChart = echarts.init(document.getElementById('leftMain'));
+    axios.post(prefix + '/countInfo').then(response => {
+        if (response.data.code == web_status.SUCCESS){
+            myChart.setOption({
+                title: {
+                    text: '资产种类统计'
+                },
+                tooltip: {},
+                legend: {
+                    data:['数量']
+                },
+                xAxis: {
+                    data: response.data.data.xAxisData,
+                    axisLabel: {
+                        rotate: 45, // 旋转标签的角度
+                        margin: 10, // 标签与坐标轴的间距
+                    },
+                },
+                yAxis: {
+                    data: ['0','10','20','30','40','50','60','70','80','90','100',]
+                },
+                series: [
+                    {
+                        name: '数量',
+                        type: 'bar',
+                        data: response.data.data.yAxisData,
+                        itemStyle: {
+                            color: '#f5d892'
+                        }
+                    }
+                ]
+            });
+        }
+    })
+    var rightMain = echarts.init(document.getElementById('rightMain'));
+    axios.post(prefix + '/countBF').then(response => {
+        if (response.data.code == web_status.SUCCESS){
+            rightMain.setOption({
+                tooltip: {
+                    trigger: 'item'
+                },
+                legend: {
+                    left: 'left'
+                },
+                series: [
+                    {
+                        type: 'pie',
+                        radius: ['40%', '70%'],
+                        avoidLabelOverlap: false,
+                        itemStyle: {
+                            borderRadius: 10,
+                            borderColor: '#fff',
+                            borderWidth: 2
+                        },
+                        label: {
+                            show: false,
+                            position: 'center'
+                        },
+                        emphasis: {
+                            label: {
+                                show: true,
+                                fontSize: 20,
+                                fontWeight: 'bold'
+                            }
+                        },
+                        labelLine: {
+                            show: false
+                        },
+                        data: response.data.data
+                    }
+                ]
+            });
+        }
+    })
 </script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
index 3071979..f78127d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
@@ -79,7 +79,6 @@
     .count_bottom{
         width: 100%;
         height: 70%;
-        background-color: white;
         border-radius: 10px;
     }
 </style>
@@ -140,7 +139,7 @@
                 </ul>
             </div>
             <div class="count_bottom">
-                <div class="col-sm-12 search-collapse">
+                <div class="col-sm-12 search-collapse" style="margin-top: 0">
                     <form id="formId">
                         <div class="select-list">
                             <ul>
@@ -177,7 +176,7 @@
                         <i class="fa fa-download"></i> 导出
                     </a>
                 </div>
-                <div class="col-sm-12 select-table table-striped" style="min-height: 76%;">
+                <div class="col-sm-12 select-table table-striped" style="min-height: 80%;">
                     <table id="bootstrap-table"></table>
                 </div>
             </div>
@@ -202,6 +201,7 @@
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
             modalName: "涉密人员培训",
+            pageSize:'5',
             columns: [
                 {
                     field: 'id',
diff --git a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html
index 725458d..c3fd8ce 100644
--- a/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html
@@ -21,12 +21,6 @@
 		width: 49%;
 		height: 100%;
 
-	}
-	.left_echarts{
-
-	}
-	.right_echarts{
-
 	}
 </style>
 <body class="gray-bg">
@@ -129,6 +123,7 @@
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
 		        modalName: "用户",
+				pageSize:'5',
 		        columns: [
 				{
 					field : 'dept.deptid',
