From 3f35c2f5d5eea9c1f0212b5fafa273adb4de0a82 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 29 三月 2024 23:16:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/meeting/webcastInfo.vue |   60 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/src/views/meeting/webcastInfo.vue b/ruoyi-ui/src/views/meeting/webcastInfo.vue
index 5d059f6..0d6e615 100644
--- a/ruoyi-ui/src/views/meeting/webcastInfo.vue
+++ b/ruoyi-ui/src/views/meeting/webcastInfo.vue
@@ -2,7 +2,7 @@
   <div class="app-container" id="printable-content">
     <div class="form-header mt">
       <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
-        <span>鐩存挱鍚嶅瓧</span>
+        <span>鐩存挱</span>
       </h1>
     </div>
 
@@ -11,15 +11,19 @@
       <el-container class="chirldContainer">
         <el-aside width="400px">
           <div class="one">1</div>
-          <div class="two">2</div>
-          <div class="three">3</div>
+          <div class="one"></div>
+          <div class="one"></div>
+          <div class="one"></div>
         </el-aside>
 
         <el-main>
-          <div></div>
+          <div class="mainContent"></div>
         </el-main>
       </el-container>
-      <el-footer>Footer</el-footer>
+      <el-footer>
+        <div class="footContent">1
+        </div>
+      </el-footer>
     </el-container>
 
 
@@ -157,11 +161,26 @@
 </script>
 
 <style scoped>
-  .one,.two,.three{
-    background-color: aqua;
-    margin-bottom: 20px;
-    height: 25%;
+  .mainContent{
+    background-color: #e3e3e3;
+    width: 98%;
+    height: 100%;
+    border-radius: 8px;
+    left: 0;
+    /* margin-left: 15%; */
   }
+  .footContent{
+    background-color: #e3e3e3;
+  }
+
+  .one,.two,.three{
+    background-color: #e3e3e3;
+    margin-bottom: 20px;
+    height: 30%;
+    width: 90%;
+    border-radius: 8px;
+  }
+
   .homeContainer {
     height: 100%;
   }
@@ -170,34 +189,37 @@
     direction: rtl;
   }
 
-  .el-header,
-  .el-footer {
-    background-color: #B3C0D1;
+  .el-header,.el-footer {
+    /* background-color: #B3C0D1; */
     color: #333;
     text-align: center;
-    line-height: 200px;
+    line-height: 150px;
+    margin-top: 10px;
+    margin-bottom: 50px;
+    border-radius: 8px;
+    height: 150px;
   }
 
   .el-main {
-    background-color: #E9EEF3;
+    /* background-color: #E9EEF3; */
     color: #333;
     text-align: center;
-    line-height: 400px;
-    width: 60%;
+/*    line-height: 100px; */
+    padding: 0;
+    height: 600px;
   }
 
   .el-aside {
     /* background-color: #D3DCE6; */
     /* color: #333; */
     text-align: center;
-    line-height: 120px;
+    line-height: 200px;
+    height: 600px;
     flex-direction: column;
   }
 
   .app-container {
     background-color: #FEF7FC;
-    height: 100%;
-    width: 100%;
   }
 
   .mt {

--
Gitblit v1.9.1