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
8a56787f
Commit
8a56787f
authored
Mar 25, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d11daa27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
825 additions
and
1028 deletions
+825
-1028
SeeksGraphMath.js
src/components/relation/core4vue/SeeksGraphMath.js
+0
-1
SeeksRGNode.vue
src/components/relation/core4vue/SeeksRGNode.vue
+1
-69
SeeksRGStore.js
src/components/relation/core4vue/SeeksRGStore.js
+0
-2
SeeksAutoLayouter.js
...mponents/relation/core4vue/layouters/SeeksAutoLayouter.js
+0
-1
SeeksBidirectionalTreeLayouter.js
...tion/core4vue/layouters/SeeksBidirectionalTreeLayouter.js
+127
-232
studyproaudit-form.vue
src/components/studyAbroad/studyproaudit-form.vue
+2
-3
studyproauditinfo-form.vue
src/components/studyAbroad/studyproauditinfo-form.vue
+2
-2
EasyReport.vue
src/pages/financial/EasyReport.vue
+311
-366
TeamRevenueReport.vue
src/pages/financial/TeamRevenueReport.vue
+382
-348
okr-align-view.vue
src/pages/okr/okr-align-view.vue
+0
-2
studyabroad.vue
src/pages/studyAbroad/studyabroad.vue
+0
-2
No files found.
src/components/relation/core4vue/SeeksGraphMath.js
View file @
8a56787f
...
...
@@ -476,7 +476,6 @@ var SeeksGraphMath = {
}
},
conductStrengthToParents
(
node
)
{
console
.
log
(
"寻找parent:"
,
node
.
id
,
node
.
lot
.
parent
)
if
(
node
.
lot
.
parent
&&
!
node
.
nodeParent
)
{
node
.
lot
.
parent
.
lot
.
strengthWithChilds
+=
1
this
.
conductStrengthToParents
(
node
.
lot
.
parent
)
...
...
src/components/relation/core4vue/SeeksRGNode.vue
View file @
8a56787f
...
...
@@ -170,23 +170,10 @@ export default {
:
"c-collapsed"
;
}
},
// show() {
//
// },
watch
:
{
// 'nodeProps.isShow': function(v) {
// console.log('nodeProps.isShow:', v)
// if (v === true) {
// this.$nextTick(() => {
// this.nodeProps.el.offsetWidth = this.$refs.seeksRGNode.offsetWidth
// this.nodeProps.el.offsetHeight = this.$refs.seeksRGNode.offsetHeight
// console.log('node 挂载 el size:', this.$refs.seeksRGNode.offsetWidth, this.$refs.seeksRGNode.offsetHeight)
// })
// }
// }
},
created
()
{
// Vue.version
if
(
this
.
nodeProps
.
childNum
>
0
)
{
this
.
childNum
=
this
.
nodeProps
.
childNum
;
}
else
if
(
this
.
nodeProps
.
childNum
&&
this
.
nodeProps
.
childNum
.
length
>
0
)
{
...
...
@@ -198,14 +185,9 @@ export default {
if
(
this
.
nodeProps
.
parentNum
){
this
.
parentNum
=
this
.
nodeProps
.
parentNum
}
// if(this.nodeProps.nodeParent){
// this.nodeProps.isShow=false
// }
},
mounted
()
{
this
.
refreshNodeProperties
();
// this.leave(this.$refs.seeksRGNode)
// console.log('node show:', this.nodeProps.text, this.$parent.$slots.node)
},
beforeDestroy
()
{
const
elx
=
this
.
$refs
.
seeksRGNode
;
...
...
@@ -214,27 +196,8 @@ export default {
methods
:
{
refreshNodeProperties
()
{
this
.
nodeProps
.
el
=
this
.
$refs
.
seeksRGNode
;
// console.log('node 挂载 el:', this.nodeProps.text, this.nodeProps.el.offsetWidth, this.nodeProps.el.offsetHeight)
// this.$nextTick(() => {
// this.nodeProps.el.offsetWidth = this.$refs.seeksRGNode.offsetWidth
// this.nodeProps.el.offsetHeight = this.$refs.seeksRGNode.offsetHeight
// console.log('node 挂载 el size:', this.$refs.seeksRGNode.offsetWidth, this.$refs.seeksRGNode.offsetHeight)
// })
// this.nodeProps.em = true
// if (this.nodeProps.style === 0) {
// this.nodeProps.name = SeeksRGUtils.transName4Circle(this.nodeProps.name, this.nodeProps.el.offsetWidth)
// console.log('resize node name:', this.name)
// }
// this.nodeProps.el_width = this.$refs.seeksRGNode.offsetWidth
// this.nodeProps.el_height = this.$refs.seeksRGNode.offsetHeight
// var __this = this
// setInterval(function() {
// __this.nodeProps.x = __this.nodeProps.x
// __this.nodeProps.y = __this.nodeProps.y
// }, 1000)
},
getNodeName
()
{
// if (this.hovering) return 'N-' + this.nodeProps.seeks_id
if
(
this
.
hovering
)
{
return
this
.
nodeProps
.
text
;
}
...
...
@@ -269,11 +232,8 @@ export default {
}
}
return
_text_arr
.
join
(
""
);
// return _num_l + '/' + _num_c
// return this.nodeProps.text
},
expandOrCollapseNode
(
e
)
{
console
.
log
(
"切换Node显示状态"
,
this
.
nodeProps
.
lot
.
childs
)
if
(
this
.
nodeProps
.
expanded
===
false
)
{
this
.
nodeProps
.
expanded
=
true
;
this
.
nodeProps
.
lot
.
childs
.
forEach
(
thisNode
=>
{
...
...
@@ -332,7 +292,6 @@ export default {
setTimeout
(
function
()
{
if
(
window
.
SeeksGraphDebug
)
console
.
log
(
"delay end dragging"
,
this
.
dragging
);
this
.
dragging
=
false
;
}.
bind
(
this
),
100
...
...
@@ -361,31 +320,7 @@ export default {
this
.
onNodeClick
(
this
.
nodeProps
,
e
);
}
},
// beforeEnter(el) {
// console.log('beforeEnter')
// el.style.opacity = 0
// el.style.transformOrigin = 'left'
// },
// enter(el, done) {
// console.log('enter')
// Velocity(el, { opacity: 1, fontSize: '1.4em' }, { duration: 300 })
// Velocity(el, { fontSize: '1em' }, { complete: done })
// },
// leave(el, done) {
// console.log('leave')
// Velocity(el, { translateX: '0px', rotateZ: '360deg' }, { duration: 600 })
// // Velocity(el, { rotateZ: '180deg' }, { loop: 1 })
// // Velocity(el, {
// // rotateZ: '45deg',
// // translateY: '30px',
// // translateX: '30px',
// // opacity: 0
// // }, { complete: done })
// },
getLightColor
(
col
)
{
// if (this.borderColor !== '') {
// return this.borderColor
// }
if
(
col
[
0
]
===
"#"
)
{
var
_s
=
col
.
substring
(
1
);
if
(
_s
.
length
===
3
)
{
...
...
@@ -397,13 +332,11 @@ export default {
parseInt
(
_s
[
4
]
+
""
+
_s
[
5
],
16
)
];
if
(
window
.
SeeksGraphDebug
)
console
.
log
(
"getLightColor1:"
,
col
,
":"
,
_rgb_arr
.
join
(
","
));
col
=
"rgb("
+
_rgb_arr
.
join
(
","
)
+
")"
;
}
var
_st
=
col
.
substring
(
col
.
indexOf
(
"("
)
+
1
);
_st
=
_st
.
substring
(
0
,
_st
.
indexOf
(
")"
));
var
_rgb_string
=
_st
.
split
(
","
);
// console.log('getLightColor444:', _st, ':', _rgb_string.join(','))
if
(
_rgb_string
.
length
>=
3
)
{
var
_rgb_number
=
[
parseInt
(
parseInt
(
_rgb_string
[
0
])
*
0.9
),
...
...
@@ -411,7 +344,6 @@ export default {
parseInt
(
parseInt
(
_rgb_string
[
2
])
*
0.9
)
];
if
(
window
.
SeeksGraphDebug
)
console
.
log
(
"getLightColor2:"
,
col
,
":"
,
_rgb_number
.
join
(
","
));
this
.
borderColor
=
"rgb("
+
_rgb_number
.
join
(
","
)
+
", 0.3)"
;
return
this
.
borderColor
;
}
else
{
...
...
src/components/relation/core4vue/SeeksRGStore.js
View file @
8a56787f
...
...
@@ -88,8 +88,6 @@ const SeeksStoreManager = {
zoom_buff_y
:
0
},
resetViewSize
:
(
config
)
=>
{
// config.canvasOffset.x = parseInt(config.viewSize.width - config.canvasSize.width) / 2
// config.canvasOffset.y = parseInt(config.viewSize.height - config.canvasSize.height) / 2
config
.
canvasOffset
.
x
=
config
.
viewNVInfo
.
width
/
2
-
100
config
.
canvasOffset
.
y
=
config
.
viewNVInfo
.
height
/
2
-
100
}
...
...
src/components/relation/core4vue/layouters/SeeksAutoLayouter.js
View file @
8a56787f
...
...
@@ -82,7 +82,6 @@ function SeeksAutoLayouter(layoutSetting, graphSetting) {
})
}
this
.
layoutTimes
=
0
// var ___this = this
this
.
autoLayout
=
function
(
forceLayout
)
{
if
(
forceLayout
)
{
this
.
layoutTimes
=
0
...
...
src/components/relation/core4vue/layouters/SeeksBidirectionalTreeLayouter.js
View file @
8a56787f
This diff is collapsed.
Click to expand it.
src/components/studyAbroad/studyproaudit-form.vue
View file @
8a56787f
...
...
@@ -167,10 +167,10 @@
</div>
<div
class=
"row"
>
<div
class=
"col-6"
>
<span>
建议卖价:{{
saveObj.SuggestPrice
.toFixed(2)}}
</span>
<span>
建议卖价:{{
Number(saveObj.SuggestPrice)
.toFixed(2)}}
</span>
</div>
<div
class=
"col-6"
>
<span>
实际卖价:{{
saveObj.SellPrice
.toFixed(2)}}
</span>
<span>
实际卖价:{{
Number(saveObj.SellPrice)
.toFixed(2)}}
</span>
</div>
</div>
<div
class=
"row"
>
...
...
@@ -507,7 +507,6 @@
initObj
()
{
queryStudyAbroadInfo
(
this
.
msg
).
then
(
res
=>
{
this
.
saveObj
=
res
.
Data
;
console
.
log
(
"this.saveObj"
,
this
.
saveObj
);
})
.
catch
(()
=>
{});
},
...
...
src/components/studyAbroad/studyproauditinfo-form.vue
View file @
8a56787f
...
...
@@ -169,10 +169,10 @@
</div>
<div
class=
"row"
>
<div
class=
"col-6"
>
<span>
建议卖价:{{
saveObj.SuggestPrice
.toFixed(2)}}
</span>
<span>
建议卖价:{{
Number(saveObj.SuggestPrice)
.toFixed(2)}}
</span>
</div>
<div
class=
"col-6"
>
<span>
实际卖价:{{
saveObj.SellPrice
.toFixed(2)}}
</span>
<span>
实际卖价:{{
Number(saveObj.SellPrice)
.toFixed(2)}}
</span>
</div>
</div>
<div
class=
"row"
>
...
...
src/pages/financial/EasyReport.vue
View file @
8a56787f
This diff is collapsed.
Click to expand it.
src/pages/financial/TeamRevenueReport.vue
View file @
8a56787f
This diff is collapsed.
Click to expand it.
src/pages/okr/okr-align-view.vue
View file @
8a56787f
...
...
@@ -208,8 +208,6 @@ export default {
};
node
.
expandHolderPosition
=
"left"
;
node
.
expanded
=
false
;
console
.
log
(
"接收到父级:"
,
obj
,
node
);
}
if
(
isParent
)
{
node
.
nodeParent
=
true
;
...
...
src/pages/studyAbroad/studyabroad.vue
View file @
8a56787f
...
...
@@ -15,7 +15,6 @@
</div>
</div>
<div
class=
"page-content"
>
<q-table
:pagination=
"msg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
class=
"sticky-column-table sticky-right-column-table"
separator=
"none"
:data=
"dataList"
:columns=
"columns"
row-key=
"name"
:visible-columns=
"visibleColumns"
>
...
...
@@ -33,7 +32,6 @@
{{
col
.
value
}}
</q-td>
<q-td
v-else-if=
"col.name == 'SupplierName' "
>
<!--&& isHaveViewSupplierAction-->
<div>
{{
col
.
value
}}
</div>
<div>
<a
:href=
"props.row.SupplierContract"
style=
"color:#2961FE;text-decoration:none;"
...
...
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