Browse Source

修改头部和底部

root 1 year ago
parent
commit
20981478a4

+ 0 - 1
src/renderer/components/ManageElectrical.vue

@@ -80,7 +80,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManageElectricalRecord.vue

@@ -123,7 +123,6 @@
       >
       </el-pagination>
     </p>
-      <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManagePluse.vue

@@ -88,7 +88,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManageScaleUser.vue

@@ -59,7 +59,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManageScaleUserRecord.vue

@@ -144,7 +144,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManageUser.vue

@@ -68,7 +68,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManageUserScale.vue

@@ -75,7 +75,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 0 - 1
src/renderer/components/ManageUserScaleRecord.vue

@@ -131,7 +131,6 @@
       >
       </el-pagination>
     </p>
-    <FootDes></FootDes>
   </div>
 </template>
 <script>

+ 1 - 1
src/renderer/components/Menu.vue

@@ -265,7 +265,7 @@
           </keep-alive>
         </div>
 
-        <!-- <div class="foot_main">Copyright© 北京决明科技有限公司</div> -->
+        <div class="foot_main">Copyright© 北京决明科技有限公司</div>
       </el-col>
     </el-row>
 

+ 10 - 20
src/renderer/components/MusicRelax.vue

@@ -1,25 +1,9 @@
 <template>
   <div class="main_right_height">
-    <el-row>
-      <el-col :span="1">&nbsp;</el-col>
-      <el-col :span="22">
-        <div style="display: flex">
-          <i
-            class="el-icon-arrow-left"
-            style="cursor: pointer; line-height: 1.5"
-            @click="goBack()"
-          ></i>
-          <span class="musicTitle">音乐放松</span>
-        </div>
-
-        <!-- <el-divider></el-divider> -->
-      </el-col>
-      <el-col :span="1"> &nbsp; </el-col>
-    </el-row>
-
+    <TopDes :flag='true' topDesFont='音乐放松'></TopDes>
     <el-row class="pagin_class">
       <el-col :span="1">&nbsp;</el-col>
-      <el-col :span="22" style="margin-bottom: 60px">
+      <el-col :span="22" style="margin-bottom: 16px">
         <el-table
           :header-cell-style="{
             background: '#66B497',
@@ -587,6 +571,11 @@ export default {
   width: 100px;
   height: 100px;
 } */
+.pagin_class {
+  height: 84vh;
+  overflow-y: scroll;
+}
+
 .el-icon-video-pause {
   cursor: pointer;
   color: #57acbb;
@@ -617,9 +606,10 @@ export default {
   margin-bottom: 5px;
 }
 .main_right_height {
-  height: 95vh !important;
+  height: 100vh !important;
+  background: #ffffff;
   display: block !important;
-  overflow-y: auto !important;
+  overflow: auto;
 }
 
 .el-table {

+ 2 - 18
src/renderer/components/ScaleListResult.vue

@@ -2,22 +2,7 @@
   <div class="main_right_height">
     <div class="">
       <div class="">
-        <el-row>
-          <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="22" class="navigation_card">
-            <div style="display: flex">
-              <i
-                class="el-icon-arrow-left"
-                style="cursor: pointer; line-height: 1.5"
-                @click="goBack()"
-              ></i>
-              <span class="musicTitle">量表报告查看</span>
-            </div>
-
-            <!-- <el-divider></el-divider> -->
-          </el-col>
-          <el-col :span="1"> &nbsp; </el-col>
-        </el-row>
+        <TopDes :flag='false' topDesFont='量表报告查看'></TopDes>
         <el-row class="mainTable-top-two">
           <el-col :span="1">
             <div>&nbsp;</div>
@@ -309,9 +294,8 @@ export default {
 }
 .main_right_height {
   background: #ffffff;
-  height: 95vh !important;
   display: block !important;
-  overflow-y: auto !important;
+  overflow: hidden;
 }
 
 .time_card {

+ 3 - 18
src/renderer/components/Video.vue

@@ -1,22 +1,6 @@
 <template>
   <div class="main_right_height">
-    <el-row>
-      <el-col :span="1">&nbsp;</el-col>
-      <el-col :span="22">
-        <div style="display: flex">
-          <i
-            class="el-icon-arrow-left"
-            style="cursor: pointer; line-height: 1.5"
-            @click="goBack()"
-          ></i>
-          <span class="musicTitle">呼吸放松</span>
-        </div>
-
-        <el-divider></el-divider>
-      </el-col>
-      <el-col :span="1">&nbsp;</el-col>
-    </el-row>
-
+    <TopDes :flag='true' topDesFont='呼吸放松'></TopDes>
     <el-row class="mainTable-top-two">
       <div v-for="item in list" :key="item.index" class="item_warp">
         <div
@@ -119,7 +103,8 @@ export default {
   margin-bottom: 5px;
 }
 .main_right_height {
-  height: 95vh !important;
+  height: 100vh !important;
+  background: #ffffff;
   display: block !important;
   overflow-y: auto !important;
 }