Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周远喜
mes-ui
Commits
10cb42cc
Commit
10cb42cc
authored
Sep 28, 2020
by
骆瑛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改表格所有的样式集合
parent
98a23682
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
679 additions
and
159 deletions
+679
-159
iview-reset.less
assets/css/iview-reset.less
+10
-131
deepBlank.less
assets/css/themes/deepBlank.less
+20
-5
default.less
assets/css/themes/default.less
+25
-9
green.less
assets/css/themes/green.less
+23
-4
process.vue
components/page/import/process.vue
+1
-1
staChart.vue
pages/home/component/staChart.vue
+2
-2
index.vue
pages/technology/index.vue
+37
-7
index.vue
pages/theme/index.vue
+561
-0
No files found.
assets/css/iview-reset.less
View file @
10cb42cc
...
@@ -555,151 +555,30 @@
...
@@ -555,151 +555,30 @@
color: @page-color;
color: @page-color;
opacity: 0.7;
opacity: 0.7;
}
}
//表格树的下拉样式
//表格
.treeTbale table tbody .treetr {
.ivu-table-header {
border: 1px solid @table-header-border !important;
}
.ivu-table-header thead tr th ,.table-tools table thead tr th{
background: @table-header-bg !important;
border: 1px solid @table-header-border !important;
color: @table-header-color !important;
}
.ivu-table-tip{
background:@table-body-bg !important;
}
/*底色斑马纹*/
.ivu-table td{
background-color:@table-body-bg ;
}
.ivu-table tr:nth-child(even) td{
background-color:@table-body-bg_even !important;
}
.ivu-table-wrapper {//表格最外层的border
border: none !important;
}
.ivu-table-body {
background-color: @table-body-bg;
background-color: @table-body-bg;
}
.ivu-table-wrapper tr td {
background-color:@table-body-bg ;
// border: 1px solid @tableCommon-boder !important;
}
}
//表格内部线条
.ivu-table-border td{
border: 1px solid @tableCommon-boder !important;
}
.ivu-table:before {
//表格下边框线
background-color: @table-boder !important;
.treeTbale table tbody .treetr:nth-child(even) {
background-color: @table-body-bg_even !important;
}
}
.ivu-table-border:after {
.treeTbale table tbody .treetr:hover td {
//表格右边框线
background-color: @table-boder !important;
}
.ivu-table td {
border-bottom:1px solid @table_line !important;
}
/*选中某一行高亮*/
.ivu-table-row:hover{
background: @table-row-hover !important;
background: @table-row-hover !important;
border: 2px solid @table_line !important;
border: 2px solid @table_line !important;
}
.ivu-table-row-highlight tr{
background: @table-row-hover !important;
border: 2px solid @table_line !important;
border-right: 2px solid transparent !important;
border-right: 2px solid transparent !important;
border-left: 2px solid transparent !important;
}
}
/*浮在某行*/
.treeTbale table tbody .treetr:hover td:first-child {
.ivu-table-row-hover td ,.ivu-table tr:nth-child(even):hover{
background: @table-row-hover !important;
border: 2px solid @table_line !important;
border-right: 2px solid transparent !important;
border-left: 2px solid transparent !important;
}
.ivu-table-row-hover td:first-child {
border-left: 2px solid @table_line !important;
border-left: 2px solid @table_line !important;
}
}
.ivu-table-row-hover td:last-child {
border-right: 2px solid @table_line !important;
}
.ivu-dropdown-rel:hover {
.ivu-btn-text {
background-color: @primary-color;
}
}
.treeTbale table tbody .treetr:hover td:last-child {
//表格字体颜色
.ivu-table {
color: @table-color !important;
}
//表格页面整体背景色处理
.product-layout{
.ivu-layout-content {
background-color: @product_content_backcolor;
}
}
//表格内checkbox
.ivu-checkbox-inner{
background: transparent !important;
}
//表格树的下拉样式
.treeTbale table tbody .treetr{
background-color:@table-body-bg ;
box-sizing: border-box;
}
.treeTbale table tbody .treetr:nth-child(even){
background-color:@table-body-bg_even !important;
}
.treeTbale table tbody .treetr:hover td{
background: @table-row-hover !important;
border: 2px solid @table_line !important;
border-right: 2px solid transparent !important;
border-left: 2px solid transparent !important;
}
.treeTbale table tbody .treetr:hover td:first-child {
border-left: 2px solid @table_line !important;
}
.treeTbale table tbody .treetr:hover td:last-child {
border-right: 2px solid @table_line !important;
border-right: 2px solid @table_line !important;
}
}
.treetr .ivu-icon{
color: @treetr_icon;
}
//修改的搜索框样式
.treetr .ivu-icon {
.search_icon {
color: @treetr_icon;
width: 36px;
height: 32px;
background: #106FFE;
border:1px solid #106FFE;
box-sizing: border-box;
.ivu-btn{
border-radius: 0px 4px 4px 0px !important;
}
}
.search_text span{
color: @search_text_span !important;
border: 1px solid transparent !important;
}
.search_text:hover{
span{
color: #106FFE !important;
}
border: 1px solid transparent !important;
background: transparent !important;
}
}
assets/css/themes/deepBlank.less
View file @
10cb42cc
...
@@ -94,8 +94,13 @@
...
@@ -94,8 +94,13 @@
@right-icon-color: #F5F6FA;
@right-icon-color: #F5F6FA;
@right-icon-color-hover: #106FFE;
@right-icon-color-hover: #106FFE;
@table-bg-color:#2F2F57;
@table-bg-color:#2F2F57;
@padding_input_border:#222341;
@search_icon_bg: #106FFE;
@table_checkbox_bg: #106FFE;
@table_checkbox_bd:#FFFFFF;
@table_checkbox_bd_header:#FFFFFF;
//高级搜索文字
@search_text_span:#ffffff;
//分页
//分页
@page-active-bg: rgba(16, 111, 254, 1);
@page-active-bg: rgba(16, 111, 254, 1);
@page-active-color-hover: #fff;
@page-active-color-hover: #fff;
...
@@ -104,21 +109,33 @@
...
@@ -104,21 +109,33 @@
//表格
//表格
@table_highbd:transparent;
@table-header-bg:#106FFE;
@table-header-bg:#106FFE;
@table-header-border:#106FFE;
@table-header-border:#106FFE;
@table-border:#2F2F57;
@header_bd_right:#106FFE;
@table-header-color:#ffffff;
@table-header-color:#ffffff;
@table-body-bg:#2F2F57;
@table-body-bg:#2F2F57;
@table-body-bd:transparent;
@table_check_bd:1px solid #ffffff;
@table-body-bg_even:rgba(34, 35, 65, 0.41);
@table-body-bg_even:rgba(34, 35, 65, 0.41);
@table-body-bd_odd:transparent;
@checkbox-inner:transparent;
@table_body_allcol:#ffffff;
@tableCommon-bg:transparent;
@tableCommon-bg:transparent;
@tableCommon-boder:transparent;
@tableCommon-boder:transparent;
@table-boder:transparent;
@table-boder:transparent;
@top_line:transparent;
@str_border:#222341;
@table-row-hover:#2F2F57;
@table-row-hover:#2F2F57;
@dispatch_part_border:1px solid transparent;
@dispatch_part_border:1px solid transparent;
@back_part_top:#2F2F57;
@back_part_top:#2F2F57;
@part_top_title:#ffffff;
@part_top_title:#ffffff;
@part_top_border:1px solid #2F2F57;
@part_top_border:1px solid #2F2F57;
@table_border-bg:transparent;
@table_border-bg:transparent;
@table_line:#106FFE;
@table_line:#106FFE;//不能改变高显行
@table-bottom_line:transparent;
@table-bottom-border:#ffffff;
// @border-right_line:transparent;
// @border-right_line:transparent;
//工单列表等背景色
//工单列表等背景色
@part_body_backcolor:#2F2F57;
@part_body_backcolor:#2F2F57;
...
@@ -129,5 +146,3 @@
...
@@ -129,5 +146,3 @@
@select_title:#ffffff;
@select_title:#ffffff;
//表格树的下拉
//表格树的下拉
@treetr_icon:#ffffff;
@treetr_icon:#ffffff;
//高级搜索文字
@search_text_span:#ffffff;
\ No newline at end of file
assets/css/themes/default.less
View file @
10cb42cc
...
@@ -96,7 +96,13 @@
...
@@ -96,7 +96,13 @@
@right-icon-color: #515A6E;
@right-icon-color: #515A6E;
@right-icon-color-hover: #F5F6FA;
@right-icon-color-hover: #F5F6FA;
@table-bg-color:#ffffff;
@table-bg-color:#ffffff;
@padding_input_border:#dcdee2;
@search_icon_bg:#2d8cf0;
@table_checkbox_bg:#2d8cf0;
@table_checkbox_bd:#e8eaec;
@table_checkbox_bd_header:#e8eaec;
//高级搜索文字
@search_text_span:#515a6e;
//分页
//分页
@page-active-bg: #fff;
@page-active-bg: #fff;
@page-active-color-hover: #515A6E;
@page-active-color-hover: #515A6E;
...
@@ -104,21 +110,33 @@
...
@@ -104,21 +110,33 @@
@page-color: #515A6E;
@page-color: #515A6E;
//表格
//表格
@table-header-bg: #F8F8F9;
@table_highbd:#dcdee2;
@table-header-border: #F8F8F9;
@table-header-bg: #F5F6FA;
@table-header-border: #dcdee2;
@table-border: #dcdee2;
@header_bd_right:#e8eaec;
@table-header-color:#515a6e;
@table-header-color:#515a6e;
@table-body-bg: #fff;
@table-body-bg: #fff;
@table-body-bg_even:#f7f7f7;
@table-body-bd:none;
@table_check_bd:transparent;
@table-body-bg_even:#f8f8f9;
@table-body-bd_odd: 1px solid #e8eaec;
@checkbox-inner:transparent;
@table_body_allcol:#515a6e;
@tableCommon-bg: #fff;
@tableCommon-bg: #fff;
@tableCommon-boder:transparent;// #dcdee2
@tableCommon-boder:transparent;
@top_line:#dcdee2;
@str_border:#dcdee2;
@table-boder: transparent;
@table-boder: transparent;
@table-row-hover: #E
FF8F7
;
@table-row-hover: #E
bf7ff
;
@dispatch_part_border:1px solid #ccc;
@dispatch_part_border:1px solid #ccc;
@back_part_top:#f5f6fa;
@back_part_top:#f5f6fa;
@part_top_title:#515a6e;
@part_top_title:#515a6e;
@part_top_border:1px solid #f5f6fa;
@part_top_border:1px solid #f5f6fa;
@table_border-bg:#dcdee2;
@table_border-bg:#dcdee2;
@table_line:#e8eaec;
@table_line:#ebf7ff;
@table-bottom_line:#dcdee2;
@table-bottom-border:#ffffff;
// @border-right_line:#dcdee2;
// @border-right_line:#dcdee2;
//工单列表等背景色
//工单列表等背景色
@part_body_backcolor:#ffffff;
@part_body_backcolor:#ffffff;
...
@@ -129,5 +147,3 @@
...
@@ -129,5 +147,3 @@
@select_title:#515a6e;
@select_title:#515a6e;
//表格树的下拉
//表格树的下拉
@treetr_icon: #2d8cf0;
@treetr_icon: #2d8cf0;
//高级搜索文字
@search_text_span:#515a6e;
\ No newline at end of file
assets/css/themes/green.less
View file @
10cb42cc
...
@@ -94,7 +94,14 @@
...
@@ -94,7 +94,14 @@
@right-icon-color: #515A6E;
@right-icon-color: #515A6E;
@right-icon-color-hover: #F5F6FA;
@right-icon-color-hover: #F5F6FA;
@table-bg-color:#ffffff;
@table-bg-color:#ffffff;
@padding_input_border:#253d6d;
@search_icon_bg: #253D6D;
@table_checkbox_bg: #106FFE;
@table_checkbox_bd:#182C51;
@table_checkbox_bd_header:#FFFFFF;
@table-color:#182C51;
//高级搜索文字
@search_text_span: #253D6D;;
//分页
//分页
@page-active-bg: #253D6D;
@page-active-bg: #253D6D;
...
@@ -103,21 +110,34 @@
...
@@ -103,21 +110,34 @@
@page-color: #515A6E;
@page-color: #515A6E;
//表格
//表格
@table_highbd:transparent;
@table-header-bg: #253D6D;
@table-header-bg: #253D6D;
@table-header-border: #253D6D;
@table-header-border: #253D6D;
@table-border:transparent;
@header_bd_right:#253D6D;
@table-header-color:#ffffff;
@table-header-color:#ffffff;
@table-body-bg: #fff;
@table-body-bg: #fff;
@table_check_bd:1px solid #ffffff;
@table-body-bd:transparent;
@table-body-bg_even:rgba(4, 187, 140, 0.06);
@table-body-bg_even:rgba(4, 187, 140, 0.06);
@table-body-bd_odd:transparent;
@checkbox-inner:transparent;
@table_body_allcol:#182C51;
@tableCommon-bg: transparent;
@tableCommon-bg: transparent;
@tableCommon-boder: transparent;
@tableCommon-boder: transparent;
@table-boder: transparent;
@table-boder: transparent;
@top_line:transparent;
@str_border:#F5F6FA;
@table-row-hover: #FFFFFF;
@table-row-hover: #FFFFFF;
@dispatch_part_border:1px solid transparent;
@dispatch_part_border:1px solid transparent;
@back_part_top:#253D6D;
@back_part_top:#253D6D;
@part_top_title:#ffffff;
@part_top_title:#ffffff;
@part_top_border:1px solid #ffffff;
@part_top_border:1px solid #ffffff;
@table_border-bg:transparent;
@table_border-bg:transparent;
@table_line: #CACBD0;;
@table_line: #CACBD0;
@table-bottom_line:transparent;
@table-bottom-border:#ffffff;
// @border-right_line:transparent;
// @border-right_line:transparent;
//工单列表等背景色
//工单列表等背景色
@part_body_backcolor:#ffffff;
@part_body_backcolor:#ffffff;
...
@@ -128,5 +148,4 @@
...
@@ -128,5 +148,4 @@
@select_title:#04BB8C;
@select_title:#04BB8C;
//表格树的下拉
//表格树的下拉
@treetr_icon: #515A6E;
@treetr_icon: #515A6E;
//高级搜索文字
@search_text_span:#ffffff;
components/page/import/process.vue
View file @
10cb42cc
...
@@ -500,7 +500,7 @@ export default {
...
@@ -500,7 +500,7 @@ export default {
}
}
.table-tools {
.table-tools {
margin: 1
5
px 20px 0;
margin: 1
3
px 20px 0;
display: flex;
display: flex;
line-height: 50px;
line-height: 50px;
background: @right-header-bg;
background: @right-header-bg;
...
...
pages/home/component/staChart.vue
View file @
10cb42cc
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<Icon
type=
"ios-images"
class=
"f20"
/>
<Icon
type=
"ios-images"
class=
"f20"
/>
<span
class=
"ml10"
>
各车间计划执行状态的详细情况
</span>
<span
class=
"ml10"
>
各车间计划执行状态的详细情况
</span>
</Col>
</Col>
<Col
span=
"9"
>
<Col
span=
"9"
style=
"margin-top: -6px;"
>
<DatePicker
<DatePicker
:value=
"value2"
:value=
"value2"
format=
"yyyy/MM/dd"
format=
"yyyy/MM/dd"
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
placeholder=
"选择日期"
placeholder=
"选择日期"
style=
"width: 200px"
style=
"width: 200px"
></DatePicker>
></DatePicker>
<Button
type=
"primary"
>
查询
</Button>
<Button
type=
"primary"
>
查询
</Button>
</Col>
</Col>
</Row>
</Row>
<div
class=
"echarts-map"
>
<div
class=
"echarts-map"
>
...
...
pages/technology/index.vue
View file @
10cb42cc
...
@@ -32,7 +32,8 @@
...
@@ -32,7 +32,8 @@
</a>
</a>
</div>
</div>
<Content
class=
"con"
:class=
"!showMenu?'con_bord':''"
>
<Content
class=
"con"
:class=
"!showMenu?'con_bord':''"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
exportTitle=
"工艺规程"
>
<theme
></theme>
<!--
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
exportTitle=
"工艺规程"
>
<template
slot=
"easySearch"
>
<template
slot=
"easySearch"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<FormItem
prop=
"keys"
>
<FormItem
prop=
"keys"
>
...
@@ -47,13 +48,23 @@
...
@@ -47,13 +48,23 @@
<Search
/>
<Search
/>
</
template
>
</
template
>
<
template
slot=
"buttons"
>
<
template
slot=
"buttons"
>
<Button
type=
"primary"
@
click=
"add"
>
新增
</Button>
<Button
type=
"text"
@
click=
"add"
class=
"search_text"
icon=
"icon iconfont iconxinzeng"
>
新增
</Button>
<Button
@
click=
"openModalIm"
>
导入
</Button>
<Dropdown
class=
"dropIcon"
@
on-click=
"changeMenu"
>
<a
href=
"javascript:void(0)"
>
<Icon
type=
"icon iconfont iconshezhi-liebiaozhanshi"
class=
"zhanshi"
/>
<Icon
type=
"ios-arrow-down"
class=
"arrow_down"
></Icon>
</a>
<DropdownMenu
slot=
"list"
>
<DropdownItem
name=
'导入'
>
<Icon
type=
"icon iconfont icondaoru"
/>
导入
</DropdownItem>
<DropdownItem
name=
'导出'
>
<Icon
type=
"icon iconfont icondaochu"
/>
导出
</DropdownItem>
</DropdownMenu>
</Dropdown>
<Button
@
click=
"openModalIm"
icon=
"icon iconfont icondaoru"
class=
"search_text"
type=
"text"
>
导入
</Button>
</
template
>
</
template
>
</DataGrid>
</DataGrid>
-->
<Modal
v-model=
"modal"
:title=
"title"
width=
"1120"
footer-hide
>
<Modal
v-model=
"modal"
:title=
"title"
width=
"1120"
footer-hide
>
<component
:is=
"detail"
:eid=
"curId"
:uid=
"uId"
:title=
"title"
:headid=
"hid"
@
on-close=
"cancel"
@
on-ok=
"ok"
/>
<component
:is=
"detail"
:eid=
"curId"
:uid=
"uId"
:title=
"title"
:headid=
"hid"
@
on-close=
"cancel"
@
on-ok=
"ok"
/>
</Modal>
</Modal>
<Modal
v-model=
"documentShow"
title=
"送审"
:mask-closable=
"false"
:scrollable=
"true"
ok-text=
"确定"
cancel-text=
"取消"
fullscreen
>
<Modal
v-model=
"documentShow"
title=
"送审"
:mask-closable=
"false"
:scrollable=
"true"
ok-text=
"确定"
cancel-text=
"取消"
fullscreen
>
<sendAudit
ref=
"sendAudit"
></sendAudit>
<sendAudit
ref=
"sendAudit"
></sendAudit>
...
@@ -105,13 +116,15 @@ import ProductTree from "@/components/page/productTree.vue";
...
@@ -105,13 +116,15 @@ import ProductTree from "@/components/page/productTree.vue";
import
sendAudit
from
"./sendAudit.vue"
;
import
sendAudit
from
"./sendAudit.vue"
;
import
routingchangeorder
from
"../processDesign/Process/routingchangeorder.vue"
;
import
routingchangeorder
from
"../processDesign/Process/routingchangeorder.vue"
;
import
changelist
from
"../processDesign/Process/changelist.vue"
;
import
changelist
from
"../processDesign/Process/changelist.vue"
;
import
theme
from
'../theme'
export
default
{
export
default
{
components
:
{
components
:
{
ProductTree
,
ProductTree
,
Search
,
Search
,
sendAudit
,
sendAudit
,
routingchangeorder
,
routingchangeorder
,
changelist
changelist
,
theme
},
},
head
:
{
head
:
{
title
:
"工艺规程"
,
title
:
"工艺规程"
,
...
@@ -120,6 +133,14 @@ export default {
...
@@ -120,6 +133,14 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
formInline
:{
value
:
''
},
ruleValidate
:
{
value
:
[
{
required
:
true
,
message
:
'输入不能为空'
,
trigger
:
'blur'
}
],
},
showMenu
:
true
,
showMenu
:
true
,
treeHeight
:
""
,
treeHeight
:
""
,
action
:
Api
.
index
,
action
:
Api
.
index
,
...
@@ -608,10 +629,19 @@ export default {
...
@@ -608,10 +629,19 @@ export default {
return
tempList
return
tempList
},
},
//批量导入end
//批量导入end
//下拉菜单事件导入
changeMenu
(
name
){
if
(
name
==
'导入'
){
openModalIm
();
}
if
(
name
==
'导出'
){
}
}
}
}
};
};
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.order-quotation {
.order-quotation {
height: 100vh !important;
height: 100vh !important;
}
}
...
...
pages/theme/index.vue
0 → 100644
View file @
10cb42cc
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment