Merge branch 'main' into dev_0.0.1_xq

src/main.ts

@@ -1,8 +1,9 @@
+import 'uno.css';
 import { createApp } from 'vue';
 import pinia from '@/stores';
 
 import '@/styles/index.scss';
-import 'uno.css'
+
 // element plus
 import ElementPlus from 'element-plus';
 // element css

src/views/faceinfo/FaceInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="div-container">
     <!-- 左侧库选择 -->
     <div class="sidebar">
       <div class="sidebar-header">
@@ -531,7 +531,7 @@ onMounted(() => {
   margin-bottom: 2px;
 }
 /* ================= 整体布局 ================= */
-.container {
+.div-container {
   display: flex;
   height: 100%;
   /* 使用 Element 的页面底层背景变量 */

src/views/sysmonitortree/sysMonitorTree/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="div-container">
     <div class="sidebar">
 <!--      左侧树型列表-->
       <el-card class="box-card" shadow="never">
@@ -1076,7 +1076,7 @@ onBeforeUnmount(() => {
 
 <style scoped>
 /* 保持原有布局 */
-.container {
+.div-container {
   display: flex;
   height: 100%;
 }

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

@@ -135,65 +135,5 @@ const onThumbnailClick = () => {
 </script>
 
 <style scoped>
-.common-layout {
-  height: 100vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.layout-container {
-  width: 100%;
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-}
 
-.header-part {
-  height: calc(100vh * 240 / 1280);
-  background-color: #b3c0d1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 36px;
-  font-weight: bold;
-  color: #333;
-}
-
-.main-part {
-  height: calc(100vh * 950 / 1280);
-  background-color: #e9eef3;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 18px;
-  color: #333;
-}
-
-.footer-part {
-  height: calc(100vh * 90 / 1280);
-  background-color: #d3dce6;
-  padding: 0 !important; /* 移除默认内边距 */
-  margin: 0 !important; /* 移除默认外边距 */
-  /* display: flex; */
-  /* align-items: center;
-  justify-content: center; */
-  /* font-size: 18px; */
-  color: #333;
-  margin-top: 0;
-}
-
-.footer-part-col {
-  height: 100%;
-  background-color: #333;
-  color: #606266;
-
-  border: 3px solid rgb(206, 12, 12);
-  border-radius: 4px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  font-weight: bold;
-}
 </style>

src/views/teacher/teacherStatistics/index.vue

@@ -9,3 +9,6 @@ onUnmounted(() => {
   console.log("组件销毁");
 });
 </script>
+<style scoped>
+
+</style>