删除通知图标,修复添加教室必填项
Some checks failed
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
CI / CI OK (push) Has been cancelled
Deploy Website on push / Rerun on failure (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
Some checks failed
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
CI / CI OK (push) Has been cancelled
Deploy Website on push / Rerun on failure (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
This commit is contained in:
@@ -990,7 +990,7 @@ const handleCellContextMenu = (col: number, row: number, event: MouseEvent) => {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="seat-layout-editor" :class="{ drawing: isDrawing }">
|
||||
<div class="seat-layout-editor">
|
||||
<Card>
|
||||
<div class="editor-toolbar">
|
||||
<div class="toolbar-section">
|
||||
@@ -1085,10 +1085,9 @@ const handleCellContextMenu = (col: number, row: number, event: MouseEvent) => {
|
||||
<div class="editor-hint">
|
||||
<p>
|
||||
<strong>操作提示:</strong>
|
||||
<strong>按住鼠标左键拖动</strong>可以连续绘制多个单元格。
|
||||
<strong>按住鼠标左键拖动</strong>可以连续绘制多个单元格。
|
||||
{{ autoNumbering ? '座位将自动编号。' : '选择"座位"时需要手动输入座位号。' }}
|
||||
<strong>右键点击座位</strong>可以设置禁坐状态。
|
||||
<span v-if="isDrawing" class="drawing-indicator">正在绘制中...</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1262,18 +1261,6 @@ const handleCellContextMenu = (col: number, row: number, event: MouseEvent) => {
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.drawing-indicator {
|
||||
display: inline-block;
|
||||
margin-left: 12px;
|
||||
padding: 2px 8px;
|
||||
background: #ff4d4f;
|
||||
color: #fff;
|
||||
border-radius: 4px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
animation: blink 1s infinite;
|
||||
}
|
||||
|
||||
.merge-indicator {
|
||||
display: inline-block;
|
||||
margin-left: 12px;
|
||||
@@ -1382,9 +1369,6 @@ const handleCellContextMenu = (col: number, row: number, event: MouseEvent) => {
|
||||
/* 移除 transform: scale,避免影响合并单元格的布局 */
|
||||
}
|
||||
|
||||
.seat-layout-editor.drawing .cell {
|
||||
cursor: crosshair;
|
||||
}
|
||||
|
||||
.cell-empty {
|
||||
background: var(--ant-color-bg-container, #ffffff);
|
||||
|
||||
@@ -160,16 +160,6 @@ watch(
|
||||
@logout="handleLogout"
|
||||
/>
|
||||
</template>
|
||||
<template #notification>
|
||||
<Notification
|
||||
:dot="showDot"
|
||||
:notifications="notifications"
|
||||
@clear="handleNoticeClear"
|
||||
@read="(item) => item.id && markRead(item.id)"
|
||||
@remove="(item) => item.id && remove(item.id)"
|
||||
@make-all="handleMakeAll"
|
||||
/>
|
||||
</template>
|
||||
<template #extra>
|
||||
<AuthenticationLoginExpiredModal
|
||||
v-model:open="accessStore.loginExpired"
|
||||
|
||||
@@ -30,7 +30,7 @@ const formData = ref<ClassroomApi.SaveParams>({
|
||||
floor: '',
|
||||
room: '',
|
||||
type: 'normal',
|
||||
capacity: 0,
|
||||
capacity: 10, // 默认容量为10
|
||||
school_id: undefined,
|
||||
teacher_id: undefined,
|
||||
description: '',
|
||||
@@ -88,7 +88,7 @@ const fetchDetail = async () => {
|
||||
floor: location.floor || data.floor || '',
|
||||
room: location.room || data.room || '',
|
||||
type: data.type || 'normal',
|
||||
capacity: data.capacity || 0,
|
||||
capacity: data.capacity || 10, // 默认容量为10
|
||||
school_id: data.school_id,
|
||||
teacher_id: data.teacher_id,
|
||||
description: data.description || '',
|
||||
@@ -192,10 +192,11 @@ onMounted(() => {
|
||||
<Select.Option value="lab">实验室</Select.Option>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item label="容量" name="capacity">
|
||||
<InputNumber v-model:value="formData.capacity" :min="0" placeholder="请输入容量" />
|
||||
</Form.Item>
|
||||
<Form.Item label="学校" name="school_id">
|
||||
<Form.Item
|
||||
label="学校"
|
||||
name="school_id"
|
||||
:rules="[{ required: true, message: '请选择学校' }]"
|
||||
>
|
||||
<Select
|
||||
v-model:value="formData.school_id"
|
||||
placeholder="请选择学校"
|
||||
@@ -220,7 +221,11 @@ onMounted(() => {
|
||||
</Select.Option>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item label="负责教师" name="teacher_id">
|
||||
<Form.Item
|
||||
label="负责教师"
|
||||
name="teacher_id"
|
||||
:rules="[{ required: true, message: '请选择负责教师' }]"
|
||||
>
|
||||
<Select
|
||||
v-model:value="formData.teacher_id"
|
||||
placeholder="请选择负责教师"
|
||||
|
||||
Reference in New Issue
Block a user