style:样式修改
Showing
46 changed files
with
208 additions
and
263 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-03-06 16:24:39 | 4 | * @LastEditTime: 2023-03-07 09:15:01 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="app-wrapper"> | 7 | <div class="app-wrapper jgWrapper"> |
8 | <navbar /> | 8 | <navbar /> |
9 | <div class="appMain"> | 9 | <div class="appMain"> |
10 | <app-main /> | 10 | <app-main /> |
... | @@ -34,8 +34,10 @@ export default { | ... | @@ -34,8 +34,10 @@ export default { |
34 | } | 34 | } |
35 | </script> | 35 | </script> |
36 | <style lang="scss"> | 36 | <style lang="scss"> |
37 | @import "~@/styles/jgSidebar.scss"; | ||
38 | </style> | ||
39 | <style lang="scss" scoped> | ||
37 | @import "~@/styles/mixin.scss"; | 40 | @import "~@/styles/mixin.scss"; |
38 | @import "~@/styles/sidebar.scss"; | ||
39 | 41 | ||
40 | .app-wrapper { | 42 | .app-wrapper { |
41 | @include clearfix; | 43 | @include clearfix; | ... | ... |
... | @@ -4,11 +4,7 @@ | ... | @@ -4,11 +4,7 @@ |
4 | <div class="logo"> | 4 | <div class="logo"> |
5 | <img :src="require('@/image/logo.png')" alt="" /> | 5 | <img :src="require('@/image/logo.png')" alt="" /> |
6 | </div> | 6 | </div> |
7 | <!-- <div class="backdrop"> | ||
8 | <Breadcrumb /> | ||
9 | </div> --> | ||
10 | <div class="right-menu"> | 7 | <div class="right-menu"> |
11 | <!-- <div class="dataView d-center pointer" @click="handleDataView">大屏展示</div> --> | ||
12 | <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand"> | 8 | <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand"> |
13 | <div class="avatar-wrapper"> | 9 | <div class="avatar-wrapper"> |
14 | <span style="padding-right:10px">{{ name }}</span> | 10 | <span style="padding-right:10px">{{ name }}</span> |
... | @@ -67,15 +63,6 @@ export default { | ... | @@ -67,15 +63,6 @@ export default { |
67 | } | 63 | } |
68 | } | 64 | } |
69 | 65 | ||
70 | .dataView { | ||
71 | color: #fff; | ||
72 | width: 120px; | ||
73 | height: 32px; | ||
74 | background: url("../../image/dp.png"); | ||
75 | background-size: cover; | ||
76 | margin-right: 20px; | ||
77 | } | ||
78 | |||
79 | .NoticeBar { | 66 | .NoticeBar { |
80 | position: absolute; | 67 | position: absolute; |
81 | bottom: 0; | 68 | bottom: 0; |
... | @@ -120,15 +107,11 @@ export default { | ... | @@ -120,15 +107,11 @@ export default { |
120 | height: $headerHeight; | 107 | height: $headerHeight; |
121 | overflow: hidden; | 108 | overflow: hidden; |
122 | position: relative; | 109 | position: relative; |
123 | // background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色 | 110 | background: #3D59C4; |
124 | // box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08); | ||
125 | background: #0d1230; | ||
126 | display: flex; | 111 | display: flex; |
127 | align-items: center; | 112 | align-items: center; |
128 | padding-right: 20px; | 113 | padding-right: 20px; |
129 | justify-content: space-between; | 114 | justify-content: space-between; |
130 | margin-bottom: 10px; | ||
131 | |||
132 | .header-logo { | 115 | .header-logo { |
133 | width: 300px; | 116 | width: 300px; |
134 | } | 117 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-03-06 16:23:31 | 4 | * @LastEditTime: 2023-03-07 09:11:01 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="app-wrapper scWrapper"> | 7 | <div class="app-wrapper scWrapper"> |
... | @@ -43,7 +43,8 @@ export default { | ... | @@ -43,7 +43,8 @@ export default { |
43 | position: relative; | 43 | position: relative; |
44 | height: 100%; | 44 | height: 100%; |
45 | width: 100%; | 45 | width: 100%; |
46 | background-color: $containerbg; | 46 | // background-color: $containerbg; |
47 | padding: 0; | ||
47 | 48 | ||
48 | &.mobile.openSidebar { | 49 | &.mobile.openSidebar { |
49 | position: fixed; | 50 | position: fixed; | ... | ... |
1 | /* | ||
2 | * @Description: | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-07 09:43:25 | ||
5 | */ | ||
1 | import router from "./router"; | 6 | import router from "./router"; |
2 | import store from "./store"; | 7 | import store from "./store"; |
3 | import { getMenuInfo } from "@/api/user"; | 8 | import { getMenuInfo } from "@/api/user"; |
... | @@ -23,6 +28,7 @@ router.beforeEach(async (to, from, next) => { | ... | @@ -23,6 +28,7 @@ router.beforeEach(async (to, from, next) => { |
23 | //请求用户信息 | 28 | //请求用户信息 |
24 | if (!hasUser) { | 29 | if (!hasUser) { |
25 | store.dispatch("user/getUserInfo"); | 30 | store.dispatch("user/getUserInfo"); |
31 | import("@/styles/public.scss"); | ||
26 | } | 32 | } |
27 | if (hasAddRoute) { | 33 | if (hasAddRoute) { |
28 | next(); | 34 | next(); | ... | ... |
1 | /* | ||
2 | * @Description: | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-07 09:38:47 | ||
5 | */ | ||
1 | import { getUserInfo } from "@/api/user"; | 6 | import { getUserInfo } from "@/api/user"; |
2 | const state = { | 7 | const state = { |
3 | hasUser: false, | 8 | hasUser: false, |
... | @@ -18,9 +23,6 @@ const actions = { | ... | @@ -18,9 +23,6 @@ const actions = { |
18 | getUserInfo ({ commit }) { | 23 | getUserInfo ({ commit }) { |
19 | return new Promise(async (resolve) => { | 24 | return new Promise(async (resolve) => { |
20 | let { result: res } = await getUserInfo(); | 25 | let { result: res } = await getUserInfo(); |
21 | // require.ensure([], function (require) { | ||
22 | // require("@/assets/sass/smart-lift/index.scss"); | ||
23 | // }); | ||
24 | commit("SET_USERINFO", res); | 26 | commit("SET_USERINFO", res); |
25 | resolve(true); | 27 | resolve(true); |
26 | }); | 28 | }); | ... | ... |
1 | .tableClass { | 1 | .tableClass { |
2 | /deep/.el-table { | 2 | .el-table { |
3 | border: none !important; | 3 | border: none !important; |
4 | border-radius: 0 !important; | 4 | border-radius: 0 !important; |
5 | background-color: rgba(0, 0, 0, 0); | 5 | background-color: rgba(0, 0, 0, 0); |
... | @@ -40,6 +40,11 @@ | ... | @@ -40,6 +40,11 @@ |
40 | } | 40 | } |
41 | 41 | ||
42 | //*****start*通用表单查询条件,列表样式******// | 42 | //*****start*通用表单查询条件,列表样式******// |
43 | .bgc { | ||
44 | box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5); | ||
45 | background-color: rgba(0, 0, 0, 0); | ||
46 | } | ||
47 | |||
43 | .from-clues { | 48 | .from-clues { |
44 | height: 100%; | 49 | height: 100%; |
45 | width: 100%; | 50 | width: 100%; |
... | @@ -56,11 +61,11 @@ | ... | @@ -56,11 +61,11 @@ |
56 | background-size: 100% 100%; | 61 | background-size: 100% 100%; |
57 | margin-top: 15px; | 62 | margin-top: 15px; |
58 | 63 | ||
59 | /deep/.el-form-item__label { | 64 | .el-form-item__label { |
60 | color: #E3F1FF; | 65 | color: #E3F1FF; |
61 | } | 66 | } |
62 | 67 | ||
63 | /deep/.el-input__inner { | 68 | .el-input__inner { |
64 | background: #07388B; | 69 | background: #07388B; |
65 | border-radius: 2px; | 70 | border-radius: 2px; |
66 | color: #CEF8FF; | 71 | color: #CEF8FF; |
... | @@ -114,16 +119,11 @@ | ... | @@ -114,16 +119,11 @@ |
114 | //修改表头的背景颜色横向渐变色 | 119 | //修改表头的背景颜色横向渐变色 |
115 | @extend .tableClass; | 120 | @extend .tableClass; |
116 | 121 | ||
117 | /deep/.el-pagination__total { | 122 | .el-pagination__total { |
118 | color: #FFFFFF; | 123 | color: #FFFFFF; |
119 | } | 124 | } |
120 | 125 | ||
121 | .bgc { | 126 | .el-pagination { |
122 | box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5); | ||
123 | background-color: rgba(0, 0, 0, 0); | ||
124 | } | ||
125 | |||
126 | /deep/ .el-pagination { | ||
127 | .el-input__inner { | 127 | .el-input__inner { |
128 | color: #FFFFFF; | 128 | color: #FFFFFF; |
129 | border: none; | 129 | border: none; |
... | @@ -142,14 +142,9 @@ | ... | @@ -142,14 +142,9 @@ |
142 | color: #FFFFFF; | 142 | color: #FFFFFF; |
143 | } | 143 | } |
144 | } | 144 | } |
145 | } | ||
145 | 146 | ||
146 | /deep/.btn-next, | ||
147 | /deep/.btn-prev { | ||
148 | @extend .bgc; | ||
149 | color: #FFFFFF; | ||
150 | } | ||
151 | 147 | ||
152 | } | ||
153 | 148 | ||
154 | .el-form--inline .el-form-item { | 149 | .el-form--inline .el-form-item { |
155 | width: auto; | 150 | width: auto; |
... | @@ -167,10 +162,15 @@ | ... | @@ -167,10 +162,15 @@ |
167 | } | 162 | } |
168 | } | 163 | } |
169 | 164 | ||
165 | .el-pagination.is-background .btn-prev, | ||
166 | .el-pagination.is-background .btn-next { | ||
167 | @extend .bgc; | ||
168 | color: #FFFFFF; | ||
169 | } | ||
170 | 170 | ||
171 | 171 | ||
172 | //*****end*通用表单查询条件,列表样式******// | 172 | //*****end*通用表单查询条件,列表样式******// |
173 | /deep/.el-range-separator { | 173 | .el-range-separator { |
174 | line-height: 28px !important; | 174 | line-height: 28px !important; |
175 | } | 175 | } |
176 | 176 | ||
... | @@ -202,7 +202,7 @@ | ... | @@ -202,7 +202,7 @@ |
202 | 202 | ||
203 | // 修改弹框样式 | 203 | // 修改弹框样式 |
204 | .modifydialog { | 204 | .modifydialog { |
205 | /deep/.el-dialog__header { | 205 | .el-dialog__header { |
206 | text-align: center; | 206 | text-align: center; |
207 | margin-bottom: 10px; | 207 | margin-bottom: 10px; |
208 | 208 | ||
... | @@ -211,36 +211,36 @@ | ... | @@ -211,36 +211,36 @@ |
211 | } | 211 | } |
212 | } | 212 | } |
213 | 213 | ||
214 | /deep/.el-form-item__label { | 214 | .el-form-item__label { |
215 | color: white; | 215 | color: white; |
216 | } | 216 | } |
217 | 217 | ||
218 | /deep/.el-input__inner { | 218 | .el-input__inner { |
219 | background-color: #07388b; | 219 | background-color: #07388b; |
220 | } | 220 | } |
221 | 221 | ||
222 | /deep/.el-input__inner { | 222 | .el-input__inner { |
223 | background: #07388b; | 223 | background: #07388b; |
224 | border-radius: 2px; | 224 | border-radius: 2px; |
225 | border: 1px solid #6bc1fc; | 225 | border: 1px solid #6bc1fc; |
226 | } | 226 | } |
227 | 227 | ||
228 | /deep/.el-textarea__inner { | 228 | .el-textarea__inner { |
229 | background: #07388b; | 229 | background: #07388b; |
230 | color: #fff; | 230 | color: #fff; |
231 | } | 231 | } |
232 | 232 | ||
233 | /deep/.el-form-item__label { | 233 | .el-form-item__label { |
234 | color: #fff; | 234 | color: #fff; |
235 | } | 235 | } |
236 | 236 | ||
237 | /deep/.el-dialog__headerbtn { | 237 | .el-dialog__headerbtn { |
238 | position: absolute; | 238 | position: absolute; |
239 | top: 22px; | 239 | top: 22px; |
240 | right: 30px; | 240 | right: 30px; |
241 | } | 241 | } |
242 | 242 | ||
243 | /deep/.el-dialog__header { | 243 | .el-dialog__header { |
244 | text-align: center; | 244 | text-align: center; |
245 | margin-bottom: 10px; | 245 | margin-bottom: 10px; |
246 | 246 | ||
... | @@ -252,23 +252,23 @@ | ... | @@ -252,23 +252,23 @@ |
252 | 252 | ||
253 | // 角色配置 | 253 | // 角色配置 |
254 | .roleconfiguration { | 254 | .roleconfiguration { |
255 | /deep/.el-dialog__body { | 255 | .el-dialog__body { |
256 | display: flex; | 256 | display: flex; |
257 | flex-direction: column; | 257 | flex-direction: column; |
258 | } | 258 | } |
259 | 259 | ||
260 | /deep/ .el-tabs { | 260 | .el-tabs { |
261 | color: #cef8ff; | 261 | color: #cef8ff; |
262 | } | 262 | } |
263 | 263 | ||
264 | .sjmx { | 264 | .sjmx { |
265 | /deep/.el-tabs__item { | 265 | .el-tabs__item { |
266 | height: 50px; | 266 | height: 50px; |
267 | padding-top: 6px; | 267 | padding-top: 6px; |
268 | } | 268 | } |
269 | } | 269 | } |
270 | 270 | ||
271 | /deep/.el-tabs__item { | 271 | .el-tabs__item { |
272 | color: #cef8ff !important; | 272 | color: #cef8ff !important; |
273 | 273 | ||
274 | display: flex; | 274 | display: flex; |
... | @@ -286,35 +286,35 @@ | ... | @@ -286,35 +286,35 @@ |
286 | background-size: 100% 100%; | 286 | background-size: 100% 100%; |
287 | } | 287 | } |
288 | 288 | ||
289 | /deep/.el-tabs__nav-scroll { | 289 | .el-tabs__nav-scroll { |
290 | background: none; | 290 | background: none; |
291 | } | 291 | } |
292 | 292 | ||
293 | /deep/.el-tabs__nav { | 293 | .el-tabs__nav { |
294 | display: flex; | 294 | display: flex; |
295 | border: none !important; | 295 | border: none !important; |
296 | } | 296 | } |
297 | 297 | ||
298 | /deep/.el-tabs__item.is-top { | 298 | .el-tabs__item.is-top { |
299 | border: 1px solid #dfe4ed; | 299 | border: 1px solid #dfe4ed; |
300 | border-top: 1px solid #dfe4ed; | 300 | border-top: 1px solid #dfe4ed; |
301 | border-bottom: 1px solid transparent; | 301 | border-bottom: 1px solid transparent; |
302 | } | 302 | } |
303 | 303 | ||
304 | /deep/.el-tabs__header { | 304 | .el-tabs__header { |
305 | border: none; | 305 | border: none; |
306 | margin-bottom: 0; | 306 | margin-bottom: 0; |
307 | } | 307 | } |
308 | 308 | ||
309 | /deep/.el-tabs__item.is-top:not(:last-child) { | 309 | .el-tabs__item.is-top:not(:last-child) { |
310 | margin-right: 5px; | 310 | margin-right: 5px; |
311 | } | 311 | } |
312 | 312 | ||
313 | /deep/.el-tabs__item.is-top { | 313 | .el-tabs__item.is-top { |
314 | background-color: none !important; | 314 | background-color: none !important; |
315 | } | 315 | } |
316 | 316 | ||
317 | /deep/.el-tabs__item.is-active { | 317 | .el-tabs__item.is-active { |
318 | background: url("~@/image/tabitemse.png") no-repeat; | 318 | background: url("~@/image/tabitemse.png") no-repeat; |
319 | background-size: 100% 100%; | 319 | background-size: 100% 100%; |
320 | } | 320 | } |
... | @@ -344,7 +344,7 @@ | ... | @@ -344,7 +344,7 @@ |
344 | border-top: none; | 344 | border-top: none; |
345 | } | 345 | } |
346 | 346 | ||
347 | /deep/.editDialogBox { | 347 | .editDialogBox { |
348 | border-radius: 8px; | 348 | border-radius: 8px; |
349 | overflow: hidden; | 349 | overflow: hidden; |
350 | min-width: 1228px; | 350 | min-width: 1228px; |
... | @@ -424,7 +424,7 @@ | ... | @@ -424,7 +424,7 @@ |
424 | overflow: hidden; | 424 | overflow: hidden; |
425 | } | 425 | } |
426 | 426 | ||
427 | /deep/.el-table { | 427 | .el-table { |
428 | background: none; | 428 | background: none; |
429 | 429 | ||
430 | th.el-table__cell { | 430 | th.el-table__cell { |
... | @@ -440,5 +440,4 @@ | ... | @@ -440,5 +440,4 @@ |
440 | } | 440 | } |
441 | } | 441 | } |
442 | } | 442 | } |
443 | |||
444 | } | 443 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | .scWrapper { | 1 | .scWrapper { |
2 | .main-container { | 2 | .main-container { |
3 | width: 100%; | 3 | width: 100%; |
4 | height: calc(100% - 84px); | 4 | height: calc(100% - 74px); |
5 | transition: margin-left 0.28s; | 5 | transition: margin-left 0.28s; |
6 | display: flex; | 6 | display: flex; |
7 | background-color: $containerbg; | ||
8 | } | 7 | } |
9 | 8 | ||
10 | .sidebar-container { | 9 | .sidebar-container { |
... | @@ -12,6 +11,7 @@ | ... | @@ -12,6 +11,7 @@ |
12 | width: $sideBarWidth !important; | 11 | width: $sideBarWidth !important; |
13 | font-size: 0px; | 12 | font-size: 0px; |
14 | margin-right: 15px; | 13 | margin-right: 15px; |
14 | background: #121F41; | ||
15 | 15 | ||
16 | .horizontal-collapse-transition { | 16 | .horizontal-collapse-transition { |
17 | transition: 0s width ease-in-out, 0s padding-left ease-in-out, | 17 | transition: 0s width ease-in-out, 0s padding-left ease-in-out, |
... | @@ -164,7 +164,7 @@ | ... | @@ -164,7 +164,7 @@ |
164 | // border-radius: 6px; | 164 | // border-radius: 6px; |
165 | } | 165 | } |
166 | } | 166 | } |
167 | 167 | ||
168 | .hideSidebar { | 168 | .hideSidebar { |
169 | .sidebar-container { | 169 | .sidebar-container { |
170 | width: 54px !important; | 170 | width: 54px !important; | ... | ... |
1 | /* | ||
2 | * @Description: | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-07 09:35:10 | ||
5 | */ | ||
1 | import Layout from '@/layout' | 6 | import Layout from '@/layout' |
2 | export default function filterAsyncRouter (routers) { | 7 | export default function filterAsyncRouter (routers) { |
3 | routers.forEach(item => { | 8 | routers.forEach(item => { | ... | ... |
... | @@ -152,6 +152,6 @@ export default { | ... | @@ -152,6 +152,6 @@ export default { |
152 | </script> | 152 | </script> |
153 | <style scoped lang="scss"> | 153 | <style scoped lang="scss"> |
154 | // 引入表单整体样式 | 154 | // 引入表单整体样式 |
155 | @import "~@/styles/public.scss"; | 155 | // @import "~@/styles/public.scss"; |
156 | </style> | 156 | </style> |
157 | 157 | ... | ... |
... | @@ -163,6 +163,6 @@ export default { | ... | @@ -163,6 +163,6 @@ export default { |
163 | } | 163 | } |
164 | </script> | 164 | </script> |
165 | <style scoped lang="scss"> | 165 | <style scoped lang="scss"> |
166 | @import "~@/styles/public.scss"; | 166 | // @import "~@/styles/public.scss"; |
167 | @import "./index.scss"; | 167 | @import "./index.scss"; |
168 | </style> | 168 | </style> | ... | ... |
... | @@ -160,5 +160,5 @@ export default { | ... | @@ -160,5 +160,5 @@ export default { |
160 | </script> | 160 | </script> |
161 | <style scoped lang="scss"> | 161 | <style scoped lang="scss"> |
162 | // 引入表单整体样式 | 162 | // 引入表单整体样式 |
163 | @import "~@/styles/public.scss"; | 163 | // @import "~@/styles/public.scss"; |
164 | </style> | 164 | </style> | ... | ... |
... | @@ -10,29 +10,16 @@ | ... | @@ -10,29 +10,16 @@ |
10 | <el-row> | 10 | <el-row> |
11 | <el-col :span="4"> | 11 | <el-col :span="4"> |
12 | <el-form-item label="开始日期" prop="startTime"> | 12 | <el-form-item label="开始日期" prop="startTime"> |
13 | <el-date-picker | 13 | <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期" |
14 | type="date" | 14 | :picker-options="pickerOptionsStart" v-model="form.startTime" |
15 | :clearable="false" | 15 | value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> |
16 | class="width100" | ||
17 | placeholder="开始日期" | ||
18 | :picker-options="pickerOptionsStart" | ||
19 | v-model="form.startTime" | ||
20 | value-format="yyyy-MM-dd HH:mm:ss" | ||
21 | ></el-date-picker> | ||
22 | </el-form-item> | 16 | </el-form-item> |
23 | </el-col> | 17 | </el-col> |
24 | <el-col :span="4"> | 18 | <el-col :span="4"> |
25 | <el-form-item label="结束日期" prop="endTime"> | 19 | <el-form-item label="结束日期" prop="endTime"> |
26 | <el-date-picker | 20 | <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期" |
27 | class="width100" | 21 | :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" |
28 | :clearable="false" | 22 | @change="endTimeChange"></el-date-picker> |
29 | type="date" | ||
30 | placeholder="结束日期" | ||
31 | :picker-options="pickerOptionsEnd" | ||
32 | v-model="form.endTime" | ||
33 | value-format="yyyy-MM-dd HH:mm:ss" | ||
34 | @change="endTimeChange" | ||
35 | ></el-date-picker> | ||
36 | </el-form-item> | 23 | </el-form-item> |
37 | </el-col> | 24 | </el-col> |
38 | <!-- 操作按钮 --> | 25 | <!-- 操作按钮 --> |
... | @@ -57,7 +44,7 @@ import efficient from "@/api/efficient"; | ... | @@ -57,7 +44,7 @@ import efficient from "@/api/efficient"; |
57 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; | 44 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; |
58 | export default { | 45 | export default { |
59 | name: "jktj", | 46 | name: "jktj", |
60 | data() { | 47 | data () { |
61 | return { | 48 | return { |
62 | // 开始日期限制 | 49 | // 开始日期限制 |
63 | pickerOptionsStart: { | 50 | pickerOptionsStart: { |
... | @@ -83,19 +70,19 @@ export default { | ... | @@ -83,19 +70,19 @@ export default { |
83 | pieChartsData: [], | 70 | pieChartsData: [], |
84 | }; | 71 | }; |
85 | }, | 72 | }, |
86 | created() {}, | 73 | created () { }, |
87 | mounted() { | 74 | mounted () { |
88 | this.getProcessCounts(); | 75 | this.getProcessCounts(); |
89 | }, | 76 | }, |
90 | computed: { | 77 | computed: { |
91 | ...mapGetters(["dicData"]), | 78 | ...mapGetters(["dicData"]), |
92 | }, | 79 | }, |
93 | methods: { | 80 | methods: { |
94 | endTimeChange(val) { | 81 | endTimeChange (val) { |
95 | this.form.endTime = timeFormat(new Date(val), true); | 82 | this.form.endTime = timeFormat(new Date(val), true); |
96 | }, | 83 | }, |
97 | //查询各区县办件数量 | 84 | //查询各区县办件数量 |
98 | async getProcessCounts() { | 85 | async getProcessCounts () { |
99 | this.pieChartsData = []; | 86 | this.pieChartsData = []; |
100 | let { result: res } = await efficient.getProcessCounts( | 87 | let { result: res } = await efficient.getProcessCounts( |
101 | this.form.startTime, | 88 | this.form.startTime, |
... | @@ -121,7 +108,7 @@ export default { | ... | @@ -121,7 +108,7 @@ export default { |
121 | }); | 108 | }); |
122 | }, | 109 | }, |
123 | // 重置 | 110 | // 重置 |
124 | resetForm() { | 111 | resetForm () { |
125 | this.form = { | 112 | this.form = { |
126 | startTime: getFirstDayOfSeason(), | 113 | startTime: getFirstDayOfSeason(), |
127 | endTime: timeFormat(new Date(), true), | 114 | endTime: timeFormat(new Date(), true), |
... | @@ -129,7 +116,7 @@ export default { | ... | @@ -129,7 +116,7 @@ export default { |
129 | this.getProcessCounts(); | 116 | this.getProcessCounts(); |
130 | }, | 117 | }, |
131 | //玫瑰图初始化 | 118 | //玫瑰图初始化 |
132 | echartInit() { | 119 | echartInit () { |
133 | let _this = this; | 120 | let _this = this; |
134 | // 基于准备好的dom,初始化echarts实例 | 121 | // 基于准备好的dom,初始化echarts实例 |
135 | let myChart = this.$echarts.init(document.getElementById("myChart")); | 122 | let myChart = this.$echarts.init(document.getElementById("myChart")); |
... | @@ -190,7 +177,7 @@ export default { | ... | @@ -190,7 +177,7 @@ export default { |
190 | }); | 177 | }); |
191 | }, | 178 | }, |
192 | //柱图初始化 | 179 | //柱图初始化 |
193 | async barChartInit(recType) { | 180 | async barChartInit (recType) { |
194 | //请求recType对应业务的各区县数据 | 181 | //请求recType对应业务的各区县数据 |
195 | let { result: res } = await efficient.getProcessDays( | 182 | let { result: res } = await efficient.getProcessDays( |
196 | recType, | 183 | recType, |
... | @@ -325,7 +312,7 @@ export default { | ... | @@ -325,7 +312,7 @@ export default { |
325 | }; | 312 | }; |
326 | </script> | 313 | </script> |
327 | <style scoped lang="scss"> | 314 | <style scoped lang="scss"> |
328 | @import "~@/styles/public.scss"; | 315 | // @import "~@/styles/public.scss"; |
329 | 316 | ||
330 | .jktjDetail { | 317 | .jktjDetail { |
331 | height: 100%; | 318 | height: 100%; |
... | @@ -364,5 +351,5 @@ export default { | ... | @@ -364,5 +351,5 @@ export default { |
364 | } | 351 | } |
365 | </style> | 352 | </style> |
366 | <style scoped lang="scss"> | 353 | <style scoped lang="scss"> |
367 | @import "~@/styles/public.scss"; | 354 | // @import "~@/styles/public.scss"; |
368 | </style> | 355 | </style> | ... | ... |
... | @@ -10,47 +10,24 @@ | ... | @@ -10,47 +10,24 @@ |
10 | <el-row> | 10 | <el-row> |
11 | <el-col :span="4"> | 11 | <el-col :span="4"> |
12 | <el-form-item label="行政区"> | 12 | <el-form-item label="行政区"> |
13 | <el-select | 13 | <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> |
14 | v-model="form.qxdm" | 14 | <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
15 | class="width100" | ||
16 | clearable | ||
17 | placeholder="行政区" | ||
18 | > | ||
19 | <el-option | ||
20 | v-for="item in dicData['A20']" | ||
21 | :key="item.DCODE" | ||
22 | :label="item.DNAME" | ||
23 | :value="item.DCODE" | ||
24 | > | ||
25 | </el-option> | 15 | </el-option> |
26 | </el-select> | 16 | </el-select> |
27 | </el-form-item> | 17 | </el-form-item> |
28 | </el-col> | 18 | </el-col> |
29 | <el-col :span="4"> | 19 | <el-col :span="4"> |
30 | <el-form-item label="开始日期" prop="startTime"> | 20 | <el-form-item label="开始日期" prop="startTime"> |
31 | <el-date-picker | 21 | <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期" |
32 | type="date" | 22 | :picker-options="pickerOptionsStart" v-model="form.startTime" |
33 | :clearable="false" | 23 | value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> |
34 | class="width100" | ||
35 | placeholder="开始日期" | ||
36 | :picker-options="pickerOptionsStart" | ||
37 | v-model="form.startTime" | ||
38 | value-format="yyyy-MM-dd HH:mm:ss" | ||
39 | ></el-date-picker> | ||
40 | </el-form-item> | 24 | </el-form-item> |
41 | </el-col> | 25 | </el-col> |
42 | <el-col :span="4"> | 26 | <el-col :span="4"> |
43 | <el-form-item label="结束日期" prop="endTime"> | 27 | <el-form-item label="结束日期" prop="endTime"> |
44 | <el-date-picker | 28 | <el-date-picker type="date" :clearable="false" class="width100" placeholder="结束日期" |
45 | type="date" | 29 | :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" |
46 | :clearable="false" | 30 | @change="endTimeChange"></el-date-picker> |
47 | class="width100" | ||
48 | placeholder="结束日期" | ||
49 | :picker-options="pickerOptionsEnd" | ||
50 | v-model="form.endTime" | ||
51 | value-format="yyyy-MM-dd HH:mm:ss" | ||
52 | @change="endTimeChange" | ||
53 | ></el-date-picker> | ||
54 | </el-form-item> | 31 | </el-form-item> |
55 | </el-col> | 32 | </el-col> |
56 | <!-- 操作按钮 --> | 33 | <!-- 操作按钮 --> |
... | @@ -98,7 +75,7 @@ export default { | ... | @@ -98,7 +75,7 @@ export default { |
98 | // 搜索表单 | 75 | // 搜索表单 |
99 | form: { | 76 | form: { |
100 | startTime: getFirstDayOfSeason(), | 77 | startTime: getFirstDayOfSeason(), |
101 | endTime: timeFormat(new Date(),true), | 78 | endTime: timeFormat(new Date(), true), |
102 | qxdm: "", | 79 | qxdm: "", |
103 | }, | 80 | }, |
104 | }; | 81 | }; |
... | @@ -111,8 +88,8 @@ export default { | ... | @@ -111,8 +88,8 @@ export default { |
111 | ...mapGetters(["dicData"]), | 88 | ...mapGetters(["dicData"]), |
112 | }, | 89 | }, |
113 | methods: { | 90 | methods: { |
114 | endTimeChange(val){ | 91 | endTimeChange (val) { |
115 | this.form.endTime = timeFormat(new Date(val),true) | 92 | this.form.endTime = timeFormat(new Date(val), true) |
116 | }, | 93 | }, |
117 | async getSuucessRate () { | 94 | async getSuucessRate () { |
118 | this.recTypeArr = []; | 95 | this.recTypeArr = []; |
... | @@ -137,7 +114,7 @@ export default { | ... | @@ -137,7 +114,7 @@ export default { |
137 | resetForm () { | 114 | resetForm () { |
138 | this.form = { | 115 | this.form = { |
139 | startTime: getFirstDayOfSeason(), | 116 | startTime: getFirstDayOfSeason(), |
140 | endTime: timeFormat(new Date(),true), | 117 | endTime: timeFormat(new Date(), true), |
141 | qxdm: "", | 118 | qxdm: "", |
142 | }; | 119 | }; |
143 | this.getSuucessRate(); | 120 | this.getSuucessRate(); |
... | @@ -231,7 +208,7 @@ export default { | ... | @@ -231,7 +208,7 @@ export default { |
231 | color: "#fff", | 208 | color: "#fff", |
232 | fontSize: "16", | 209 | fontSize: "16", |
233 | }, | 210 | }, |
234 | splitNumber:2, | 211 | splitNumber: 2, |
235 | axisLabel: { | 212 | axisLabel: { |
236 | formatter: "{value} %", | 213 | formatter: "{value} %", |
237 | textStyle: { | 214 | textStyle: { |
... | @@ -302,7 +279,7 @@ export default { | ... | @@ -302,7 +279,7 @@ export default { |
302 | }; | 279 | }; |
303 | </script> | 280 | </script> |
304 | <style scoped lang="scss"> | 281 | <style scoped lang="scss"> |
305 | @import "~@/styles/public.scss"; | 282 | // @import "~@/styles/public.scss"; |
306 | 283 | ||
307 | .jktjDetail { | 284 | .jktjDetail { |
308 | height: 100%; | 285 | height: 100%; |
... | @@ -337,5 +314,5 @@ export default { | ... | @@ -337,5 +314,5 @@ export default { |
337 | } | 314 | } |
338 | </style> | 315 | </style> |
339 | <style scoped lang="scss"> | 316 | <style scoped lang="scss"> |
340 | @import "~@/styles/public.scss"; | 317 | // @import "~@/styles/public.scss"; |
341 | </style> | 318 | </style> | ... | ... |
... | @@ -10,47 +10,24 @@ | ... | @@ -10,47 +10,24 @@ |
10 | <el-row> | 10 | <el-row> |
11 | <el-col :span="4"> | 11 | <el-col :span="4"> |
12 | <el-form-item label="行政区"> | 12 | <el-form-item label="行政区"> |
13 | <el-select | 13 | <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> |
14 | v-model="form.qxdm" | 14 | <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
15 | class="width100" | ||
16 | clearable | ||
17 | placeholder="行政区" | ||
18 | > | ||
19 | <el-option | ||
20 | v-for="item in dicData['A20']" | ||
21 | :key="item.DCODE" | ||
22 | :label="item.DNAME" | ||
23 | :value="item.DCODE" | ||
24 | > | ||
25 | </el-option> | 15 | </el-option> |
26 | </el-select> | 16 | </el-select> |
27 | </el-form-item> | 17 | </el-form-item> |
28 | </el-col> | 18 | </el-col> |
29 | <el-col :span="4"> | 19 | <el-col :span="4"> |
30 | <el-form-item label="开始日期"> | 20 | <el-form-item label="开始日期"> |
31 | <el-date-picker | 21 | <el-date-picker class="width100" :clearable="false" type="date" placeholder="开始日期" |
32 | class="width100" | 22 | :picker-options="pickerOptionsStart" v-model="form.startTime" |
33 | :clearable="false" | 23 | value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> |
34 | type="date" | ||
35 | placeholder="开始日期" | ||
36 | :picker-options="pickerOptionsStart" | ||
37 | v-model="form.startTime" | ||
38 | value-format="yyyy-MM-dd HH:mm:ss" | ||
39 | ></el-date-picker> | ||
40 | </el-form-item> | 24 | </el-form-item> |
41 | </el-col> | 25 | </el-col> |
42 | <el-col :span="4"> | 26 | <el-col :span="4"> |
43 | <el-form-item label="结束日期"> | 27 | <el-form-item label="结束日期"> |
44 | <el-date-picker | 28 | <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期" |
45 | class="width100" | 29 | :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" |
46 | :clearable="false" | 30 | @change="endTimeChange"></el-date-picker> |
47 | type="date" | ||
48 | placeholder="结束日期" | ||
49 | :picker-options="pickerOptionsEnd" | ||
50 | v-model="form.endTime" | ||
51 | value-format="yyyy-MM-dd HH:mm:ss" | ||
52 | @change="endTimeChange" | ||
53 | ></el-date-picker> | ||
54 | </el-form-item> | 31 | </el-form-item> |
55 | </el-col> | 32 | </el-col> |
56 | <!-- 操作按钮 --> | 33 | <!-- 操作按钮 --> |
... | @@ -98,13 +75,13 @@ export default { | ... | @@ -98,13 +75,13 @@ export default { |
98 | // 搜索表单 | 75 | // 搜索表单 |
99 | form: { | 76 | form: { |
100 | startTime: getFirstDayOfSeason(), | 77 | startTime: getFirstDayOfSeason(), |
101 | endTime: timeFormat(new Date(),true), | 78 | endTime: timeFormat(new Date(), true), |
102 | qxdm: "", | 79 | qxdm: "", |
103 | }, | 80 | }, |
104 | chartData:[] | 81 | chartData: [] |
105 | }; | 82 | }; |
106 | }, | 83 | }, |
107 | mounted() { | 84 | mounted () { |
108 | // 查询业务量 | 85 | // 查询业务量 |
109 | this.getProcessCounts(); | 86 | this.getProcessCounts(); |
110 | }, | 87 | }, |
... | @@ -112,10 +89,10 @@ export default { | ... | @@ -112,10 +89,10 @@ export default { |
112 | ...mapGetters(["dicData"]), | 89 | ...mapGetters(["dicData"]), |
113 | }, | 90 | }, |
114 | methods: { | 91 | methods: { |
115 | endTimeChange(val){ | 92 | endTimeChange (val) { |
116 | this.form.endTime = timeFormat(new Date(val),true) | 93 | this.form.endTime = timeFormat(new Date(val), true) |
117 | }, | 94 | }, |
118 | async getProcessCounts(){ | 95 | async getProcessCounts () { |
119 | this.chartData = []; | 96 | this.chartData = []; |
120 | let { result: res } = await efficient.getProcessCounts( | 97 | let { result: res } = await efficient.getProcessCounts( |
121 | this.form.startTime, | 98 | this.form.startTime, |
... | @@ -133,13 +110,13 @@ export default { | ... | @@ -133,13 +110,13 @@ export default { |
133 | resetForm () { | 110 | resetForm () { |
134 | this.form = { | 111 | this.form = { |
135 | startTime: getFirstDayOfSeason(), | 112 | startTime: getFirstDayOfSeason(), |
136 | endTime: timeFormat(new Date(),true), | 113 | endTime: timeFormat(new Date(), true), |
137 | qxdm: "" | 114 | qxdm: "" |
138 | }; | 115 | }; |
139 | this.getProcessCounts(); | 116 | this.getProcessCounts(); |
140 | }, | 117 | }, |
141 | //图表渲染 | 118 | //图表渲染 |
142 | echartInit(chartArr) { | 119 | echartInit (chartArr) { |
143 | // 基于准备好的dom,初始化echarts实例 | 120 | // 基于准备好的dom,初始化echarts实例 |
144 | let myChart = this.$echarts.init(document.getElementById("myChart")); | 121 | let myChart = this.$echarts.init(document.getElementById("myChart")); |
145 | // 绘制图表 | 122 | // 绘制图表 |
... | @@ -158,7 +135,7 @@ export default { | ... | @@ -158,7 +135,7 @@ export default { |
158 | xAxis: [ | 135 | xAxis: [ |
159 | { | 136 | { |
160 | type: "category", | 137 | type: "category", |
161 | data: chartArr.map(item=>item.recTypeName), | 138 | data: chartArr.map(item => item.recTypeName), |
162 | axisLabel: { | 139 | axisLabel: { |
163 | interval: 0, | 140 | interval: 0, |
164 | formatter: function (val) { | 141 | formatter: function (val) { |
... | @@ -221,7 +198,7 @@ export default { | ... | @@ -221,7 +198,7 @@ export default { |
221 | }, | 198 | }, |
222 | }, | 199 | }, |
223 | barMaxWidth: '60', | 200 | barMaxWidth: '60', |
224 | data: chartArr.map(item=>item.counts), | 201 | data: chartArr.map(item => item.counts), |
225 | }, | 202 | }, |
226 | ], | 203 | ], |
227 | }); | 204 | }); |
... | @@ -230,7 +207,7 @@ export default { | ... | @@ -230,7 +207,7 @@ export default { |
230 | }; | 207 | }; |
231 | </script> | 208 | </script> |
232 | <style scoped lang="scss"> | 209 | <style scoped lang="scss"> |
233 | @import "~@/styles/public.scss"; | 210 | // @import "~@/styles/public.scss"; |
234 | 211 | ||
235 | .jktjDetail { | 212 | .jktjDetail { |
236 | height: 100%; | 213 | height: 100%; |
... | @@ -240,11 +217,13 @@ export default { | ... | @@ -240,11 +217,13 @@ export default { |
240 | .rows { | 217 | .rows { |
241 | margin-left: 100px; | 218 | margin-left: 100px; |
242 | } | 219 | } |
220 | |||
243 | .center { | 221 | .center { |
244 | line-height: 50vh; | 222 | line-height: 50vh; |
245 | text-align: center; | 223 | text-align: center; |
246 | color:#b6b5b5 | 224 | color: #b6b5b5 |
247 | } | 225 | } |
226 | |||
248 | .echarts-box { | 227 | .echarts-box { |
249 | display: flex; | 228 | display: flex; |
250 | justify-content: center; | 229 | justify-content: center; |
... | @@ -263,5 +242,5 @@ export default { | ... | @@ -263,5 +242,5 @@ export default { |
263 | } | 242 | } |
264 | </style> | 243 | </style> |
265 | <style scoped lang="scss"> | 244 | <style scoped lang="scss"> |
266 | @import "~@/styles/public.scss"; | 245 | // @import "~@/styles/public.scss"; |
267 | </style> | 246 | </style> | ... | ... |
... | @@ -293,7 +293,7 @@ export default { | ... | @@ -293,7 +293,7 @@ export default { |
293 | </script> | 293 | </script> |
294 | <style scoped lang="scss"> | 294 | <style scoped lang="scss"> |
295 | // 引入表单整体样式 | 295 | // 引入表单整体样式 |
296 | @import "~@/styles/public.scss"; | 296 | // // @import "~@/styles/public.scss"; |
297 | // 引入当前css | 297 | // 引入当前css |
298 | @import "./index.scss"; | 298 | @import "./index.scss"; |
299 | </style> | 299 | </style> | ... | ... |
... | @@ -6,6 +6,10 @@ | ... | @@ -6,6 +6,10 @@ |
6 | border-right: 1px solid #458ACF !important; | 6 | border-right: 1px solid #458ACF !important; |
7 | } | 7 | } |
8 | 8 | ||
9 | /deep/.el-table thead.is-group th.el-table__cell { | ||
10 | background-color: transparent !important; | ||
11 | } | ||
12 | |||
9 | /deep/.el-table--group::after, | 13 | /deep/.el-table--group::after, |
10 | .el-table--border::after { | 14 | .el-table--border::after { |
11 | width: 0 !important; | 15 | width: 0 !important; | ... | ... |
... | @@ -164,7 +164,7 @@ export default { | ... | @@ -164,7 +164,7 @@ export default { |
164 | </script> | 164 | </script> |
165 | <style scoped lang="scss"> | 165 | <style scoped lang="scss"> |
166 | // 引入表单整体样式 | 166 | // 引入表单整体样式 |
167 | @import "~@/styles/public.scss"; | 167 | // @import "~@/styles/public.scss"; |
168 | @import "../css/index.scss"; | 168 | @import "../css/index.scss"; |
169 | </style> | 169 | </style> |
170 | 170 | ... | ... |
... | @@ -155,7 +155,7 @@ export default { | ... | @@ -155,7 +155,7 @@ export default { |
155 | </script> | 155 | </script> |
156 | <style scoped lang="scss"> | 156 | <style scoped lang="scss"> |
157 | // 引入表单整体样式 | 157 | // 引入表单整体样式 |
158 | @import "~@/styles/public.scss"; | 158 | // @import "~@/styles/public.scss"; |
159 | @import "../css/index.scss"; | 159 | @import "../css/index.scss"; |
160 | </style> | 160 | </style> |
161 | 161 | ... | ... |
... | @@ -148,7 +148,7 @@ export default { | ... | @@ -148,7 +148,7 @@ export default { |
148 | </script> | 148 | </script> |
149 | <style scoped lang="scss"> | 149 | <style scoped lang="scss"> |
150 | // 引入表单整体样式 | 150 | // 引入表单整体样式 |
151 | @import "~@/styles/public.scss"; | 151 | // @import "~@/styles/public.scss"; |
152 | @import "../css/index.scss"; | 152 | @import "../css/index.scss"; |
153 | </style> | 153 | </style> |
154 | 154 | ... | ... |
... | @@ -459,7 +459,7 @@ export default { | ... | @@ -459,7 +459,7 @@ export default { |
459 | </script> | 459 | </script> |
460 | <style scoped lang="scss"> | 460 | <style scoped lang="scss"> |
461 | @import "~@/styles/mixin.scss"; | 461 | @import "~@/styles/mixin.scss"; |
462 | @import "~@/styles/public.scss"; | 462 | // @import "~@/styles/public.scss"; |
463 | @import "~@/styles/dialogBox.scss"; | 463 | @import "~@/styles/dialogBox.scss"; |
464 | 464 | ||
465 | 465 | ... | ... |
... | @@ -154,6 +154,5 @@ export default { | ... | @@ -154,6 +154,5 @@ export default { |
154 | } | 154 | } |
155 | </script> | 155 | </script> |
156 | <style scoped lang="scss"> | 156 | <style scoped lang="scss"> |
157 | @import "~@/styles/public.scss"; | ||
158 | @import "./index.scss"; | 157 | @import "./index.scss"; |
159 | </style> | 158 | </style> | ... | ... |
... | @@ -235,7 +235,6 @@ export default { | ... | @@ -235,7 +235,6 @@ export default { |
235 | </script> | 235 | </script> |
236 | <style scoped lang="scss"> | 236 | <style scoped lang="scss"> |
237 | // 引入页面公共样式 | 237 | // 引入页面公共样式 |
238 | @import "~@/styles/public.scss"; | ||
239 | @import "./index.scss"; | 238 | @import "./index.scss"; |
240 | </style> | 239 | </style> |
241 | 240 | ... | ... |
... | @@ -146,8 +146,7 @@ export default { | ... | @@ -146,8 +146,7 @@ export default { |
146 | } | 146 | } |
147 | </script> | 147 | </script> |
148 | <style rel="stylesheet/scss" lang="scss" scoped> | 148 | <style rel="stylesheet/scss" lang="scss" scoped> |
149 | @import "~@/styles/public.scss"; | 149 | // @import "~@/styles/public.scss"; |
150 | |||
151 | .editDialogBox-box { | 150 | .editDialogBox-box { |
152 | margin: 14px 18px 30px 18px !important | 151 | margin: 14px 18px 30px 18px !important |
153 | } | 152 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <!-- 编辑 --> | 2 | <!-- 编辑 --> |
3 | <dialogBox submitForm="submitForm" class="tableClass" @closeDialog="closeDialog" @submitForm="handleSubmit" | 3 | <dialogBox submitForm="submitForm" class="tableClass" @closeDialog="closeDialog" @submitForm="handleSubmit" width="60%" |
4 | width="60%" v-model="myValue" :isMain="true" title="字典信息"> | 4 | v-model="myValue" :isMain="true" title="字典信息"> |
5 | <div class="editDialogBox-box "> | 5 | <div class="editDialogBox-box "> |
6 | <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> | 6 | <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> |
7 | <el-row :gutter="20"> | 7 | <el-row :gutter="20"> |
... | @@ -17,9 +17,8 @@ | ... | @@ -17,9 +17,8 @@ |
17 | </el-col> | 17 | </el-col> |
18 | </el-row> | 18 | </el-row> |
19 | </el-form> | 19 | </el-form> |
20 | <lb-table :column="column" class="loadingtext opacity-input" :heightNum="600" :key="key" | 20 | <lb-table :column="column" class="loadingtext opacity-input" :heightNum="600" :key="key" :expand-row-keys="keyList" |
21 | :expand-row-keys="keyList" row-key="dictid" :tree-props="{ children: 'children' }" :pagination="false" | 21 | row-key="dictid" :tree-props="{ children: 'children' }" :pagination="false" :data="tableData"> |
22 | :data="tableData"> | ||
23 | </lb-table> | 22 | </lb-table> |
24 | </div> | 23 | </div> |
25 | </dialogBox> | 24 | </dialogBox> |
... | @@ -359,7 +358,7 @@ export default { | ... | @@ -359,7 +358,7 @@ export default { |
359 | }; | 358 | }; |
360 | </script> | 359 | </script> |
361 | <style rel="stylesheet/scss" lang="scss" scoped> | 360 | <style rel="stylesheet/scss" lang="scss" scoped> |
362 | @import "~@/styles/public.scss"; | 361 | // @import "~@/styles/public.scss"; |
363 | 362 | ||
364 | /deep/.el-radio { | 363 | /deep/.el-radio { |
365 | margin-right: 5px !important; | 364 | margin-right: 5px !important; | ... | ... |
... | @@ -22,64 +22,68 @@ | ... | @@ -22,64 +22,68 @@ |
22 | </div> | 22 | </div> |
23 | </template> | 23 | </template> |
24 | <script> | 24 | <script> |
25 | import "@/utils/flexible.js"; | 25 | import "@/utils/flexible.js"; |
26 | import BaseSet from "./base-set.vue"; | 26 | import BaseSet from "./base-set.vue"; |
27 | import PasswordEdit from "./password-edit.vue"; | 27 | import PasswordEdit from "./password-edit.vue"; |
28 | export default { | 28 | export default { |
29 | components: { | 29 | components: { |
30 | BaseSet, | 30 | BaseSet, |
31 | PasswordEdit, | 31 | PasswordEdit, |
32 | }, | ||
33 | data () { | ||
34 | return { | ||
35 | isshow: true, | ||
36 | }; | ||
37 | }, | ||
38 | computed: { | ||
39 | userData () { | ||
40 | return this.$store.state.user.userInfo; | ||
32 | }, | 41 | }, |
33 | data () { | 42 | }, |
34 | return { | 43 | watch: {}, |
35 | isshow: true, | 44 | created () { }, |
36 | }; | 45 | mounted () { |
37 | }, | ||
38 | computed: { | ||
39 | userData () { | ||
40 | return this.$store.state.user.userInfo; | ||
41 | }, | ||
42 | }, | ||
43 | watch: {}, | ||
44 | created () { }, | ||
45 | mounted () { | ||
46 | 46 | ||
47 | 47 | ||
48 | }, | ||
49 | methods: { | ||
50 | information () { | ||
51 | this.isshow = true; | ||
48 | }, | 52 | }, |
49 | methods: { | 53 | password () { |
50 | information () { | 54 | this.isshow = false; |
51 | this.isshow = true; | ||
52 | }, | ||
53 | password () { | ||
54 | this.isshow = false; | ||
55 | }, | ||
56 | }, | 55 | }, |
57 | }; | 56 | }, |
57 | }; | ||
58 | </script> | 58 | </script> |
59 | 59 | ||
60 | <style scoped lang="scss"> | 60 | <style scoped lang="scss"> |
61 | @import "~@/styles/mixin.scss"; | 61 | @import "~@/styles/mixin.scss"; |
62 | @import "~@/styles/public.scss"; | 62 | |
63 | .information { | 63 | // @import "~@/styles/public.scss"; |
64 | .btnColRight { | 64 | .information { |
65 | margin-top: 20px; | 65 | .btnColRight { |
66 | } | 66 | margin-top: 20px; |
67 | /deep/.content { | 67 | } |
68 | .el-input__inner { | 68 | |
69 | background: none; | 69 | /deep/.content { |
70 | } | 70 | .el-input__inner { |
71 | .user-info { | 71 | background: none; |
72 | background: none; | ||
73 | } | ||
74 | } | 72 | } |
75 | /deep/.el-tabs { | 73 | |
76 | .el-tabs__content { | 74 | .user-info { |
77 | height: 100%; | 75 | background: none; |
78 | width: 100%; | ||
79 | } | ||
80 | } | 76 | } |
81 | .contentbox { | 77 | } |
82 | height: 3.0854rem; | 78 | |
79 | /deep/.el-tabs { | ||
80 | .el-tabs__content { | ||
81 | height: 100%; | ||
82 | width: 100%; | ||
83 | } | 83 | } |
84 | } | 84 | } |
85 | </style> | 85 | |
86 | .contentbox { | ||
87 | height: 3.0854rem; | ||
88 | } | ||
89 | }</style> | ... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
... | @@ -249,5 +249,5 @@ export default { | ... | @@ -249,5 +249,5 @@ export default { |
249 | </script> | 249 | </script> |
250 | <style scoped lang="scss"> | 250 | <style scoped lang="scss"> |
251 | @import "~@/styles/mixin.scss"; | 251 | @import "~@/styles/mixin.scss"; |
252 | @import "~@/styles/public.scss"; | 252 | // @import "~@/styles/public.scss"; |
253 | </style> | 253 | </style> | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -199,6 +199,6 @@ export default { | ... | @@ -199,6 +199,6 @@ export default { |
199 | }; | 199 | }; |
200 | </script> | 200 | </script> |
201 | <style scoped lang="scss"> | 201 | <style scoped lang="scss"> |
202 | @import "~@/styles/public.scss"; | 202 | // @import "~@/styles/public.scss"; |
203 | @import "./index.scss"; | 203 | @import "./index.scss"; |
204 | </style> | 204 | </style> | ... | ... |
-
Please register or sign in to post a comment