Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ETL-admin
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
莫晓莉
ETL-admin
Commits
4febc18a
Commit
4febc18a
authored
Mar 31, 2021
by
zlr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改etlweb路径配置,显示图标
parent
d9f1394f
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
31 additions
and
18 deletions
+31
-18
src/assets/styles/index.scss
+1
-1
src/main.js
+2
-0
src/views/dashboard-kettle/components/designer/modules/node.vue
+1
-1
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
+1
-2
src/views/dashboard-kettle/components/designer/modules/node_menu2.vue
+3
-1
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+19
-9
src/views/dialogs-components/global/export-tree/main.vue
+1
-1
src/views/dialogs-components/global/in-repository/main.vue
+1
-1
src/views/kettle/home2.vue
+1
-1
src/views/kettle/toolbar.js
+1
-1
No files found.
src/assets/styles/index.scss
View file @
4febc18a
...
...
@@ -581,7 +581,7 @@ aside {
//
$svgUrl
:
'http://192.168.0.
2
:9888/ETLWEB-SERVER/etlweb'
;
$svgUrl
:
'http://192.168.0.
44
:9888/ETLWEB-SERVER/etlweb'
;
// $svgUrl:'http://192.168.0.44:9888/ETLWEB-SERVER/etlweb';
// $svgUrl:'http://192.168.0.44:9882/ETLWEB-SERVER/etlweb';
// .schema { background-image: url($svgUrl/ui/images/schema.svg?scale=16) !important;}
...
...
src/main.js
View file @
4febc18a
...
...
@@ -75,6 +75,8 @@ import * as R from 'ramda'
Vue
.
prototype
.
R
=
R
Vue
.
config
.
productionTip
=
false
const
baseUrl
=
process
.
env
.
VUE_APP_BASE_API
===
'/'
?
''
:
process
.
env
.
VUE_APP_BASE_API
Vue
.
prototype
.
etlWeb
=
baseUrl
+
"ETLWEB-SERVER/etlweb/"
new
Vue
({
router
,
...
...
src/views/dashboard-kettle/components/designer/modules/node.vue
View file @
4febc18a
...
...
@@ -35,7 +35,7 @@
},
data
()
{
return
{
prefix
:
'http://192.168.0.44:9882/etlweb/'
,
prefix
:
this
.
etlWeb
,
}
},
computed
:
{
...
...
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
View file @
4febc18a
...
...
@@ -64,7 +64,6 @@
<span
class=
"custom-tree-node"
slot-scope=
"
{ node, data }">
<span>
<img
:src=
"prefix+data.icon"
style=
"width:20px"
width=
""
alt=
""
>
{{
node
.
label
}}
</span>
...
...
@@ -88,7 +87,7 @@ export default {
data
()
{
return
{
// prefix:'http://192.168.0.2:9700/etlweb/',
prefix
:
'http://192.168.0.44:9882/etlweb/'
,
prefix
:
this
.
etlWeb
,
// 测试数据开始=====
jobTreeList
:
[
{
...
...
src/views/dashboard-kettle/components/designer/modules/node_menu2.vue
View file @
4febc18a
...
...
@@ -11,9 +11,10 @@
class=
"custom-tree-node"
:key-id=
"data.children ? '' : 123"
:id=
"data.id"
:icon=
"data.icon"
:icon=
"
prefix+
data.icon"
:pluginId=
"data.pluginId"
>
<img
:src=
"prefix+data.icon"
style=
"width:20px"
width=
""
alt=
""
>
{{
data
.
text
}}
</div>
</div>
...
...
@@ -34,6 +35,7 @@ export default {
pluginId
:
"pluginId"
,
},
data
:
[],
prefix
:
this
.
etlWeb
};
},
components
:
{},
...
...
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
View file @
4febc18a
...
...
@@ -1267,6 +1267,18 @@ export default {
const
{
width
,
height
}
=
toolItem
;
const
parent
=
this
.
graph
.
getDefaultParent
();
this
.
graph
.
getModel
().
beginUpdate
();
const
styleObj
=
{
fillColor
:
'transparent'
,
strokeColor
:
'#000000'
,
strokeWidth
:
'1'
,
shape
:
mxConstants
.
SHAPE_LABEL
,
align
:
mxConstants
.
ALIGN_CENTER
,
verticalAlign
:
mxConstants
.
ALIGN_BOTTOM
,
imageAlign
:
mxConstants
.
ALIGN_CENTER
,
imageVerticalAlign
:
mxConstants
.
ALIGN_TOP
,
image
:
toolItem
[
'icon'
]
}
const
style
=
Object
.
keys
(
styleObj
).
map
((
attr
)
=>
`
${
attr
}
=
${
styleObj
[
attr
]}
`
).
join
(
';'
)
try
{
let
vertex
=
this
.
graph
.
insertVertex
(
parent
,
...
...
@@ -1275,12 +1287,14 @@ export default {
x
,
y
,
width
,
height
height
,
style
);
vertex
.
title
=
toolItem
[
"title"
];
vertex
.
ids
=
toolItem
[
"id"
];
vertex
.
pluginId
=
toolItem
[
"pluginId"
];
this
.
xmlDocuments
=
mxUtils
.
parseXml
(
decodeURIComponent
(
this
.
blankCanvas
));
console
.
log
(
this
.
xmlDocuments
,
'拖拽'
);
...
...
@@ -1319,17 +1333,13 @@ export default {
//选择
initToolbar
()
{
let
domArr
=
document
.
querySelectorAll
(
'[key-id="123"]'
);
console
.
log
(
domArr
);
domArr
.
forEach
((
dom
,
index
)
=>
{
// console.log(dom.pluginId);
// console.log(dom);
let
toolItemObj
=
{
title
:
dom
.
inner
HTML
,
title
:
dom
.
inner
Text
,
id
:
dom
.
id
,
width
:
60
,
height
:
60
,
width
:
50
,
height
:
50
,
icon
:
dom
.
attributes
[
"icon"
].
nodeValue
,
// value: dom.pluginId,
pluginId
:
dom
.
getAttribute
(
"pluginId"
),
...
...
src/views/dialogs-components/global/export-tree/main.vue
View file @
4febc18a
...
...
@@ -123,7 +123,7 @@ export default {
// document.body.appendChild(link);
// link.click();
var
url
=
`http://192.168.0.2:9888/ETLWEB-SERVER/etlweb/
attachment/download?filePath=
${
res
.
message
}
&remove=true`
var
url
=
this
.
etlWeb
+
`
attachment/download?filePath=
${
res
.
message
}
&remove=true`
window
.
open
(
url
);
}
else
{
...
...
src/views/dialogs-components/global/in-repository/main.vue
View file @
4febc18a
...
...
@@ -159,7 +159,7 @@ export default {
// document.body.appendChild(link);
// link.click();
var
url
=
`http://192.168.0.2:9888/ETLWEB-SERVER/etlweb/
attachment/download?filePath=
${
res
.
message
}
&remove=true`
var
url
=
this
.
etlWeb
+
`
attachment/download?filePath=
${
res
.
message
}
&remove=true`
window
.
open
(
url
);
}
else
{
...
...
src/views/kettle/home2.vue
View file @
4febc18a
...
...
@@ -391,7 +391,7 @@ props: ["dragItem"],
estabTitle
:
'转换'
,
//新建转换弹窗提示
featureDialogVisible
:
false
,
//特征列表弹窗
scanDialogVisible
:
false
,
//浏览弹窗
prefix
:
'http://192.168.0.2:9700/etlweb/'
,
prefix
:
this
.
etlWeb
,
inputValue
:
''
,
// 密码
// dropFunction,//删除数据库表
deleteLink
,
//删除资源库模块的方法
...
...
src/views/kettle/toolbar.js
View file @
4febc18a
...
...
@@ -2,7 +2,7 @@ import mxgraph from './mx.js'
import
{
steps
}
from
'@/api/kettle/link'
const
MxConstants
=
mxgraph
.
mxConstants
const
prefix
=
'192.168.0.2:9700/etlweb/'
const
prefix
=
this
.
etlWeb
const
bar
=
[]
const
pamer
=
new
FormData
()
// 创建form对象
...
...
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