Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mocp-uniapp
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
pangchong
mocp-uniapp
Commits
34978d3a
Commit
34978d3a
authored
May 27, 2024
by
pangchong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 样式调整
parent
e111a694
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
27 deletions
+38
-27
src/components/global-icon/global-icon.vue
+6
-1
src/components/global-picker/global-picker.vue
+2
-1
src/pages/panel/appraisal-record/add.vue
+6
-1
src/pages/panel/appraisal-record/components/card-details.vue
+5
-5
src/pages/panel/appraisal-record/constants/details.scss
+9
-9
src/pages/panel/appraisal-record/details.vue
+10
-10
No files found.
src/components/global-icon/global-icon.vue
View file @
34978d3a
...
@@ -25,4 +25,9 @@ const getIconStyle = computed(() => {
...
@@ -25,4 +25,9 @@ const getIconStyle = computed(() => {
}
}
})
})
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
></
style
>
<
style
lang=
"scss"
scoped
>
.iconfont
{
position
:
relative
;
bottom
:
-2
rpx
;
}
</
style
>
src/components/global-picker/global-picker.vue
View file @
34978d3a
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
<view
class=
"picker-icon-close"
v-if=
"clearable && selectedValue && !disabled"
@
tap
.
stop=
"clear"
>
<view
class=
"picker-icon-close"
v-if=
"clearable && selectedValue && !disabled"
@
tap
.
stop=
"clear"
>
<up-icon
name=
"close-circle-fill"
color=
"#c0c4cc"
size=
"36rpx"
></up-icon>
<up-icon
name=
"close-circle-fill"
color=
"#c0c4cc"
size=
"36rpx"
></up-icon>
</view>
</view>
<up-icon
name=
"arrow-right"
color=
"#86909C"
size=
"36rpx"
></up-icon>
<up-icon
name=
"arrow-right"
color=
"#86909C"
size=
"36rpx"
v-if=
"mode == 'selector'"
></up-icon>
<global-icon
icon=
"calendar"
color=
"#86909C"
v-else
></global-icon>
</view>
</view>
</view>
</view>
</picker>
</picker>
...
...
src/pages/panel/appraisal-record/add.vue
View file @
34978d3a
<
template
>
<
template
>
<global-page
title=
"添加公司值班信息"
showEdit
@
handleCancel=
"handleCancel"
@
handleSave=
"handleSave"
>
<global-page
:title=
"formData.isDuty == 0 ? '添加公司值班信息' : '添加品质中心信息'"
showEdit
@
handleCancel=
"handleCancel"
@
handleSave=
"handleSave"
>
<view
class=
"form"
>
<view
class=
"form"
>
<up-form
labelPosition=
"left"
labelWidth=
"auto"
>
<up-form
labelPosition=
"left"
labelWidth=
"auto"
>
<up-form-item
:label=
"formData.isDuty == 0 ? '公司值班经理' : '品质中心经理'"
:borderBottom=
"true"
>
<up-form-item
:label=
"formData.isDuty == 0 ? '公司值班经理' : '品质中心经理'"
:borderBottom=
"true"
>
...
...
src/pages/panel/appraisal-record/components/card-details.vue
View file @
34978d3a
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<view
class=
"card-title"
>
<view
class=
"card-title"
>
<view
class=
"left"
>
<view
class=
"left"
>
<global-icon
:icon=
"titleIcon"
color=
"#1D2129"
></global-icon>
<global-icon
:icon=
"titleIcon"
color=
"#1D2129"
></global-icon>
<text>
{{
title
}}
</text>
<text
class=
"txt"
>
{{
title
}}
</text>
</view>
</view>
<view
class=
"right"
v-if=
"edit"
>
<view
class=
"right"
v-if=
"edit"
>
<global-button
type=
"text"
@
tap=
"handleAdd"
>
{{
calendar
!=
-
1
?
'编辑'
:
'添加'
}}
</global-button>
<global-button
type=
"text"
@
tap=
"handleAdd"
>
{{
calendar
!=
-
1
?
'编辑'
:
'添加'
}}
</global-button>
...
@@ -21,11 +21,11 @@
...
@@ -21,11 +21,11 @@
<view
class=
"card-footer"
>
<view
class=
"card-footer"
>
<view
class=
"label"
>
<view
class=
"label"
>
<global-icon
icon=
"idcard"
color=
"#1D2129"
></global-icon>
<global-icon
icon=
"idcard"
color=
"#1D2129"
></global-icon>
<text>
{{ idcard || '-' }}
</text>
<text
class=
"txt"
>
{{ idcard || '-' }}
</text>
</view>
</view>
<view
class=
"label"
>
<view
class=
"label"
>
<global-icon
icon=
"calendar"
color=
"#1D2129"
></global-icon>
<global-icon
icon=
"calendar"
color=
"#1D2129"
></global-icon>
<text>
{{ calendar != -1 ? timeStampFormat(calendar) : '-' }}
</text>
<text
class=
"txt"
>
{{ calendar != -1 ? timeStampFormat(calendar) : '-' }}
</text>
</view>
</view>
</view>
</view>
</slot>
</slot>
...
@@ -86,7 +86,7 @@ const handleAdd = () => {
...
@@ -86,7 +86,7 @@ const handleAdd = () => {
.left
{
.left
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
te
xt
{
.t
xt
{
margin-left
:
8
rpx
;
margin-left
:
8
rpx
;
}
}
}
}
...
@@ -100,7 +100,7 @@ const handleAdd = () => {
...
@@ -100,7 +100,7 @@ const handleAdd = () => {
justify-content
:
flex-end
;
justify-content
:
flex-end
;
.label
{
.label
{
margin-left
:
16
rpx
;
margin-left
:
16
rpx
;
te
xt
{
.t
xt
{
margin-left
:
16
rpx
;
margin-left
:
16
rpx
;
}
}
}
}
...
...
src/pages/panel/appraisal-record/constants/details.scss
View file @
34978d3a
...
@@ -36,17 +36,17 @@
...
@@ -36,17 +36,17 @@
padding
:
16rpx
0
;
padding
:
16rpx
0
;
&
-top
{
&
-top
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
flex-direction
:
column
;
justify-content
:
space-between
;
.top
{
.left
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
te
xt
{
.t
xt
{
margin-left
:
4rpx
;
margin-left
:
4rpx
;
}
}
}
}
.right
{
.bottom
{
text
{
margin-top
:
16rpx
;
.txt
{
margin-left
:
24rpx
;
margin-left
:
24rpx
;
}
}
}
}
...
@@ -63,8 +63,8 @@
...
@@ -63,8 +63,8 @@
color
:
#1d2129
;
color
:
#1d2129
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
te
xt
{
.t
xt
{
margin-left
:
16
rpx
;
margin-left
:
8
rpx
;
}
}
}
}
&
-center
{
&
-center
{
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
.person-info
{
.person-info
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
te
xt
{
.t
xt
{
margin-left
:
16rpx
;
margin-left
:
16rpx
;
}
}
&
:first-child
{
&
:first-child
{
...
...
src/pages/panel/appraisal-record/details.vue
View file @
34978d3a
...
@@ -31,33 +31,33 @@
...
@@ -31,33 +31,33 @@
</view>
</view>
<view
class=
"details-body"
>
<view
class=
"details-body"
>
<view
class=
"details-body-top"
>
<view
class=
"details-body-top"
>
<view
class=
"
left
"
>
<view
class=
"
top
"
>
<global-icon
icon=
"mind-mapping"
></global-icon>
<global-icon
icon=
"mind-mapping"
></global-icon>
<text
>
来源编号:{{ details.eventSource || '暂无~
' }}
</text>
<text
class=
"txt u-line-1"
>
事件来源:{{ details.eventSource || ' -
' }}
</text>
</view>
</view>
<view
class=
"
right
"
>
<view
class=
"
bottom"
v-if=
"details.department != '-1' && details.appraisee != '-1'
"
>
{{ details.department != '-1' ? details.department : '' }}
{{ details.department != '-1' ? details.department : '
-
' }}
<text
>
{{ details.appraisee != '-1' ? details.appraisee : '
' }}
</text>
<text
class=
"txt"
>
{{ details.appraisee != '-1' ? details.appraisee : '-
' }}
</text>
</view>
</view>
</view>
</view>
<view
class=
"details-body-bottom"
>
<view
class=
"details-body-bottom"
>
{{ details.eventMsg || '
暂无内容~
' }}
{{ details.eventMsg || '
-
' }}
</view>
</view>
</view>
</view>
<view
class=
"details-footer"
>
<view
class=
"details-footer"
>
<view
class=
"details-footer-top"
>
<view
class=
"details-footer-top"
>
<global-icon
icon=
"subscribed"
color=
"#1D2129"
></global-icon>
<global-icon
icon=
"subscribed"
color=
"#1D2129"
></global-icon>
<text
>
{{ details.examineType != -1 ? details.examineType : '暂无内容~
' }}
</text>
<text
class=
"txt"
>
{{ details.examineType != -1 ? details.examineType : '-
' }}
</text>
</view>
</view>
<view
class=
"details-footer-center"
>
{{ details.examineBasis }}
</view>
<view
class=
"details-footer-center"
>
{{ details.examineBasis
|| ' -'
}}
</view>
<view
class=
"details-footer-bottom"
>
<view
class=
"details-footer-bottom"
>
<view
class=
"person-info"
>
<view
class=
"person-info"
>
<global-icon
icon=
"idcard"
></global-icon>
<global-icon
icon=
"idcard"
></global-icon>
<text>
当班人员:{{ details.onDutyUser || '-' }}
</text>
<text
class=
"txt"
>
当班人员:{{ details.onDutyUser || '-' }}
</text>
</view>
</view>
<view
class=
"person-info"
>
<view
class=
"person-info"
>
<global-icon
icon=
"idcard"
></global-icon>
<global-icon
icon=
"idcard"
></global-icon>
<text>
值班人员:{{ details.dmName || '-' }}
</text>
<text
class=
"txt"
>
值班人员:{{ details.dmName || '-' }}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
...
...
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