Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
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
罗超
confucius
Commits
bb8347b4
Commit
bb8347b4
authored
Jan 29, 2021
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
4c2a90d4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
185 additions
and
4 deletions
+185
-4
index.js
src/api/okr/index.js
+13
-0
basecycle-form.vue
src/components/okr/basecycle-form.vue
+0
-0
baseset-form.vue
src/components/okr/baseset-form.vue
+1
-1
remind-form.vue
src/components/okr/remind-form.vue
+165
-0
ruleset-form.vue
src/components/okr/ruleset-form.vue
+0
-0
okrmanage.vue
src/pages/system/okrmanage.vue
+6
-3
No files found.
src/api/okr/index.js
View file @
bb8347b4
...
...
@@ -72,6 +72,19 @@ export function GetRuleTypeEnumList(data) {
})
}
/**
* 获取OKR提醒列表
* @param {JSON参数} data
*/
export
function
GetOKRRemindList
(
data
)
{
return
request
({
url
:
'/OKRPeriod/GetOKRRemindList'
,
method
:
'post'
,
data
})
}
src/components/
system
/basecycle-form.vue
→
src/components/
okr
/basecycle-form.vue
View file @
bb8347b4
File moved
src/components/
system
/baseset-form.vue
→
src/components/
okr
/baseset-form.vue
View file @
bb8347b4
...
...
@@ -151,7 +151,7 @@
import
{
GetOKRPeriodConfigInfo
}
from
'../../api/okr/index'
;
import
basecycleForm
from
'../../components/
system
/basecycle-form'
;
import
basecycleForm
from
'../../components/
okr
/basecycle-form'
;
export
default
{
meta
:
{
title
:
""
...
...
src/components/okr/remind-form.vue
0 → 100644
View file @
bb8347b4
<
style
>
.remindOne
{
border
:
1px
solid
rgba
(
187
,
191
,
196
,
.3
);
border-radius
:
4px
;
margin-bottom
:
12px
;
padding
:
20px
24px
8px
;
}
.Notifititle
{
position
:
relative
;
font-size
:
16px
;
line-height
:
24px
;
font-weight
:
500
;
color
:
#1f2329
;
padding-left
:
10px
;
margin-bottom
:
4px
;
}
.Notifititle
::before
{
position
:
absolute
;
left
:
0
;
top
:
4px
;
height
:
16px
;
width
:
0
;
content
:
""
;
border-left
:
2px
solid
#3370ff
;
}
.Notificat-item
{
padding
:
16px
0
;
border-bottom
:
1px
solid
rgba
(
187
,
191
,
196
,
.2
);
display
:
-ms-flexbox
;
display
:
flex
;
-ms-flex-align
:
center
;
align-items
:
center
;
}
.Notificat_Inner
{
font-size
:
14px
;
line-height
:
22px
;
color
:
#1f2329
;
margin-bottom
:
2px
;
}
.Notify_innerTwo
{
font-size
:
12px
;
line-height
:
18px
;
color
:
#8f959e
;
}
.Notify_Edit
{
cursor
:
pointer
;
color
:
#3370ff
;
}
</
style
>
<
template
>
<div>
<div
class=
"page-content"
>
<div
class=
"remindOne"
>
<div
class=
"Notifititle"
>
提醒全体成员
</div>
<div>
<div
class=
"Notificat-item"
>
<div
style=
"flex:1"
>
<div
class=
"Notificat_Inner"
>
填写 OKR(仅未填写的)
</div>
<div
class=
"Notify_innerTwo"
v-if=
"dataList&&dataList.length>0"
>
提醒时间:周期开始后第
{{
dataList
[
0
].
Days
}}
个工作日
{{
dataList
[
0
].
Time
}}
<span
class=
"Notify_Edit"
>
修改
</span>
</div>
</div>
<div>
<template
v-if=
"dataList&&dataList.length>0"
>
<q-toggle
size=
"md"
color=
"primary"
v-model=
"dataList[0].Enable"
:false-value=
"2"
:true-value=
"1"
/>
</
template
>
</div>
</div>
<div
class=
"Notificat-item"
style=
"border:0;"
>
<div
style=
"flex:1"
>
<div
class=
"Notificat_Inner"
>
给 OKR 打分(仅未打分的)
</div>
<div
class=
"Notify_innerTwo"
v-if=
"dataList&&dataList.length>0"
>
提醒时间:周期结束前第 {{dataList[1].Days}} 个工作日 {{dataList[1].Time}}
<span
class=
"Notify_Edit"
>
修改
</span>
</div>
</div>
<div>
<
template
v-if=
"dataList&&dataList.length>0"
>
<q-toggle
size=
"md"
color=
"primary"
v-model=
"dataList[1].Enable"
:false-value=
"2"
:true-value=
"1"
/>
</
template
>
</div>
</div>
</div>
</div>
<div
class=
"remindOne"
>
<div
class=
"Notifititle"
>
提醒管理者
</div>
<div>
<div
class=
"Notificat-item"
>
<div
style=
"flex:1"
>
<div
class=
"Notificat_Inner"
>
查看下级 OKR 填写情况(仅有下级未填写的)
</div>
<div
class=
"Notify_innerTwo"
v-if=
"dataList&&dataList.length>0"
>
提醒时间:周期开始后第 {{dataList[2].Days}} 个工作日 {{dataList[2].Time}}
<span
class=
"Notify_Edit"
>
修改
</span>
</div>
</div>
<div>
<
template
v-if=
"dataList&&dataList.length>0"
>
<q-toggle
size=
"md"
color=
"primary"
v-model=
"dataList[2].Enable"
:false-value=
"2"
:true-value=
"1"
/>
</
template
>
</div>
</div>
<div
class=
"Notificat-item"
style=
"border:0;"
>
<div
style=
"flex:1"
>
<div
class=
"Notificat_Inner"
>
查看下级 OKR 打分情况(仅有下级未打分的)
</div>
<div
class=
"Notify_innerTwo"
v-if=
"dataList&&dataList.length>0"
>
提醒时间:周期结束前第 {{dataList[3].Days}} 个工作日 {{dataList[2].Time}}
<span
class=
"Notify_Edit"
>
修改
</span>
</div>
</div>
<div>
<
template
v-if=
"dataList&&dataList.length>0"
>
<q-toggle
size=
"md"
color=
"primary"
v-model=
"dataList[3].Enable"
:false-value=
"2"
:true-value=
"1"
/>
</
template
>
</div>
</div>
</div>
</div>
<!-- <ruleseteditForm v-if="isShowsetForm" @close="closeruleset" :save-obj="ruleObj" @success="refreshRule">
</ruleseteditForm> -->
</div>
</div>
</template>
<
script
>
import
{
GetOKRRemindList
}
from
'../../api/okr/index'
;
// import ruleseteditForm from '../../components/okr/rulesetedit-form';
export
default
{
meta
:
{
title
:
"提醒设置"
},
// components: {
// ruleseteditForm
// },
data
()
{
return
{
dataList
:
[],
}
},
created
()
{},
mounted
()
{
this
.
getList
();
},
methods
:
{
//获取数据
getList
()
{
GetOKRRemindList
({}).
then
(
res
=>
{
console
.
log
(
res
,
'数据来了'
);
if
(
res
.
Code
==
1
)
{
this
.
dataList
=
res
.
Data
;
}
})
},
}
}
</
script
>
src/components/
system
/ruleset-form.vue
→
src/components/
okr
/ruleset-form.vue
View file @
bb8347b4
File moved
src/pages/system/okrmanage.vue
View file @
bb8347b4
...
...
@@ -12,18 +12,21 @@
</q-tabs>
<ruleset-form
v-if=
"tabCheck=='first'"
></ruleset-form>
<baseset-form
v-if=
"tabCheck=='second'"
></baseset-form>
<remind-form
v-if=
"tabCheck=='third'"
></remind-form>
</div>
</
template
>
<
script
>
import
rulesetForm
from
'../../components/system/ruleset-form'
;
import
basesetForm
from
'../../components/system/baseset-form'
;
import
rulesetForm
from
'../../components/okr/ruleset-form'
;
import
basesetForm
from
'../../components/okr/baseset-form'
;
import
remindForm
from
'../../components/okr/remind-form'
;
export
default
{
meta
:
{
title
:
"OKR设置"
},
components
:
{
rulesetForm
,
basesetForm
basesetForm
,
remindForm
},
data
()
{
return
{
...
...
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