1e47f312 by unknown

20191215

1 parent c344db20
...@@ -18,7 +18,8 @@ exports.cssLoaders = function (options) { ...@@ -18,7 +18,8 @@ exports.cssLoaders = function (options) {
18 const cssLoader = { 18 const cssLoader = {
19 loader: 'css-loader', 19 loader: 'css-loader',
20 options: { 20 options: {
21 sourceMap: options.sourceMap 21 sourceMap: options.sourceMap,
22 minimize: true
22 } 23 }
23 } 24 }
24 25
......
...@@ -52,11 +52,12 @@ const webpackConfig = merge(baseWebpackConfig, { ...@@ -52,11 +52,12 @@ const webpackConfig = merge(baseWebpackConfig, {
52 }), 52 }),
53 // Compress extracted CSS. We are using this plugin so that possible 53 // Compress extracted CSS. We are using this plugin so that possible
54 // duplicated CSS from different components can be deduped. 54 // duplicated CSS from different components can be deduped.
55 new OptimizeCSSPlugin({ 55 // 打包CSS生效
56 cssProcessorOptions: config.build.productionSourceMap 56 // new OptimizeCSSPlugin({
57 ? { safe: true, map: { inline: false } } 57 // cssProcessorOptions: config.build.productionSourceMap
58 : { safe: true } 58 // ? { safe: true, map: { inline: false } }
59 }), 59 // : { safe: true }
60 // }),
60 // generate dist index.html with correct asset hash for caching. 61 // generate dist index.html with correct asset hash for caching.
61 // you can customize output by editing /index.html 62 // you can customize output by editing /index.html
62 // see https://github.com/ampedandwired/html-webpack-plugin 63 // see https://github.com/ampedandwired/html-webpack-plugin
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-12 17:39:25 3 * @Date: 2019-12-12 17:39:25
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-14 10:22:48 5 * @LastEditTime: 2019-12-15 15:48:43
6 * @FilePath: \supermapvue\index.html 6 * @FilePath: \supermapvue\index.html
7 --> 7 -->
8 <!DOCTYPE html> 8 <!DOCTYPE html>
...@@ -14,9 +14,10 @@ ...@@ -14,9 +14,10 @@
14 <script src="./static/js/v3.0.11/turf.min.js"></script> 14 <script src="./static/js/v3.0.11/turf.min.js"></script>
15 <script src="./static/js/v1.0.9/mapbox-gl-draw.js"></script> 15 <script src="./static/js/v1.0.9/mapbox-gl-draw.js"></script>
16 <script src="./static/js/mapbox-gl-enhance.js"></script> 16 <script src="./static/js/mapbox-gl-enhance.js"></script>
17 <script src="./static//js/styles.js"></script> 17 <script src="./static/js/styles.js"></script>
18 <link href='./static/css/mapbox-gl.css' rel='stylesheet' /> 18 <link href='./static/css/mapbox-gl.css' rel='stylesheet' />
19 <link rel="stylesheet" href="./static/js/v1.0.9/mapbox-gl-draw.css" type="text/css"/> 19 <link rel="stylesheet" href="./static/js/v1.0.9/mapbox-gl-draw.css" type="text/css"/>
20
20 </head> 21 </head>
21 <body style="padding: 0px; margin: 0px; overflow: hidden;"> 22 <body style="padding: 0px; margin: 0px; overflow: hidden;">
22 <div id="app"></div> 23 <div id="app"></div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-12 17:40:15 3 * @Date: 2019-12-12 17:40:15
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-15 13:28:05 5 * @LastEditTime: 2019-12-15 15:51:16
6 * @FilePath: \mymapbox\src\App.vue 6 * @FilePath: \mymapbox\src\App.vue
7 --> 7 -->
8 <template> 8 <template>
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
44 } 44 }
45 </script> 45 </script>
46 46
47 <style> 47 <style scoped>
48 .ant-layout-header { 48 .ant-layout-header {
49 height: 64px; 49 height: 64px;
50 padding: 0 25px; 50 padding: 0 25px;
...@@ -66,13 +66,6 @@ export default { ...@@ -66,13 +66,6 @@ export default {
66 margin: 16px 28px 16px 0; 66 margin: 16px 28px 16px 0;
67 float: left; 67 float: left;
68 } 68 }
69 .ant-layout-sider {
70 position: relative;
71 min-width: 0;
72 background:white;
73 -webkit-transition: all 0.2s;
74 transition: all 0.2s;
75 }
76 .ant-layout-sider-trigger { 69 .ant-layout-sider-trigger {
77 position: fixed; 70 position: fixed;
78 bottom: 0; 71 bottom: 0;
...@@ -86,6 +79,13 @@ export default { ...@@ -86,6 +79,13 @@ export default {
86 -webkit-transition: all 0.2s; 79 -webkit-transition: all 0.2s;
87 transition: all 0.2s; 80 transition: all 0.2s;
88 } 81 }
82 .ant-layout-sider {
83 position: relative;
84 min-width: 0;
85 background:white;
86 -webkit-transition: all 0.2s;
87 transition: all 0.2s;
88 }
89 #app{ 89 #app{
90 height: 100%; 90 height: 100%;
91 } 91 }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-13 23:53:57 3 * @Date: 2019-12-13 23:53:57
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-14 12:09:23 5 * @LastEditTime: 2019-12-15 15:28:22
6 * @FilePath: \supermapvue\src\components\menu\MyMenu.vue 6 * @FilePath: \supermapvue\src\components\menu\MyMenu.vue
7 --> 7 -->
8 <template> 8 <template>
...@@ -48,5 +48,17 @@ ...@@ -48,5 +48,17 @@
48 </a-menu> 48 </a-menu>
49 </template> 49 </template>
50 <style scoped> 50 <style scoped>
51 51 .ant-layout-sider-trigger {
52 position: fixed;
53 bottom: 0;
54 z-index: 1;
55 height: 48px;
56 color: #b73c3c;
57 line-height: 48px;
58 text-align: center;
59 background: #ffffff;
60 cursor: pointer;
61 -webkit-transition: all 0.2s;
62 transition: all 0.2s;
63 }
52 </style> 64 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 .ant-layout-header {
2 height: 64px;
3 padding: 0 25px;
4 line-height: 64px;
5 background: #2e7fb4;
6 color: white;
7 font-size: 26px;
8 border-bottom-style: solid;
9 border-bottom-width: 2px;
10 border-bottom-color: #bb5905;
11 }
12 .ant-layout {
13 height: 100%;
14 }
15 #components-layout-demo-top-side-2 .logo {
16 width: 120px;
17 height: 31px;
18 background: rgba(255, 255, 255, 0.2);
19 margin: 16px 28px 16px 0;
20 float: left;
21 }
22 .ant-layout-sider {
23 position: relative;
24 min-width: 0;
25 background:white;
26 -webkit-transition: all 0.2s;
27 transition: all 0.2s;
28 }
29 .ant-layout-sider-trigger {
30 position: fixed;
31 bottom: 0;
32 z-index: 1;
33 height: 48px;
34 color: #b73c3c;
35 line-height: 48px;
36 text-align: center;
37 background: #ffffff;
38 cursor: pointer;
39 -webkit-transition: all 0.2s;
40 transition: all 0.2s;
41 }
42 #app{
43 height: 100%;
44 }
...\ No newline at end of file ...\ No newline at end of file