From fbec0a50ff9a4e4afb5ac7cbb965020acb9db2c7 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期五, 10 五月 2024 15:35:10 +0800
Subject: [PATCH] 备忘录添加了fid
---
ruoyi-ui/src/views/meeting/statistics.vue | 135 ++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 43 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index bf8d969..196a7d6 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -16,14 +16,14 @@
</div>
</el-button>
</div>
- <div style="display: flex; align-items: center;">
+ <!-- <div style="display: flex; align-items: center;">
<el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
<div class="form2" style="width: 100px;"><el-icon style="padding-right:30px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鏂板缓</span>
</div>
</el-button>
- </div>
+ </div> -->
</h1>
@@ -31,19 +31,19 @@
<el-table :data="tableData" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }"
:row-class-name="tableRowClassName" :row-key="getRowId">
- <el-table-column label="瀹跺涵鍙�" prop="num" sortable align="center">
- <template slot-scope="scope">{{ scope.row.num
- ? scope.row.num : '鈥斺�斺�斺��' }}</template>
+ <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.familyId
+ ? scope.row.familyId : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="浣跨敤鏃堕棿" prop="time" sortable align="center">
- <template slot-scope="scope">{{ scope.row.time
- ? scope.row.time : '鈥斺�斺�斺��' }}</template>
+ <el-table-column label="浣跨敤鏃堕棿" prop="useTime" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.useTime
+ ? scope.row.useTime : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="浼氳瀹ゅ悕绉�" prop="address" sortable align="center">
+ <el-table-column label="浼氳瀹ゅ悕绉�" prop="conferenceRoom" sortable align="center">
<template slot-scope="scope">{{
- scope.row.address ? scope.row.address : '鈥斺�斺�斺��' }}</template>
+ scope.row.conferenceRoom ? scope.row.conferenceRoom : '鈥斺�斺�斺��' }}</template>
</el-table-column>
<el-table-column label="鏍囬" prop="title" sortable align="center">
@@ -51,14 +51,14 @@
? scope.row.title : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" prop="applicant" sortable align="center">
+ <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center">
<template slot-scope="scope">{{
- scope.row.applicant ? scope.row.applicant : '鈥斺�斺�斺��' }}</template>
+ scope.row.applyPerson ? scope.row.applyPerson : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="瀹℃壒浜�" prop="approve" sortable align="center">
- <template slot-scope="scope">{{ scope.row.approve ?
- scope.row.approve : '鈥斺�斺�斺��' }}</template>
+ <el-table-column label="瀹℃壒浜�" prop="ratifyPerson" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.ratifyPerson ?
+ scope.row.ratifyPerson : '鈥斺�斺�斺��' }}</template>
</el-table-column>
<el-table-column label="鐘舵��" prop="status" sortable align="center">
@@ -69,8 +69,8 @@
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button> -->
+ <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button> -->
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</div>
</template>
@@ -79,21 +79,22 @@
</el-table>
<!-- 鍥捐〃缁熻 -->
- <el-dialog :title="title2" :visible.sync="open2" width="1500px" append-to-body>
- <div class="p1">
- <h1 style="font-size:21px">姣忔湀浼氳娆℃暟缁熻</h1>
+ <el-dialog :title="title2" :visible.sync="open2" width="1500px" @open="open1()" append-to-body>
+ <!-- class="p1" -->
+ <div class="p1" id="main1">
+ <!-- <h1 style="font-size:21px">姣忔湀浼氳娆℃暟缁熻</h1> -->
</div>
- <div class="p1">
- <h1 style="font-size:21px">浼氳瀹跺涵鍗犳瘮缁熻</h1>
+ <div class="p1" id="main2">
+ <!-- <h1 style="font-size:21px">浼氳瀹跺涵鍗犳瘮缁熻</h1> -->
</div>
</el-dialog>
<!-- 鏂板鏁版嵁妗� -->
- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <!-- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="瀹跺涵鍙�" prop="num">
- <el-input v-model="formDat.num" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ <el-form-item label="瀹跺涵鍙�" prop="familyId">
+ <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
@@ -108,8 +109,8 @@
></el-date-picker>
</el-form-item>
- <el-form-item label="浼氳瀹ゅ悕绉�" prop="address">
- <el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ <el-form-item label="浼氳瀹ゅ悕绉�" prop="conferenceRoom">
+ <el-input v-model="formDat.conferenceRoom" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
@@ -118,13 +119,13 @@
</el-input>
</el-form-item>
- <el-form-item label="鐢宠浜�" prop="applicant">
- <el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
+ <el-form-item label="鐢宠浜�" prop="applyPerson">
+ <el-input v-model="formDat.applyPerson" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
- <el-form-item label="瀹℃壒浜�" prop="approve">
- <el-input v-model="formDat.approve" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}">
+ <el-form-item label="瀹℃壒浜�" prop="ratifyPerson">
+ <el-input v-model="formDat.ratifyPerson" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
@@ -143,13 +144,15 @@
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </el-dialog> -->
</div>
</template>
<script>
+import * as echarts from 'echarts';
export default {
+ created() {},
data() {
return {
// 鏄剧ず鎼滅储鏉′欢
@@ -159,18 +162,18 @@
title: "",
tableData: [{
id: 1,
- num: '1',
+ familyId: '1',
title: '1',
name: 'asasd',
- address: 'asdadsdasd',
+ conferenceRoom: 'asdadsdasd',
status: '缁撴'
},
{
id: 2,
- num: '2',
+ familyId: '2',
title: '2',
name: 'qweqwqwe',
- address: 'qweqweqwe',
+ conferenceRoom: 'qweqweqwe',
status: '鏈粨妗�'
}
@@ -180,19 +183,19 @@
happenTime: undefined,
endTime: undefined,
meetingTitle: undefined,
- address: undefined,
- approve: undefined,
- applicant: undefined,
+ conferenceRoom: undefined,
+ ratifyPerson: undefined,
+ applyPerson: undefined,
url: "",
status: undefined,
- num: undefined
+ familyId: undefined
},
queryParams: {
pageNum: 1,
pageSize: 10,
- address:undefined,
+ conferenceRoom:undefined,
applyOrganization:undefined,
- applicant:undefined,
+ applyPerson:undefined,
happenTime:undefined
},
dateRange: [],
@@ -219,6 +222,52 @@
}
},
methods: {
+ open1(){
+ this.$nextTick(() => {
+ // 鎵цecharts鏂规硶
+ this.initEcharts()
+ })
+ },
+ initEcharts() {
+ var echarts = require('echarts');
+
+ const myChart1 = this.$echarts.init(document.getElementById('main1'));
+ const option1 = {
+ title: {
+ text: 'ECharts 鍏ラ棬绀轰緥'
+ },
+ tooltip: {},
+ xAxis: {
+ data: ['琛～', '缇婃瘺琛�', '闆汉琛�', '瑁ゅ瓙', '楂樿窡闉�', '琚滃瓙']
+ },
+ yAxis: {},
+ series: [{
+ name: '閿�閲�',
+ type: 'bar',
+ data: [5, 20, 36, 10, 10, 20]
+ }]
+ };
+
+ const myChart2 = this.$echarts.init(document.getElementById('main2'));
+ const option2 = {
+ title: {
+ text: 'ECharts 鍏ラ棬绀轰緥'
+ },
+ tooltip: {},
+ xAxis: {
+ data: ['琛～', '缇婃瘺琛�', '闆汉琛�', '瑁ゅ瓙', '楂樿窡闉�', '琚滃瓙']
+ },
+ yAxis: {},
+ series: [{
+ name: '閿�閲�',
+ type: 'bar',
+ data: [5, 20, 36, 10, 10, 20]
+ }]
+ };
+
+ myChart1.setOption(option1)
+ myChart2.setOption(option2)
+ },
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -345,7 +394,7 @@
width: 700px;
height: 700px;
display: inline-block;
- background-color: aqua;
+ /* background-color: aqua; */
margin-right: 30px;
}
</style>
--
Gitblit v1.9.1