From 6e948b6e10993060232e76d63d3436bcf8d9d7e1 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Tue, 8 Oct 2024 17:26:45 +0800
Subject: [PATCH 1/2] =?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     | 50 ++++++++++++++++---
 1 file changed, 43 insertions(+), 7 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 144fbcd..20bfa24 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
@@ -16,7 +16,7 @@
         overflow: hidden;
     }
     .children_echarts{
-        width: 49%;
+        width: 33%;
         height: 100%;
 
     }
@@ -75,16 +75,19 @@
 <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 class="children_echarts left_echarts" style="width: 33%">
+                <div id="leftMain" style="width: 500px;height:310px"></div>
             </div>
-            <div class="children_echarts right_echarts" style="width: 40%">
+            <div class="children_echarts center_echarts" style="width: 33%">
+                <div id="centerMain" style="width: 500px;height:310px"></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: 580px;height:200px"></div>
+                <div id="rightMain" style="width: 360px;height:200px"></div>
             </div>
         </div>
         <div class="col-sm-12 search-collapse">
@@ -267,11 +270,11 @@
         }
     }
     var myChart = echarts.init(document.getElementById('leftMain'));
-    axios.post(prefix + '/countInfo').then(response => {
+    axios.post(prefix + '/countMessageMonth').then(response => {
         if (response.data.code == web_status.SUCCESS){
             myChart.setOption({
                 title: {
-                    text: '信息设备种类统计'
+                    text: '涉密信息设备统计'
                 },
                 tooltip: {},
                 legend: {
@@ -299,6 +302,39 @@
             });
         }
     })
+    var centerMain = echarts.init(document.getElementById('centerMain'));
+    axios.post(prefix + '/countSecretsMonth').then(response => {
+        if (response.data.code == web_status.SUCCESS){
+            centerMain.setOption({
+                title: {
+                    text: '涉密设备统计'
+                },
+                tooltip: {},
+                legend: {
+                    data:['数量']
+                },
+                xAxis: {
+                    data: response.data.data.xAxisData,
+                    axisLabel: {
+                        rotate: 45, // 旋转标签的角度
+                        margin: 10, // 标签与坐标轴的间距
+                    },
+                },
+                yAxis: {
+                },
+                series: [
+                    {
+                        name: '数量',
+                        type: 'bar',
+                        data: response.data.data.yAxisData,
+                        itemStyle: {
+                            color: '#c3ea51'
+                        }
+                    }
+                ]
+            });
+        }
+    })
     var rightMain = echarts.init(document.getElementById('rightMain'));
     axios.post(prefix + '/countBF').then(response => {
         if (response.data.code == web_status.SUCCESS){

From cf80fe2eec5adc59731d81358554c60662af76ca Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Wed, 9 Oct 2024 08:53:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=89=E5=AF=86=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tdmeeting/meetingnum/meetingnum.html      | 251 +++++++++++++++++-
 1 file changed, 245 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html
index c4ec13a..78abe86 100644
--- a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html
@@ -1,10 +1,249 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <th:block th:include="include :: header('考试统计')" />
+    <th:block th:include="include :: element-css" />
 </head>
-<body>
-1
+<style>
+    .count_box{
+        width: 95%;
+        height: 95%;
+        margin: 0 auto;
+    }
+    .count_top{
+        width: 100%;
+        height: 50%;
+        background-color: white;
+        border-radius: 10px;
+        margin-bottom: 10px;
+    }
+    .count_bottom{
+        width: 100%;
+        height: 50%;
+        background-color: white;
+        border-radius: 10px;
+    }
+    .echart{
+        width: 100%;
+        height: 100%;
+        background-color: white;
+        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%;
+        margin-top: 20px;
+    }
+</style>
+<body class="gray-bg">
+<div class="container-div" id="app">
+    <div class="count_box">
+        <div class="count_top">
+            <div class="echart">
+                <div class="children_echarts right_echarts">
+                    <div id="rightMain" style="width: 1300px;height:380px"></div>
+                </div>
+            </div>
+        </div>
+        <div class="count_bottom">
+            <div class="col-sm-12 search-collapse" style="margin-top: 0">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>会议主题：</label>
+                                <input type="text" name="meetingTitle"/>
+                            </li>
+                            <li>
+                                <label>会议类型：</label>
+                                <select name="meetingType" th:with="type=${@dict.getType('sys_meeting_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>会议状态：</label>
+                                <select name="meetingState" th:with="type=${@dict.getType('sys_meeting_state')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: element-js" />
+<th:block th:include="include :: echarts-js" />
+<script th:inline="javascript">
+    var meetingState = [[${@dict.getType('sys_meeting_state')}]];
+    var meetingType = [[${@dict.getType('sys_meeting_type')}]];
+    var detailFlag = [[${@permission.hasPermi('system:meetingnum:detail')}]]
+    var prefix = ctx + "system/meetingnum";
+    var app = new Vue({
+        el: '#app',
+        data: {
+            CityList: [],
+            AreaList:[],
+            City:'',
+            Area:'',
+            params:{
+                parentId:'',
+            }
+        },
+        created(){
+            // 初始化地市列表
+            this.getCityList();
+            if (this.City){
+                this.getAreaList()
+            }
+        },
+        methods:{
+            getCityList(){
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params ,
+                    success:((res)=>{
+                        this.CityList = res.data
+                    }) ,
+                });
+            },
+            getAreaList(){
+                this.params.parentId = this.City
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params,
+                    success:((res)=>{
+                        this.AreaList = res.data
+                    }) ,
+                });
+            }
+        }
+    })
+    var rightMain = echarts.init(document.getElementById('rightMain'));
+    axios.post(prefix + '/countMeetingMonth').then(response => {
+        if (response.data.code == web_status.SUCCESS){
+            rightMain.setOption({
+                title: {
+                    text: '涉密会议统计'
+                },
+                tooltip: {},
+                legend: {
+                    data:['次数']
+                },
+                xAxis: {
+                    data: response.data.data.xAxisData,
+                    axisLabel: {
+                        rotate: 45, // 旋转标签的角度
+                        margin: 10, // 标签与坐标轴的间距
+                    },
+                },
+                yAxis: {
+
+                },
+                series: [
+                    {
+                        name: '次数',
+                        type: 'bar',
+                        data: response.data.data.yAxisData,
+                        itemStyle: {
+                            color: '#38dbe0'
+                        }
+                    }
+                ],
+            });
+        }
+    })
+    var prefixTable = ctx + "system/checkReport";
+    let datas = []
+    $.ajax({
+        url: ctx + "system/area/getAllList",
+        type: 'GET',
+        data:{parentId:''} ,
+        success:((res)=>{
+            datas = res.data
+        }) ,
+    });
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            detailUrl: ctx +  "system/tdmeeting/detail/{id}",
+            modalName: "涉密会议登记",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: 'ID',
+                    visible: false
+                },
+                {
+                    field: 'meetingTitle',
+                    title: '会议主题',
+                },
+                {
+                    field: 'meetingTime',
+                    title: '会议时间',
+                    formatter: function (value){
+                        let date = new Date(value);
+                        return date.toISOString().split('T')[0];
+                    }
+                },
+                {
+                    field: 'meetingAddress',
+                    title: '会议地点',
+                },
+                {
+                    field: 'meetingUsernum',
+                    title: '参会人数',
+                },
+                {
+                    field: 'meetingType',
+                    title: '会议类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(meetingType, value);
+                    }
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    sortable: true
+                },
+                {
+                    field: 'meetingState',
+                    title: '会议状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(meetingState, value);
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
-</html>
\ No newline at end of file
+</html>