From 780c1858c9d8f3adf17287ddc4c717833e305c65 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:47:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/meeting/replay.vue | 3 ++-
ruoyi-ui/src/views/meeting/webcast.vue | 22 +++++++++++++++++++---
ruoyi-ui/src/router/index.js | 6 +++---
ruoyi-ui/src/views/meeting/index.vue | 14 --------------
4 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index c755a4a..fccb877 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -206,11 +206,11 @@
permissions: ['meetingModel:webcast:list'],
children: [
{
- path: 'webcastInfo/',
+ path: 'Home/',
// path: 'webcastInfo/:id(\\d+)',
component: () => import('@/views/meeting/Home'),
- name: 'webcastInfo',
- meta: { title: '鐩存挱璇︽儏',activeMenu: '/meeting/webcastInfo'}
+ name: 'Home',
+ meta: { title: '鐩存挱璇︽儏',activeMenu: '/meeting/Home'}
}
]
},
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index abce3f0..4fa0894 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -21,20 +21,6 @@
<hr>
-<!-- <el-form :model="queryParams1">
- <el-row>
- <el-form-item label="" prop="people">
- <el-input v-model="queryParams1.people" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" clearable style="width: 200px;
- height: 35px;
- text-align: left;
- border-radius: 16px 16px 16px 16px;
- opacity: 0.5;" @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-form-item>
- </el-row>
- </el-form> -->
-
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="鏃堕棿" prop="happenTime">
diff --git a/ruoyi-ui/src/views/meeting/replay.vue b/ruoyi-ui/src/views/meeting/replay.vue
index a0110e7..3f56b4f 100644
--- a/ruoyi-ui/src/views/meeting/replay.vue
+++ b/ruoyi-ui/src/views/meeting/replay.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container" style="width: 1500px; height: 800px;">
+ <div class="app-container" style="width: 100%; height: 800px;">
<!-- 鍥炲埌椤堕儴 -->
<el-backtop :bottom="150" :right="30">
<el-button type="primary" circle class="el-icon-top"></el-button>
@@ -13,6 +13,7 @@
<hr>
<!-- 鎼滅储 -->
+
<el-form :model="queryParams1">
<el-row>
<el-form-item label="" prop="people">
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index 109725a..8c202b2 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -10,12 +10,12 @@
<span>鐩存挱</span>
<div class="button-container"></div>
<div style="display: flex; align-items: center;">
- <el-button size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
+<!-- <el-button size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
<div class="form" @click="newRequest"><el-icon style="padding-right:100px;"></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>
+ </el-button> -->
</div>
</h1>
@@ -40,6 +40,21 @@
opacity: 1;">閲嶇疆</el-button>
</el-form-item>
</el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="newRequest"
+ v-hasPermi="['person:information:memo']"
+ >鏂板</el-button>
+ </el-col>
+
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
<el-row :gutter="0" v-loading="loading">
<el-col :span="4" v-for="(item,i) in webcastList">
@@ -168,6 +183,7 @@
},
data() {
return {
+ showSearch: true,
pageSizes: [12, 24, 36],
webcastList:[],
// 鎬绘潯鏁�
@@ -248,7 +264,7 @@
);
},
toLook() {
- this.$router.push('/meeting/webcast/webcastInfo/')
+ this.$router.push('/meeting/webcast/Home/')
}
}
--
Gitblit v1.9.1