Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
Project
Project
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
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
13b15d88
Commit
13b15d88
authored
2 years ago
by
纪泽龙
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jzl'
parents
6f2adafc
74d3e649
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
56 additions
and
26 deletions
+56
-26
Item.vue
...ews/educationPlanExam/trainingProgram/components/Item.vue
+55
-25
vue.config.js
danger-manage-web/vue.config.js
+1
-1
No files found.
danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Item.vue
View file @
13b15d88
...
...
@@ -3,39 +3,47 @@
<div
class=
"item flex"
:class=
"
{ active: isActive }">
<div
class=
"left flex"
>
<div
class=
"left-item flex"
:class=
"
{ active: isActive }">
<div
class=
"text"
>
<i
class=
"iconfont icon-24gl-checklist"
/>
<div
class=
"text flex"
>
<div
class=
"i-wrapper"
>
<i
class=
"iconfont icon-24gl-checklist"
/>
</div>
<div
ref=
"tp"
class=
"text-center-wrapper flex"
>
<div
ref=
"t"
style=
"margin-right: 10px"
v-if=
"!isActive"
>
{{
infoData
.
planName
}}
</div>
</div>
<span
style=
"margin-right: 10px"
v-if=
"!isActive"
>
{{
infoData
.
planName
}}
</span>
<el-input
<!--
<el-input
v-else
size=
"mini"
v-model=
"infoData.planName"
placeholder=
"请输入内容"
style=
"width: 120px"
></el-input>
></el-input>
-->
</div>
</div>
</div>
<div
class=
"right flex"
style=
"line-height: 110px;"
>
<div
style=
"margin-left: 20px"
v-if=
"infoData.personnelType==1"
>
员工培训
</div>
<div
style=
"margin-left: 20px"
v-if=
"infoData.personnelType==2"
>
承包商培训
</div>
<div
class=
"right flex"
style=
"line-height: 110px"
>
<div
style=
"margin-left: 20px"
v-if=
"infoData.personnelType == 1"
>
员工培训
</div>
<div
style=
"margin-left: 20px"
v-if=
"infoData.personnelType == 2"
>
承包商培训
</div>
</div>
<div
class=
"middle flex"
>
<div>
<div
class=
"top"
>
参与培训人员(
{{
personnelOptions
.
length
}}
)
</div>
<div
class=
"top"
>
参与培训人员(
{{
personnelOptions
.
length
}}
)
</div>
<div
class=
"bottom"
>
<!--
<el-checkbox-group
class=
""
v-model=
"infoData.postIds"
>
-->
<el-checkbox
:disabled=
"!isActive"
v-model=
"personnel.ischeck"
v-for=
"personnel in personnelOptions"
:label=
"personnel.postId"
:key=
"personnel.postId"
>
{{
personnel
.
postName
}}
</el-checkbox
>
<el-checkbox
:disabled=
"!isActive"
v-model=
"personnel.ischeck"
v-for=
"personnel in personnelOptions"
:label=
"personnel.postId"
:key=
"personnel.postId"
>
{{
personnel
.
postName
}}
</el-checkbox
>
<!--
</el-checkbox-group>
-->
</div>
</div>
...
...
@@ -43,7 +51,9 @@
<div
class=
"right flex"
>
<template
v-if=
"!isActive"
>
<div>
<el-button
type=
"text"
@
click=
"edit(personnelOptions)"
>
编辑
</el-button>
<el-button
type=
"text"
@
click=
"edit(personnelOptions)"
>
编辑
</el-button
>
<el-button
type=
"text"
@
click=
"deletePlan"
>
删除
</el-button>
</div>
</
template
>
...
...
@@ -86,7 +96,18 @@ export default {
return
this
.
isActiveId
===
this
.
infoData
.
planId
;
},
},
mounted
()
{},
mounted
()
{
console
.
log
(
this
.
$refs
.
t
.
offsetHeight
);
// 如果子元素的高大于父元素的高,就改变上下居中策略,改为滚动条展示
if
(
this
.
$refs
.
t
.
offsetHeight
>
this
.
$refs
.
tp
.
offsetHeight
)
{
console
.
log
(
this
.
$refs
.
tp
.
style
);
this
.
$refs
.
tp
.
style
.
overflow
=
"auto"
;
this
.
$refs
.
tp
.
style
.
alignItems
=
""
;
}
else
{
// console.log(this.$refs.t.offsetHeight)
// this.$refs.t.style.alignItems='center'
}
},
data
()
{
return
{
// 记录初始的选项
...
...
@@ -99,7 +120,7 @@ export default {
edit
(
personnelOptions
)
{
// 编辑
console
.
log
(
personnelOptions
);
this
.
$parent
.
addClick
(
this
.
infoData
,
personnelOptions
);
this
.
$parent
.
addClick
(
this
.
infoData
,
personnelOptions
);
//this.$emit("edit", this.oldInfoData);
},
save
()
{
...
...
@@ -204,11 +225,12 @@ export default {
align-items
:
center
;
justify-content
:
right
;
margin-top
:
25px
;
.left-item
{
transition
:
all
0
.5s
;
width
:
200px
;
height
:
60px
;
line-height
:
60px
;
//
line-height: 60px;
font-size
:
14px
;
padding-left
:
25px
;
border
:
1px
solid
#efefef
;
...
...
@@ -223,8 +245,16 @@ export default {
background
:
#1d84ff
;
color
:
#fff
;
}
span
{
margin-left
:
10px
;
.i-wrapper
{
height
:
60px
;
line-height
:
60px
;
padding-right
:
10px
;
}
.text-center-wrapper
{
height
:
100%
;
width
:
100%
;
// overflow: auto;
align-items
:
center
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
danger-manage-web/vue.config.js
View file @
13b15d88
...
...
@@ -35,7 +35,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[
process
.
env
.
VUE_APP_BASE_API
]:
{
target
:
process
.
env
.
VUE_APP_TARGET
,
//target: `http://192.168.2.21:8908/dangerManage`,
//
target: `http://192.168.2.21:8908/dangerManage`,
changeOrigin
:
true
,
pathRewrite
:
{
[
'^'
+
process
.
env
.
VUE_APP_BASE_API
]:
''
...
...
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