From bea0fca09b8c2028208dd7d94027dec301047415 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 17 十月 2024 19:34:15 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/train/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/train/index.vue b/src/views/train/index.vue
index 484207e..0e756c8 100644
--- a/src/views/train/index.vue
+++ b/src/views/train/index.vue
@@ -8,7 +8,7 @@
<div class="card-wrapper">
<div class="card-header">
<div class="header-tab">
- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tabs v-model="activeName" @tab-click="handleClick" size="small">
<el-tab-pane label="鍏ㄩ儴" name="all"></el-tab-pane>
<el-tab-pane label="鏈紑濮�" name="0"></el-tab-pane>
<el-tab-pane label="杩涜涓�" name="1"></el-tab-pane>
@@ -16,12 +16,12 @@
</el-tabs>
</div>
<div class="header-search">
- <el-input v-model="queryParam.meetName" @input="getList" clearable @clear="getList"
+ <el-input v-model="queryParam.meetName" @input="getList" clearable @clear="getList" size="small"
placeholder="璇疯緭鍏ヨ绋嬪悕绉�"/>
- <el-button type="primary" class="ml-4" @click="getList">鎼滅储</el-button>
+ <el-button type="primary" class="ml-4" style="margin-left: 5px" size="small" @click="getList">鎼滅储</el-button>
</div>
<div>
- <el-button type="primary" @click="handleAdd()">娣诲姞</el-button>
+ <el-button type="primary" @click="handleAdd()" size="small">娣诲姞</el-button>
</div>
</div>
@@ -40,7 +40,7 @@
</el-card>
<!-- 娣诲姞浼氳瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
<el-form label-width="80px" ref="form" :model="form" :rules="rules">
<el-form-item label="鎴块棿鍚�" prop="meetName">
<el-input v-model="form.meetName" placeholder="璇疯緭鍏ユ埧闂村悕" style="width: 300px"></el-input>
@@ -156,7 +156,8 @@
let routeUrl = this.$router.resolve({
path: '/meet',
query: {
- domain: 'ycl.easyblog.vip:8443/' + item.id,
+ meetId: item.id,
+ domain: 'www.kgmeet.com:8443/' + item.id,
roomName: item.meetName,
userInfoStr: JSON.stringify({
displayName: item.teacherName
--
Gitblit v1.8.0