From 76f84021c817dbec24bde29c903a1ee8cff6d042 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期五, 10 五月 2024 18:31:53 +0800
Subject: [PATCH] 会议统计
---
ruoyi-ui/src/views/meeting/approve.vue | 2
ruoyi-ui/src/api/meeting/index.js | 21 +++++
ruoyi-ui/src/views/meeting/statistics.vue | 177 +++++++++++++++++++++++++++++--------------
ruoyi-ui/src/views/meeting/index.vue | 2
4 files changed, 141 insertions(+), 61 deletions(-)
diff --git a/ruoyi-ui/src/api/meeting/index.js b/ruoyi-ui/src/api/meeting/index.js
index fde3be7..069a4e1 100644
--- a/ruoyi-ui/src/api/meeting/index.js
+++ b/ruoyi-ui/src/api/meeting/index.js
@@ -91,4 +91,25 @@
+// ------------------------------------------------
+// 浼氳缁熻
+// 鏌ヨ鎵�鏈変細璁�
+export function listMeeting3(query) {
+ return request({
+ url: '/zMeetingStatistic/all',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鍥惧舰缁熻淇℃伅
+export function listGraph(query) {
+ return request({
+ url: '/zMeetingStatistic/one',
+ method: 'get',
+ params: query
+ })
+}
+
+
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 0563977..aaa8f44 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -20,7 +20,7 @@
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index 1663f1c..492f878 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -44,7 +44,7 @@
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index 196a7d6..91492da 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -29,7 +29,7 @@
<hr />
- <el-table :data="tableData" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }"
+ <el-table :data="meetingList" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }"
:row-class-name="tableRowClassName" :row-key="getRowId">
<el-table-column label="瀹跺涵鍙�" prop="familyId" sortable align="center">
<template slot-scope="scope">{{ scope.row.familyId
@@ -77,9 +77,17 @@
</el-table-column>
</el-table>
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ style="background: #FEF7FC;"
+ />
<!-- 鍥捐〃缁熻 -->
- <el-dialog :title="title2" :visible.sync="open2" width="1500px" @open="open1()" append-to-body>
+ <el-dialog :title="title2" :visible.sync="open2" width="1500px" @open="openGraph()" append-to-body>
<!-- class="p1" -->
<div class="p1" id="main1">
<!-- <h1 style="font-size:21px">姣忔湀浼氳娆℃暟缁熻</h1> -->
@@ -151,8 +159,19 @@
<script>
import * as echarts from 'echarts';
+ import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+ import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+
+ import { Notification, MessageBox, Message, Loading } from 'element-ui'
+
+ //鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
+ import {listMeeting3,listGraph} from "@/api/meeting/index";
export default {
- created() {},
+ created() {
+ this.getList();
+ this.graphData();
+ },
data() {
return {
// 鏄剧ず鎼滅储鏉′欢
@@ -160,53 +179,34 @@
open: false,
open2: false,
title: "",
- tableData: [{
- id: 1,
- familyId: '1',
- title: '1',
- name: 'asasd',
- conferenceRoom: 'asdadsdasd',
- status: '缁撴'
- },
- {
- id: 2,
- familyId: '2',
- title: '2',
- name: 'qweqwqwe',
- conferenceRoom: 'qweqweqwe',
- status: '鏈粨妗�'
-
- }
- ],
+ meetingList: [],
+ dataList:[],
+ graphID: [],
+ graphDate: [],
formDat:{
- id: undefined,
- happenTime: undefined,
- endTime: undefined,
- meetingTitle: undefined,
- conferenceRoom: undefined,
- ratifyPerson: undefined,
- applyPerson: undefined,
- url: "",
- status: undefined,
- familyId: undefined
+ "title":undefined,
+ "familyId":undefined,
+ "conferenceRoom":undefined,
+ "applyPerson":undefined,
+ "ratifyPerson":undefined,
+ "status":undefined,
+ "useTime":undefined
},
+
queryParams: {
pageNum: 1,
pageSize: 10,
- conferenceRoom:undefined,
- applyOrganization:undefined,
- applyPerson:undefined,
- happenTime:undefined
+
},
dateRange: [],
// 琛ㄥ崟鏍￠獙
- rules: {
- name: [{
- required: true,
- message: '璇疯緭鍏ヨ澶囧悕绉�',
- trigger: 'blur'
- }],
- },
+ // rules: {
+ // name: [{
+ // required: true,
+ // message: '璇疯緭鍏ヨ澶囧悕绉�',
+ // trigger: 'blur'
+ // }],
+ // },
typeOptions: [
{
value: '1',
@@ -222,50 +222,109 @@
}
},
methods: {
- open1(){
+ graphData(){
+ this.loading = true;
+ listGraph().then(response => {
+ this.dataList = response.data
+ // console.log(this.graphList,'11111111111')
+ let a = {}
+ this.dataList.forEach(element=>{
+ if(a[element['familyId']]){
+ a[element['familyId']] += 1
+ }else{
+ a[element['familyId']] = 1
+ }
+ })
+ for(let i in a){
+ this.graphID.push({'name': i , 'value': a[i]})
+ }
+ // console.log(this.graphID,'graphIDgraphIDgraphID')
+
+
+ this.loading = false;
+ }
+ );
+ },
+ getList() {
+ this.loading = true;
+ // console.log(this.queryParams)
+ // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+ listMeeting3(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data.data,'22222222222')
+ this.meetingList = response.data.data;
+
+ this.total = response.data.total;
+ this.loading = false;
+ }
+
+ );
+ },
+
+ openGraph(){
this.$nextTick(() => {
// 鎵цecharts鏂规硶
this.initEcharts()
})
},
initEcharts() {
- var echarts = require('echarts');
-
- const myChart1 = this.$echarts.init(document.getElementById('main1'));
+ const myChart1 = echarts.init(document.getElementById('main1'))
const option1 = {
title: {
- text: 'ECharts 鍏ラ棬绀轰緥'
+ text: '姣忔湀浼氳娆℃暟缁熻',
+ left:'center'
},
tooltip: {},
xAxis: {
data: ['琛～', '缇婃瘺琛�', '闆汉琛�', '瑁ゅ瓙', '楂樿窡闉�', '琚滃瓙']
},
yAxis: {},
+ legend:{},
series: [{
- name: '閿�閲�',
type: 'bar',
data: [5, 20, 36, 10, 10, 20]
}]
};
+ myChart1.setOption(option1)
- const myChart2 = this.$echarts.init(document.getElementById('main2'));
+ const myChart2 = echarts.init(document.getElementById('main2'))
const option2 = {
title: {
- text: 'ECharts 鍏ラ棬绀轰緥'
+ text: '浼氳瀹跺涵鍗犳瘮缁熻',
+ left:'center',
+ textStyle:{
+ fontSize:20
+ }
},
tooltip: {},
- xAxis: {
- data: ['琛～', '缇婃瘺琛�', '闆汉琛�', '瑁ゅ瓙', '楂樿窡闉�', '琚滃瓙']
+ legend:{
+ orient: 'vertical',
+ left: 'left',
+ textStyle:{
+ fontSize:15
+ }
},
- yAxis: {},
+
series: [{
- name: '閿�閲�',
- type: 'bar',
- data: [5, 20, 36, 10, 10, 20]
+ name: '瀹跺涵鍙�',
+ type: 'pie',
+ data: this.graphID,
+ label: {
+ show: true, // 鏄惁鏄剧ず鏍囩
+ position: 'top', // 鏍囩浣嶇疆锛屽彲閫夊�间负锛歵op銆乥ottom銆乧enter銆乮nside锛堟煴鐘跺浘鍐呴儴锛夈�乷utside锛堟煴鐘跺浘澶栭儴锛�
+ textStyle: {
+ color: '#333', // 鏍囩瀛椾綋棰滆壊
+ fontSize: 25, // 鏍囩瀛椾綋澶у皬
+ fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
+ fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
+ fontFamily: 'Arial' // 鏍囩瀛椾綋
+ }
+ },
}]
};
- myChart1.setOption(option1)
myChart2.setOption(option2)
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -290,7 +349,7 @@
// this.reset();
},
submitDataScope() {
- console.log(666)
+ // console.log(666)
},
tableRowClassName({
@@ -394,7 +453,7 @@
width: 700px;
height: 700px;
display: inline-block;
- /* background-color: aqua; */
margin-right: 30px;
+ /* background-color: aqua; */
}
</style>
--
Gitblit v1.9.1