From 3884f9aaf2f86ec43b3d80768d04a0a0d9de1ea7 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Fri, 11 Oct 2024 11:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=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     | 71 ++++++++++++++-----
 1 file changed, 52 insertions(+), 19 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 20bfa24..05c8001 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
@@ -75,19 +75,14 @@
 <div class="container-div" id="app">
     <div class="row">
         <div class="echart">
-            <div class="children_echarts left_echarts" style="width: 33%">
-                <div id="leftMain" style="width: 500px;height:310px"></div>
+            <div class="children_echarts left_echarts">
+                <div id="leftMain" style="width: 500px;height:350px"></div>
             </div>
-            <div class="children_echarts center_echarts" style="width: 33%">
-                <div id="centerMain" style="width: 500px;height:310px"></div>
+            <div class="children_echarts center_echarts">
+                <div id="centerMain" style="width: 550px;height:350px"></div>
             </div>
-            <div class="children_echarts right_echarts" style="width: 33%">
-                <div class="statuList">
-                    <p v-for="item in statusList">
-                        {{item.name}}<span>{{item.value}}</span>
-                    </p>
-                </div>
-                <div id="rightMain" style="width: 360px;height:200px"></div>
+            <div class="children_echarts right_echarts">
+                <div id="rightMain" style="width: 400px;height:350px;margin-left: 85px"></div>
             </div>
         </div>
         <div class="col-sm-12 search-collapse">
@@ -274,11 +269,11 @@
         if (response.data.code == web_status.SUCCESS){
             myChart.setOption({
                 title: {
-                    text: '涉密信息设备统计'
+                    text: '密品统计'
                 },
                 tooltip: {},
                 legend: {
-                    data:['数量']
+                    data:['涉密信息设备','涉密设备']
                 },
                 xAxis: {
                     data: response.data.data.xAxisData,
@@ -291,12 +286,20 @@
                 },
                 series: [
                     {
-                        name: '数量',
+                        name: '涉密信息设备',
                         type: 'bar',
                         data: response.data.data.yAxisData,
                         itemStyle: {
                             color: '#f5d892'
                         }
+                    },
+                    {
+                        name: '涉密设备',
+                        type: 'bar',
+                        data: response.data.data.yAxisDataSb,
+                        itemStyle: {
+                            color: '#a2ea57'
+                        }
                     }
                 ]
             });
@@ -307,11 +310,13 @@
         if (response.data.code == web_status.SUCCESS){
             centerMain.setOption({
                 title: {
-                    text: '涉密设备统计'
+                    text: '密品销毁统计'
                 },
                 tooltip: {},
                 legend: {
-                    data:['数量']
+                    data:['信息设备-已销毁','信息设备-未销毁','设备-已销毁','设备-未销毁'],
+                    width:'60%',
+                    right: 'right'
                 },
                 xAxis: {
                     data: response.data.data.xAxisData,
@@ -324,11 +329,35 @@
                 },
                 series: [
                     {
-                        name: '数量',
+                        name: '信息设备-已销毁',
                         type: 'bar',
                         data: response.data.data.yAxisData,
                         itemStyle: {
-                            color: '#c3ea51'
+                            color: '#ffa587'
+                        }
+                    },
+                    {
+                        name: '信息设备-未销毁',
+                        type: 'bar',
+                        data: response.data.data.yAxisDataWx,
+                        itemStyle: {
+                            color: '#3a48e0'
+                        }
+                    },
+                    {
+                        name: '设备-已销毁',
+                        type: 'bar',
+                        data: response.data.data.yAxisDataSb,
+                        itemStyle: {
+                            color: '#80e547'
+                        }
+                    },
+                    {
+                        name: '设备-未销毁',
+                        type: 'bar',
+                        data: response.data.data.yAxisDataWxSb,
+                        itemStyle: {
+                            color: '#ef1fea'
                         }
                     }
                 ]
@@ -343,7 +372,11 @@
                     trigger: 'item'
                 },
                 legend: {
-                    left: 'left'
+                    width:'60%',
+                    right: 'right'
+                },
+                title: {
+                    text: '密品报废统计'
                 },
                 series: [
                     {