微调

src/components/yxgl/table.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="table_box">
     <div class="table_title">{{ title }}</div>
+    <div class="table_more">
+      <el-button type="primary" link> 更多 </el-button>
+    </div>
     <el-table :data="tableData" style="width: 100%" height="calc(100% - 60px)">
       <el-table-column prop="serviceName" label="服务名称" width="300" />
       <el-table-column prop="serviceType" label="类别" width="300" />
@@ -53,26 +56,29 @@ export default {
 };
 </script>
 
-<<<<<<< HEAD
-<style lang="less" scoped>
-=======
 <style>
->>>>>>> f3e3ede (运行管理页面UI完善，和示例数据格式，内嵌页面)
 .table_box {
   width: 100%;
   height: 100%;
   padding: 20px;
   box-sizing: border-box;
+<<<<<<< HEAD
 <<<<<<< HEAD
   position: relative;
 =======
   position: inherit;
 >>>>>>> f3e3ede (运行管理页面UI完善，和示例数据格式，内嵌页面)
+=======
+  position: relative;
+>>>>>>> 3ed3cf1 (微调)
 }
 .table_title {
   font-size: 16px;
 }
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3ed3cf1 (微调)
 .table_more {
   position: absolute;
   top: 20px;
@@ -80,8 +86,11 @@ export default {
   font-size: 14px;
   color: #1890ff;
 }
+<<<<<<< HEAD
 =======
 >>>>>>> f3e3ede (运行管理页面UI完善，和示例数据格式，内嵌页面)
+=======
+>>>>>>> 3ed3cf1 (微调)
 .table_pagination {
   position: absolute;
   bottom: 20px;

src/views/Wgn.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wgn_box">
-    <el-backtop target=".wgn_box" :right="20" :bottom="70" />
+    <el-backtop target="#scrollbar" :right="20" :bottom="70" />
     <div class="server_title">
       <el-image
         style="width: 824px; height: calc(100vh - 70px)"

src/views/Yxgl.vue

@@ -41,6 +41,7 @@
         overflowY: menuActive == 'StatisticalAnalysis' ? 'auto' : 'hidden',
       }"
     >
+      <el-backtop target=".viewBox" :right="20" :bottom="70" />
       <StatisticalAnalysis v-if="menuActive == 'StatisticalAnalysis'" />
       <iframe v-else :src="iframeUrl" frameborder="0"></iframe>
     </div>