Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
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
常超
founder_vue
Commits
2fa280da
Commit
2fa280da
authored
Jan 12, 2022
by
李姝悦
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://39.99.224.27:9022/changchao/founder_vue
into dev
parents
74823855
8180dc84
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
112 additions
and
95 deletions
+112
-95
src/assets/css/globalBase.scss
+98
-86
src/views/Home.vue
+3
-3
src/views/cxyrd/QueryConfirm.vue
+10
-6
src/views/drFPTX/Index.vue
+1
-0
src/views/drFPTX/RAList.vue
+0
-0
src/views/zljc/Index.vue
+0
-0
No files found.
src/assets/css/globalBase.scss
View file @
2fa280da
/
deep
/
.el-input__inner
{
background
:
#ffffff
;
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.03
);
border-radius
:
4px
;
border
:
none
;
background
:
#ffffff
;
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.03
);
border-radius
:
4px
;
border
:
none
;
}
// 输入框选中样式
/
deep
/
.el-input.is-active
.el-input__inner
,
/
deep
/
.el-input__inner
:focus
{
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.08
)
!
important
;
border-color
:
none
!
important
;
color
:
#055FE7
;
// 输入框选中样式
/
deep
/
.el-input.is-active
.el-input__inner
,
/
deep
/
.el-input__inner
:focus
{
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.08
)
!
important
;
border-color
:
none
!
important
;
color
:
#055fe7
;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时,:focus-within伪类的元素就会有效著作权归作者所有。
/
deep
/
.el-input.is-active
.el-input__inner
,
/
deep
/
.el-input__inner
:focus-within
{
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.08
)
!
important
;
border-color
:
none
!
important
;
color
:
#055FE7
;
.el-range-input
{
color
:
#055FE7
;
}
/
deep
/
.el-input.is-active
.el-input__inner
,
/
deep
/
.el-input__inner
:focus-within
{
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.08
)
!
important
;
border-color
:
none
!
important
;
color
:
#055fe7
;
.el-range-input
{
color
:
#055fe7
;
}
}
/
deep
/
.el-table
td
,
.el-table
th
.is-leaf
{
background-color
:
#ffffff
;
border
:
none
;
// border-bottom: 1px #f6f8fa solid;
border-top
:
1px
#f6f8fa
solid
;
}
// 去除table表格最底部边框
.el-table__row
>
td
{
.el-table__row
>
td
{
border
:
none
;
}
// 去除table表格最底部边框
...
...
@@ -30,73 +38,72 @@
height
:
0px
;
}
/
deep
/
.el-table
.el-table__header-wrapper
tr
th
{
background-color
:
#
ECF1F7
!
important
;
/
deep
/
.el-table
.el-table__header-wrapper
tr
th
{
background-color
:
#
ecf1f7
!
important
;
font-size
:
14px
!
important
;
font-family
:
HarmonyOS_Sans_SC_Medium
!
important
;
color
:
#282F3C
!
important
;
height
:
48px
!
important
;
padding
:
0
!
important
;
font-family
:
HarmonyOS_Sans_SC_Medium
!
important
;
color
:
#282f3c
!
important
;
height
:
48px
!
important
;
padding
:
0
!
important
;
}
/
deep
/
.el-table
.el-table__body
tr
.current-row
>
td
{
background-color
:
#
F2F7FE
!
important
;
background-color
:
#
f2f7fe
!
important
;
}
/
deep
/
.el-table
.el-table__body
tr
:hover
>
td
{
background-color
:
#
F2F7FE
!
important
;
background-color
:
#
f2f7fe
!
important
;
}
/
deep
/
.el-table__row
{
height
:
48px
!
important
;
height
:
48px
!
important
;
}
/
deep
/
.el-table__row--level-1
{
.el-table__cell
{
background-color
:
#F5F6F
7
!
important
;
}
.el-table__cell
{
background-color
:
#f5f6f
7
!
important
;
}
}
/
deep
/
.el-table
.el-table__cell
{
padding
:
0
!
important
;
padding
:
0
!
important
;
}
/
deep
/
.el-table__body
{
width
:
100%
!
important
;
width
:
100%
!
important
;
}
/
deep
/
.btn-prev
{
cursor
:
pointer
;
i
{
cursor
:
pointer
;
}
cursor
:
pointer
;
i
{
cursor
:
pointer
;
}
}
/
deep
/
.btn-next
{
cursor
:
pointer
;
i
{
cursor
:
pointer
;
}
cursor
:
pointer
;
i
{
cursor
:
pointer
;
}
}
// 分页
/
deep
/
.el-pager
{
.number
{
background-color
:
transparent
!
important
;
}
.number.active
{
background-color
:
#055fe7
!
important
;
box-shadow
:
0px
12px
16px
1px
rgba
(
0
,
21
,
51
,
0
.03
);
border-radius
:
6px
;
}
.el-icon.more.btn-quicknext.el-icon-more
,
.el-icon.more.btn-quickprev.el-icon-more
{
background-color
:
transparent
!
important
;
}
.number
{
background-color
:
transparent
!
important
;
}
.number.active
{
background-color
:
#055fe7
!
important
;
box-shadow
:
0px
12px
16px
1px
rgba
(
0
,
21
,
51
,
0
.03
);
border-radius
:
6px
;
}
.el-icon.more.btn-quicknext.el-icon-more
,
.el-icon.more.btn-quickprev.el-icon-more
{
background-color
:
transparent
!
important
;
}
}
/
deep
/
.btn-prev
,
/
deep
/
.btn-next
{
background-color
:
transparent
!
important
;
background-color
:
transparent
!
important
;
}
/
deep
/
.el-pagination__sizes
{
position
:
absolute
;
right
:
0
;
position
:
absolute
;
right
:
0
;
}
// 修改下拉框样式
...
...
@@ -104,45 +111,51 @@
padding-left
:
10px
!
important
;
}
/
deep
/
.el-input__inner
:hover
{
cursor
:
text
;
}
// 日期选择器
/
deep
/
.el-date-editor
{
display
:
flex
;
align-items
:
center
;
display
:
flex
;
align-items
:
center
;
}
/
deep
/
.el-date-editor
.el-range-separator
{
line-height
:
26px
;
line-height
:
26px
;
}
/
deep
/
.el-input__icon
{
height
:
32px
;
/
deep
/
.el-date-editor
{
/
deep
/
.el-range__close-icon
{
height
:
32px
!
important
;
}
}
/
deep
/
.el-input__icon.el-range__icon.el-icon-date
{
position
:
absolute
;
right
:
6px
;
position
:
absolute
;
right
:
6px
;
}
.f-primary-button
{
cursor
:
pointer
;
background
:
#055FE
7
!
important
;
&
:hover
{
background
:
#377FEC
!
important
;
}
&
:active
{
background
:
#044CB
9
!
important
;
}
cursor
:
pointer
;
background
:
#055fe
7
!
important
;
&
:hover
{
background
:
#377fec
!
important
;
}
&
:active
{
background
:
#044cb
9
!
important
;
}
}
.f-default-button
{
border-radius
:
6px
;
border
:
1px
solid
#AEB5C2
!
important
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
#2E3846
!
important
;
&
:hover
{
border
:
1px
solid
#055FE7
!
important
;
color
:
#055FE7
!
important
;
}
&
:active
{
border
:
1px
solid
#044CB9
!
important
;
color
:
#044CB9
!
important
;
}
}
\ No newline at end of file
border-radius
:
6px
;
border
:
1px
solid
#aeb5c2
!
important
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
#2e3846
!
important
;
&
:hover
{
border
:
1px
solid
#055fe7
!
important
;
color
:
#055fe7
!
important
;
}
&
:active
{
border
:
1px
solid
#044cb9
!
important
;
color
:
#044cb9
!
important
;
}
}
src/views/Home.vue
View file @
2fa280da
...
...
@@ -892,10 +892,10 @@ export default {
.el-tabs
/
deep
/
{
font-family
:
HarmonyOS_Sans_SC
;
width
:
1235px
;
height
:
60
px
;
height
:
56
px
;
.el-tabs__header
{
margin
:
0
;
height
:
60
px
;
height
:
56
px
;
.el-tabs__nav-wrap.is-top
{
height
:
100%
;
}
...
...
@@ -1220,7 +1220,7 @@ export default {
.main
{
//
padding
:
24px
;
width
:
100%
;
height
:
calc
(
100%
-
60
px
);
height
:
calc
(
100%
-
56
px
);
.contain
{
position
:
relative
;
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
2fa280da
...
...
@@ -8,7 +8,7 @@
<div
class=
"display_style"
>
<span
class=
"labelFont"
>
条码号:
</span>
<el-input
class=
"el_input"
class=
"el_input
tmh
"
v-model=
"reqParam.contrastCustomSearchReq.barcode"
placeholder=
"请输入条码号"
></el-input>
...
...
@@ -247,8 +247,8 @@
v-show=
"isShowTip"
>
<i
class=
"
el-icon-info
"
style=
"color: #055fe7; font-size:
0.9375rem
"
class=
"
iconfont icon-tanhao1
"
style=
"color: #055fe7; font-size:
1rem; margin: 0 0.625rem;
"
></i>
已选择
<span
style=
"color: #055fe7"
>
{{
selectionData
.
length
}}
</span>
项
...
...
@@ -1489,14 +1489,14 @@ b {
font-size
:
12px
;
}
.el-button
{
width
:
96
px
;
width
:
72
px
;
height
:
32px
;
border-radius
:
4px
;
margin
:
0
;
padding
:
0
;
}
.el-button__inner
{
width
:
56
px
;
width
:
72
px
;
height
:
16px
;
font-size
:
14px
;
font-family
:
HarmonyOS_Sans_SC
;
...
...
@@ -1510,6 +1510,7 @@ b {
padding
:
0
8px
!important
;
background
:
#ddebff
;
border-radius
:
4px
;
font-size
:
0.75rem
;
}
.confirm-page
{
...
...
@@ -1608,6 +1609,9 @@ b {
border-radius
:
4px
;
//
border
:
1px
solid
#e6e6e8
;
}
.tmh
{
width
:
232px
;
}
/
deep
/
.el-input__inner
{
height
:
32px
!important
;
}
...
...
@@ -1690,7 +1694,7 @@ b {
}
.el-button--primary
{
width
:
96
px
;
width
:
72
px
;
height
:
32px
;
line-height
:
22px
;
padding
:
0
;
...
...
src/views/drFPTX/Index.vue
View file @
2fa280da
...
...
@@ -89,6 +89,7 @@
FPTX的条码号
</div>
<el-table
:border=
"false"
height=
"33rem"
:data=
"datas"
@
selection-change=
"checkAll1"
...
...
src/views/drFPTX/RAList.vue
View file @
2fa280da
This diff is collapsed.
Click to expand it.
src/views/zljc/Index.vue
View file @
2fa280da
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