浏览代码

大屏整体样式调整

lizhixing 3 年之前
父节点
当前提交
d3f419bc35
共有 3 个文件被更改,包括 21 次插入13 次删除
  1. 2 2
      src/layout/header-aside/layout.vue
  2. 14 8
      src/router/routes.js
  3. 5 3
      src/views/system/visualized/index.vue

+ 2 - 2
src/layout/header-aside/layout.vue

@@ -5,7 +5,7 @@
5 5
     <!-- 主体内容 -->
6 6
     <div class="d2-layout-header-aside-content" flex="dir:top">
7 7
       <!-- 顶栏 -->
8
-      <div class="d2-theme-header" :style="{ opacity: this.searchActive ? 0.5 : 1 }" flex-box="0" flex v-if='this.$route.path!="/visualized"'>
8
+      <div class="d2-theme-header" :style="{ opacity: this.searchActive ? 0.5 : 1 }" flex-box="0" flex >
9 9
         <!-- <router-link
10 10
           to="/index"
11 11
           :class="{'logo-group': true, 'logo-transition': asideTransition}"
@@ -74,7 +74,7 @@
74 74
                   </keep-alive>
75 75
                 </transition>
76 76
               </div>
77
-              <Foot v-if='this.$route.path!="/visualized"'></Foot>
77
+              <Foot></Foot>
78 78
             </div>
79 79
           </transition>
80 80
 

+ 14 - 8
src/router/routes.js

@@ -8,21 +8,27 @@ const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
8 8
  * 在主框架内显示
9 9
  */
10 10
 const frameIn = [
11
+  {  // 大屏首页
12
+    path: '/visualized',
13
+    name: 'visualized',
14
+    component: _import('system/visualized')
15
+  },
11 16
 
12 17
   {
13 18
     path: '/',
14 19
     redirect: { name: 'index' },
15 20
     component: layoutHeaderAside,
21
+    
16 22
     children: [
17 23
        // 大屏首页
18
-     {
19
-      path: 'visualized',
20
-      name: 'visualized',
21
-      meta: {
22
-        auth: true
23
-      },
24
-      component: _import('system/visualized')
25
-    },
24
+    //  {
25
+    //   path: 'visualized',
26
+    //   name: 'visualized',
27
+    //   meta: {
28
+    //     auth: true
29
+    //   },
30
+    //   component: _import('system/visualized')
31
+    // },
26 32
        
27 33
       // 首页
28 34
       {

+ 5 - 3
src/views/system/visualized/index.vue

@@ -1385,13 +1385,15 @@ export default {
1385 1385
 <style lang="scss" scoped>
1386 1386
 .big-screen {
1387 1387
   height: calc(100% - 20px);
1388
-  // min-width:1635px;
1389
-  // overflow-x:scroll ;
1388
+  min-height: 800px;
1389
+   
1390
+    overflow: hidden;
1391
+
1390 1392
   padding: 10px;
1391 1393
   display: flex;
1392 1394
   // background: #2c695f;
1393 1395
   background: url("../../../assets/images/bigScreen/bg.png") no-repeat;
1394
-  background-size: 100%;
1396
+  background-size: cover;
1395 1397
   .screen-left {
1396 1398
     width: 100%;
1397 1399
     height: 100%;