提交 5ed5ca97 authored 作者: 王鹏飞's avatar 王鹏飞

优化实验管理界面,调整下拉选择框为可过滤,更新应用配置中的logo链接

上级 b4b308ef
...@@ -147,9 +147,10 @@ const appConfigList = [ ...@@ -147,9 +147,10 @@ const appConfigList = [
}, },
{ {
system: 'dml', system: 'dml',
title: '湖北工匠杯技能大赛', // title: '湖北工匠杯技能大赛',
logo: 'https://webapp-pub.ezijing.com/website/base/images/favicon_swsjfxs.png', // logo: 'https://webapp-pub.ezijing.com/website/base/images/favicon_swsjfxs.png',
favicon: 'https://webapp-pub.ezijing.com/website/base/images/favicon_swsjfxs.png', // favicon: 'https://webapp-pub.ezijing.com/website/base/images/favicon_swsjfxs.png',
logo: 'https://webapp-pub.ezijing.com/website/base/logo.svg',
hosts: ['ccsc'], hosts: ['ccsc'],
dmlURL: import.meta.env.VITE_DML_PRO_URL, dmlURL: import.meta.env.VITE_DML_PRO_URL,
loginURL: import.meta.env.VITE_SWSJFXS_LOGIN_URL, loginURL: import.meta.env.VITE_SWSJFXS_LOGIN_URL,
......
...@@ -122,12 +122,12 @@ function handleUpdate(params: ExperimentCreateItem) { ...@@ -122,12 +122,12 @@ function handleUpdate(params: ExperimentCreateItem) {
@update:modelValue="(value) => $emit('update:modelValue', value)"> @update:modelValue="(value) => $emit('update:modelValue', value)">
<el-form ref="formRef" :model="form" :rules="rules" label-width="145px"> <el-form ref="formRef" :model="form" :rules="rules" label-width="145px">
<el-form-item label="实验所属部门/学校" prop="organ_id"> <el-form-item label="实验所属部门/学校" prop="organ_id">
<el-select v-model="form.organ_id" style="width: 100%" :disabled="isUpdate" @change="handleOrgChange"> <el-select filterable v-model="form.organ_id" style="width: 100%" :disabled="isUpdate" @change="handleOrgChange">
<el-option v-for="item in organizations" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in organizations" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="实验课程" prop="course_id"> <el-form-item label="实验课程" prop="course_id">
<el-select v-model="form.course_id" style="width: 100%" :disabled="isUpdate"> <el-select filterable v-model="form.course_id" style="width: 100%" :disabled="isUpdate">
<el-option v-for="item in courses" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in courses" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
...@@ -4,7 +4,7 @@ import { CirclePlus, MoreFilled, CopyDocument, Delete, Setting, Edit, EditPen } ...@@ -4,7 +4,7 @@ import { CirclePlus, MoreFilled, CopyDocument, Delete, Setting, Edit, EditPen }
import AppList from '@/components/base/AppList.vue' import AppList from '@/components/base/AppList.vue'
import { getExperimentList, deleteExperiment } from '../api' import { getExperimentList, deleteExperiment } from '../api'
import { useGetCourseList } from '../composables/useGetCourseList' import { useGetCourseList } from '../composables/useGetCourseList'
import { useGetCourseExperimentList } from '../composables/useGetCourseExperimentList' // import { useGetCourseExperimentList } from '../composables/useGetCourseExperimentList'
import { useMapStore } from '@/stores/map' import { useMapStore } from '@/stores/map'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
...@@ -19,7 +19,7 @@ const status = useMapStore().getMapValuesByKey('system_status') ...@@ -19,7 +19,7 @@ const status = useMapStore().getMapValuesByKey('system_status')
const { courses, updateCourses } = useGetCourseList() const { courses, updateCourses } = useGetCourseList()
updateCourses('') updateCourses('')
// 课程实验 // 课程实验
const { courseExperiments, updateCourseExperiments } = useGetCourseExperimentList() // const { courseExperiments, updateCourseExperiments } = useGetCourseExperimentList()
const appList = $ref<InstanceType<typeof AppList> | null>(null) const appList = $ref<InstanceType<typeof AppList> | null>(null)
...@@ -29,12 +29,12 @@ const params = reactive({ ...@@ -29,12 +29,12 @@ const params = reactive({
name: '', name: '',
status: '', status: '',
}) })
watch( // watch(
() => params.course_id, // () => params.course_id,
() => { // () => {
updateCourseExperiments(params.course_id) // updateCourseExperiments(params.course_id)
} // },
) // )
// 列表配置 // 列表配置
const listOptions = $computed(() => { const listOptions = $computed(() => {
return { return {
...@@ -58,6 +58,12 @@ const listOptions = $computed(() => { ...@@ -58,6 +58,12 @@ const listOptions = $computed(() => {
}, },
}, },
filters: [ filters: [
{
type: 'input',
prop: 'name',
label: '实验名称',
placeholder: '请输入实验名称',
},
{ {
type: 'select', type: 'select',
prop: 'course_id', prop: 'course_id',
...@@ -67,15 +73,15 @@ const listOptions = $computed(() => { ...@@ -67,15 +73,15 @@ const listOptions = $computed(() => {
labelKey: 'name', labelKey: 'name',
valueKey: 'id', valueKey: 'id',
}, },
{ // {
type: 'select', // type: 'select',
prop: 'id', // prop: 'id',
label: '实验名称', // label: '实验名称',
placeholder: '请选择实验', // placeholder: '请选择实验',
options: courseExperiments.value, // options: courseExperiments.value,
labelKey: 'name', // labelKey: 'name',
valueKey: 'id', // valueKey: 'id',
}, // },
{ {
type: 'select', type: 'select',
prop: 'status', prop: 'status',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论