cad71d88 by 任超

style:部署

2 parents 7a5ffe6e 1edd2157
Showing 50 changed files with 720 additions and 938 deletions
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 09:42:59
5 -->
1 # 安装依赖 6 # 安装依赖
2 npm install 7 npm install
3 # 建议不要直接使用 cnpm 安装依赖,会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 8 # 建议不要直接使用 cnpm 安装依赖,会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
...@@ -15,4 +20,3 @@ npm install --registry=https://registry.npm.taobao.org ...@@ -15,4 +20,3 @@ npm install --registry=https://registry.npm.taobao.org
15 - `chore` 依赖更新/脚手架配置修改等 20 - `chore` 依赖更新/脚手架配置修改等
16 - `wip` 开发中 21 - `wip` 开发中
17 22
18
......
1 { 1 {
2 "TITLE": "汉中市数据上报系统", 2 "TITLE": "汉中市数据上报系统",
3 "THEME": "jg", 3 "THEME": "sb",
4 "CODE": "BDCJGPT",
4 "SERVERAPI": "/bdcsjsb", 5 "SERVERAPI": "/bdcsjsb",
5 "MANAGEMENTAPI": "http://192.168.2.236/management" 6 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
6 } 7 }
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-24 15:07:01
5 -->
1 <template> 6 <template>
2 <div id="app"> 7 <div id="app">
3 <router-view /> 8 <router-view />
4 </div> 9 </div>
5 </template>
...\ No newline at end of file ...\ No newline at end of file
10 </template>
......
1 /* 1 /*
2 * @Description: 这个是所有api的前缀配置文件 2 * @Description: 这个是所有api的前缀配置文件
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-21 16:26:55 4 * @LastEditTime: 2023-03-24 16:51:18
5 */ 5 */
6 export default { 6 export default {
7 SERVERAPI: '/bdcsjsb', //赵千 7 SERVERAPI: '/bdcsjsb', //赵千
8 MANAGEMENTAPI: 'http://192.168.2.236/management' 8 MANAGEMENTAPI: 'http://192.168.2.38:8090/management'
9 } 9 }
...\ 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-03-23 13:17:59 4 * @LastEditTime: 2023-03-24 09:28:25
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 // let SERVER = JSON.parse(localStorage.getItem('ApiUrl')) 7 // let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
8 let SERVER = JSON.parse(localStorage.getItem('ApiUrl')) 8 let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
9 console.log(JSON.parse(localStorage.getItem('ApiUrl')));
10 // 获取用户信息 9 // 获取用户信息
11 export function getUserInfo () { 10 export function getUserInfo () {
12 return request({ 11 return request({
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 09:53:16
5 */
1 import dialogBox from '@/components/DialogBox' 6 import dialogBox from '@/components/DialogBox'
2 import LbTable from '@/components/LbTable' 7 import LbTable from '@/components/LbTable'
3 import Theme from '@/components/Theme.vue'
4 import Breadcrumb from "@/components/Breadcrumb.vue"; 8 import Breadcrumb from "@/components/Breadcrumb.vue";
5 // 引入按钮 9 // 引入按钮
6 import btn from '@/components/Button.vue' 10 import btn from '@/components/Button.vue'
...@@ -12,8 +16,6 @@ export default { ...@@ -12,8 +16,6 @@ export default {
12 Vue.component('Breadcrumb', Breadcrumb); 16 Vue.component('Breadcrumb', Breadcrumb);
13 Vue.component('btn', btn); 17 Vue.component('btn', btn);
14 Vue.component('lbTable', LbTable); 18 Vue.component('lbTable', LbTable);
15 Vue.component('Theme', Theme);
16 Vue.prototype.$popup = Popup.install;
17 Vue.prototype.$alertMes = MessageBox.alert; 19 Vue.prototype.$alertMes = MessageBox.alert;
18 } 20 }
19 } 21 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox editDialogBox mainCenter" 2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox dataReporting editDialogBox mainCenter"
3 :visible.sync="dialogVisible" width="92%"> 3 :visible.sync="dialogVisible" width="92%">
4 <div slot="title" class="dialog_title" ref="dialogTitle"> 4 <div slot="title" class="dialog_title" ref="dialogTitle">
5 {{ title || '详情' }} 5 {{ title || '详情' }}
...@@ -335,194 +335,11 @@ ...@@ -335,194 +335,11 @@
335 } 335 }
336 </script> 336 </script>
337 <style scoped lang="scss"> 337 <style scoped lang="scss">
338 // @import "~@/styles/mixin.scss";
339 // @import "~@/styles/dialogBox.scss";
340
341 /deep/.el-dialog__body {
342 display: flex;
343 flex-direction: column;
344 padding-bottom: 30px;
345 }
346
347 /deep/ .el-tabs {
348 color: #cef8ff;
349 }
350
351 .d-center {
352 z-index: 1000;
353 }
354
355 .sjmx {
356 display: flex;
357 flex-direction: column;
358 height: 49vh;
359
360 /deep/.el-tabs__item {
361 height: 50px;
362 padding-top: 6px;
363 }
364 }
365
366 .result {
367 flex: 1;
368 height: 100%;
369 }
370
371 .editDialogBox-con {
372 flex: 1;
373 height: 100%;
374 overflow-y: hidden;
375 }
376
377 /deep/.el-tabs__item {
378 color: #cef8ff !important;
379
380 display: flex;
381 flex-direction: row;
382 justify-content: center;
383 background: url("~@/image/tabitem.png") no-repeat;
384 background-size: 100% 100%;
385 border: none !important;
386 }
387
388 .obligee-item-name {
389 background: #05275b;
390 color: #ffffff;
391 background: url("~@/image/itembg.png") no-repeat;
392 background-size: 100% 100%;
393 }
394
395 /deep/.el-tabs__nav-scroll {
396 background: none;
397 }
398
399 /deep/.el-tabs__nav {
400 display: flex;
401 border: none !important;
402 }
403
404 /deep/.el-tabs__item.is-top {
405 border: 1px solid #dfe4ed;
406 border-top: 1px solid #dfe4ed;
407 border-bottom: 1px solid transparent;
408 }
409
410 /deep/.el-tabs__header {
411 border: none;
412 margin-bottom: 0;
413 }
414
415 /deep/.el-tabs__item.is-top:not(:last-child) {
416 margin-right: 5px;
417 }
418
419 /deep/.el-tabs__item.is-top {
420 background-color: none !important;
421 }
422
423 /deep/.el-tabs__item.is-active {
424 background: url("~@/image/tabitemse.png") no-repeat;
425 background-size: 100% 100%;
426 }
427
428 .success-images {
429 width: 30px;
430 height: 30px;
431 position: relative;
432 top: 10px;
433 right: 3px;
434 }
435
436 .tab-pane-item {
437 line-height: 20px;
438 color: #02d9fd;
439
440 p {
441 text-align: center;
442 }
443 }
444
445 .edit-content {
446 overflow-y: auto;
447 overflow-x: hidden;
448 padding-right: 1px;
449 border-top: none;
450 }
451
452 /deep/.editDialogBox { 338 /deep/.editDialogBox {
453 border-radius: 8px;
454 overflow: hidden;
455 min-width: 1228px;
456
457 .el-dialog__header { 339 .el-dialog__header {
458 display: flex; 340 display: flex;
459 margin-bottom: 10px; 341 margin-bottom: 10px;
460 } 342 }
461
462 .dialog_footer {
463 flex-direction: column;
464
465 .dialog_button {
466 margin-top: 8px;
467 }
468 }
469
470 .divider {
471 width: 100%;
472 border-bottom: 1px solid #ccc;
473 }
474 }
475
476 .el-dialog__wrapper {
477 overflow: hidden;
478 }
479
480 .dialog-from {
481 padding-top: 0;
482
483 .el-col {
484 justify-content: space-between;
485 }
486
487 .bz {
488 height: 100%;
489 position: relative;
490 top: 3px;
491 }
492
493 /deep/.el-select {
494 padding-right: 15px;
495 }
496
497 /deep/.el-icon-circle-close {
498 display: none;
499 }
500
501 /deep/.el-input__suffix {
502 right: -25px !important;
503 top: -5px;
504 }
505
506 /deep/.el-select,
507 /deep/.el-input {
508 flex: 1;
509 width: 100%;
510 }
511
512 /deep/.el-textarea__inner {
513 border: none !important;
514 margin: 0;
515 }
516
517 &_header {
518 margin: 0 -5px !important;
519 }
520
521 &_title {
522 font-size: 18px;
523 color: #d7eaee;
524 margin: 3px 0;
525 }
526 } 343 }
527 </style> 344 </style>
528 345
......
1 <template>
2 <el-color-picker v-model="theme"
3 :predefine="['#409EFF', '#1890ff', '#304156', '#212121', '#11a983', '#13c2c2', '#6959CD', '#f5222d',]"
4 class="theme-picker" popper-class="theme-picker-dropdown" />
5 </template>
6
7 <script>
8 const version = require('element-ui/package.json').version // element-ui version from node_modules
9 const ORIGINAL_THEME = '#409EFF' // default color
10
11 export default {
12 data () {
13 return {
14 chalk: '', // content of theme-chalk css
15 theme: ''
16 }
17 },
18 computed: {
19 defaultTheme () {
20 return this.$store.state.app.theme
21 }
22 },
23 watch: {
24 defaultTheme: {
25 handler: function (val, oldVal) {
26 this.theme = val
27 },
28 immediate: true
29 },
30 async theme (val) {
31 const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
32 if (typeof val !== 'string') return
33 const themeCluster = this.getThemeCluster(val.replace('#', ''))
34 const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
35 const $message = this.$message({
36 message: ' Compiling the theme',
37 customClass: 'theme-message',
38 type: 'success',
39 duration: 0,
40 iconClass: 'el-icon-loading'
41 })
42
43 const getHandler = (variable, id) => {
44 return () => {
45 const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
46 const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
47
48 let styleTag = document.getElementById(id)
49 if (!styleTag) {
50 styleTag = document.createElement('style')
51 styleTag.setAttribute('id', id)
52 document.head.appendChild(styleTag)
53 }
54 styleTag.innerText = newStyle
55 }
56 }
57
58 if (!this.chalk) {
59 const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
60 await this.getCSSString(url, 'chalk')
61 }
62
63 const chalkHandler = getHandler('chalk', 'chalk-style')
64
65 chalkHandler()
66
67 const styles = [].slice.call(document.querySelectorAll('style'))
68 .filter(style => {
69 const text = style.innerText
70 return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
71 })
72 styles.forEach(style => {
73 const { innerText } = style
74 if (typeof innerText !== 'string') return
75 style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
76 })
77
78 this.$emit('change', val)
79
80 $message.close()
81 }
82 },
83
84 methods: {
85 updateStyle (style, oldCluster, newCluster) {
86 let newStyle = style
87 oldCluster.forEach((color, index) => {
88 newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
89 })
90 return newStyle
91 },
92
93 getCSSString (url, variable) {
94 return new Promise(resolve => {
95 const xhr = new XMLHttpRequest()
96 xhr.onreadystatechange = () => {
97 if (xhr.readyState === 4 && xhr.status === 200) {
98 this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
99 resolve()
100 }
101 }
102 xhr.open('GET', url)
103 xhr.send()
104 })
105 },
106
107 getThemeCluster (theme) {
108 const tintColor = (color, tint) => {
109 let red = parseInt(color.slice(0, 2), 16)
110 let green = parseInt(color.slice(2, 4), 16)
111 let blue = parseInt(color.slice(4, 6), 16)
112
113 if (tint === 0) { // when primary color is in its rgb space
114 return [red, green, blue].join(',')
115 } else {
116 red += Math.round(tint * (255 - red))
117 green += Math.round(tint * (255 - green))
118 blue += Math.round(tint * (255 - blue))
119
120 red = red.toString(16)
121 green = green.toString(16)
122 blue = blue.toString(16)
123
124 return `#${red}${green}${blue}`
125 }
126 }
127
128 const shadeColor = (color, shade) => {
129 let red = parseInt(color.slice(0, 2), 16)
130 let green = parseInt(color.slice(2, 4), 16)
131 let blue = parseInt(color.slice(4, 6), 16)
132
133 red = Math.round((1 - shade) * red)
134 green = Math.round((1 - shade) * green)
135 blue = Math.round((1 - shade) * blue)
136
137 red = red.toString(16)
138 green = green.toString(16)
139 blue = blue.toString(16)
140
141 return `#${red}${green}${blue}`
142 }
143
144 const clusters = [theme]
145 for (let i = 0; i <= 9; i++) {
146 clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
147 }
148 clusters.push(shadeColor(theme, 0.1))
149 return clusters
150 }
151 }
152 }
153 </script>
154
155 <style>
156 .theme-message,
157 .theme-picker-dropdown {
158 z-index: 99999 !important;
159 }
160
161 .theme-picker .el-color-picker__trigger {
162 height: 26px !important;
163 width: 26px !important;
164 padding: 2px;
165 }
166
167 .theme-picker-dropdown .el-color-dropdown__link-btn {
168 display: none;
169 }
170 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-24 17:10:02
5 -->
1 <template> 6 <template>
2 <div v-if="!item.hidden"> 7 <div v-if="!item.hidden">
3 <template 8 <template
...@@ -65,9 +70,9 @@ export default { ...@@ -65,9 +70,9 @@ export default {
65 }) 70 })
66 71
67 // When there is only one child router, the child router is displayed by default 72 // When there is only one child router, the child router is displayed by default
68 if (showingChildren.length === 1) { 73 // if (showingChildren.length === 1) {
69 return true 74 // return true
70 } 75 // }
71 76
72 // Show parent if there are no child router to display 77 // Show parent if there are no child router to display
73 if (showingChildren.length === 0) { 78 if (showingChildren.length === 0) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-23 16:17:42 4 * @LastEditTime: 2023-03-24 17:10:32
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText" 9 <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText"
10 :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical"> 10 :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
11 <!-- 权限菜单 --> 11 <!-- 权限菜单 -->
12 <sidebar-item v-for="route in permission_routes.slice(4)" :key="route.path" :item="route" 12 <sidebar-item v-for="route in permission_routes.slice(5)" :key="route.path" :item="route"
13 :base-path="route.path" /> 13 :base-path="route.path" />
14 <!-- 菜单全部展示 --> 14 <!-- 菜单全部展示 -->
15 <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> --> 15 <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
50 } 50 }
51 }, 51 },
52 mounted () { 52 mounted () {
53 console.log(this.permission_routes, 'permission_routespermission_routes'); 53 console.log(this.permission_routes.slice(5), 'permission_routes');
54 } 54 }
55 } 55 }
56 </script> 56 </script>
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
3 <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll"> 3 <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
4 <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''" 4 <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
5 :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" 5 :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
6 @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" @contextmenu.prevent.native="openMenu(tag, $event)"> 6 @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
7 @contextmenu.prevent.native="openMenu(tag, $event)">
7 {{ tag.title }} 8 {{ tag.title }}
8 <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> 9 <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
9 </router-link> 10 </router-link>
...@@ -190,30 +191,32 @@ export default { ...@@ -190,30 +191,32 @@ export default {
190 </script> 191 </script>
191 192
192 <style lang="scss" scoped> 193 <style lang="scss" scoped>
194 @import "~@/styles/_handle.scss";
195
193 .tags-view-container { 196 .tags-view-container {
194 height: 40px; 197 height: 40px;
195 width: 100%; 198 width: 100%;
196 background: #fff; 199 background: #fff;
197 border-bottom: 1px solid #d8dce5; 200 border-bottom: 1px solid #d8dce5;
198 box-sizing: border-box; 201 box-sizing: border-box;
199 padding-top: 3px; 202 padding-top: 2px;
200 box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); 203 margin-bottom: 7px;
201 margin-bottom: 5px; 204 border-radius: 4px;
202 205
203 .tags-view-wrapper { 206 .tags-view-wrapper {
204 .tags-view-item { 207 .tags-view-item {
205 display: inline-block; 208 display: inline-block;
206 position: relative; 209 position: relative;
207 cursor: pointer; 210 cursor: pointer;
208 height: 26px;
209 line-height: 26px; 211 line-height: 26px;
210 border: 1px solid #d8dce5; 212 color: #4A4A4A;
211 color: #495060; 213 @include font_color("tagsText");
212 background: #fff;
213 padding: 0 8px; 214 padding: 0 8px;
214 font-size: 12px; 215 font-size: 12px;
215 margin-left: 5px; 216 margin-left: 5px;
216 margin-top: 4px; 217 margin-top: 4px;
218 border-radius: 4px;
219 @include borderColor("tagsBorderColor");
217 220
218 &:first-of-type { 221 &:first-of-type {
219 margin-left: 15px; 222 margin-left: 15px;
...@@ -224,13 +227,13 @@ export default { ...@@ -224,13 +227,13 @@ export default {
224 } 227 }
225 228
226 &.active { 229 &.active {
227 background-color: #0794FF; 230 @include background("tagsBg");
228 color: #fff; 231 @include borderColor("tagsActiveText");
229 border-color: #0794FF; 232 @include font_color("tagsActiveText");
230 233
231 &::before { 234 &::before {
232 content: ''; 235 content: '';
233 background: #fff; 236 @include background("tagsActiveText");
234 display: inline-block; 237 display: inline-block;
235 width: 8px; 238 width: 8px;
236 height: 8px; 239 height: 8px;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-23 16:37:20 4 * @LastEditTime: 2023-03-24 17:28:37
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import router from "./router"; 7 import router from "./router";
...@@ -25,7 +25,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -25,7 +25,7 @@ router.beforeEach(async (to, from, next) => {
25 localStorage.removeItem("token"); 25 localStorage.removeItem("token");
26 next(); 26 next();
27 } else { 27 } else {
28 let code = Vue.prototype.BASE_API.THEME == "sb" ? "BDCSBPT" : "BDCJGPT" 28 let code = Vue.prototype.BASE_API.CODE
29 //判断token是否存在 29 //判断token是否存在
30 const hasToken = localStorage.getItem("token"); 30 const hasToken = localStorage.getItem("token");
31 if (hasToken) { 31 if (hasToken) {
......
...@@ -32,11 +32,7 @@ export const constantRoutes = [ ...@@ -32,11 +32,7 @@ export const constantRoutes = [
32 { 32 {
33 path: '/', 33 path: '/',
34 redirect: to => { 34 redirect: to => {
35 if (Vue.prototype.BASE_API.THEME == 'jg') { 35 return { path: `/${Vue.prototype.BASE_API.THEME}` }
36 return { path: '/jg' }
37 } else {
38 return { path: '/sb' }
39 }
40 }, 36 },
41 }, 37 },
42 // 监管首页 38 // 监管首页
......
...@@ -20,6 +20,15 @@ ...@@ -20,6 +20,15 @@
20 @function themed($key) { 20 @function themed($key) {
21 @return map-get($theme-map, $key); 21 @return map-get($theme-map, $key);
22 } 22 }
23
24 //获取边框颜色
25 @mixin borderColor($color) {
26 @include themeify {
27 border: 1px solid themed($color) !important;
28 }
29 }
30
31
23 //获取渐变背景 32 //获取渐变背景
24 @mixin background($color) { 33 @mixin background($color) {
25 @include themeify { 34 @include themeify {
...@@ -33,9 +42,10 @@ ...@@ -33,9 +42,10 @@
33 background-color: themed($color) !important; 42 background-color: themed($color) !important;
34 } 43 }
35 } 44 }
45
36 //获取字体颜色 46 //获取字体颜色
37 @mixin font_color($color) { 47 @mixin font_color($color) {
38 @include themeify { 48 @include themeify {
39 color: themed($color)!important; 49 color: themed($color) !important;
40 } 50 }
41 } 51 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,15 +7,19 @@ $themes: (blue: ( //背景 ...@@ -7,15 +7,19 @@ $themes: (blue: ( //背景
7 menuActiveText: #4162D8, 7 menuActiveText: #4162D8,
8 // 没有子集 8 // 没有子集
9 submenuBg: #3D59C4, 9 submenuBg: #3D59C4,
10 submenuColor: #FFFFFF 10 submenuColor: #FFFFFF,
11 ), 11 // tags
12 tagsBorderColor: #E5E5E5,
13 tagsBg: rgba(65, 98, 216, 0.1),
14 tagsText: #4A4A4A,
15 tagsActiveText: #4162D8,
16 // 操纵btn
17 btnBg: #4162D8,
18 btnColor: #4162D8),
12 19
13 green: ( 20 green: (navbg: #0F8B80,
14 navbg: #0F8B80,
15 menuBg:#121A2E, 21 menuBg:#121A2E,
16 menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%), 22 menuActive: linear-gradient(90deg, rgba(61, 90, 198, 0.7) 0%, rgba(61, 90, 198, 0) 100%),
17 //字体 23 //字体
18 menuText: #A1A7C2, 24 menuText: #A1A7C2,
19 menuActiveText: #FFFFFF
20 )
21 )
...\ No newline at end of file ...\ No newline at end of file
25 menuActiveText: #FFFFFF))
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 **/ 4 **/
5 5
6 /* theme color */ 6 /* theme color */
7 $--color-primary: #0F93F6; 7 $--color-primary: #4162D8;
8 $--color-success: #67C23B; 8 $--color-success: #67C23B;
9 $--color-warning: #E6A23C; 9 $--color-warning: #E6A23C;
10 $--color-danger: #F46C6C; 10 $--color-danger: #F46C6C;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 background: none !important; 5 background: none !important;
6 } 6 }
7 7
8 // 列表样式
8 .tableClass { 9 .tableClass {
9 .el-table { 10 .el-table {
10 border: none !important; 11 border: none !important;
...@@ -52,6 +53,7 @@ ...@@ -52,6 +53,7 @@
52 background-color: rgba(0, 0, 0, 0); 53 background-color: rgba(0, 0, 0, 0);
53 } 54 }
54 55
56 // 查询表单样式
55 .from-clues { 57 .from-clues {
56 height: 100%; 58 height: 100%;
57 width: 100%; 59 width: 100%;
...@@ -264,7 +266,7 @@ ...@@ -264,7 +266,7 @@
264 } 266 }
265 } 267 }
266 268
267 // 角色配置 269 // 角色管理人员菜单配置弹框样式
268 .roleconfiguration { 270 .roleconfiguration {
269 .el-dialog__body { 271 .el-dialog__body {
270 display: flex; 272 display: flex;
...@@ -358,82 +360,7 @@ ...@@ -358,82 +360,7 @@
358 border-top: none; 360 border-top: none;
359 } 361 }
360 362
361 .editDialogBox {
362 border-radius: 8px;
363 overflow: hidden;
364 min-width: 1228px;
365 height: 825px !important;
366
367 .dialog-from {
368 padding: 13px;
369 border-radius: 2px;
370 box-sizing: border-box;
371
372 .el-row {
373 display: flex;
374 flex-wrap: nowrap;
375 }
376 363
377 .el-col {
378 line-height: 18px;
379 display: flex;
380 align-items: center;
381 margin-bottom: 3px;
382 color: #b5d6dc;
383 border-radius: 2px;
384 border: 1px solid #224c7c;
385 margin: 5px;
386
387 span {
388 display: inline-block;
389 padding: 3px;
390 border-radius: 3px;
391 overflow: hidden;
392 white-space: nowrap;
393 text-align: left;
394 color: #02d9fd;
395 }
396
397 p {
398 flex: 1;
399 width: 100%;
400 padding-left: 5px;
401 line-height: 20px;
402 color: #c0c4cc;
403 cursor: not-allowed;
404 white-space: nowrap;
405 margin-right: 5px;
406 text-align: right;
407 }
408 }
409 }
410
411 .dialog_title {
412 display: flex;
413 position: relative;
414 font-size: 24px;
415 top: -8px;
416 width: 38%;
417 height: 40px;
418 margin-left: 28px;
419 justify-content: center;
420 }
421
422 .el-dialog__header {
423 display: flex;
424 margin-bottom: 10px;
425 }
426
427 .el-dialog__footer {
428 padding-right: 40px;
429 }
430
431 .divider {
432 width: 100%;
433 border-bottom: 1px solid #ccc;
434 }
435
436 }
437 364
438 .el-dialog__wrapper { 365 .el-dialog__wrapper {
439 overflow: hidden; 366 overflow: hidden;
...@@ -514,16 +441,7 @@ ...@@ -514,16 +441,7 @@
514 font-size: 12px; 441 font-size: 12px;
515 } 442 }
516 443
517 .button:hover { 444 // 按钮样式
518 // width: 76px;
519 // height: 32px;
520 // color: #ffffff;
521 // cursor: pointer;
522 // border: 0;
523 // font-size: 12px;
524 // background: none;
525 }
526
527 .cx { 445 .cx {
528 background: url("../image/btn.png") no-repeat 0 -34px; 446 background: url("../image/btn.png") no-repeat 0 -34px;
529 background-size: cover; 447 background-size: cover;
...@@ -627,7 +545,7 @@ ...@@ -627,7 +545,7 @@
627 } 545 }
628 546
629 .item-content-input { 547 .item-content-input {
630 /deep/.el-input__inner { 548 .el-input__inner {
631 border: none !important; 549 border: none !important;
632 text-align: right; 550 text-align: right;
633 } 551 }
...@@ -742,6 +660,7 @@ ...@@ -742,6 +660,7 @@
742 } 660 }
743 661
744 } 662 }
663
745 .contentCenter { 664 .contentCenter {
746 position: absolute; 665 position: absolute;
747 top: 50%; 666 top: 50%;
...@@ -761,3 +680,347 @@ ...@@ -761,3 +680,347 @@
761 } 680 }
762 } 681 }
763 682
683 // 登簿日志弹出框
684 .entryJournal {
685 .el-tabs__header {
686 margin: 0;
687 }
688
689 .el-dialog {
690 display: flex;
691 flex-direction: column;
692 }
693
694 .el-dialog__body {
695 display: flex;
696 flex-direction: column;
697 padding-bottom: 30px;
698 height: 100%;
699 flex: 1;
700 position: relative;
701 }
702
703 .regularHeight {
704 display: flex;
705 flex-direction: column;
706 height: 87vh;
707 margin-bottom: 5px;
708
709 .editDialogBox-con,
710 .JsonEditor {
711 flex: 1;
712 }
713 }
714
715 .d-center {}
716
717 .dialog_title {
718 top: -6px
719 }
720
721 .el-tabs__item {
722 color: #CEF8FF !important;
723
724 display: flex;
725 flex-direction: row;
726 justify-content: center;
727 background: url("~@/image/tabitem.png") no-repeat;
728 background-size: 100% 100%;
729 border: none !important;
730 }
731
732 .el-tabs__nav {
733 display: flex;
734 border: none !important;
735 }
736
737 .el-tabs__item.is-top:not(:last-child) {
738 margin-right: 5px;
739 }
740
741 .el-icon-circle-close {
742 display: none;
743 }
744
745 .el-tabs__item.is-active {
746 background: url("~@/image/tabitemse.png") no-repeat;
747 background-size: 100% 100%;
748 }
749
750 .from-clues-content {
751 margin-top: 0;
752 background: none;
753 padding: 0;
754 }
755
756 .editDialogBox-box {
757 position: relative;
758 top: 10px;
759 height: 100%;
760 }
761
762 .dialog-from {
763 padding-top: 0;
764
765 .el-col {
766 justify-content: space-between;
767 }
768
769 .bz {
770 height: 100%;
771 position: relative;
772 top: 3px;
773 }
774
775 .el-input {
776 flex: 1;
777 width: 100%;
778 }
779
780 .el-textarea__inner {
781 border: none !important;
782 margin: 0;
783 }
784
785 &_header {
786 margin: 0 -5px !important;
787 }
788
789 &_title {
790 font-size: 14px;
791 color: #d7eaee;
792 margin: 3px 0;
793 }
794 }
795 }
796
797 // 数据上报弹出框
798 .dataReporting {
799 .el-dialog__body {
800 display: flex;
801 flex-direction: column;
802 padding-bottom: 30px;
803 }
804
805 .el-tabs {
806 color: #cef8ff;
807 }
808
809 .d-center {
810 z-index: 1000;
811 }
812
813 .sjmx {
814 display: flex;
815 flex-direction: column;
816 height: 49vh;
817
818 .el-tabs__item {
819 height: 50px;
820 padding-top: 6px;
821 }
822 }
823
824 .result {
825 flex: 1;
826 height: 100%;
827 }
828
829 .editDialogBox-con {
830 flex: 1;
831 height: 100%;
832 overflow-y: hidden;
833 }
834
835 .el-tabs__item {
836 color: #cef8ff !important;
837
838 display: flex;
839 flex-direction: row;
840 justify-content: center;
841 background: url("~@/image/tabitem.png") no-repeat;
842 background-size: 100% 100%;
843 border: none !important;
844 }
845
846 .obligee-item-name {
847 background: #05275b;
848 color: #ffffff;
849 background: url("~@/image/itembg.png") no-repeat;
850 background-size: 100% 100%;
851 }
852
853 .el-tabs__nav-scroll {
854 background: none;
855 }
856
857 .el-tabs__nav {
858 display: flex;
859 border: none !important;
860 }
861
862 .el-tabs__item.is-top {
863 border: 1px solid #dfe4ed;
864 border-top: 1px solid #dfe4ed;
865 border-bottom: 1px solid transparent;
866 }
867
868 .el-tabs__header {
869 border: none;
870 margin-bottom: 0;
871 }
872
873 .el-tabs__item.is-top:not(:last-child) {
874 margin-right: 5px;
875 }
876
877 .el-tabs__item.is-top {
878 background-color: none !important;
879 }
880
881 .el-tabs__item.is-active {
882 background: url("~@/image/tabitemse.png") no-repeat;
883 background-size: 100% 100%;
884 }
885
886 .success-images {
887 width: 30px;
888 height: 30px;
889 position: relative;
890 top: 10px;
891 right: 3px;
892 }
893
894 .tab-pane-item {
895 line-height: 20px;
896 color: #02d9fd;
897
898 p {
899 text-align: center;
900 }
901 }
902
903 .edit-content {
904 overflow-y: auto;
905 overflow-x: hidden;
906 padding-right: 1px;
907 border-top: none;
908 }
909
910 .editDialogBox {
911 border-radius: 8px;
912 overflow: hidden;
913 min-width: 1228px;
914
915 .el-dialog__header {
916 display: flex;
917 margin-bottom: 10px;
918 }
919
920 .dialog_footer {
921 flex-direction: column;
922
923 .dialog_button {
924 margin-top: 8px;
925 }
926 }
927
928 .divider {
929 width: 100%;
930 border-bottom: 1px solid #ccc;
931 }
932 }
933
934 .el-dialog__wrapper {
935 overflow: hidden;
936 }
937
938 .dialog-from {
939 padding-top: 0;
940
941 .el-col {
942 justify-content: space-between;
943 }
944
945 .bz {
946 height: 100%;
947 position: relative;
948 top: 3px;
949 }
950
951 .el-select {
952 padding-right: 15px;
953 }
954
955 .el-icon-circle-close {
956 display: none;
957 }
958
959 .el-input__suffix {
960 right: -25px !important;
961 top: -5px;
962 }
963
964 .el-select,
965 .el-input {
966 flex: 1;
967 width: 100%;
968 }
969
970 .el-textarea__inner {
971 border: none !important;
972 margin: 0;
973 }
974
975 &_header {
976 margin: 0 -5px !important;
977 }
978
979 &_title {
980 font-size: 18px;
981 color: #d7eaee;
982 margin: 3px 0;
983 }
984 }
985 }
986
987 // 人员管理上下移动按钮样式
988 .el-button.is-disabled.el-button--text {
989 width: 64px;
990 height: 28px;
991 background: rgba(255, 255, 255, 0.1);
992 border-radius: 16px;
993 }
994
995 // 人员管理角色管理菜单管理修改新增弹框样式
996 .PersonnelDialog {
997 .el-dialog__header {
998 .dialog_title {
999 display: -webkit-box;
1000 display: -ms-flexbox;
1001 display: flex;
1002 position: relative;
1003 top: -7px;
1004 width: 29%;
1005 height: 40px;
1006 margin-left: 28px;
1007 -webkit-box-pack: center;
1008 -ms-flex-pack: center;
1009 justify-content: center;
1010 white-space: nowrap;
1011
1012 b {
1013 font-size: 16px;
1014 }
1015 }
1016
1017 .el-dialog__headerbtn {
1018 right: 20px !important;
1019 top: 23px !important;
1020 }
1021 }
1022
1023 .selbig {
1024 width: 500px;
1025 }
1026 }
......
1 @import '~@/styles/sbElement-ui.scss'; 1 @import '~@/styles/sbElement-ui.scss';
2 @import "~@/styles/_handle.scss";
2 3
3 .from-clues { 4 .from-clues {
4 height: 100%; 5 height: 100%;
...@@ -9,7 +10,7 @@ ...@@ -9,7 +10,7 @@
9 10
10 &-header { 11 &-header {
11 width: 100%; 12 width: 100%;
12 padding: 15px; 13 padding: 10px 15px 10px 15px;
13 box-sizing: border-box; 14 box-sizing: border-box;
14 background-size: 100% 100%; 15 background-size: 100% 100%;
15 background: #FFFFFF; 16 background: #FFFFFF;
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
96 .cx { 97 .cx {
97 width: 86px; 98 width: 86px;
98 height: 32px; 99 height: 32px;
99 background-color: #4162D8; 100 @include background_color("btnBg");
100 color: white; 101 color: white;
101 border: none; 102 border: none;
102 } 103 }
...@@ -104,7 +105,7 @@ ...@@ -104,7 +105,7 @@
104 .cx:hover { 105 .cx:hover {
105 width: 86px; 106 width: 86px;
106 height: 32px; 107 height: 32px;
107 background-color: #4162D8; 108 @include background_color("btnBg");
108 color: white; 109 color: white;
109 border: none; 110 border: none;
110 } 111 }
...@@ -113,8 +114,7 @@ ...@@ -113,8 +114,7 @@
113 width: 86px; 114 width: 86px;
114 height: 32px; 115 height: 32px;
115 background-color: white; 116 background-color: white;
116 color: #4162D8; 117 @include font_color("btnColor");
117
118 border: 1px solid rgba(65, 98, 216, 0.3); 118 border: 1px solid rgba(65, 98, 216, 0.3);
119 } 119 }
120 120
...@@ -122,23 +122,17 @@ ...@@ -122,23 +122,17 @@
122 width: 86px; 122 width: 86px;
123 height: 32px; 123 height: 32px;
124 background-color: white; 124 background-color: white;
125 color: #4162D8; 125 @include font_color("btnColor");
126 border: 1px solid rgba(65, 98, 216, 0.3); 126 border: 1px solid rgba(65, 98, 216, 0.3);
127 } 127 }
128 128
129 .el-button:focus {
130 // background: none;
131 }
132
133 .cx:focus { 129 .cx:focus {
134 color: white; 130 color: white;
135 background-color: #4162D8; 131 @include background_color("btnBg");
136 background-size: cover; 132 background-size: cover;
137 } 133 }
138 134
139 .cz:focus { 135 .cz:focus {
140 color: #4162D8;
141 background-color: white; 136 background-color: white;
142 ;
143 background-size: cover; 137 background-size: cover;
144 } 138 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -9,7 +9,7 @@ $yellow:#FEC171; ...@@ -9,7 +9,7 @@ $yellow:#FEC171;
9 $panGreen: #30B08F; 9 $panGreen: #30B08F;
10 10
11 // header 11 // header
12 $headerHeight: 74px; 12 $headerHeight: 72px;
13 13
14 // sidebar 14 // sidebar
15 $menuText:#ffffff; 15 $menuText:#ffffff;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-21 13:42:13 4 * @LastEditTime: 2023-03-24 16:44:54
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 export default function getTheme (theme = Vue.prototype.BASE_API.THEME) { 7 export default function getTheme (theme = Vue.prototype.BASE_API.THEME) {
8 const resultMap = { 8 const resultMap = {
9 'jg': function () { 9 'jg': function () {
10 import("@/styles/jgPublic.scss") 10 return import("@/styles/jgPublic.scss");
11 }, 11 },
12 'sb': function () { 12 'sb': function () {
13 import("@/styles/sbPublic.scss") 13 return import("@/styles/sbPublic.scss");
14 }, 14 },
15 default: function () { 15 'default': function () {
16 throw new Error(`Unsupported theme: ${theme}`);
16 }, 17 },
18 };
19 const result = resultMap[theme]();
20 if (result instanceof Promise) {
21 return result;
22 } else {
23 return resultMap.default();
17 } 24 }
18 return resultMap[theme]() || resultMap.default() 25 }
19 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="Cfdj from-clues"> 2 <div class="Cfdj from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
2 <div class="dyaq from-clues"> 2 <div class="dyaq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="120px"> 4 <el-form ref="form" :model="form" label-width="120px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6
6 <Breadcrumb /> 7 <Breadcrumb />
7 </el-form-item> 8 </el-form-item>
8 <el-row class="mb-5"> 9 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="150px"> 4 <el-form ref="form" :model="form" label-width="150px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="fdcqdz from-clues"> 2 <div class="fdcqdz from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="120px"> 4 <el-form ref="form" :model="form" label-width="120px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="fdcqqfsyq from-clues"> 2 <div class="fdcqqfsyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="fdcqyz from-clues"> 2 <div class="fdcqyz from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="120px"> 4 <el-form ref="form" :model="form" label-width="120px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="gzwsyq from-clues"> 2 <div class="gzwsyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="105px"> 4 <el-form ref="form" :model="form" label-width="105px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="hysyq from-clues"> 2 <div class="hysyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="105px"> 4 <el-form ref="form" :model="form" label-width="105px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="jsydzjdsyq from-clues"> 2 <div class="jsydzjdsyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="120px"> 4 <el-form ref="form" :model="form" label-width="120px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="lq from-clues"> 2 <div class="lq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="105px"> 4 <el-form ref="form" :model="form" label-width="105px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="105px"> 4 <el-form ref="form" :model="form" label-width="105px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="tdsyq from-clues"> 2 <div class="tdsyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="120px"> 4 <el-form ref="form" :model="form" label-width="120px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="110px"> 4 <el-form ref="form" :model="form" label-width="110px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="105px"> 4 <el-form ref="form" :model="form" label-width="105px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="cancellationReg from-clues"> 2 <div class="cancellationReg from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="105px"> 4 <el-form ref="form" :model="form" label-width="105px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
22 </div> 22 </div>
23 </template> 23 </template>
24 <script> 24 <script>
25 import { getMenuInfo } from "@/api/user";
26 import { loginIn } from "@/api/login.js"; 25 import { loginIn } from "@/api/login.js";
27 export default { 26 export default {
28 name: "jgLogin", 27 name: "jgLogin",
......
...@@ -108,10 +108,10 @@ export default { ...@@ -108,10 +108,10 @@ export default {
108 if (valid) { 108 if (valid) {
109 let res = await loginIn(self.user.account, self.user.password) 109 let res = await loginIn(self.user.account, self.user.password)
110 if (res.status == 1) { 110 if (res.status == 1) {
111 let code = this.BASE_API.THEME == "sb" ? "BDCSBPT" : "BDCJGPT" 111 let code = this.BASE_API.CODE;
112 localStorage.setItem("token", `Bearer ${res.content}`); 112 localStorage.setItem("token", `Bearer ${res.content}`);
113 const { result: getMenuData } = (await getMenuInfo(code)) || []; 113 const { result: getMenuData } = (await getMenuInfo(code)) || [];
114 let path1 = JSON.parse(getMenuData[0].metadata)?.path + '/' + JSON.parse(getMenuData[0].children[0].metadata)?.path 114 let path1 = JSON.parse(getMenuData[1].metadata)?.path + '/' + JSON.parse(getMenuData[1].children[0].metadata)?.path
115 //登录成功后需判断有无重定向,没有重定向则跳转首页 115 //登录成功后需判断有无重定向,没有重定向则跳转首页
116 const accessRoutes = await this.$store.dispatch( 116 const accessRoutes = await this.$store.dispatch(
117 "permission/generateRoutes", 117 "permission/generateRoutes",
......
1 <template> 1 <template>
2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox editDialogBox mainCenter" 2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox entryJournal editDialogBox mainCenter"
3 :visible.sync="dialogVisible" width="90%"> 3 :visible.sync="dialogVisible" width="90%">
4 <div slot="title" class="dialog_title" ref="dialogTitle"> 4 <div slot="title" class="dialog_title" ref="dialogTitle">
5 {{ title || '登薄日志' }} 5 {{ title || '登薄日志' }}
...@@ -458,119 +458,5 @@ ...@@ -458,119 +458,5 @@
458 } 458 }
459 </script> 459 </script>
460 <style scoped lang="scss"> 460 <style scoped lang="scss">
461 // @import "~@/styles/mixin.scss";
462 // @import "~@/styles/dialogBox.scss";
463
464 /deep/.el-tabs__header {
465 margin: 0;
466 }
467
468 /deep/.el-dialog {
469 display: flex;
470 flex-direction: column;
471 }
472
473 /deep/.el-dialog__body {
474 display: flex;
475 flex-direction: column;
476 padding-bottom: 30px;
477 height: 100%;
478 flex: 1;
479 position: relative;
480 }
481
482 .regularHeight {
483 display: flex;
484 flex-direction: column;
485 height: 87vh;
486 margin-bottom: 5px;
487
488 .editDialogBox-con,
489 .JsonEditor {
490 flex: 1;
491 }
492 }
493
494 .d-center {
495 }
496
497 .dialog_title {
498 top: -13px;
499 }
500
501 /deep/.el-tabs__item {
502 color: #cef8ff !important;
503
504 display: flex;
505 flex-direction: row;
506 justify-content: center;
507 background: url("~@/image/tabitem.png") no-repeat;
508 background-size: 100% 100%;
509 border: none !important;
510 }
511
512 /deep/.el-tabs__nav {
513 display: flex;
514 border: none !important;
515 }
516
517 /deep/.el-tabs__item.is-top:not(:last-child) {
518 margin-right: 5px;
519 }
520
521 /deep/.el-icon-circle-close {
522 display: none;
523 }
524
525 /deep/.el-tabs__item.is-active {
526 background: url("~@/image/tabitemse.png") no-repeat;
527 background-size: 100% 100%;
528 }
529
530 .from-clues-content {
531 margin-top: 0;
532 background: none;
533 padding: 0;
534 }
535
536 .editDialogBox-box {
537 position: relative;
538 top: 10px;
539 height: 100%;
540 }
541
542 .dialog-from {
543 padding-top: 0;
544
545 .el-col {
546 justify-content: space-between;
547 }
548
549 .bz {
550 height: 100%;
551 position: relative;
552 top: 3px;
553 }
554
555 /deep/.el-input {
556 flex: 1;
557 width: 100%;
558 }
559
560 /deep/.el-textarea__inner {
561 border: none !important;
562 margin: 0;
563 }
564
565 &_header {
566 margin: 0 -5px !important;
567 }
568
569 &_title {
570 font-size: 14px;
571 color: #d7eaee;
572 margin: 3px 0;
573 }
574 }
575 </style> 461 </style>
576 462
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="80px"> 6 <el-form ref="ruleForm" :model="form" label-width="80px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!-- 表单部分 --> 3 <!-- 表单部分 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form @submit.native.prevent :model="ruleForm" label-width="120px"> 5 <el-form @submit.native.prevent :model="ruleForm" label-width="120px">
6 <el-form-item> 6 <el-form-item v-if="BASE_API.THEME == 'jg'">
7 <Breadcrumb /> 7 <Breadcrumb />
8 </el-form-item> 8 </el-form-item>
9 <el-row :gutter="20"> 9 <el-row :gutter="20">
......
1 <!-- 1 <!--
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 20:54:28 3 * @Date: 2023-03-09 20:54:28
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-16 19:40:40 5 * @LastEditTime: 2023-03-27 09:13:22
6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue 6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 --> 8 -->
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <div class="information from-clues"> 10 <div class="information from-clues">
11 <div class="from-clues-header"> 11 <div class="from-clues-header">
12 <el-form ref="ruleForm" label-width="100px"> 12 <el-form ref="ruleForm" label-width="100px">
13 <el-form-item> 13 <el-form-item v-if="BASE_API.THEME == 'jg'">
14 <Breadcrumb /> 14 <Breadcrumb />
15 </el-form-item> 15 </el-form-item>
16 <el-row class="mb-5"> 16 <el-row class="mb-5">
...@@ -34,60 +34,64 @@ ...@@ -34,60 +34,64 @@
34 </div> 34 </div>
35 </template> 35 </template>
36 <script> 36 <script>
37 import "@/utils/flexible.js"; 37 import "@/utils/flexible.js";
38 import BaseSet from "./base-set.vue"; 38 import BaseSet from "./base-set.vue";
39 import PasswordEdit from "./password-edit.vue"; 39 import PasswordEdit from "./password-edit.vue";
40 export default { 40 export default {
41 components: { 41 components: {
42 BaseSet, 42 BaseSet,
43 PasswordEdit, 43 PasswordEdit,
44 },
45 data () {
46 return {
47 isshow: true,
48 };
49 },
50 computed: {
51 userData () {
52 return this.$store.state.user.userInfo;
44 }, 53 },
45 data () { 54 },
46 return { 55 watch: {},
47 isshow: true, 56 created () { },
48 }; 57 mounted () { },
58 methods: {
59 information () {
60 this.isshow = true;
49 }, 61 },
50 computed: { 62 password () {
51 userData () { 63 this.isshow = false;
52 return this.$store.state.user.userInfo;
53 },
54 }, 64 },
55 watch: {}, 65 },
56 created () { }, 66 };
57 mounted () { },
58 methods: {
59 information () {
60 this.isshow = true;
61 },
62 password () {
63 this.isshow = false;
64 },
65 },
66 };
67 </script> 67 </script>
68 68
69 <style scoped lang="scss"> 69 <style scoped lang="scss">
70 @import "~@/styles/mixin.scss"; 70 @import "~@/styles/mixin.scss";
71 .information { 71
72 .information {
73 display: flex;
74 flex-direction: column;
75
76 .btnColRight {
77 margin-top: 10px;
72 display: flex; 78 display: flex;
73 flex-direction: column; 79 justify-content: center;
74 .btnColRight { 80 // background-color: cadetblue;
75 margin-top: 10px; 81 height: 30px;
76 display: flex; 82 }
77 justify-content: center; 83
78 // background-color: cadetblue; 84 /deep/.content {
79 height: 30px; 85 .el-input__inner {
80 } 86 background: none;
81 /deep/.content {
82 .el-input__inner {
83 background: none;
84 }
85 .user-info {
86 background: none;
87 }
88 } 87 }
89 .boxin { 88
90 flex: 1; 89 .user-info {
90 background: none;
91 } 91 }
92 } 92 }
93 </style> 93
94 .boxin {
95 flex: 1;
96 }
97 }</style>
......
1 <template> 1 <template>
2 <dialogBox class="modifydialog" :isMain="true" width="40%" :title="title" @closeDialog="close" @submitForm="submitForm" 2 <dialogBox class="modifydialog PersonnelDialog" :isMain="true" width="40%" :title="title" @closeDialog="close" @submitForm="submitForm"
3 v-model="myValue"> 3 v-model="myValue">
4 <div class="dialogCon"> 4 <div class="dialogCon">
5 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
...@@ -63,208 +63,208 @@ ...@@ -63,208 +63,208 @@
63 </template> 63 </template>
64 64
65 <script> 65 <script>
66 import { getParentMenuListAction } from '@/api/authorityManage' 66 import { getParentMenuListAction } from '@/api/authorityManage'
67 import IconList from '../../../components/IconList' 67 import IconList from '../../../components/IconList'
68 import JsonEditor from '@/components/JsonEditors' 68 import JsonEditor from '@/components/JsonEditors'
69 import { validateCode } from '@/utils/validate'; 69 import { validateCode } from '@/utils/validate';
70 import { api, httpAction } from '@/api/manageApi' 70 import { api, httpAction } from '@/api/manageApi'
71 export default { 71 export default {
72 name: 'MenuModal', 72 name: 'MenuModal',
73 components: { 73 components: {
74 JsonEditor, 74 JsonEditor,
75 IconList, 75 IconList,
76 },
77 props: {
78 value: { type: Boolean, default: false },
79 productId: {
80 type: String,
81 default: ''
82 }
83 },
84 data () {
85 return {
86 myValue: this.value,
87 form: {
88 icon: '',
89 code: ''
90 },
91 rules: {
92 name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
93 code: [
94 { required: true, message: '必填', trigger: 'blur' },
95 { validator: validateCode, trigger: 'blur' }
96 ]
97 },
98 title: '',
99 type: '',
100 visible: false,
101 parentMenuList: [],
102 menuKey: 0,
103 jumpModeList: [
104 { name: '在当前页面显示', value: 1 },
105 { name: '跳转到新页面', value: 2 }
106 ],
107 setProps: {
108 value: 'id',
109 label: 'name',
110 children: 'children',
111 expandTrigger: 'hover',
112 checkStrictly: true, // 可取消关联,选择任意一级选项
113 emitPath: false
114 },
115 dataUrl: api.menus
116 }
117 },
118 computed: {
119 codeComputed: {
120 get: function () {
121 return this.form.code
122 },
123 set: function (val) {
124 this.form.code = val.toUpperCase()
125 }
126 }
127 },
128 watch: {
129 value (val) {
130 this.myValue = val
131 }
132 },
133 methods: {
134 // 获取父级菜单
135 getParentMenuList (id) {
136
137 getParentMenuListAction(id).then((res) => {
138 if (res.status === 1) {
139 const list = this.$dealArrChildren(res.content)
140 if (id) {
141 this.parentMenuList = this.$dealArrDisabled(
142 this.$deepCopy(list),
143 id
144 )
145 this.menuKey++
146 } else {
147 this.parentMenuList = list
148 }
149 } else {
150 this.$message.error({ message: res.message, showClose: true })
151 }
152 })
153 },
154 // 选择图标
155 getIconName (data) {
156 this.form.icon = data;
157 }, 76 },
158 getIconList () { 77 props: {
159 this.$refs.iconList.show(true) 78 value: { type: Boolean, default: false },
160 }, 79 productId: {
161 getIconName (data) { 80 type: String,
162 this.form.icon = data 81 default: ''
163 }, 82 }
164 // 配置参数
165 getJsonString (data) {
166 this.form.metadata = data
167 }, 83 },
168 // 新增菜单 84 data () {
169 add () { 85 return {
170 this.getParentMenuList(this.productId) 86 myValue: this.value,
171 this.type = 0 87 form: {
172 this.form.jumpMode = 1 88 icon: '',
89 code: ''
90 },
91 rules: {
92 name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
93 code: [
94 { required: true, message: '必填', trigger: 'blur' },
95 { validator: validateCode, trigger: 'blur' }
96 ]
97 },
98 title: '',
99 type: '',
100 visible: false,
101 parentMenuList: [],
102 menuKey: 0,
103 jumpModeList: [
104 { name: '在当前页面显示', value: 1 },
105 { name: '跳转到新页面', value: 2 }
106 ],
107 setProps: {
108 value: 'id',
109 label: 'name',
110 children: 'children',
111 expandTrigger: 'hover',
112 checkStrictly: true, // 可取消关联,选择任意一级选项
113 emitPath: false
114 },
115 dataUrl: api.menus
116 }
173 }, 117 },
174 // 编辑菜单 118 computed: {
175 edit (record) { 119 codeComputed: {
176 this.type = 1 120 get: function () {
177 // 若有id为编辑 121 return this.form.code
178 if (record.id) { 122 },
179 this.$nextTick(() => { 123 set: function (val) {
180 this.form = Object.assign({}, record) 124 this.form.code = val.toUpperCase()
181 this.getParentMenuList(this.productId) 125 }
182 })
183 } 126 }
184 }, 127 },
185 // 选择上级菜单 128 watch: {
186 handleChange (value) { 129 value (val) {
187 this.form.parentId = value 130 this.myValue = val
131 }
188 }, 132 },
189 // 保存 133 methods: {
190 submitForm (submitType) { 134 // 获取父级菜单
191 this.$refs.form.validate((valid) => { 135 getParentMenuList (id) {
192 if (valid) { 136
193 let method = '' 137 getParentMenuListAction(id).then((res) => {
194 let url = '' 138 if (res.status === 1) {
195 const formData = this.form 139 const list = this.$dealArrChildren(res.content)
196 formData.productId = this.productId 140 if (id) {
197 if (!formData.id) { 141 this.parentMenuList = this.$dealArrDisabled(
198 method = 'post' 142 this.$deepCopy(list),
199 url = this.dataUrl 143 id
144 )
145 this.menuKey++
146 } else {
147 this.parentMenuList = list
148 }
200 } else { 149 } else {
201 method = 'put' 150 this.$message.error({ message: res.message, showClose: true })
202 url = `${this.dataUrl}/${formData.id}`
203 } 151 }
204 httpAction(url, formData, method) 152 })
205 .then((res) => { 153 },
206 if (res.status === 1) { 154 // 选择图标
207 this.$message.success({ 155 getIconName (data) {
208 message: res.message, 156 this.form.icon = data;
209 showClose: true 157 },
210 }) 158 getIconList () {
159 this.$refs.iconList.show(true)
160 },
161 getIconName (data) {
162 this.form.icon = data
163 },
164 // 配置参数
165 getJsonString (data) {
166 this.form.metadata = data
167 },
168 // 新增菜单
169 add () {
170 this.getParentMenuList(this.productId)
171 this.type = 0
172 this.form.jumpMode = 1
173 },
174 // 编辑菜单
175 edit (record) {
176 this.type = 1
177 // 若有id为编辑
178 if (record.id) {
179 this.$nextTick(() => {
180 this.form = Object.assign({}, record)
181 this.getParentMenuList(this.productId)
182 })
183 }
184 },
185 // 选择上级菜单
186 handleChange (value) {
187 this.form.parentId = value
188 },
189 // 保存
190 submitForm (submitType) {
191 this.$refs.form.validate((valid) => {
192 if (valid) {
193 let method = ''
194 let url = ''
195 const formData = this.form
196 formData.productId = this.productId
197 if (!formData.id) {
198 method = 'post'
199 url = this.dataUrl
200 } else {
201 method = 'put'
202 url = `${this.dataUrl}/${formData.id}`
203 }
204 httpAction(url, formData, method)
205 .then((res) => {
206 if (res.status === 1) {
207 this.$message.success({
208 message: res.message,
209 showClose: true
210 })
211 211
212 this.resetForm() 212 this.resetForm()
213 this.$emit('ok') 213 this.$emit('ok')
214 } else { 214 } else {
215 this.$message.error({ message: res.message, showClose: true }) 215 this.$message.error({ message: res.message, showClose: true })
216 } 216 }
217 }) 217 })
218 .catch((err) => { 218 .catch((err) => {
219 console.log(err) 219 console.log(err)
220 }) 220 })
221 }
222 })
223 },
224 resetForm () {
225 this.$refs.form.resetFields()
226 this.form = {
227 icon: '',
228 code: ''
221 } 229 }
222 }) 230 },
223 }, 231 close () {
224 resetForm () { 232 this.resetForm()
225 this.$refs.form.resetFields() 233 this.$emit('input', false)
226 this.form = {
227 icon: '',
228 code: ''
229 } 234 }
230 },
231 close () {
232 this.resetForm()
233 this.$emit('input', false)
234 } 235 }
235 } 236 }
236 }
237 </script> 237 </script>
238 <style scoped lang="scss"> 238 <style scoped lang="scss">
239 .modifydialog { 239 // .modifydialog {
240 &-con { 240 // &-con {
241 background: #031a46; 241 // background: #031a46;
242 } 242 // }
243 243
244 /deep/.el-dialog__header { 244 // /deep/.el-dialog__header {
245 .dialog_title { 245 // .dialog_title {
246 display: -webkit-box; 246 // display: -webkit-box;
247 display: -ms-flexbox; 247 // display: -ms-flexbox;
248 display: flex; 248 // display: flex;
249 position: relative; 249 // position: relative;
250 top: -8px; 250 // top: -8px;
251 width: 28%; 251 // width: 28%;
252 height: 40px; 252 // height: 40px;
253 margin-left: 28px; 253 // margin-left: 28px;
254 -webkit-box-pack: center; 254 // -webkit-box-pack: center;
255 -ms-flex-pack: center; 255 // -ms-flex-pack: center;
256 justify-content: center; 256 // justify-content: center;
257 white-space: nowrap; 257 // white-space: nowrap;
258 258
259 b { 259 // b {
260 font-size: 16px; 260 // font-size: 16px;
261 } 261 // }
262 } 262 // }
263 263
264 .el-dialog__headerbtn { 264 // .el-dialog__headerbtn {
265 right: 20px !important; 265 // right: 20px !important;
266 top: 23px !important; 266 // top: 23px !important;
267 } 267 // }
268 } 268 // }
269 } 269 // }
270 </style> 270 </style>
......
1 <!-- 新增 & 修改角色 --> 1 <!-- 新增 & 修改角色 -->
2 <template> 2 <template>
3 <dialogBox 3 <dialogBox
4 class="modifydialog" 4 class="modifydialog PersonnelDialog"
5 :title="title" 5 :title="title"
6 :width="'567px'" 6 :width="'567px'"
7 :isMain="true" 7 :isMain="true"
...@@ -160,29 +160,4 @@ ...@@ -160,29 +160,4 @@
160 } 160 }
161 </script> 161 </script>
162 <style scoped lang="scss"> 162 <style scoped lang="scss">
163 .modifydialog {
164 /deep/.el-dialog__header {
165 .dialog_title {
166 display: -webkit-box;
167 display: -ms-flexbox;
168 display: flex;
169 position: relative;
170 top: -8px;
171 width: 24%;
172 height: 40px;
173 margin-left: 28px;
174 -webkit-box-pack: center;
175 -ms-flex-pack: center;
176 justify-content: center;
177 white-space: nowrap;
178 b {
179 font-size: 16px;
180 }
181 }
182 .el-dialog__headerbtn {
183 right: 20px !important;
184 top: 23px !important;
185 }
186 }
187 }
188 </style> 163 </style>
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 10:27:32
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 class data extends filter { 7 class data extends filter {
3 constructor() { 8 constructor() {
...@@ -17,7 +22,8 @@ class data extends filter { ...@@ -17,7 +22,8 @@ class data extends filter {
17 }, 22 },
18 { 23 {
19 prop: "cronExpression", 24 prop: "cronExpression",
20 label: "cron表达式" 25 label: "cron表达式",
26 width: 160,
21 }, 27 },
22 { 28 {
23 prop: "beanName", 29 prop: "beanName",
...@@ -34,7 +40,7 @@ class data extends filter { ...@@ -34,7 +40,7 @@ class data extends filter {
34 render: (h, scope) => { 40 render: (h, scope) => {
35 return ( 41 return (
36 <div> 42 <div>
37 { this.stateStatus(scope.row.jobStatus) } 43 {this.stateStatus(scope.row.jobStatus)}
38 </div> 44 </div>
39 ) 45 )
40 }, 46 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
1 <template> 1 <template>
2 <dialogBox :title="title" :width="'867px'" class="modifydialog" @closeDialog="close" :isMain="true" @submitForm="submitForm" 2 <dialogBox :title="title" :width="'867px'" class="modifydialog PersonnelDialog" @closeDialog="close" :isMain="true" @submitForm="submitForm"
3 v-model="myValue"> 3 v-model="myValue">
4 <div class="dialogCon"> 4 <div class="dialogCon">
5 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
...@@ -193,32 +193,4 @@ ...@@ -193,32 +193,4 @@
193 } 193 }
194 </script> 194 </script>
195 <style scoped lang="scss"> 195 <style scoped lang="scss">
196 .modifydialog {
197 /deep/.el-dialog__header {
198 .dialog_title {
199 display: -webkit-box;
200 display: -ms-flexbox;
201 display: flex;
202 position: relative;
203 top: -7px;
204 width: 29%;
205 height: 40px;
206 margin-left: 28px;
207 -webkit-box-pack: center;
208 -ms-flex-pack: center;
209 justify-content: center;
210 white-space: nowrap;
211 b {
212 font-size: 16px;
213 }
214 }
215 .el-dialog__headerbtn {
216 right: 20px !important;
217 top: 23px !important;
218 }
219 }
220 .selbig {
221 width: 500px;
222 }
223 }
224 </style> 196 </style>
......