Skip to content

I
ibzrt
提交 d6bac312 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_qyk 发布系统代码

上级 7e63971b
显示空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 115 行删除
app_Web/src/components/app-breadcrumb/app-breadcrumb.vue
浏览文件 @ d6bac312
......@@ -23,7 +23,7 @@
<script lang="ts">
import { compile } from 'path-to-regexp'
import { Component, Vue, Watch } from 'vue-property-decorator'
import { Component, Vue, Watch, Prop } from 'vue-property-decorator'
import { RouteRecord, Route } from 'vue-router'
@Component({
......@@ -32,6 +32,9 @@ import { RouteRecord, Route } from 'vue-router'
export default class extends Vue {
private breadcrumbs: RouteRecord[] = []
@Prop() public defPSAppView?: any;
@Watch('$route')
private onRouteChange(route: Route) {
// if you go to the redirect page, do not update the breadcrumbs
......@@ -70,23 +73,15 @@ export default class extends Vue {
return name.trim().toLocaleLowerCase() === 'index'.toLocaleLowerCase()
}
private pathCompile(path: string) {
const { params } = this.$route
const toPath = compile(path)
return toPath(params)
private pathCompile(item: any) {
const { params, path, query } = item;
return { params, path, query };
}
private handleLink(item: any) {
const { redirect, path } = item
if (redirect) {
this.$router.push(redirect).catch(err => {
console.warn(err)
})
return
}
this.$router.push(this.pathCompile(path)).catch(err => {
console.warn(err)
})
this.$router.push(this.pathCompile(item)).catch(err => {
console.warn(err);
});
}
}
</script>
......
app_Web/src/components/tab-page-exp/tab-page-exp.less
浏览文件 @ d6bac312
......@@ -89,6 +89,7 @@
.ibiz-page-tag {
.el-tabs{
.el-tabs__nav{
padding:0px 10px;
border:none;
}
.el-tabs__item{
......@@ -105,5 +106,9 @@
.el-tabs__nav-scroll{
background-color: white;
}
.el-tabs__header{
box-shadow: 0 1px 2px 0 rgba(0,0,0,.15);
margin:0 0 1 0;
}
}
}
\ No newline at end of file
app_Web/src/pages/rt/index/index-base.vue
浏览文件 @ d6bac312
......@@ -7,7 +7,7 @@
<div class="sider-top">
<div class="page-logo">
<img v-show="collapseChange" src="../../../assets/img/logo.png" height="16" />
<span v-show="!collapseChange" style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfCaption)}}</span>
<span v-show="!collapseChange" style="display: block;text-align: center;font-weight: 300;font-size: 20px;">{{$t(model.srfCaption)}}</span>
</div>
</div>
<view_appmenu
......@@ -31,7 +31,7 @@
<div class="page-logo">
<i v-show="!collapseChange" class="ivu-icon el-icon-s-fold" @click="handleClick"></i>
<i v-show="collapseChange" class="ivu-icon el-icon-s-unfold" @click="handleClick"></i>
<app-breadcrumb></app-breadcrumb>
<app-breadcrumb :defPSAppView="defPSAppView"></app-breadcrumb>
</div>
</div>
<div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
......
app_Web/src/pages/rt/index/index.less
浏览文件 @ d6bac312
......@@ -5,11 +5,14 @@
.index_view{
margin-bottom: 1px;
width: 100%;
height: 100%;
padding: 0;
margin: 0;
overflow: hidden;
color:#303133;
background-color: #fff;
.index_header{
height:65px;
padding:0 20px;
......@@ -21,6 +24,23 @@
align-items: center;
}
.header-left{
i{
color:#b4bcc8;
}
i:hover{
color:#1890ff;
}
> .app-breadcrumb{
> span .el-breadcrumb__item .el-breadcrumb__inner{
a{
color:#606d80 !important;
cursor: pointer !important;
}
a:last-child:hover{
color:#1890ff !important;
}
}
}
.ivu-icon{
font-size: 20px;
padding: 4px;
......@@ -61,7 +81,12 @@
cursor: pointer;
}
.sider-top{
margin-bottom: 1px;
height:65px;
box-shadow: 0 1px 2px 0 rgba(0,0,0,.15);
> .page-logo{
text-align: center;
}
}
}
......
app_Web/src/theme/blue.theme.less
浏览文件 @ d6bac312
/*** BRGIN:默认蓝色主题 ***/
.app_theme_blue {
> .ivu-layout-has-sider > .ivu-layout > header{
background-color: #2d5f8b;
color: #6ba1d1;
.app-theme-icon {
color: #6ba1d1;
}
.header-right {
> div:hover {
background: #3774aa;
}
}
.header-left {
i{
color:#b4bcc8;
}
i:hover{
color:#fff;
}
.app-breadcrumb{
> span .el-breadcrumb__item .el-breadcrumb__inner{
a{
color:#b4bcc8 !important;
cursor: pointer !important;
}
a:last-child:hover{
color:#fff !important;
}
}
}
}
.el-menu.el-menu--horizontal {
/* .el-menu.el-menu--horizontal {
> .el-menu-item, > .el-submenu > .el-submenu__title {
background: #2d5f8b;
color: #6ba1d1;
......@@ -52,16 +26,15 @@
color: #f1f1f1;
}
}
} */
}
}
> .ivu-layout {
> .ivu-layout-sider {
background-color: #4276a4;
.sider-top {
.ivu-icon {
color: hsla(0,0%,100%,.8);
background: #2d5f8b;
color: #6ba1d1;
}
}
}
}
......
app_Web/src/theme/dark-blue.theme.less
浏览文件 @ d6bac312
/*** BRGIN:默认Dark Blue主题 ***/
.app_theme_darkblue {
> .ivu-layout-has-sider > .ivu-layout > header{
background-color: #2b3643;
color: #606d80;
.app-theme-icon {
color: #606d80;
}
.header-right {
> div:hover {
background: #3b4a5c;
}
}
.header-left {
i{
color:#b4bcc8;
}
i:hover{
color:#fff;
}
.app-breadcrumb{
> span .el-breadcrumb__item .el-breadcrumb__inner{
a{
color:#b4bcc8 !important;
cursor: pointer !important;
}
a:last-child:hover{
color:#fff !important;
}
}
}
}
}/*
.el-menu.el-menu--horizontal {
> .el-menu-item, > .el-submenu > .el-submenu__title {
background: #2b3643;
background: #20222A;
color: #606d80;
i {
color: #606d80;
}
}
> .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
background-color: #364150;
background-color: #20222A;
color: #f1f1f1;
i {
color: #f1f1f1;
......@@ -52,23 +26,20 @@
color: #f1f1f1;
}
}
}
} */
}
> .ivu-layout {
> .ivu-layout-sider {
background-color: #364150;
background-color: #20222A;
.sider-top {
.ivu-icon {
background: #2b3643;
color: #606d80;
}
color: hsla(0,0%,100%,.8);
background-color: #20222A;
}
}
}
> .el-menu , > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu {
background: #364150;
background: #20222A;
.el-menu-item:hover, .el-menu-item:hover {
background: #3e4b5c !important;
color: #f1f1f1 !important;
i {
color: #f1f1f1;
......@@ -82,13 +53,13 @@
}
}
.el-menu-item.is-active{
border-left: 4px solid #1caf9a;
background: #3e4b5c !important;
border-left: 4px solid #409EFF;
background: #060708 !important;
color:white;
}
.el-submenu.is-opened, .el-submenu:hover, .el-submenu.is-active {
> .el-submenu__title {
background: #364150;
background: #20222A;
}
}
.el-submenu__title, .el-menu-item {
......@@ -98,21 +69,21 @@
}
}
.el-menu-item {
border-top: 1px solid #364150;
background: #364150;
border-top: 1px solid #20222A;
background: #20222A;
border-left: 4px solid transparent;
}
.el-submenu {
border-top: 1px solid #364150;
background: #364150;
border-top: 1px solid #20222A;
background: #20222A;
> .el-menu {
border-top: 1px solid #364150;
background: #364150;
border-top: 1px solid #20222A;
background: #20222A;
}
}
}
.ivu-menu-light{
background: #364150;
background: #20222A;
}
.ivu-menu-submenu-title{
color: #fff;
......
app_Web/src/theme/default.theme.less
浏览文件 @ d6bac312
/*** BRGIN:默认亮色主题 ***/
.app-default-theme {
> header {
background-color: #e8eaec;
color: #aaaaaa;
> .ivu-layout-has-sider > .ivu-layout > header {
.app-theme-icon {
color: #aaaaaa;
}
.header-right {
> div:hover {
background: #d4d4d4;
}
}
.el-menu.el-menu--horizontal {
/* .el-menu.el-menu--horizontal {
> .el-menu-item, > .el-submenu > .el-submenu__title {
background: #e1e1e1;
color: #aaaaaa;
......@@ -33,14 +26,14 @@
color: #666666;
}
}
}
} */
}
> .ivu-layout {
> .ivu-layout-sider {
background-color: #f6f6f6;
.sider-top {
background-color: #e8eaec;
.ivu-icon {
background: #f6f6f6;
color: #aaaaaa;
}
}
......
ibzrt-util/src/main/java/cn/ibizlab/util/enums/DEPredefinedFieldType.java
浏览文件 @ d6bac312
......@@ -49,11 +49,11 @@ public enum DEPredefinedFieldType {
*/
LOGICVALID,
/**
* 不处理
* 排序
*/
NONE,
ORDERVALUE,
/**
* 其它
* 不处理
*/
ORDERVALUE
NONE
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或