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
f8429996
Commit
f8429996
authored
Mar 12, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
6ddb30e3
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
21 additions
and
97 deletions
+21
-97
course-form.vue
src/components/course/course-form.vue
+1
-4
job-form.vue
src/components/course/job-form.vue
+1
-1
notify.vue
src/components/global/notify.vue
+1
-1
user-right-box.vue
src/components/global/user-right-box.vue
+2
-2
kr-power.vue
src/components/okr/kr-power.vue
+2
-4
kr-union.vue
src/components/okr/kr-union.vue
+0
-3
objective-process.vue
src/components/okr/objective-process.vue
+0
-1
okr-add.vue
src/components/okr/okr-add.vue
+1
-1
okr-emp-info.vue
src/components/okr/okr-emp-info.vue
+0
-5
okr-info.vue
src/components/okr/okr-info.vue
+0
-1
progressRemark.vue
src/components/okr/progressRemark.vue
+0
-2
remindtime-form.vue
src/components/okr/remindtime-form.vue
+0
-1
GraphBottomPanel.vue
src/components/relation/GraphBottomPanel.vue
+0
-1
GraphMiniToolBar.vue
src/components/relation/GraphMiniToolBar.vue
+2
-10
GraphMiniView.vue
src/components/relation/GraphMiniView.vue
+1
-1
GraphSettingPanel.vue
src/components/relation/GraphSettingPanel.vue
+4
-13
SeeksAutoLayouter.js
...mponents/relation/core4vue/layouters/SeeksAutoLayouter.js
+3
-5
SeeksFixedLayouter.js
...ponents/relation/core4vue/layouters/SeeksFixedLayouter.js
+0
-1
index.vue
src/components/relation/index.vue
+3
-31
course.vue
src/pages/course/course.vue
+0
-1
index.vue
src/pages/okr/index.vue
+0
-2
okr-align-view.vue
src/pages/okr/okr-align-view.vue
+0
-6
No files found.
src/components/course/course-form.vue
View file @
f8429996
...
...
@@ -393,14 +393,11 @@ export default {
var
qMsg
=
{};
queryCourseCategoryTree
(
qMsg
).
then
(
res
=>
{
this
.
TreeCategoryList
=
res
.
Data
;
console
.
log
(
this
.
objOption
.
CateId
,
this
.
TreeCategoryList
)
//if(this.objOption.CateId!=0){
this
.
TreeCategoryList
.
forEach
(
x
=>
{
if
(
x
.
CateId
==
this
.
objOption
.
CateId
){
this
.
chosenCateId
=
x
}
})
//}
});
},
//新增阶梯定价
...
...
@@ -513,7 +510,7 @@ export default {
this
.
objOption
.
StepPriceList
=
this
.
ladderPriceList
;
this
.
objOption
.
Teacher_Ids
=
Teacher_Ids
;
this
.
objOption
.
Saleplat
=
salePlat
;
console
.
log
(
this
.
chosenCateId
)
this
.
objOption
.
CateId
=
this
.
chosenCateId
saveCourseInfo
(
this
.
objOption
)
.
then
(
res
=>
{
...
...
src/components/course/job-form.vue
View file @
f8429996
...
...
@@ -118,7 +118,7 @@
Uid
:
this
.
getLocalStorage
().
Id
}
UploadLocalSystem
(
JSON
.
stringify
(
fileParams
),
files
.
file
,
res
=>
{
console
.
log
(
"res"
,
res
);
})
},
//获取教师下拉
...
...
src/components/global/notify.vue
View file @
f8429996
...
...
@@ -254,7 +254,7 @@ export default {
title
:
'功能提示'
,
message
:
'灰度测试功能,即将在下版本中开启'
}).
onOk
(()
=>
{
// console.log('OK')
});
},
},
...
...
src/components/global/user-right-box.vue
View file @
f8429996
...
...
@@ -116,7 +116,7 @@ export default {
title
:
'功能提示'
,
message
:
'此功能即将在下一版本中开放'
}).
onOk
(()
=>
{
// console.log('OK')
});
},
logout
()
{
...
...
@@ -126,7 +126,7 @@ export default {
this
.
$router
.
push
(
'/login'
)
})
.
catch
((
e
)
=>
{
console
.
log
(
e
)
})
},
},
...
...
src/components/okr/kr-power.vue
View file @
f8429996
...
...
@@ -346,7 +346,7 @@ export default {
});
},
changeType
()
{
console
.
log
(
this
.
defaultGroupType
);
},
querySearch
()
{
this
.
searchText
=
this
.
searchText
.
trim
();
...
...
@@ -372,7 +372,7 @@ export default {
if
(
this
.
postsList
.
length
>
0
)
{
this
.
showResult
=
true
;
}
console
.
log
(
this
.
postsList
);
});
},
queryDepts
()
{
...
...
@@ -402,7 +402,6 @@ export default {
return
x
;
}
});
console
.
log
(
pw
);
if
(
pw
&&
pw
.
Id
)
{
if
(
pw
.
State
!=
this
.
defaultPower
.
id
)
{
pw
.
State
=
this
.
defaultPower
.
id
;
...
...
@@ -446,7 +445,6 @@ export default {
TargetId
:
this
.
kr
.
Id
}).
then
(
r
=>
{
this
.
powersList
=
r
.
Data
;
console
.
log
(
this
.
powersList
);
});
}
}
...
...
src/components/okr/kr-union.vue
View file @
f8429996
...
...
@@ -402,7 +402,6 @@ export default {
queryKRRuleRangeList
({
KeyResultId
:
this
.
kr
.
Id
}).
then
(
r
=>
{
console
.
log
(
r
.
Data
)
r
.
Data
.
forEach
(
x
=>
{
if
(
x
.
Type
==
2
&&
x
.
RelationId
!=
this
.
userInfo
.
Id
)
{
this
.
rangeList
.
push
({
...
...
@@ -419,10 +418,8 @@ export default {
name
:
x
.
RelationName
,
type
:
1
});
console
.
log
(
'this.rangeList'
,
this
.
rangeList
);
}
});
console
.
log
(
this
.
rangeList
);
});
}
}
...
...
src/components/okr/objective-process.vue
View file @
f8429996
...
...
@@ -69,7 +69,6 @@ export default {
}
},
mounted
()
{
console
.
log
(
this
.
obj
)
if
(
this
.
obj
.
IsDefaultState
==
1
){
this
.
status
=
'0'
}
else
{
...
...
src/components/okr/okr-add.vue
View file @
f8429996
...
...
@@ -1000,7 +1000,7 @@ export default {
});
})
.
onCancel
(()
=>
{
// console.log('>>>> Cancel')
});
}
}
...
...
src/components/okr/okr-emp-info.vue
View file @
f8429996
...
...
@@ -186,7 +186,6 @@ export default {
watch
:
{
userObj
:
{
handler
(
newV
,
oldV
)
{
console
.
log
(
newV
);
this
.
user
=
newV
;
this
.
init
();
this
.
queryLikeState
();
...
...
@@ -207,10 +206,8 @@ export default {
},
created
()
{
this
.
user
=
this
.
userObj
;
console
.
log
(
this
.
auditMode
);
if
(
this
.
auditMode
)
{
this
.
auditPeroids
=
this
.
peroids
.
split
(
","
);
console
.
log
(
this
.
auditPeroids
);
}
},
mounted
()
{
...
...
@@ -279,7 +276,6 @@ export default {
this
.
periodList
.
forEach
(
x
=>
{
x
.
isHaveAudit
=
this
.
auditPeroids
.
indexOf
(
x
.
Id
.
toString
())
!=
-
1
;
});
console
.
log
(
this
.
periodList
);
this
.
$emit
(
"change"
,
this
.
periodList
[
this
.
periodId
].
Id
);
if
(
!
this
.
auditMode
)
{
this
.
queryMyObjective
();
...
...
@@ -303,7 +299,6 @@ export default {
UserId
:
this
.
user
.
Id
};
queryOtherObjectiveList
(
msg
).
then
(
r
=>
{
console
.
log
(
r
);
if
(
r
.
Data
.
List
&&
r
.
Data
.
List
.
length
>
0
)
{
r
.
Data
.
List
.
forEach
(
x
=>
{
x
.
PeriodId
=
this
.
periodList
[
this
.
periodId
].
Id
;
...
...
src/components/okr/okr-info.vue
View file @
f8429996
...
...
@@ -284,7 +284,6 @@ export default {
},
200
);
}
else
{
let
keyn
=
`object_
${
this
.
objectiveList
.
length
-
1
}
`
;
console
.
log
(
this
.
$refs
[
keyn
]);
this
.
$refs
[
keyn
][
0
].
$refs
.
obj_content
.
focus
();
}
},
...
...
src/components/okr/progressRemark.vue
View file @
f8429996
...
...
@@ -264,13 +264,11 @@ export default {
},
returnContent
()
{
this
.
dat
.
content
=
this
.
$refs
.
ue
.
getUEContent
();
console
.
log
(
this
.
dat
.
content
);
},
showContent
()
{
this
.
show
=
!
this
.
show
;
},
setVal
(
val
)
{
//this.$refs.div.innerHTML = val;
this
.
txt
=
val
;
this
.
ueditor
.
value
=
decodeURIComponent
(
val
);
this
.
chosenText
=
""
;
...
...
src/components/okr/remindtime-form.vue
View file @
f8429996
...
...
@@ -140,7 +140,6 @@
},
computed
:
{},
mounted
()
{
console
.
log
(
this
.
saveObj
,
'saveObj'
);
this
.
msg
.
Id
=
this
.
saveObj
.
Id
;
this
.
daysOne
=
this
.
saveObj
.
Days
.
split
(
','
);
this
.
msg
.
Time
=
this
.
saveObj
.
Time
;
...
...
src/components/relation/GraphBottomPanel.vue
View file @
f8429996
...
...
@@ -8,7 +8,6 @@
// import SeeksRGStore from './core4vue/SeeksRGStore'
// import { mapState } from 'vuex'
// var _parent = this.$parent
// console.log('GraphSettingPanel.vue:', _parent)
export
default
{
name
:
'GraphBottomPanel'
,
props
:
{
...
...
src/components/relation/GraphMiniToolBar.vue
View file @
f8429996
...
...
@@ -120,13 +120,6 @@ export default {
downloadPanelWidth
:
106
}
},
// watch: {
// 'graphSetting.layoutName': function(newV, oldV) {
// console.log('change layout:', newV, oldV)
// SeeksRGLayouters.switchLayout(newV, this.graphSetting)
// this.refresh()
// }
// },
mounted
()
{
if
(
this
.
$parent
.
onDownloadExcel
!==
null
)
{
this
.
downloadPanelWidth
+=
50
...
...
@@ -145,17 +138,16 @@ export default {
this
.
refresh
()
},
toggleAutoLayout
()
{
// console.log('this.graphSetting.autoLayouting', this.graphSetting.autoLayouting)
this
.
graphSetting
.
autoLayouting
=
!
this
.
graphSetting
.
autoLayouting
if
(
this
.
graphSetting
.
autoLayouting
)
{
if
(
!
this
.
graphSetting
.
layouter
.
autoLayout
)
{
console
.
log
(
'当前布局不支持自动布局!'
)
}
else
{
this
.
graphSetting
.
layouter
.
autoLayout
(
true
)
}
}
else
{
if
(
!
this
.
graphSetting
.
layouter
.
stop
)
{
console
.
log
(
'当前布局不支持自动布局stop!'
)
}
else
{
this
.
graphSetting
.
layouter
.
stop
()
}
...
...
src/components/relation/GraphMiniView.vue
View file @
f8429996
...
...
@@ -46,7 +46,7 @@ export default {
}
else
{
this
.
zoom
=
1
}
// console.log('Mini View style:', _view_center_x, _canvas_center_x)
var
style
=
{
width
:
_width
+
'px'
,
height
:
_height
+
'px'
,
...
...
src/components/relation/GraphSettingPanel.vue
View file @
f8429996
...
...
@@ -112,7 +112,7 @@ import SeeksRGLayouters from './core4vue/SeeksRGLayouters'
// import SeeksRGStore from './core4vue/SeeksRGStore'
// import { mapState } from 'vuex'
// var _parent = this.$parent
// console.log('GraphSettingPanel.vue:', _parent)
export
default
{
name
:
'GraphSettingPanel'
,
props
:
{
...
...
@@ -129,16 +129,7 @@ export default {
currentLayoutName
:
''
}
},
// computed: mapState({
// graphSetting: () => _parent.graphSetting
// }),
// watch: {
// 'graphSetting.layoutName': function(newV, oldV) {
// console.log('change layout:', newV, oldV)
// SeeksRGLayouters.switchLayout(newV, this.graphSetting)
// this.$parent.refresh()
// }
// },
methods
:
{
toggleSettingPanel
()
{
this
.
showSettingPanel
=
!
this
.
showSettingPanel
...
...
@@ -146,13 +137,13 @@ export default {
toggleAutoLayout
()
{
if
(
this
.
graphSetting
.
autoLayouting
)
{
if
(
!
this
.
graphSetting
.
layouter
.
autoLayout
)
{
console
.
log
(
'当前布局不支持自动布局!'
)
}
else
{
this
.
graphSetting
.
layouter
.
autoLayout
(
true
)
}
}
else
{
if
(
!
this
.
graphSetting
.
layouter
.
stop
)
{
console
.
log
(
'当前布局不支持自动布局stop!'
)
}
else
{
this
.
graphSetting
.
layouter
.
stop
()
}
...
...
src/components/relation/core4vue/layouters/SeeksAutoLayouter.js
View file @
f8429996
...
...
@@ -217,12 +217,10 @@ function SeeksAutoLayouter(layoutSetting, graphSetting) {
if
(
zero_length
<
30
)
{
Kf
=
Kf
*
100
}
// if (length < 100)Kf = Kf * 2
var
_buff_x
=
(
node1
.
x
-
node2
.
x
)
/
length
var
_buff_y
=
(
node1
.
y
-
node2
.
y
)
/
length
// if (_buff_x < 30)_buff_x = 1
// if (_buff_y < 30)_buff_y = 1
// console.log({ Kf, _buff_x, _buff_y, zero_length })
this
.
addFtoNode
(
node1
,
_buff_x
*
Kf
,
_buff_y
*
Kf
,
0
)
this
.
addFtoNode
(
node2
,
_buff_x
*
Kf
*
-
1
,
_buff_y
*
Kf
*
-
1
,
0
)
}
...
...
@@ -233,7 +231,7 @@ function SeeksAutoLayouter(layoutSetting, graphSetting) {
return
(
8
-
level
)
/
8
}
this
.
addFtoNode
=
function
(
node
,
x
,
y
)
{
// console.log('Add F:', node.text, type, parseInt(x), parseInt(y))
if
(
isNaN
(
x
)
||
isNaN
(
y
))
{
return
}
...
...
src/components/relation/core4vue/layouters/SeeksFixedLayouter.js
View file @
f8429996
...
...
@@ -11,7 +11,6 @@ function SeeksFixedLayouter(layoutSetting, graphSetting) {
}
this
.
placeNodes
=
function
(
allNodes
,
rootNode
)
{
if
(
!
rootNode
)
{
console
.
log
(
'root is null:'
,
rootNode
)
return
}
else
{
if
(
window
.
SeeksGraphDebug
)
console
.
log
(
'layout by root:'
,
rootNode
)
...
...
src/components/relation/index.vue
View file @
f8429996
...
...
@@ -194,17 +194,6 @@
},
data
()
{
var
wheelEvent
=
{}
// console.log('this.options.disableZoom:', this.options.disableZoom)
// if (this.options.disableZoom) {
// wheelEvent = {
// 'mousewheel':this.mouseListener
// }
// } else {
// wheelEvent = {
// 'mousewheel':this.mouseListener
// }
// console.log('wheelEvent:', wheelEvent)
// }
return
{
wheelEvent
,
version
:
'1.1.0'
,
...
...
@@ -302,23 +291,11 @@
this
.
syncToolsPosition
()
},
methods
:
{
// getCanvasSizeAndPosition() {
// console.log('重新计算:getCanvasSizeAndPosition')
// return {
// 'width': this.graphSetting.canvasSize.width + 'px',
// 'height': this.graphSetting.canvasSize.height + 'px',
// 'margin-left': (this.graphSetting.canvasOffset.x) + 'px',
// 'margin-top': (this.graphSetting.canvasOffset.y) + 'px',
// 'background-color': this.canvasBackgroundColor,
// 'transform': 'scale(' + this.graphSetting.canvasZoom / 100 + ',' + this.graphSetting.canvasZoom / 100 + ')'
// // 'transform-origin': (this.graphSetting.canvasOffset.zoom_buff_x * 100).toFixed(2) + '% ' + (this.graphSetting.canvasOffset.zoom_buff_y * 100).toFixed(2) + '%'
// }
// },
init
()
{
this
.
$refs
.
rgCanvas
.
style
.
setProperty
(
'--stroke'
,
'url(
\'
#'
+
this
.
graphSetting
.
instanceId
+
'-lineStyle
\'
)'
)
this
.
$refs
.
rgCanvas
.
style
.
setProperty
(
'--markerEnd'
,
'url(
\'
#'
+
this
.
graphSetting
.
instanceId
+
'-arrow-default
\'
)'
)
this
.
$refs
.
rgCanvas
.
style
.
setProperty
(
'--markerEndChecked'
,
'url(
\'
#'
+
this
.
graphSetting
.
instanceId
+
'-arrow-checked
\'
)'
)
// console.log('#############Seeks graph viewSize:', this.graphSetting.viewSize.width, this.graphSetting.viewSize.height)
this
.
cycleTask
()
this
.
resetViewSize
()
this
.
refreshNVAnalysisInfo
()
...
...
@@ -1183,7 +1160,6 @@
this
.
graphSetting
.
canvasOffset
.
x
+=
_speed_x
this
.
graphSetting
.
canvasOffset
.
y
+=
_speed_y
},
()
=>
{
// console.log('分解完毕....')
callback
()
})
},
...
...
@@ -1196,12 +1172,10 @@
this
.
animateStepAction
(
0
,
_perDelay
,
_allStepNum
,
()
=>
{
this
.
zoom
(
_speed
)
},
()
=>
{
// console.log('分解完毕....')
callback
()
})
},
animateStepAction
(
stepIndex
,
delay
,
allStepNum
,
stepCallback
,
finalCallback
)
{
// console.log(Date.now() + '步骤[' + stepIndex + ']')
if
(
stepIndex
<
allStepNum
)
{
stepCallback
(
stepIndex
,
allStepNum
)
setTimeout
(()
=>
{
...
...
@@ -1224,7 +1198,7 @@
}
},
onNodeCollapseEvent
(
node
,
e
)
{
console
.
log
(
'onNodeCollapse:'
,
node
)
if
(
this
.
onNodeCollapse
)
{
this
.
onNodeCollapse
(
node
,
e
)
}
...
...
@@ -1248,8 +1222,7 @@
return
this
.
SeeksRGStore
.
getOptions
()
},
printGraphJsonData
()
{
console
.
log
(
'graph options:'
,
JSON
.
stringify
(
this
.
getGraphJsonOptions
()))
console
.
log
(
'graph json data:'
,
JSON
.
stringify
(
this
.
getGraphJsonData
()))
}
}
}
...
...
@@ -1257,7 +1230,6 @@
<
style
scoped
>
.rel-map
{
background-color
:
#ffffff
;
/*background-image: url("/static/images/graph-bg.png");*/
overflow
:
hidden
;
cursor
:
default
;
user-select
:
none
;
...
...
src/pages/course/course.vue
View file @
f8429996
...
...
@@ -368,7 +368,6 @@ export default {
},
computed
:
mapState
({
isHavePriceAction
(
state
)
{
console
.
log
(
state
.
user
.
userInfo
)
if
(
state
.
user
.
userInfo
.
ActionMenuList
)
{
let
action
=
state
.
user
.
userInfo
.
ActionMenuList
.
find
(
x
=>
{
if
(
x
.
FunctionCode
==
"Edit_CoursePrice"
)
{
...
...
src/pages/okr/index.vue
View file @
f8429996
...
...
@@ -473,7 +473,6 @@ export default {
getUserList
()
{
queryOKRMyEmployeeList
().
then
(
res
=>
{
this
.
menuList
=
res
.
Data
;
console
.
log
(
this
.
menuList
);
});
},
changeMenu
(
m
,
t
,
obj
)
{
...
...
@@ -491,7 +490,6 @@ export default {
},
openUserObjective
(
obj
)
{
this
.
isOtherUser
=
obj
.
Id
!=
this
.
userInfo
.
Id
;
console
.
log
(
this
.
isOtherUser
,
obj
.
Id
,
this
.
userInfo
);
if
(
this
.
isOtherUser
)
{
this
.
chosenUser
=
obj
;
}
else
{
...
...
src/pages/okr/okr-align-view.vue
View file @
f8429996
...
...
@@ -156,7 +156,6 @@ export default {
?
obj
.
ChildNum
:
0
};
console
.
log
(
node
.
id
)
if
(
prev
.
indexOf
(
'child'
)
!=
-
1
)
{
node
.
childNum
=
obj
.
ChildList
?
obj
.
ChildList
.
length
...
...
@@ -217,7 +216,6 @@ export default {
applyCollapseStyle2Node
(
_node
)
{
// _node的子节点将被隐藏,同时让_node右侧显示一个加号,点击后可以展开子节点
if
(
_node
.
lot
.
childs
.
length
>
0
)
{
console
.
log
(
_node
);
_node
.
lot
.
childs
.
forEach
(
thisChildNode
=>
{
thisChildNode
.
isShow
=
false
;
this
.
applyCollapseStyle2Node
(
thisChildNode
);
...
...
@@ -227,23 +225,19 @@ export default {
}
},
onNodeCollapse
(
node
,
e
)
{
console
.
log
(
"onNodeCollapse2222:"
,
node
);
// 当有一些节点被显示或隐藏起来时,会让图谱看着很难看,需要布局器重新为节点分配位置,所以这里需要调用refresh方法来重新布局
this
.
$refs
.
seeksRelationGraph
.
refresh
();
},
onNodeExpand
(
node
,
e
)
{
// 当有一些节点被显示或隐藏起来时,会让图谱看着很难看,需要布局器重新为节点分配位置,所以这里需要调用refresh方法来重新布局
console
.
log
(
"onNodeExpand1111:"
,
node
);
//this.$refs.seeksRelationGraph.refresh();
// 根据具体的业务需要决定是否需要从后台加载数据
if
(
!
node
.
data
.
isNeedLoadDataFromRemoteServer
)
{
console
.
log
(
"这个节点的子节点已经加载过了"
);
this
.
$refs
.
seeksRelationGraph
.
refresh
();
return
;
}
//判断是否已经动态加载数据了
if
(
node
.
data
.
childrenLoaded
)
{
console
.
log
(
"这个节点的子节点已经加载过了"
);
this
.
$refs
.
seeksRelationGraph
.
refresh
();
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