From c2a1c68a2a398e6d0f2f5854c65127efbff306b1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 11:36:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/class-management/Class.vue | 75 +++++++++++++++++++++++--------------
src/api/user.js | 4 +-
src/views/meet/index.vue | 12 ++++++
src/api/classes.js | 8 ++++
4 files changed, 69 insertions(+), 30 deletions(-)
diff --git a/src/api/classes.js b/src/api/classes.js
index 95940ee..673b8e2 100644
--- a/src/api/classes.js
+++ b/src/api/classes.js
@@ -83,3 +83,11 @@
method: "PUT"
})
}
+
+// 鑾峰彇鑰佸笀鍒楄〃
+export const getTeacherList = () => {
+ return axios({
+ url: "/api/admin/user/student/list",
+ method: "GET"
+ })
+}
diff --git a/src/api/user.js b/src/api/user.js
index 450f224..46a57f8 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,4 +1,4 @@
-import { post,get } from '@/utils/request'
+import { post, get } from '@/utils/request'
export default {
getUserPageList: query => post('/api/admin/user/page/list', query),
@@ -12,5 +12,5 @@
selectByUserName: query => post('/api/admin/user/selectByUserName', query),
studentList: () => get('/api/admin/user/student/list'),
getClassesCurrentUserList: (param) => get('/api/admin/user/classes/students', param),
- updatePassword: (data) => post('/api/common/user/update/password', data)
+ updatePassword: (data) => post('/api/common/user/update/password', data),
}
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index 5dffd29..d567a34 100644
--- a/src/views/class-management/Class.vue
+++ b/src/views/class-management/Class.vue
@@ -37,7 +37,7 @@
>
<el-table-column
align="center"
- label="鐝骇"
+ label="鐝骇鍚嶇О"
prop="className"
width="180px"
></el-table-column>
@@ -60,9 +60,9 @@
<!-- ></el-table-column>-->
<el-table-column
align="center"
- width="100px"
+ width="300px"
label="鏁欏笀"
- prop="createUserName"
+ prop="teacherNamesStr"
></el-table-column>
<!-- <el-table-column-->
<!-- align="center"-->
@@ -91,10 +91,10 @@
<el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerEdit(scope.row)"
type="primary">淇敼
</el-button>
- <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" type="warning">鐝骇楠岃瘉</el-button>
- <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerOpenNotify(scope.row)"
- type="info">閫氱煡
- </el-button>
+<!-- <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" type="warning">鐝骇楠岃瘉</el-button>-->
+<!-- <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerOpenNotify(scope.row)"-->
+<!-- type="info">閫氱煡-->
+<!-- </el-button>-->
<el-button v-show="scope.row.status !== '瑙ｆ暎'" @click="studentManager(scope.row.id,scope.row.className)" size="small"
type="success">鎴愬憳绠＄悊
</el-button>
@@ -123,25 +123,25 @@
<pagination v-show="total>0" :total="total" :page.sync="searchForm.currentPage"
:limit.sync="searchForm.pageSize"
@pagination="page"/>
- <el-dialog
- title="鐝骇閫氱煡"
- :visible.sync="notifyOpen"
- width="600px"
- :before-close="handleNotifyClose"
- :close-on-click-modal="false">
- <el-form :model="notifyForm" :rules="notifyRules" ref="notifyForm" label-width="100px" class="demo-ruleForm">
- <el-form-item label="閫氱煡鐝骇锛�" prop="className">
- <span>{{ notifyForm.className }}</span>
- </el-form-item>
- <el-form-item label="閫氱煡鍐呭锛�" prop="notifyContent">
- <el-input type="textarea" v-model="notifyForm.notifyContent" size="small"></el-input>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="handleNotifyClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitNotifyForm">纭� 瀹�</el-button>
- </span>
- </el-dialog>
+<!-- <el-dialog-->
+<!-- title="鐝骇閫氱煡"-->
+<!-- :visible.sync="notifyOpen"-->
+<!-- width="600px"-->
+<!-- :before-close="handleNotifyClose"-->
+<!-- :close-on-click-modal="false">-->
+<!-- <el-form :model="notifyForm" :rules="notifyRules" ref="notifyForm" label-width="100px" class="demo-ruleForm">-->
+<!-- <el-form-item label="閫氱煡鐝骇锛�" prop="className">-->
+<!-- <span>{{ notifyForm.className }}</span>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="閫氱煡鍐呭锛�" prop="notifyContent">-->
+<!-- <el-input type="textarea" v-model="notifyForm.notifyContent" size="small"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <span slot="footer" class="dialog-footer">-->
+<!-- <el-button @click="handleNotifyClose">鍙� 娑�</el-button>-->
+<!-- <el-button type="primary" @click="submitNotifyForm">纭� 瀹�</el-button>-->
+<!-- </span>-->
+<!-- </el-dialog>-->
<el-dialog
:title="title"
@@ -152,6 +152,16 @@
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="鐝骇鍚嶇О" prop="className">
<el-input v-model="form.className" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鑰佸笀閰嶇疆" prop="teacherList">
+ <el-select v-model="form.teacherList" multiple clearable size="small" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in teacherList"
+ :key="item.id"
+ :label="item.realName"
+ :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鐝骇鏃堕棿" required>
<el-col :span="11">
@@ -191,7 +201,7 @@
</template>
<script>
-import { addClasses, editClasses, getClassess, dissolution, recover } from '@/api/classes'
+import { addClasses, editClasses, getClassess, dissolution, recover, getTeacherList } from '@/api/classes'
import { addClassesNotify } from '@/api/classesNotify'
import Pagination from '@/components/Pagination'
@@ -199,6 +209,7 @@
components: { Pagination },
data () {
return {
+ teacherList: [],
notifyOpen: false,
notifyForm: {
className: '',
@@ -220,6 +231,7 @@
form: {
id: null,
className: '',
+ teacherList: [],
status: '',
verifyStatus: '',
startTime: null,
@@ -248,6 +260,11 @@
}
},
methods: {
+ getTeacherList () {
+ getTeacherList().then(res => {
+ this.teacherList = res.data.data
+ })
+ },
handlerOpenNotify (row) {
this.notifyOpen = true
this.notifyForm.className = row.className
@@ -286,6 +303,7 @@
this.form = {
id: null,
className: '',
+ teacherList: [],
status: '',
verifyStatus: '',
startTime: null,
@@ -362,7 +380,8 @@
},
created () {
this.page()
- },
+ this.getTeacherList()
+ }
}
</script>
diff --git a/src/views/meet/index.vue b/src/views/meet/index.vue
index a7c5448..6fef657 100644
--- a/src/views/meet/index.vue
+++ b/src/views/meet/index.vue
@@ -82,9 +82,21 @@
methods: {
muteEveryone () {
this.jitsiApi.executeCommand('muteEveryone', 'audio')
+ const h = this.$createElement;
+
+ this.$notify({
+ title: '鎻愮ず',
+ message: h('i', { style: 'color: teal'}, '宸插叏浣撶闊�')
+ });
},
videoEveryone () {
this.jitsiApi.executeCommand('muteEveryone', 'video')
+ const h = this.$createElement;
+
+ this.$notify({
+ title: '鎻愮ず',
+ message: h('i', { style: 'color: teal'}, '宸插叧闂叏浣撹棰�')
+ });
},
handleCommand (command) {
this.sendMessage(JSON.stringify(command))
--
Gitblit v1.8.0