bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-26 18:27:16 +08:00
parent ff06debde4 00dcf192e5
commit aabe6c4003
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components.d.ts vendored
View File

@ -3,7 +3,7 @@
// @ts-nocheck // @ts-nocheck
// Generated by unplugin-vue-components // Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399 // Read more: https://github.com/vuejs/core/pull/3399
export {} export { }
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
@ -17,8 +17,16 @@ declare module 'vue' {
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage'] ElImage: typeof import('element-plus/es')['ElImage']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow'] ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTag: typeof import('element-plus/es')['ElTag']
EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default'] EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default'] EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']

51
src/views/home/index.vue
View File

@ -163,32 +163,27 @@ const onSelectItem = (type: number) => {
{{ child.name }} {{ child.name }}
</span> </span>
<span <span style="display: flex; flex: 1; flex-wrap: wrap">
style=" <a
display: flex; v-for="son in child.children"
flex: 1; :key="son.id"
flex-direction: column; style="font-size: 14px; font-weight: normal"
flex-wrap: wrap; @click="onSharedHall(3, son.id)"
" >
> {{ son.name }}
</a>
</span>
<!-- <span style="display: flex; flex: 1">
<span <span
v-for="son in child.children" v-for="son in child.children"
:key="son.id" :key="son.id"
style=" style="font-size: 14px; font-weight: normal"
font-size: 14px;
font-weight: bold;
width: 100%;
display: flex;
"
@click="onSharedHall(3, son.id)" @click="onSharedHall(3, son.id)"
> >
<!-- {{ son.name }} --> {{ son.name }} -->
<span style="width: 30%"> <!-- <span
{{ son.name }}
</span>
<span
style=" style="
width: 70%; width: 70%;
display: flex; display: flex;
@ -209,9 +204,9 @@ const onSelectItem = (type: number) => {
> >
{{ son_1.name }} {{ son_1.name }}
</span> </span>
</span> </span> -->
</span> <!-- </span>
</span> </span> -->
<!-- <span>{{ child.name }}</span> <!-- <span>{{ child.name }}</span>
<span> <span>
@ -445,11 +440,12 @@ const onSelectItem = (type: number) => {
top: 0; top: 0;
left: 200px; left: 200px;
width: 915px; width: 915px;
min-height: 100%;
max-height: 100%; max-height: 100%;
background-color: #f5f4f4; background-color: #fff;
z-index: 999; z-index: 999;
// opacity: 0.9; // opacity: 0.9;
border: 1px solid #333; border: 1px solid #eee;
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
@ -468,6 +464,11 @@ const onSelectItem = (type: number) => {
margin: 0 15px; margin: 0 15px;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
color: #333;
&:hover {
color: #1abc9c;
border-bottom: 1px solid #1abc9c !important;
}
} }
.last-level { .last-level {