diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index 1851c1e7f..d2d4354f1 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -1,347 +1,3 @@ -//button.el-button.form-upload-btn.el-button--default.el-button--small{ -// padding: 13px 15px; -//} -////设置查询按钮 -//.el-button--primary.searchAngNewBtn{ -// height: 32px; -// padding: 0 15px; -// color: #fff; -// background-color: #3391CE; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif; -// border-color: #3391CE; -// &.is-disabled { -// background-color: #b0d3ed !important; -// border-color: #bcd1e0 !important; -// } -//} -//.el-button--primary.searchAngNewBtn:hover{ -// padding: 0 15px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button--primary.searchAngNewBtn:focus{ -// padding: 0 15px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button--danger.searchAngNewBtn{ -// height: 32px; -// padding: 0 15px; -// color: #fff; -//} -//.el-button--danger.searchAngNewBtn:hover{ -// padding: 0 15px; -//} -//.el-button--danger.searchAngNewBtn:focus{ -// padding: 0 15px; -//} -//.el-button.searchAngNewBtn{ -// height: 32px; -// padding: 0 15px; -// //color: #fff; -//} -//.el-button.searchAngNewBtn:hover{ -// padding: 0 15px; -//} -//.el-button.searchAngNewBtn:focus{ -// padding: 0 15px; -//} -////设置新增,导出等按钮 -//.el-button.el-button--primary.el-button--mini { -// padding: 5px 18px; -// color: #fff; -// background-color: #3391CE; -// border-color: #3391CE; -// &.is-disabled { -// background-color: #b0d3ed !important; -// border-color: #bcd1e0 !important; -// } -//} -//.el-button.el-button--primary.el-button--mini:hover{ -// padding: 5px 18px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--primary.el-button--mini:focus{ -// padding: 5px 18px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--danger.el-button--mini { -// padding: 5px 18px; -// color: #fff; -//} -//.el-button.el-button--danger.el-button--mini:hover{ -// padding: 5px 18px; -//} -//.el-button.el-button--danger.el-button--mini:focus{ -// padding: 5px 18px; -//} -//// 设置表格操作按钮 -//.el-button.el-button--primary.el-button--mini.opera-btn { -// padding: 5px 7px; -// color: #fff; -// background-color: #3391CE; -// border-color: #3391CE; -// &.is-disabled { -// background-color: #b0d3ed !important; -// border-color: #bcd1e0 !important; -// } -//} -//.el-button.el-button--primary.el-button--mini.opera-btn:hover{ -// padding: 5px 7px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--primary.el-button--mini.opera-btn:focus{ -// padding: 5px 7px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--danger.el-button--mini.opera-btn { -// padding: 5px 7px; -// color: #fff; -//} -//.el-button.el-button--danger.el-button--mini.opera-btn:hover{ -// padding: 5px 7px; -//} -//.el-button.el-button--danger.el-button--mini.opera-btn:focus{ -// padding: 5px 7px; -//} -//.el-button.el-button--warning.el-button--mini.opera-btn { -// padding: 5px 7px; -// color: #fff; -// background-color: #ff9900; -// border-color: #ff9900; -//} -//.el-button.el-button--warning.el-button--mini.opera-btn:hover{ -// padding: 5px 7px; -// background-color: #ff9900; -// border-color: #ff9900; -//} -//.el-button.el-button--warning.el-button--mini.opera-btn:focus{ -// padding: 5px 7px; -// background-color: #ff9900; -// border-color: #ff9900; -//} -// -////设置form-item -//.el-form-item.serch-form-item { -// margin-bottom: 0; -// margin-right: 6px; -// margin-top: 10px; -//} -//.el-form-item.serch-form-item.btn-box { -// margin-bottom: 0; -// margin-right: 2px; -//} -//// 设置查询orm-item-lable -//.serch-form-item .el-form-item__label{ -// position: relative; -// top: 1px; -// padding: 0 7px; -// height: 32px; -// line-height: 32px; -// font-size: 12px; -// border: 1px solid #DDD; -// border-top-left-radius: 4px; -// border-bottom-left-radius: 4px; -// border-right: none; -// background: #F4F8FB; -// text-align: center; -// min-width: 80px; -//} -//.serch-form-item .el-form-item__content { -// line-height: 32px; -// position: relative; -// font-size: 14px; -// .put__inner{ -// height: 32px !important; -// line-height: 32px !important; -// width: 170px; -// 0 4px 4px 0; -// font-size: 12px; -// color: #515a6e; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// } -// .el-input__icon{ -// line-height: 32px; -// } -//} -//.el-form-item.search-form-item.btn-box { -// margin-bottom: 0; -// margin-right: 2px; -//} -//// 设置查询orm-item-lable -//.search-form-item .el-form-item__label{ -// position: relative; -// top: 1px; -// padding: 0 7px; -// height: 32px; -// line-height: 32px; -// font-size: 12px; -// border: 1px solid #DDD; -// border-top-left-radius: 4px; -// border-bottom-left-radius: 4px; -// border-right: none; -// background: #F4F8FB; -// text-align: center; -// min-width: 80px; -//} -//.search-form-item .el-form-item__content { -// line-height: 32px; -// position: relative; -// font-size: 14px; -// .el-input__inner{ -// height: 32px !important; -// line-height: 32px !important; -// width: 180px; -// 4px; -// font-size: 12px; -// color: #515a6e; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// } -// .el-input__icon{ -// line-height: 32px; -// } -//} -//// 设置新增form-item-lable -//.add-form-item .el-form-item__label{ -// position: relative; -// top: 1px; -// padding: 0 7px; -// width: 120px; -// height: 40px; -// line-height: 40px; -// font-size: 12px; -// border: 1px solid #DDD; -// border-top-left-radius: 4px; -// border-bottom-left-radius: 4px; -// border-right: none; -// background: #F4F8FB; -// text-align: center; -// white-space: nowrap; -// text-overflow: ellipsis; -// overflow: hidden; -//} -//.add-form-item .el-form-item__content { -// position: relative; -// font-size: 14px; -// width: 224px; -// .el-input__inner{ -// 0 4px 4px 0; -// font-size: 12px; -// color: #515a6e; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// width: 224px; -// } -// //设置输入框高度 -//// .label-input-form{ -//// .el-input__inner{ -//// // @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { -//// // // ie下样式偏差1px -//// // line-height: 27px !important; -//// // } -//// } -//// } -//} -//// 设置新增等按钮区域样式 -//.action-bar{ -// padding:10px 0; -// .el-button+.el-button{ -// margin-left: 2px; -// } -//} -//// 设置tabs激活状态颜色 -//.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active { -// color: #3391CE; -// background-color: #FFF; -// border-right-color: #DCDFE6; -// border-left-color: #DCDFE6; -//} -//// 设置tabs hover颜色 -//.el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover { -// color: #3391CE; -//} -//// 设置页面查询区域下的下划线 -//.search-area { -// border-bottom: 1px solid #e8eaec; -//} -///* element样式重置 start */ -///* 去掉input尾部上下小箭头 start */ -//input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{ -// -webkit-appearance: none !important; -// -moz-appearance: none !important; -// -o-appearance: none !important; -// -ms-appearance: none !important; -// appearance: none !important; -// margin: 0; -//} -//input[type="number"]{ -// -webkit-appearance:textfield; -// -moz-appearance:textfield; -// -o-appearance:textfield; -// -ms-appearance:textfield; -// appearance:textfield; -//} -///* 去掉input尾部上下小箭头 end */ -//// 所属部门选项 样式 -//.user-dept-popper{ -// padding: 0; -//} -//// 表单验证星星样式 -//.single-star { -// .el-form-item__label:before{ -// content: '*' !important; -// color: #F56C6C !important; -// margin-right: 4px !important; -// } -//} -//.double-star { -// .el-form-item__label:before{ -// content: '**' !important; -// color: #F56C6C !important; -// margin-right: 4px !important; -// } -//} -//.add-form-item{ -// /*margin-top -1px*/ -// .top1px{ -// .el-input__inner{ -// margin-top: -1px; -// } -// } -// .el-textarea{ -// .el-textarea__inner{ -// height: 40px; -// min-height: 40px !important; -// font-size: 12px; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// border-bottom-left-radius: 0; -// border-top-left-radius: 0; -// } -// } -// .form-upload-btn{ -// font-size: 12px; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// } -//} -//// 设置日期样式 -//.el-date-editor .el-range-input{ -// font-size: 12px; -// font-family: sans-serif; -//} -//span.el-range-separator{ -// position: relative; -// left: -6px; -// font-size: 12px; -//} -//.el-date-editor .el-range-separator{ -// line-height: 26px; -//} -//.serch-form-item .el-form-item__content .el-input__icon{ -// line-height: 26px; -//} // 设置查询区域 .search-area{ display: flex; @@ -516,6 +172,7 @@ button.el-button.common-button-default.el-button--default.is-round{ } // 按钮 + 图标 .add-button{ + height: 32px; .add{ background-image: url("~assets/images/shangqi/img/add.png"); } diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2fdf6eed3..2e58d256d 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -8,7 +8,8 @@ -
{{ this.isCollapse ? '' : '' }}
+
+
{{ this.isCollapse ? '' : '' }}
- 新增 + 新增 展示区域管理
数据处理中 diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue index f34bab654..ddb33e2fe 100644 --- a/src/pages/config/pages/attributeCustom/components/laws.vue +++ b/src/pages/config/pages/attributeCustom/components/laws.vue @@ -2,7 +2,7 @@