zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' into zhuhao_dev 

# Conflicts:
#	src/renderer/src/views/prepare/index.vue
This commit is contained in:
朱浩 2024-08-14 10:00:16 +08:00
parent 79055dc1c2 e3a04c0add
commit ea4afb409f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/src/views/classManage/classReserv.vue
View File

@ -17,6 +17,8 @@
v-show="tabActive === '已结束'" v-show="tabActive === '已结束'"
:key="index" :key="index"
:item="item" :item="item"
@open-edit="reservDialog.openDialog(item)"
@delete-reserv="deleteReserv(item)"
></reserv-item> ></reserv-item>
</div> </div>
<reserv ref="reservDialog"></reserv> <reserv ref="reservDialog"></reserv>
@ -51,8 +53,8 @@ const doneDataList = computed(() => {
}) })
const toolStore = useToolState() const toolStore = useToolState()
watch( watch(
() => toolStore.isToolWin, () => [dataList,toolStore.isToolWin],
(newD, oldD) => { () => {
getSelfReserv().then((res) => { getSelfReserv().then((res) => {
dataList.value = [...res.data] dataList.value = [...res.data]
}) })

4
src/renderer/src/views/profile/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20" style="display: flex;flex-wrap: nowrap;justify-content: start">
<el-col :span="6" :xs="24"> <el-col :xs="24" style="min-width: 260px;max-width: 260px">
<el-card class="box-card"> <el-card class="box-card">
<template v-slot:header> <template v-slot:header>
<div class="clearfix"> <div class="clearfix">

2
src/renderer/src/views/tool/components/side.vue
View File

@ -139,4 +139,4 @@ const clickHandel = (o, e) => {
color: red; color: red;
} }
</style> </style>