From 8f6a2095d907c2a892df84476ea1ccd23b984ecd Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 13 六月 2024 15:40:19 +0800
Subject: [PATCH] fix(培训列表):修改横向滚动条问题
---
src/views/train/data-list/index.vue | 80 ++++++++++++++++++++++++++++------------
src/views/meet/index.vue | 1
src/views/exam/index.vue | 6 ++
3 files changed, 62 insertions(+), 25 deletions(-)
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index 65c156c..61ee1a9 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -97,7 +97,7 @@
</template>
<script setup>
-import { ref, toRefs } from 'vue';
+import { ref } from 'vue';
import { storeToRefs } from 'pinia';
import { Close } from '@element-plus/icons-vue';
import AnswerTag from './components/answer-tag/index.vue';
@@ -107,6 +107,9 @@
import AnswerMultiple from './components/answer-main/answer-multiple/index.vue';
import AnswerTime from './components/answer-time/index.vue';
import { useExamStore } from '@/store/index.js';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
const examStore = useExamStore();
const { currentType, currentIndex, activeQuestion, examDetail } = storeToRefs(examStore);
@@ -181,6 +184,7 @@
const confirmCancel = () => {
dialogVisible.value = false;
+ router.back();
};
</script>
diff --git a/src/views/meet/index.vue b/src/views/meet/index.vue
index cd6e192..1d9f847 100644
--- a/src/views/meet/index.vue
+++ b/src/views/meet/index.vue
@@ -22,6 +22,7 @@
enabled: false
}
},
+ toolbarButtons: ['whiteboard']
};
const api = new JitsiMeetExternalAPI(domain, options);
});
diff --git a/src/views/train/data-list/index.vue b/src/views/train/data-list/index.vue
index 72bfe2c..5adeca2 100644
--- a/src/views/train/data-list/index.vue
+++ b/src/views/train/data-list/index.vue
@@ -1,30 +1,34 @@
<template>
<div class="list-container w-full h-full">
<el-scrollbar>
- <el-row :gutter="20">
- <el-col :span="6" v-for="item in dataList">
- <el-card shadow="hover" class="list-card cursor-pointer" :body-style="{ padding: 0 }" @click="itemClick(item)">
- <div class="img-container w-full">
- <img src="@/assets/image/list-card-bg.jpg" class="w-full">
- </div>
- <div class="item-info p-3">
- <div class="info-title font-bold">{{ item.title }}</div>
- <div class="info-teacher flex text-sm text-gray-500">
- <div class="info-label">涓昏:</div>
- <div class="info-text">{{ item.teacher }}</div>
+ <div class="list-content w-full overflow-x-hidden">
+ <el-row :gutter="20">
+ <el-col :span="6" v-for="item in dataList" class="mb-5">
+ <el-card shadow="hover" class="list-card cursor-pointer" :body-style="{ padding: 0 }"
+ @click="itemClick(item)">
+ <div class="img-container w-full">
+ <img src="@/assets/image/list-card-bg.jpg" class="w-full">
</div>
- <div class="info-time flex text-sm text-gray-500">
- <div class="info-label">寮�濮嬫椂闂�:</div>
- <div class="info-text">{{ item.startTime }}</div>
+ <div class="item-info p-3">
+ <div class="info-title font-bold">{{ item.title }}</div>
+ <div class="info-teacher flex text-sm text-gray-500">
+ <div class="info-label">涓昏:</div>
+ <div class="info-text">{{ item.teacher }}</div>
+ </div>
+ <div class="info-time flex text-sm text-gray-500">
+ <div class="info-label">寮�濮嬫椂闂�:</div>
+ <div class="info-text">{{ item.startTime }}</div>
+ </div>
+ <div class="info-time flex text-sm text-gray-500">
+ <div class="info-label">缁撴潫鏃堕棿:</div>
+ <div class="info-text">{{ item.endTime }}</div>
+ </div>
</div>
- <div class="info-time flex text-sm text-gray-500">
- <div class="info-label">缁撴潫鏃堕棿:</div>
- <div class="info-text">{{ item.endTime }}</div>
- </div>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ </el-card>
+ </el-col>
+ </el-row>
+ </div>
+
</el-scrollbar>
</div>
</template>
@@ -42,12 +46,40 @@
endTime: '2024-6-13 8:00',
teacher: '娴嬭瘯娴嬭瘯',
roomName: 'test'
+ },
+ {
+ title: '娴嬭瘯1',
+ startTime: '2024-6-13 8:00',
+ endTime: '2024-6-13 8:00',
+ teacher: '娴嬭瘯娴嬭瘯',
+ roomName: 'test'
+ },
+ {
+ title: '娴嬭瘯1',
+ startTime: '2024-6-13 8:00',
+ endTime: '2024-6-13 8:00',
+ teacher: '娴嬭瘯娴嬭瘯',
+ roomName: 'test'
+ },
+ {
+ title: '娴嬭瘯1',
+ startTime: '2024-6-13 8:00',
+ endTime: '2024-6-13 8:00',
+ teacher: '娴嬭瘯娴嬭瘯',
+ roomName: 'test'
+ },
+ {
+ title: '娴嬭瘯1',
+ startTime: '2024-6-13 8:00',
+ endTime: '2024-6-13 8:00',
+ teacher: '娴嬭瘯娴嬭瘯',
+ roomName: 'test'
}
-])
+]);
const itemClick = (item) => {
- if(window.electron) {
+ if (window.electron) {
window.electron.openNewWindow();
}
}
--
Gitblit v1.8.0