From d570456e3f1d79a085918718f87a9db0e6361ae8 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 19 六月 2023 09:26:07 +0800
Subject: [PATCH] 修改青羊开始后台
---
vue.config.js | 2
src/api/user.js | 4 +
src/views/meeting/list.vue | 58 ++++++++++++++++++++++++----
src/views/exam/paper/edit.vue | 4 --
4 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/src/api/user.js b/src/api/user.js
index bd97bde..03a9197 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -9,5 +9,7 @@
updateUser: query => post('/api/admin/user/update', query),
changeStatus: id => post('/api/admin/user/changeStatus/' + id),
deleteUser: id => post('/api/admin/user/delete/' + id),
- selectByUserName: query => post('/api/admin/user/selectByUserName', query)
+ selectByUserName: query => post('/api/admin/user/selectByUserName', query),
+ addMeetin:query => post('/api/admin/video/add', query),
+ delMeetin:query => post('/api/admin/video/clear', query)
}
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 638773c..c9607e7 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -25,9 +25,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="璇曞嵎鍚嶇О锛�" prop="name" required >
-
<el-row :gutter="20">
-
<el-col :span="9">
<el-input v-model="form.name"/>
</el-col>
@@ -47,9 +45,7 @@
<el-col :span="9">
<el-input v-model="titleItem.name" style="width: 80%"/>
</el-col>
-
</el-row>
-
</el-form-item>
<!-- <el-form-item label="鎬绘暟鍒嗭細" v-if="form.paperType==7" prop="name" required>-->
<!-- <el-input v-model="form.name"/>-->
diff --git a/src/views/meeting/list.vue b/src/views/meeting/list.vue
index c41befd..7beda95 100644
--- a/src/views/meeting/list.vue
+++ b/src/views/meeting/list.vue
@@ -1,20 +1,21 @@
<template>
<!-- <div ref="jitsiContainer" style="height: 100vh; width: 100%;"></div>-->
- <div style="display: flex">
- <div id="meet"></div>
+ <div style="display: flex;height: calc(100vh - 84px);" >
+ <div id="meet" style="width: 65%;height: 100%;"></div>
<!-- <el-button @click="Connect">鍔犲叆</el-button>-->
- <div>
+ <div class="table-meet">
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶏細">
<el-input v-model="queryParam.userName"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
- <el-button type="primary" @click="addMeeting">娣诲姞鑷充細璁�</el-button>
+ <el-button type="primary" @click="addMeeting">娣诲姞鑷充細璁�</el-button>
+ <el-button type="primary" @click="delMeeting">娓呯┖</el-button>
</el-form-item>
</el-form>
- <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
+ <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
@@ -24,7 +25,7 @@
<el-table-column prop="userLevel" label="瀛︾骇" :formatter="levelFormatter"/>
<!-- <el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>-->
</el-table>
- <pagination v-show="total>0" :total="total" :page.sync="queryParam.pageIndex" :limit.sync="queryParam.pageSize"
+ <pagination class="meet-pagin" v-show="total>0" :total="total" :page.sync="queryParam.pageIndex" :limit.sync="queryParam.pageSize"
@pagination="search"/>
</div>
</div>
@@ -52,6 +53,7 @@
// },
data () {
return {
+ multipleSelection:[],
userInfo:null,
queryParam: {
userName: '',
@@ -92,8 +94,8 @@
const domain = '124.222.18.104:8443';
const options = {
roomName: this.roomName,
- width: 1200,
- height: 800,
+ width: 100+'%',
+ height: 100+'%',
parentNode: document.querySelector('#meet'),
configOverwrite: {
disableSsl: true
@@ -172,8 +174,37 @@
this.queryParam.pageIndex = 1
this.search()
},
+ handleSelectionChange(val){
+ console.log(val)
+ this.multipleSelection = val;
+ },
addMeeting(){
- this.$message.success('娣诲姞鎴愬姛')
+ //娣诲姞浼氳
+ let obj={}
+ let arr= []
+ this.multipleSelection.forEach(item=>{
+ arr.push(item.id)
+ })
+ obj.roomName=this.roomName
+ obj.stuIds = arr
+ userApi.addMeetin(obj).then(res=>{
+ console.log(res)
+ if (res.code ==1){
+ this.$message.success('娣诲姞鎴愬姛')
+ }
+ })
+
+ },
+ delMeeting(){
+ // 娓呴櫎浼氳
+ userApi.delMeetin().then(res=>{
+ console.log(res)
+ if (res.code==1){
+ this.$message.success('娓呴櫎鎴愬姛')
+ }
+
+ })
+
},
search () {
this.listLoading = true
@@ -237,3 +268,12 @@
}
};
</script>
+<style scoped lang="scss">
+ .table-meet{
+ padding: 5px;
+ }
+ .meet-pagin{
+ position: absolute;
+ bottom: 5px;
+ }
+</style>
diff --git a/vue.config.js b/vue.config.js
index 2284dab..6d1c6dc 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,7 +19,7 @@
hotOnly: false,
proxy: {
'/api': {
- target: 'http://192.168.3.228:8000',
+ target: 'http://192.168.3.220:8000',
changeOrigin: true
}
}
--
Gitblit v1.8.0