Merge branch 'dev'
Showing
35 changed files
with
221 additions
and
228 deletions
... | @@ -10,190 +10,190 @@ | ... | @@ -10,190 +10,190 @@ |
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: { |
17 | type: Boolean, | 17 | type: Boolean, |
18 | default: false | 18 | default: false |
19 | }, | 19 | }, |
20 | customClass: { | 20 | customClass: { |
21 | type: String, | 21 | type: String, |
22 | default: '' | 22 | default: '' |
23 | }, | 23 | }, |
24 | title: { | 24 | title: { |
25 | type: String, | 25 | type: String, |
26 | default: '新增' | 26 | default: '新增' |
27 | }, | 27 | }, |
28 | appendToBody: { | 28 | appendToBody: { |
29 | // Dialog 自身是否插入至 body 元素上。嵌套的 Dialog 必须指定该属性并赋值为 true | 29 | // Dialog 自身是否插入至 body 元素上。嵌套的 Dialog 必须指定该属性并赋值为 true |
30 | type: Boolean, | 30 | type: Boolean, |
31 | default: true | 31 | default: true |
32 | }, | 32 | }, |
33 | modalAppendToBody: { | 33 | modalAppendToBody: { |
34 | // 遮罩层是否插入至 body 元素上,若为 false,则遮罩层会插入至 Dialog 的父元素上 | 34 | // 遮罩层是否插入至 body 元素上,若为 false,则遮罩层会插入至 Dialog 的父元素上 |
35 | type: Boolean, | 35 | type: Boolean, |
36 | default: true | 36 | default: true |
37 | }, | 37 | }, |
38 | modal: { | 38 | modal: { |
39 | // 是否需要遮罩层 | 39 | // 是否需要遮罩层 |
40 | type: Boolean, | 40 | type: Boolean, |
41 | default: true | 41 | default: true |
42 | }, | ||
43 | fullscreen: { | ||
44 | // 是否全屏 | ||
45 | type: Boolean, | ||
46 | default: false | ||
47 | }, | ||
48 | destroyOnClose: { | ||
49 | // 关闭时销毁 Dialog 中的元素 | ||
50 | type: Boolean, | ||
51 | default: false | ||
52 | }, | ||
53 | width: { | ||
54 | type: String, | ||
55 | default: '30%' | ||
56 | } | ||
42 | }, | 57 | }, |
43 | fullscreen: { | 58 | data () { |
44 | // 是否全屏 | 59 | return {} |
45 | type: Boolean, | ||
46 | default: false | ||
47 | }, | 60 | }, |
48 | destroyOnClose: { | 61 | computed: { |
49 | // 关闭时销毁 Dialog 中的元素 | 62 | visible: { |
50 | type: Boolean, | 63 | get () { |
51 | default: false | 64 | return this.show |
65 | }, | ||
66 | set (val) { | ||
67 | this.$emit('update:show', val) // visible 改变的时候通知父组件 | ||
68 | } | ||
69 | } | ||
52 | }, | 70 | }, |
53 | width: { | 71 | methods: { |
54 | type: String, | 72 | close () { |
55 | default: '30%' | 73 | this.$emit('close') |
56 | } | ||
57 | }, | ||
58 | data () { | ||
59 | return {} | ||
60 | }, | ||
61 | computed: { | ||
62 | visible: { | ||
63 | get () { | ||
64 | return this.show | ||
65 | }, | ||
66 | set (val) { | ||
67 | this.$emit('update:show', val) // visible 改变的时候通知父组件 | ||
68 | } | 74 | } |
69 | } | 75 | } |
70 | }, | ||
71 | methods: { | ||
72 | close () { | ||
73 | this.$emit('close') | ||
74 | } | ||
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 | } | ||
86 | |||
87 | .el-dialog__header { | ||
88 | padding: 0; | ||
89 | height: 56px; | ||
90 | line-height: 56px; | ||
91 | border-bottom: none; | ||
92 | |||
93 | .el-dialog__title { | ||
94 | font-weight: 400; | ||
95 | } | 85 | } |
96 | 86 | ||
97 | .el-dialog__title:before { | 87 | .el-dialog__header { |
98 | display: inline-block; | 88 | padding: 0; |
99 | content: ''; | 89 | height: 56px; |
100 | width: 4px; | 90 | line-height: 56px; |
101 | height: 16px; | 91 | border-bottom: none; |
102 | background: #3aa3f8; | ||
103 | margin-left: 12px; | ||
104 | margin-right: 8px; | ||
105 | position: relative; | ||
106 | top: 2px; | ||
107 | } | ||
108 | 92 | ||
109 | .el-dialog__headerbtn { | 93 | .el-dialog__title { |
110 | position: absolute; | 94 | font-weight: 400; |
111 | // top: 2%; | 95 | } |
112 | right: 12px; | ||
113 | } | ||
114 | } | ||
115 | 96 | ||
116 | .el-dialog__body { | 97 | .el-dialog__title:before { |
117 | margin: 0px 12px; | 98 | display: inline-block; |
118 | padding: 48px 24px; | 99 | content: ""; |
119 | background: #fff; | 100 | width: 4px; |
120 | border: 1px solid #dfe7f3; | 101 | height: 16px; |
102 | background: #3aa3f8; | ||
103 | margin-left: 12px; | ||
104 | margin-right: 8px; | ||
105 | position: relative; | ||
106 | top: 2px; | ||
107 | } | ||
121 | 108 | ||
122 | .el-button { | 109 | .el-dialog__headerbtn { |
123 | padding: 8px 16px; | 110 | position: absolute; |
124 | border: none; | 111 | // top: 2%; |
112 | right: 12px; | ||
113 | } | ||
125 | } | 114 | } |
126 | 115 | ||
127 | .el-form { | 116 | .el-dialog__body { |
128 | .el-checkbox { | 117 | margin: 0px 12px; |
129 | line-height: 32px; | 118 | padding: 48px 24px; |
130 | height: 32px; | 119 | background: #fff; |
131 | } | 120 | border: 1px solid #dfe7f3; |
132 | 121 | ||
133 | .form-item-mb0 { | 122 | .el-button { |
134 | margin-bottom: 0 !important; | 123 | padding: 8px 16px; |
124 | border: none; | ||
135 | } | 125 | } |
136 | 126 | ||
137 | .el-form-item { | 127 | .el-form { |
138 | margin-bottom: 24px; | 128 | .el-checkbox { |
139 | |||
140 | .el-form-item__label { | ||
141 | height: 32px; | ||
142 | line-height: 32px; | 129 | line-height: 32px; |
143 | vertical-align: middle; | 130 | height: 32px; |
144 | } | 131 | } |
145 | 132 | ||
146 | .el-form-item__content { | 133 | .form-item-mb0 { |
147 | line-height: 32px; | 134 | margin-bottom: 0 !important; |
135 | } | ||
148 | 136 | ||
149 | // date 组件有图标 | 137 | .el-form-item { |
150 | .has-icon.el-date-editor { | 138 | margin-bottom: 24px; |
151 | .el-input__inner { | ||
152 | padding-left: 32px; | ||
153 | } | ||
154 | } | ||
155 | 139 | ||
156 | .el-input__inner { | 140 | .el-form-item__label { |
157 | padding: 0 8px; | ||
158 | height: 32px; | 141 | height: 32px; |
159 | line-height: 32px; | 142 | line-height: 32px; |
160 | text-align: left; | 143 | vertical-align: middle; |
161 | } | 144 | } |
162 | 145 | ||
163 | .el-textarea__inner { | 146 | .el-form-item__content { |
164 | padding: 8px 8px; | 147 | line-height: 32px; |
165 | } | ||
166 | 148 | ||
167 | .el-input .el-input__icon { | 149 | // date 组件有图标 |
168 | font-size: 14px; | 150 | .has-icon.el-date-editor { |
169 | color: #747e8c; | 151 | .el-input__inner { |
152 | padding-left: 32px; | ||
153 | } | ||
154 | } | ||
155 | |||
156 | .el-input__inner { | ||
157 | padding: 0 8px; | ||
158 | height: 32px; | ||
159 | line-height: 32px; | ||
160 | text-align: left; | ||
161 | } | ||
162 | |||
163 | .el-textarea__inner { | ||
164 | padding: 8px 8px; | ||
165 | } | ||
166 | |||
167 | .el-input .el-input__icon { | ||
168 | font-size: 14px; | ||
169 | color: #747e8c; | ||
170 | } | ||
170 | } | 171 | } |
171 | } | 172 | } |
172 | } | 173 | } |
173 | } | ||
174 | 174 | ||
175 | .el-select, | 175 | .el-select, |
176 | .el-cascader, | 176 | .el-cascader, |
177 | .el-date-editor { | 177 | .el-date-editor { |
178 | width: 100%; | 178 | width: 100%; |
179 | line-height: 32px; | 179 | line-height: 32px; |
180 | } | ||
180 | } | 181 | } |
181 | } | ||
182 | 182 | ||
183 | .el-dialog__footer { | 183 | .el-dialog__footer { |
184 | padding: 0 12px; | 184 | padding: 0 12px; |
185 | height: 56px; | 185 | height: 56px; |
186 | line-height: 56px; | 186 | line-height: 56px; |
187 | border: none; | ||
188 | |||
189 | .el-button { | ||
190 | padding: 8px 16px; | ||
191 | border: none; | 187 | border: none; |
192 | } | ||
193 | 188 | ||
194 | .el-button+.el-button { | 189 | .el-button { |
195 | margin-left: 12px; | 190 | padding: 8px 16px; |
191 | border: none; | ||
192 | } | ||
193 | |||
194 | .el-button + .el-button { | ||
195 | margin-left: 12px; | ||
196 | } | ||
196 | } | 197 | } |
197 | } | 198 | } |
198 | } | ||
199 | </style> | 199 | </style> | ... | ... |
src/image/bg.png
deleted
100644 → 0
764 KB
src/image/breadcrumb.png
deleted
100644 → 0
170 KB
src/image/dialogBg.png
deleted
100644 → 0
37.1 KB
src/image/djlxzl.png
deleted
100644 → 0
17.1 KB
src/image/djywl.png
deleted
100644 → 0
17.3 KB
src/image/dp.png
deleted
100644 → 0
2.34 KB
src/image/formContent.png
deleted
100644 → 0
31.8 KB
src/image/formHeader.png
deleted
100644 → 0
14.5 KB
src/image/header.png
deleted
100644 → 0
37.7 KB
src/image/homebk.png
deleted
100644 → 0
2.76 KB
src/image/loginBg.png
deleted
100644 → 0
13.5 KB
src/image/loginBoxBg.png
deleted
100644 → 0
1.67 MB
src/image/loginBoxsb.png
deleted
100644 → 0
296 KB
src/image/loginLogo.png
deleted
100644 → 0
258 KB
src/image/logo.png
deleted
100644 → 0
7.41 KB
src/image/mapcenter.png
deleted
100644 → 0
24.9 KB
src/image/navbar.png
deleted
100644 → 0
1.34 KB
src/image/pageBg.png
deleted
100644 → 0
289 KB
src/image/qxjr.png
deleted
100644 → 0
15.6 KB
src/image/rqjx.png
deleted
100644 → 0
6.22 KB
src/image/sbtj.png
deleted
100644 → 0
20 KB
src/image/selNavbar.png
deleted
100644 → 0
1.38 KB
src/image/sjqs.png
deleted
100644 → 0
20 KB
src/image/slbg.png
deleted
100644 → 0
3.53 KB
src/image/slitembg.png
deleted
100644 → 0
405 Bytes
src/image/tabitem.png
deleted
100644 → 0
805 Bytes
src/image/tabitemse.png
deleted
100644 → 0
5.62 KB
src/image/xjgyfwxx.png
deleted
100644 → 0
17.1 KB
src/image/xzslitembg.png
deleted
100644 → 0
506 Bytes
src/mixins/login.js
deleted
100644 → 0
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,75 +16,75 @@ | ... | @@ -11,75 +16,75 @@ |
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 | }, |
20 | components: { maps, brokenline }, | 25 | components: { maps, brokenline }, |
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; |
32 | padding: 0 0.0521rem; | 37 | padding: 0 0.0521rem; |
33 | display: flex; | 38 | display: flex; |
34 | flex-direction: column; | 39 | flex-direction: column; |
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%; |
42 | 47 | ||
43 | .title { | 48 | .title { |
44 | position: absolute; | 49 | position: absolute; |
45 | font-weight: bold; | 50 | font-weight: bold; |
46 | color: #02d9fd; | 51 | color: #02d9fd; |
47 | line-height: 0.1354rem; | 52 | line-height: 0.1354rem; |
48 | font-size: 0.1146rem; | 53 | font-size: 0.1146rem; |
49 | position: absolute; | 54 | position: absolute; |
50 | left: 0; | 55 | left: 0; |
51 | right: 0; | 56 | right: 0; |
52 | top: 0.0365rem; | 57 | top: 0.0365rem; |
53 | text-align: right; | 58 | text-align: right; |
54 | padding-right: 15%; | 59 | padding-right: 15%; |
60 | } | ||
55 | } | 61 | } |
56 | } | ||
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; |
64 | 69 | ||
65 | .title { | 70 | .title { |
66 | position: absolute; | 71 | position: absolute; |
67 | font-weight: bold; | 72 | font-weight: bold; |
68 | color: #02d9fd; | 73 | color: #02d9fd; |
69 | line-height: 0.1354rem; | 74 | line-height: 0.1354rem; |
70 | font-size: 0.1146rem; | 75 | font-size: 0.1146rem; |
71 | position: absolute; | 76 | position: absolute; |
72 | left: 0; | 77 | left: 0; |
73 | right: 0; | 78 | right: 0; |
74 | top: 0.0365rem; | 79 | top: 0.0365rem; |
75 | text-align: center; | 80 | text-align: center; |
76 | margin-bottom: 0.0521rem; | 81 | margin-bottom: 0.0521rem; |
77 | } | 82 | } |
78 | 83 | ||
79 | .brokenline { | 84 | .brokenline { |
80 | margin: auto; | 85 | margin: auto; |
81 | width: 100%; | 86 | width: 100%; |
87 | } | ||
82 | } | 88 | } |
83 | } | 89 | } |
84 | } | ||
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 | ... | ... |
-
Please register or sign in to post a comment