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/meeting/statistics.vue | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 364 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index 05955e7..196a7d6 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -6,16 +6,344 @@
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;">
- <span>浼氳缁熻</span>
+ <p><span >浼氳缁熻</span></p>
+ <div class="button-container"></div>
+ <div style="display: flex; align-items: center;">
+ <el-button @click="pictureStatistics" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
+ <div class="form1"><el-icon style="padding-right:50px;"></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 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> -->
+
</h1>
<hr />
+
+ <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="familyId" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.familyId
+ ? scope.row.familyId : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <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="conferenceRoom" sortable align="center">
+ <template slot-scope="scope">{{
+ scope.row.conferenceRoom ? scope.row.conferenceRoom : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="鏍囬" prop="title" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.title
+ ? scope.row.title : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center">
+ <template slot-scope="scope">{{
+ scope.row.applyPerson ? scope.row.applyPerson : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <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">
+ <template slot-scope="scope">{{ scope.row.status
+ ? scope.row.status : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <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-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+ </div>
+ </template>
+ </el-table-column>
+
+ </el-table>
+
+ <!-- 鍥捐〃缁熻 -->
+ <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" id="main2">
+ <!-- <h1 style="font-size:21px">浼氳瀹跺涵鍗犳瘮缁熻</h1> -->
+ </div>
+ </el-dialog>
+ <!-- 鏂板鏁版嵁妗� -->
+ <!-- <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="familyId">
+ <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="寮�濮嬫椂闂�" prop="happenTime">
+ <el-date-picker v-model="formDat.happenTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
+ <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+
+ <el-form-item label="浼氳瀹ゅ悕绉�" prop="conferenceRoom">
+ <el-input v-model="formDat.conferenceRoom" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鏍囬" prop="meetingTitle">
+ <el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <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="ratifyPerson">
+ <el-input v-model="formDat.ratifyPerson" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="formDat.status" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+
+ </el-form>
+
+ </el-upload>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog> -->
</div>
</template>
<script>
+import * as echarts from 'echarts';
+ export default {
+ created() {},
+ data() {
+ return {
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ 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: '鏈粨妗�'
+ }
+ ],
+ formDat:{
+ id: undefined,
+ happenTime: undefined,
+ endTime: undefined,
+ meetingTitle: undefined,
+ conferenceRoom: undefined,
+ ratifyPerson: undefined,
+ applyPerson: undefined,
+ url: "",
+ status: undefined,
+ familyId: undefined
+ },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ conferenceRoom:undefined,
+ applyOrganization:undefined,
+ applyPerson:undefined,
+ happenTime:undefined
+ },
+ dateRange: [],
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ name: [{
+ required: true,
+ message: '璇疯緭鍏ヨ澶囧悕绉�',
+ trigger: 'blur'
+ }],
+ },
+ typeOptions: [
+ {
+ value: '1',
+ label: '缁撴',
+ },
+ {
+ value: '0',
+ label: '鏈粨妗�',
+ }
+ ],
+
+
+ }
+ },
+ 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;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+
+
+ newRequest(){
+ this.open = true;
+ this.title = "鏂板"
+ },
+ cancel() {
+ this.open = false;
+ // this.reset();
+ },
+ submitDataScope() {
+ console.log(666)
+ },
+
+ tableRowClassName({
+ row,
+ rowIndex
+ }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+ getRowId(row) {
+ return row.id
+ },
+
+ // 淇敼
+ handleUpdate(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/meeting/statistics/statisticsInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+ // 鏌ョ湅璇︾粏淇℃伅
+ handleCheck(row){
+ const id = row.id;
+ this.$router.push("/meeting/statistics/statisticsInfo/" + id);
+ },
+
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+ return delSelfEconomy(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+
+ // 鍥捐〃缁熻
+ pictureStatistics(){
+ this.open2=true;
+ this.title2 = "鍥捐〃缁熻"
+ },
+
+ }
+ }
</script>
<style scoped>
.el-table__row.statistics-warning-row {
@@ -30,9 +358,43 @@
font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
}
.button-container {
- display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+ /* display: inline-flex; 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+ text-align: right;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ flex-grow: 1;
}
.app-container {
background-color: #FEF7FC;
}
+ .form1{
+ background:left/40% no-repeat url('../../assets/icons/pic.png') ;
+ height: 50px;
+ line-height: 50px;
+ }
+ .form2{
+ background:left/25% no-repeat url('../../assets/icons/add1.png') ;
+ height: 50px;
+ line-height: 50px;
+ }
+
+ /deep/ .el-table .statistics-warning-row {
+ background: #E0EEFE;
+ }
+
+ /deep/ .el-table .statistics-warning-row1 {
+ background: #FFEFF2;
+ }
+
+ .el-table {
+ border-radius: 14px 14px 14px 14px;
+ }
+ .p1{
+ width: 700px;
+ height: 700px;
+ display: inline-block;
+ /* background-color: aqua; */
+ margin-right: 30px;
+ }
</style>
--
Gitblit v1.9.1