From e717167307cd29740484741f553e1f7aa3e36dc2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 07 五月 2024 17:38:03 +0800
Subject: [PATCH] 解决了必选项和封面问题
---
ruoyi-ui/src/views/self/show.vue | 68 +++++++++++++++++
ruoyi-ui/package.json | 2
ruoyi-ui/src/views/meeting/statistics.vue | 127 ++++++++++++++++++++++---------
3 files changed, 157 insertions(+), 40 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 4dbcb7d..9c8d555 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -41,7 +41,7 @@
"clipboard": "2.0.8",
"core-js": "3.25.3",
"d3": "^7.8.5",
- "echarts": "5.4.0",
+ "echarts": "^5.5.0",
"element-ui": "2.15.12",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index 3e8d8a6..196a7d6 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -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,12 +79,13 @@
</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>
<!-- 鏂板鏁版嵁妗� -->
@@ -92,8 +93,8 @@
<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>
@@ -149,7 +150,9 @@
</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>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 5bddab2..4d237b7 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1216,6 +1216,74 @@
trigger: 'blur'
}],
+ relation: [{
+ required: true,
+ message: '璇疯緭鍏ュ叧绯�',
+ trigger: 'blur'
+ }],
+ otherName: [{
+ required: true,
+ message: '璇疯緭鍏ュ鍚�',
+ trigger: 'blur'
+ }],
+ otherUnit: [{
+ required: true,
+ message: '璇疯緭鍏ュ崟浣�',
+ trigger: 'blur'
+ }],
+ otherPosition: [{
+ required: true,
+ message: '璇疯緭鍏ヨ亴鍔�',
+ trigger: 'blur'
+ }],
+ otherPolitical: [{
+ required: true,
+ message: '璇疯緭鍏ユ斂娌婚潰璨�',
+ trigger: 'blur'
+ }],
+
+ cerName: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺悕绉�',
+ trigger: 'blur'
+ }],
+ type: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠剁被鍨�',
+ trigger: 'blur'
+ }],
+ ownStatus: [{
+ required: true,
+ message: '璇疯緭鍏ユ寔鏈夋儏鍐�',
+ trigger: 'blur'
+ }],
+ idNo: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
+ trigger: 'blur'
+ }],
+
+ startTime: [{
+ required: true,
+ message: '璇疯緭鍏ュ紑濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇疯緭鍏ョ粨鏉熸椂闂�',
+ trigger: 'blur'
+ }],
+ destination: [{
+ required: true,
+ message: '璇疯緭鍏ユ墍鍒板湴鍖�',
+ trigger: 'blur'
+ }],
+ cause: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨鐢�',
+ trigger: 'blur'
+ }]
+
},
selectedOption:'',
typeOptions:[],
--
Gitblit v1.9.1