Merge branch 'dev_0.0.1_xq' of http://web.ronyao.com:3000/RYTEC/Real-time-monitoring-frontend into dev_0.0.1_xq

src/views/teacher/teacherStatistics/components/custom-componet/myEditor.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- <vueImg /> -->
-  <div class="w-1/1 h-100vh">
+  <div  class="relative flex-auto w-1/1 h-1/1">
     <mt-edit
       :use-thumbnail="true"
       @on-preview-click="onPreviewClick"
@@ -164,4 +164,6 @@ const onThumbnailClick = () => {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+
+</style>

src/views/teacher/teacherStatistics/components/mt-edit/index.vue

@@ -3,11 +3,10 @@
     <el-container class="h-1/1">
       <!-- 头部1 -->
       <el-header
-        height="45px"
         class="dark:bg-myDarkBgColor cb-border p-0 select-none"
         @mousedown="mainPanelRef?.stopListenerKeyDown()"
       >
-        <!-- 头部2 -->
+<!--        &lt;!&ndash; 头部2 &ndash;&gt;-->
         <header-panel
           v-model:leftAside="aside_state.left_show"
           v-model:rightAside="aside_state.right_show"
@@ -528,7 +527,10 @@ defineExpose({
 .mt-edit-aside {
   transition: width 0.3s;
 }
-
+.el-container[data-v-3a4046f9] .el-header
+{
+  height: 40px !important;
+}
 .vertical-radio-group {
   display: flex;
   flex-direction: column;