钞小赢 3 years ago
parent
commit
ce07ac19bd

+ 1 - 0
src/App.vue

@@ -30,4 +30,5 @@ export default {
30
   display:flex;
30
   display:flex;
31
 justify-content: flex-end;
31
 justify-content: flex-end;
32
 }
32
 }
33
+
33
 </style>
34
 </style>

+ 8 - 0
src/assets/style/public-class.scss

@@ -65,3 +65,11 @@ $sizes: (0, 5, 10, 15, 20);
65
 .#{$prefix}-pr { padding-right: 20px !important; }
65
 .#{$prefix}-pr { padding-right: 20px !important; }
66
 .#{$prefix}-pb { padding-bottom: 20px !important; }
66
 .#{$prefix}-pb { padding-bottom: 20px !important; }
67
 .#{$prefix}-pl { padding-left: 20px !important; }
67
 .#{$prefix}-pl { padding-left: 20px !important; }
68
+
69
+//树形菜单
70
+.el-tree{
71
+  // background:#163d79 !important;
72
+}
73
+.el-tree-node{
74
+  background: #163d79;
75
+}

+ 6 - 2
src/assets/style/theme/theme-base.scss

@@ -288,12 +288,15 @@
288
               top: 0px;
288
               top: 0px;
289
               right: 20px;
289
               right: 20px;
290
               bottom: 20px;
290
               bottom: 20px;
291
-              left: 20px;
291
+              left: 0px;
292
               display: flex;
292
               display: flex;
293
               flex-direction: column;
293
               flex-direction: column;
294
               overflow: hidden;
294
               overflow: hidden;
295
               .d2-container-full__header {
295
               .d2-container-full__header {
296
-                padding: 20px;
296
+                // padding: 20px;
297
+                padding: 10px;
298
+                background: #004a93;
299
+                color:#fff;
297
               }
300
               }
298
               .d2-container-full__body {
301
               .d2-container-full__body {
299
                 flex-grow: 1;
302
                 flex-grow: 1;
@@ -301,6 +304,7 @@
301
                 padding: 20px 20px;
304
                 padding: 20px 20px;
302
                 overflow: auto;
305
                 overflow: auto;
303
                 position: relative;
306
                 position: relative;
307
+                background-color: #09163a;
304
               }
308
               }
305
               .d2-container-full__footer {
309
               .d2-container-full__footer {
306
                 padding: 20px;
310
                 padding: 20px;

+ 4 - 2
src/assets/style/theme/theme.scss

@@ -302,11 +302,13 @@
302
           // [组件]
302
           // [组件]
303
           // d2-container-full 填充型
303
           // d2-container-full 填充型
304
           .d2-container-full {
304
           .d2-container-full {
305
-            border: $theme-container-border-outer;
305
+            // border: $theme-container-border-outer;
306
+            border:none;
306
             border-top: none;
307
             border-top: none;
307
             border-bottom: none;
308
             border-bottom: none;
308
             .d2-container-full__header {
309
             .d2-container-full__header {
309
-              border-bottom: $theme-container-border-inner;
310
+              // border-bottom: $theme-container-border-inner;
311
+              border-bottom: none;
310
               background: $theme-container-header-footer-background-color;
312
               background: $theme-container-header-footer-background-color;
311
             }
313
             }
312
             .d2-container-full__body {
314
             .d2-container-full__body {

+ 4 - 0
src/components/d2-container/components/d2-container-full.vue

@@ -29,3 +29,7 @@ export default {
29
   }
29
   }
30
 }
30
 }
31
 </script>
31
 </script>
32
+<style lang="scss" scoped>
33
+
34
+  
35
+</style>

+ 21 - 0
src/layout/header-aside/components/footer/index.vue

@@ -0,0 +1,21 @@
1
+<template>
2
+    <div>
3
+        <div class="foot">Copyright &nbsp; © &nbsp; 紫光软件 All&nbsp;Rights&nbsp;Reserved</div>
4
+    </div>
5
+</template>
6
+<script>
7
+export default {
8
+    name:"Foot"
9
+}
10
+</script>
11
+<style lang="scss" scoped>
12
+    .foot{
13
+        height:30px;
14
+        line-height:30px;
15
+        text-align:center;
16
+        // z-index: 999;
17
+        background:#002049;
18
+        font-size:14px;
19
+        color:#fff;
20
+    }
21
+</style>

+ 65 - 49
src/layout/header-aside/layout.vue

@@ -1,11 +1,20 @@
1
 <template>
1
 <template>
2
-  <div class="d2-layout-header-aside-group" :style="styleLayoutMainGroup" :class="{grayMode: grayActive}">
2
+  <div
3
+    class="d2-layout-header-aside-group"
4
+    :style="styleLayoutMainGroup"
5
+    :class="{ grayMode: grayActive }"
6
+  >
3
     <!-- 半透明遮罩 -->
7
     <!-- 半透明遮罩 -->
4
     <div class="d2-layout-header-aside-mask"></div>
8
     <div class="d2-layout-header-aside-mask"></div>
5
     <!-- 主体内容 -->
9
     <!-- 主体内容 -->
6
     <div class="d2-layout-header-aside-content" flex="dir:top">
10
     <div class="d2-layout-header-aside-content" flex="dir:top">
7
       <!-- 顶栏 -->
11
       <!-- 顶栏 -->
8
-      <div class="d2-theme-header" :style="{ opacity: this.searchActive ? 0.5 : 1 }" flex-box="0" flex>
12
+      <div
13
+        class="d2-theme-header"
14
+        :style="{ opacity: this.searchActive ? 0.5 : 1 }"
15
+        flex-box="0"
16
+        flex
17
+      >
9
         <!-- <router-link
18
         <!-- <router-link
10
           to="/index"
19
           to="/index"
11
           :class="{'logo-group': true, 'logo-transition': asideTransition}"
20
           :class="{'logo-group': true, 'logo-transition': asideTransition}"
@@ -14,18 +23,15 @@
14
           <img v-if="asideCollapse" :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
23
           <img v-if="asideCollapse" :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
15
           <img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`">
24
           <img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`">
16
         </router-link> -->
25
         </router-link> -->
17
-        <div
18
-         class="imgFather"
19
-          
20
-          flex-box="0">
21
-          <img src="../../assets/images/logo.png" alt="">
26
+        <div class="imgFather" flex-box="0">
27
+          <img src="../../assets/images/logo.png" alt="" />
22
           <!-- <img v-if="asideCollapse" :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
28
           <!-- <img v-if="asideCollapse" :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
23
           <img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`"> -->
29
           <img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`"> -->
24
         </div>
30
         </div>
25
         <!-- <div class="toggle-aside-btn" @click="handleToggleAside" flex-box="0">
31
         <!-- <div class="toggle-aside-btn" @click="handleToggleAside" flex-box="0">
26
           <d2-icon name="bars"/>
32
           <d2-icon name="bars"/>
27
         </div> -->
33
         </div> -->
28
-        <d2-menu-header flex-box="1"/>
34
+        <d2-menu-header flex-box="1" />
29
         <!-- 顶栏右侧 -->
35
         <!-- 顶栏右侧 -->
30
         <div class="d2-header-right" flex-box="0">
36
         <div class="d2-header-right" flex-box="0">
31
           <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
37
           <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
@@ -36,7 +42,7 @@
36
           <d2-header-size/>
42
           <d2-header-size/>
37
           <d2-header-locales/>
43
           <d2-header-locales/>
38
           <d2-header-color/> -->
44
           <d2-header-color/> -->
39
-          <d2-header-user/>
45
+          <d2-header-user />
40
         </div>
46
         </div>
41
       </div>
47
       </div>
42
       <!-- 下面 主体 -->
48
       <!-- 下面 主体 -->
@@ -57,12 +63,16 @@
57
           <!-- 搜索 -->
63
           <!-- 搜索 -->
58
           <transition name="fade-scale">
64
           <transition name="fade-scale">
59
             <div v-if="searchActive" class="d2-theme-container-main-layer" flex>
65
             <div v-if="searchActive" class="d2-theme-container-main-layer" flex>
60
-              <d2-panel-search ref="panelSearch" @close="searchPanelClose"/>
66
+              <d2-panel-search ref="panelSearch" @close="searchPanelClose" />
61
             </div>
67
             </div>
62
           </transition>
68
           </transition>
63
           <!-- 内容 -->
69
           <!-- 内容 -->
64
           <transition name="fade-scale">
70
           <transition name="fade-scale">
65
-            <div v-if="!searchActive" class="d2-theme-container-main-layer" flex="dir:top">
71
+            <div
72
+              v-if="!searchActive"
73
+              class="d2-theme-container-main-layer"
74
+              flex="dir:top"
75
+            >
66
               <!-- tab -->
76
               <!-- tab -->
67
               <!-- <div class="d2-theme-container-main-header" flex-box="0">
77
               <!-- <div class="d2-theme-container-main-header" flex-box="0">
68
                 <d2-tabs/>
78
                 <d2-tabs/>
@@ -75,37 +85,41 @@
75
                   </keep-alive>
85
                   </keep-alive>
76
                 </transition>
86
                 </transition>
77
               </div>
87
               </div>
88
+               <Foot></Foot>
78
             </div>
89
             </div>
79
           </transition>
90
           </transition>
91
+        
80
         </div>
92
         </div>
93
+
94
+            
81
       </div>
95
       </div>
82
     </div>
96
     </div>
83
   </div>
97
   </div>
84
 </template>
98
 </template>
85
 
99
 
86
 <script>
100
 <script>
87
-import d2MenuSide from './components/menu-side'
88
-import d2MenuHeader from './components/menu-header'
89
-import d2Tabs from './components/tabs'
101
+import d2MenuSide from "./components/menu-side";
102
+import d2MenuHeader from "./components/menu-header";
103
+import d2Tabs from "./components/tabs";
104
+import Foot from "./components/footer";
90
 // import d2HeaderFullscreen from './components/header-fullscreen'
105
 // import d2HeaderFullscreen from './components/header-fullscreen'
91
 // import d2HeaderLocales from './components/header-locales'
106
 // import d2HeaderLocales from './components/header-locales'
92
 // import d2HeaderSearch from './components/header-search'
107
 // import d2HeaderSearch from './components/header-search'
93
 // import d2HeaderSize from './components/header-size'
108
 // import d2HeaderSize from './components/header-size'
94
 // import d2HeaderTheme from './components/header-theme'
109
 // import d2HeaderTheme from './components/header-theme'
95
-import d2HeaderUser from './components/header-user'
110
+import d2HeaderUser from "./components/header-user";
96
 // import d2HeaderLog from './components/header-log'
111
 // import d2HeaderLog from './components/header-log'
97
 // import d2HeaderColor from './components/header-color'
112
 // import d2HeaderColor from './components/header-color'
98
-import { mapState, mapGetters, mapActions } from 'vuex'
99
-import mixinSearch from './mixins/search'
113
+import { mapState, mapGetters, mapActions } from "vuex";
114
+import mixinSearch from "./mixins/search";
100
 export default {
115
 export default {
101
-  name: 'd2-layout-header-aside',
102
-  mixins: [
103
-    mixinSearch
104
-  ],
116
+  name: "d2-layout-header-aside",
117
+  mixins: [mixinSearch],
105
   components: {
118
   components: {
106
     d2MenuSide,
119
     d2MenuSide,
107
     d2MenuHeader,
120
     d2MenuHeader,
108
     d2Tabs,
121
     d2Tabs,
122
+    Foot,
109
     // d2HeaderFullscreen,
123
     // d2HeaderFullscreen,
110
     // d2HeaderLocales,
124
     // d2HeaderLocales,
111
     // d2HeaderSearch,
125
     // d2HeaderSearch,
@@ -115,42 +129,44 @@ export default {
115
     // d2HeaderLog,
129
     // d2HeaderLog,
116
     // d2HeaderColor
130
     // d2HeaderColor
117
   },
131
   },
118
-  data () {
132
+  data() {
119
     return {
133
     return {
120
       // [侧边栏宽度] 正常状态
134
       // [侧边栏宽度] 正常状态
121
-      asideWidth: '200px',
135
+      asideWidth: "200px",
122
       // [侧边栏宽度] 折叠状态
136
       // [侧边栏宽度] 折叠状态
123
-      asideWidthCollapse: '65px'
124
-    }
137
+      asideWidthCollapse: "65px",
138
+    };
125
   },
139
   },
126
   computed: {
140
   computed: {
127
-    ...mapState('d2admin', {
128
-      keepAlive: state => state.page.keepAlive,
129
-      grayActive: state => state.gray.active,
130
-      transitionActive: state => state.transition.active,
131
-      asideCollapse: state => state.menu.asideCollapse,
132
-      asideTransition: state => state.menu.asideTransition
141
+    ...mapState("d2admin", {
142
+      keepAlive: (state) => state.page.keepAlive,
143
+      grayActive: (state) => state.gray.active,
144
+      transitionActive: (state) => state.transition.active,
145
+      asideCollapse: (state) => state.menu.asideCollapse,
146
+      asideTransition: (state) => state.menu.asideTransition,
133
     }),
147
     }),
134
-    ...mapGetters('d2admin', {
135
-      themeActiveSetting: 'theme/activeSetting'
148
+    ...mapGetters("d2admin", {
149
+      themeActiveSetting: "theme/activeSetting",
136
     }),
150
     }),
137
     /**
151
     /**
138
      * @description 用来实现带参路由的缓存
152
      * @description 用来实现带参路由的缓存
139
      */
153
      */
140
-    routerViewKey () {
154
+    routerViewKey() {
141
       // 默认情况下 key 类似 __transition-n-/foo
155
       // 默认情况下 key 类似 __transition-n-/foo
142
       // 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo
156
       // 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo
143
-      const stamp = this.$route.meta[`__stamp-${this.$route.path}`] || ''
144
-      return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.path}`
157
+      const stamp = this.$route.meta[`__stamp-${this.$route.path}`] || "";
158
+      return `${stamp ? `__stamp-${stamp}-` : ""}${this.$route.path}`;
145
     },
159
     },
146
     /**
160
     /**
147
      * @description 最外层容器的背景图片样式
161
      * @description 最外层容器的背景图片样式
148
      */
162
      */
149
-    styleLayoutMainGroup () {
163
+    styleLayoutMainGroup() {
150
       return this.themeActiveSetting.backgroundImage
164
       return this.themeActiveSetting.backgroundImage
151
-        ? { backgroundImage: `url('${this.$baseUrl}${this.themeActiveSetting.backgroundImage}')` }
152
-        : {}
153
-    }
165
+        ? {
166
+            backgroundImage: `url('${this.$baseUrl}${this.themeActiveSetting.backgroundImage}')`,
167
+          }
168
+        : {};
169
+    },
154
   },
170
   },
155
   methods: {
171
   methods: {
156
     // ...mapActions('d2admin/menu', [
172
     // ...mapActions('d2admin/menu', [
@@ -162,24 +178,24 @@ export default {
162
     // handleToggleAside () {
178
     // handleToggleAside () {
163
     //   this.asideCollapseToggle()
179
     //   this.asideCollapseToggle()
164
     // }
180
     // }
165
-  }
166
-}
181
+  },
182
+};
167
 </script>
183
 </script>
168
 
184
 
169
 <style lang="scss">
185
 <style lang="scss">
170
 // 注册主题
186
 // 注册主题
171
-@import '~@/assets/style/theme/register.scss';
187
+@import "~@/assets/style/theme/register.scss";
172
 //头部导航背景色
188
 //头部导航背景色
173
-.d2-theme-header{
174
-  background-image:url(../../assets/images/nav-bg.png)
189
+.d2-theme-header {
190
+  background-image: url(../../assets/images/nav-bg.png);
175
 }
191
 }
176
 //整体内容背景色
192
 //整体内容背景色
177
-.d2-layout-header-aside-group{
178
-    background-image:url(../../assets/images/bg.png)
193
+.d2-layout-header-aside-group {
194
+  background-image: url(../../assets/images/bg.png);
179
 }
195
 }
180
-.imgFather{
196
+.imgFather {
181
   display: flex;
197
   display: flex;
182
   align-items: center;
198
   align-items: center;
183
-  padding-left: 10px;;
199
+  padding-left: 10px;
184
 }
200
 }
185
 </style>
201
 </style>

+ 1 - 1
src/menu/index.js

@@ -44,7 +44,7 @@ export const menuHeader = supplementPath([
44
   },
44
   },
45
   {
45
   {
46
     title: '参数设置',
46
     title: '参数设置',
47
-    icon: 'folder-o',
47
+    icon: '',
48
     children: [
48
     children: [
49
       { path: '/hardwareParame', title: '硬件参数' },
49
       { path: '/hardwareParame', title: '硬件参数' },
50
       { path: '/scanParame', title: '扫描参数' },
50
       { path: '/scanParame', title: '扫描参数' },

+ 28 - 6
src/views/demo/dataQuery/index.vue

@@ -24,6 +24,9 @@
24
         <div class="right">
24
         <div class="right">
25
           <!-- <template slot="header">首页/数据查询</template> -->
25
           <!-- <template slot="header">首页/数据查询</template> -->
26
           <div class="nav">首页/数据查询</div>
26
           <div class="nav">首页/数据查询</div>
27
+          <div class="right_main">
28
+            <div class="right_title">数据查询</div>
29
+            <div class="right_table">
27
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
30
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
28
             <el-form-item label="扫描时间">
31
             <el-form-item label="扫描时间">
29
               <el-date-picker
32
               <el-date-picker
@@ -102,6 +105,8 @@
102
             :total="pagination.total"
105
             :total="pagination.total"
103
           >
106
           >
104
           </el-pagination>
107
           </el-pagination>
108
+          </div>
109
+        </div>
105
         </div>
110
         </div>
106
       </div>
111
       </div>
107
     </d2-container>
112
     </d2-container>
@@ -259,18 +264,35 @@ export default {
259
   height: 100%;
264
   height: 100%;
260
   display: flex;
265
   display: flex;
261
   .left {
266
   .left {
262
-    width: 200px;
267
+    width: 250px;
263
     height: 100%;
268
     height: 100%;
264
-    border-right: 1px solid #ccc;
265
-    padding-right: 20px;
269
+   background: #163d79;
270
+  
266
   }
271
   }
267
   .right {
272
   .right {
268
     margin-left: 20px;
273
     margin-left: 20px;
274
+    width:calc(100% - 250px);
269
     .nav {
275
     .nav {
270
-      margin: 10px 0 20px 0;
271
-      padding-bottom: 10px;
272
-      border-bottom: 1px solid #ccc;
276
+      padding: 10px 0 10px 10px;
277
+      color:#FFF;
278
+  
279
+      background: #004a93;
280
+    }
281
+    .right_main{
282
+      border:1px solid #0a3e6b;
283
+      background:#112f5d;
284
+      margin-top:10px;
285
+      .right_title{
286
+        color:#FFF;
287
+        border-bottom:1px solid #0a3e6b;
288
+        padding:10px;
289
+    }
290
+    .right_table{
291
+       padding:20px;
292
+    
293
+    }
273
     }
294
     }
295
+   
274
   }
296
   }
275
 }
297
 }
276
 
298