Merge branch 'main' into zhuhao_dev

# Conflicts:
#	src/renderer/src/views/prepare/index.vue

src/renderer/src/views/classManage/classReserv.vue

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

src/renderer/src/views/profile/index.vue

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

src/renderer/src/views/tool/components/side.vue

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