Skip to content

bdc / bdcsjsb-web

Go to a project
Toggle navigation
Toggle navigation pinning
59789030 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 953a0ebe 0348f007
Inline Side-by-side
Showing 35 changed files with 29 additions and 36 deletions
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 </template> 10 </template>
11 11
12 <script> 12 <script>
13 export default { 13 export default {
14 name: '', 14 name: '',
15 props: { 15 props: {
16 show: { 16 show: {
...@@ -73,14 +73,14 @@ export default { ...@@ -73,14 +73,14 @@ export default {
73 this.$emit('close') 73 this.$emit('close')
74 } 74 }
75 } 75 }
76 } 76 }
77 </script> 77 </script>
78 78
79 <style lang="scss" scoped> 79 <style lang="scss" scoped>
80 .dialog { 80 .dialog {
81 /deep/.el-dialog { 81 /deep/.el-dialog {
82 overflow: hidden; 82 overflow: hidden;
83 background: url("~@/image/dialogBg.png") no-repeat !important; 83 // background: url("~@/image/dialogBg.png") no-repeat !important;
84 background-size: 100% 100% !important; 84 background-size: 100% 100% !important;
85 } 85 }
86 86
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
96 96
97 .el-dialog__title:before { 97 .el-dialog__title:before {
98 display: inline-block; 98 display: inline-block;
99 content: ''; 99 content: "";
100 width: 4px; 100 width: 4px;
101 height: 16px; 101 height: 16px;
102 background: #3aa3f8; 102 background: #3aa3f8;
...@@ -191,9 +191,9 @@ export default { ...@@ -191,9 +191,9 @@ export default {
191 border: none; 191 border: none;
192 } 192 }
193 193
194 .el-button+.el-button { 194 .el-button + .el-button {
195 margin-left: 12px; 195 margin-left: 12px;
196 } 196 }
197 } 197 }
198 } 198 }
199 </style> 199 </style>
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-23 14:47:38
5 */
6 let mixin = {
7
8 methods: {
9
10 }
11 }
12 export default mixin
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-08 10:48:43 4 * @LastEditTime: 2023-06-09 09:43:07
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import axios from 'axios' 7 import axios from 'axios'
...@@ -79,7 +79,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -79,7 +79,7 @@ router.beforeEach(async (to, from, next) => {
79 let path = JSON.parse(getMenuData[0].metadata)?.path + JSON.parse(getMenuData[0].children[0].metadata)?.path 79 let path = JSON.parse(getMenuData[0].metadata)?.path + JSON.parse(getMenuData[0].children[0].metadata)?.path
80 router.addRoutes([ 80 router.addRoutes([
81 ...accessRoutes, 81 ...accessRoutes,
82 { path: "*", redirect: "/404", hidden: true }, 82 { path: "*", redirect: "/404", hidden: true }
83 ]); 83 ]);
84 const routeTo = Cookies.get("routerTo"); 84 const routeTo = Cookies.get("routerTo");
85 if (routeTo && routeTo !== "/") { 85 if (routeTo && routeTo !== "/") {
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-09 10:06:26
5 -->
1 <template> 6 <template>
2 <div class="centercard"> 7 <div class="centercard">
3 <div class="card1"> 8 <div class="card1">
...@@ -11,9 +16,9 @@ ...@@ -11,9 +16,9 @@
11 </template> 16 </template>
12 17
13 <script> 18 <script>
14 import maps from "@/components/Echart/Map"; 19 import maps from "@/components/Echart/Map";
15 import brokenline from "@/components/Echart/Brokenline"; 20 import brokenline from "@/components/Echart/Brokenline";
16 export default { 21 export default {
17 data () { 22 data () {
18 return {}; 23 return {};
19 }, 24 },
...@@ -21,11 +26,11 @@ export default { ...@@ -21,11 +26,11 @@ export default {
21 mounted () { }, 26 mounted () { },
22 beforeDestroy () { }, 27 beforeDestroy () { },
23 methods: {}, 28 methods: {},
24 }; 29 };
25 </script> 30 </script>
26 31
27 <style lang="scss" scoped> 32 <style lang="scss" scoped>
28 .centercard { 33 .centercard {
29 width: 40%; 34 width: 40%;
30 height: calc(100vh - 114px); 35 height: calc(100vh - 114px);
31 box-sizing: border-box; 36 box-sizing: border-box;
...@@ -35,7 +40,7 @@ export default { ...@@ -35,7 +40,7 @@ export default {
35 40
36 .card1 { 41 .card1 {
37 width: 100%; 42 width: 100%;
38 background: url("~@/image/mapcenter.png") no-repeat; 43 // background: url("~@/image/mapcenter.png") no-repeat;
39 background-size: 100% 100%; 44 background-size: 100% 100%;
40 position: relative; 45 position: relative;
41 height: 64%; 46 height: 64%;
...@@ -57,7 +62,7 @@ export default { ...@@ -57,7 +62,7 @@ export default {
57 62
58 .card2 { 63 .card2 {
59 width: 100%; 64 width: 100%;
60 background: url("~@/image/sjqs.png") no-repeat; 65 // background: url("~@/image/sjqs.png") no-repeat;
61 background-size: 100% 100%; 66 background-size: 100% 100%;
62 position: relative; 67 position: relative;
63 flex: 1; 68 flex: 1;
...@@ -81,5 +86,5 @@ export default { ...@@ -81,5 +86,5 @@ export default {
81 width: 100%; 86 width: 100%;
82 } 87 }
83 } 88 }
84 } 89 }
85 </style> 90 </style>
......
1 <!-- 1 <!--
2 * @Description :工作台左侧 2 * @Description :工作台左侧
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-05-17 15:23:32 4 * @LastEditTime: 2023-06-09 10:08:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftcard"> 7 <div class="leftcard">
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 130
131 .card { 131 .card {
132 height: 22%; 132 height: 22%;
133 background: url("~@/image/qxjr.png") no-repeat; 133 // background: url("~@/image/qxjr.png") no-repeat;
134 background-size: 100% 100%; 134 background-size: 100% 100%;
135 position: relative; 135 position: relative;
136 text-align: center; 136 text-align: center;
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 } 147 }
148 148
149 .card1 { 149 .card1 {
150 background: url("~@/image/sbtj.png") no-repeat; 150 // background: url("~@/image/sbtj.png") no-repeat;
151 background-size: 100% 100%; 151 background-size: 100% 100%;
152 position: relative; 152 position: relative;
153 box-sizing: border-box; 153 box-sizing: border-box;
......
1 <!-- 1 <!--
2 * @Description :工作台右侧 2 * @Description :工作台右侧
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-05-17 15:22:56 4 * @LastEditTime: 2023-06-09 10:06:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rightcard"> 7 <div class="rightcard">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 124
125 .card1 { 125 .card1 {
126 height: 33%; 126 height: 33%;
127 background: url("~@/image/xjgyfwxx.png") no-repeat; 127 // background: url("~@/image/xjgyfwxx.png") no-repeat;
128 background-size: 100% 100%; 128 background-size: 100% 100%;
129 129
130 /deep/.dv-scroll-board { 130 /deep/.dv-scroll-board {
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
155 155
156 .card2 { 156 .card2 {
157 height: 33%; 157 height: 33%;
158 background: url("~@/image/djywl.png") no-repeat; 158 // background: url("~@/image/djywl.png") no-repeat;
159 background-size: 100% 100%; 159 background-size: 100% 100%;
160 padding: 0.3825rem 0 0 0; 160 padding: 0.3825rem 0 0 0;
161 overflow: hidden; 161 overflow: hidden;
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 .card3 { 164 .card3 {
165 height: 33%; 165 height: 33%;
166 flex: 1; 166 flex: 1;
167 background: url("~@/image/djlxzl.png") no-repeat; 167 // background: url("~@/image/djlxzl.png") no-repeat;
168 background-size: 100% 100%; 168 background-size: 100% 100%;
169 padding-bottom: 0; 169 padding-bottom: 0;
170 170
......