Merge remote-tracking branch 'origin/DEV' into DEV

# Conflicts:
#	src/views/dashboard/Analysis/index.vue
This commit is contained in:
xbx 2024-03-27 15:58:02 +08:00
commit 81d2d93618
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<div style="background: #ececec; padding-top: 0px;padding-left: 20px;padding-right: 20px;padding-bottom: 20px;"> <div style="background: #ececec; padding-top: 0px;padding-left: 20px;padding-right: 20px;padding-bottom: 20px;">
    <a-card title="四六级总通过率查询" :bordered="false">     <a-card title="考场座位查询" :bordered="false">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="5">
<locationaTree ref="locationaTrees" :height="700" @onSelect="onSelect"></locationaTree> <locationaTree ref="locationaTrees" :height="700" @onSelect="onSelect"></locationaTree>

View File

@ -104,4 +104,4 @@ export default {
color: rgb(8, 8, 8); color: rgb(8, 8, 8);
font-weight: bold; font-weight: bold;
} }
</style> </style>