From c661c48ac71e093cab4a2f5b4900ae3bbc0fc24c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 14 五月 2024 15:16:41 +0800
Subject: [PATCH] 完成会议统计
---
ruoyi-ui/src/api/meeting/index.js | 10 ++++++++++
ruoyi-ui/src/views/meeting/statistics.vue | 4 ++--
ruoyi-ui/src/views/meeting/statisticsInfo.vue | 46 +++++++++++++++++++++++++++++++++++++++-------
3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/api/meeting/index.js b/ruoyi-ui/src/api/meeting/index.js
index 069a4e1..3e1ae4b 100644
--- a/ruoyi-ui/src/api/meeting/index.js
+++ b/ruoyi-ui/src/api/meeting/index.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+// 浼氳鐢宠
// 鏌ヨ鎵�鏈変細璁�
export function listMeeting(query) {
return request({
@@ -102,6 +103,15 @@
})
}
+// 鏍规嵁id鏌ヨ鎵�鏈変細璁缁嗕俊鎭�
+export function getMeetingInfo1(id) {
+ return request({
+ url: '/zMeetingStatistic/' + id,
+ method: 'get',
+
+ })
+}
+
// 鍥惧舰缁熻淇℃伅
export function listGraph(query) {
return request({
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index f15bd84..e619cdf 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -62,10 +62,10 @@
</el-table-column>
<el-table-column label="鐘舵��" prop="status" sortable align="center">
- <template slot-scope="scope">{{ scope.row.status
- ? scope.row.status : '鈥斺�斺�斺��' }}</template>
+ <template slot-scope="scope">{{scope.row.status===1? '缁撴': '鏈粨妗�'}}</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">
diff --git a/ruoyi-ui/src/views/meeting/statisticsInfo.vue b/ruoyi-ui/src/views/meeting/statisticsInfo.vue
index 95fff1e..c283340 100644
--- a/ruoyi-ui/src/views/meeting/statisticsInfo.vue
+++ b/ruoyi-ui/src/views/meeting/statisticsInfo.vue
@@ -21,15 +21,12 @@
</el-cow>
<el-cow>
- <el-form-item label="浣跨敤鏃堕棿" prop="useTime" label-width="80px"
+ <el-form-item label="浣跨敤鏃堕棿" prop="useTime" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-date-picker v-model="formData.useTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
- :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb">
- </el-date-picker>
+ <el-input v-model="formData.useTime" placeholder="璇疯緭鍏ヤ娇鐢ㄦ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
</el-form-item>
</el-cow>
-
-
<el-cow>
<el-form-item label="浼氳瀹ゅ悕绉�" prop="conferenceRoom" label-width="90px"
@@ -89,6 +86,11 @@
</template>
<script>
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+import {getMeetingInfo1} from "@/api/meeting/index";
export default {
components: {},
props: [],
@@ -155,7 +157,37 @@
}
let _this = this
- },
+
+ this.loading = true;
+ getMeetingInfo1(id).then((response) => {
+ console.log(response.data,'123123123')
+ this.formData = response.data;
+ // let paths = this.formData.url.split(",");
+ // for(let i = 0; i < paths.length; i++)
+ // {
+ // if(paths[i]!="") {
+ // let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ // if (_this.fot.includes(pth) === true)
+ // {
+ // if(paths[i][0]=="/")
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ // else
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ // }
+ // else {
+ // let nms = paths[i].split("\/")
+ // let nm = nms[nms.length - 1]
+ // if(paths[i][0]=="/")
+ // _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ // else
+ // _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ // }
+ // }
+ // }
+ this.loading = false;
+ });
+ },
mounted() {},
methods: {
submitForm() {
--
Gitblit v1.9.1