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
91571fd0
Commit
91571fd0
authored
Apr 18, 2021
by
李耀琨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新代码
parent
4d3e4766
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
10 deletions
+12
-10
.env.development
+4
-4
src/assets/styles/index.scss
+1
-1
src/main.js
+1
-1
src/utils/request.js
+2
-2
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
+1
-1
src/views/dashboard-kettle/components/designer/modules/node_menu2.vue
+2
-1
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+1
-0
No files found.
.env.development
View file @
91571fd0
ENV = 'development'
ENV = 'development'
VUE_APP_BASE_API = 'http://1
92.168.0.44
:9888/'
VUE_APP_BASE_API = 'http://1
47.1.3.180
:9888/'
VUE_APP_WS_API = 'ws://1
92.168.0.44
:9888/'
VUE_APP_WS_API = 'ws://1
47.1.3.180
:9888/'
#VUE_APP_BASE_API = 'http://192.168.0.44:988
2
/'
#VUE_APP_BASE_API = 'http://192.168.0.44:988
8
/'
#VUE_APP_WS_API = 'ws://192.168.0.44:988
2
/'
#VUE_APP_WS_API = 'ws://192.168.0.44:988
8
/'
...
...
src/assets/styles/index.scss
View file @
91571fd0
...
@@ -581,7 +581,7 @@ aside {
...
@@ -581,7 +581,7 @@ aside {
//
//
$svgUrl
:
'http://1
92.168.0.44
:9888/ETLWEB-SERVER/etlweb'
;
$svgUrl
:
'http://1
47.1.3.180
: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';
// $svgUrl:'http://192.168.0.44:9882/ETLWEB-SERVER/etlweb';
// .schema { background-image: url($svgUrl/ui/images/schema.svg?scale=16) !important;}
// .schema { background-image: url($svgUrl/ui/images/schema.svg?scale=16) !important;}
...
...
src/main.js
View file @
91571fd0
...
@@ -76,7 +76,7 @@ Vue.prototype.R = R
...
@@ -76,7 +76,7 @@ Vue.prototype.R = R
Vue
.
config
.
productionTip
=
false
Vue
.
config
.
productionTip
=
false
const
baseUrl
=
process
.
env
.
VUE_APP_BASE_API
===
'/'
?
''
:
process
.
env
.
VUE_APP_BASE_API
const
baseUrl
=
process
.
env
.
VUE_APP_BASE_API
===
'/'
?
''
:
process
.
env
.
VUE_APP_BASE_API
Vue
.
prototype
.
etlWeb
=
baseUrl
+
"
ETLWEB-SERVER/etlweb/"
Vue
.
prototype
.
etlWeb
=
"http://147.1.3.180:9888/
ETLWEB-SERVER/etlweb/"
new
Vue
({
new
Vue
({
router
,
router
,
...
...
src/utils/request.js
View file @
91571fd0
...
@@ -20,9 +20,9 @@ const addTopName = (data) => {
...
@@ -20,9 +20,9 @@ const addTopName = (data) => {
case
'kettleRepository'
:
case
'kettleRepository'
:
return
`/KETTLE-SERVER/
${
data
.
url
}
`
return
`/KETTLE-SERVER/
${
data
.
url
}
`
case
'webetl'
:
case
'webetl'
:
case
'etlwebui'
:
return
`/ETLWEB-SERVER/
${
data
.
url
}
`
return
`/ETLWEB-SERVER/
${
data
.
url
}
`
// case 'etlweb':
// return `/ETLWEB-SERVER/${data.url}`
default
:
default
:
return
`
${
data
.
url
}
`
return
`
${
data
.
url
}
`
}
}
...
...
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
View file @
91571fd0
...
@@ -87,7 +87,7 @@ export default {
...
@@ -87,7 +87,7 @@ export default {
data
()
{
data
()
{
return
{
return
{
// prefix:'http://192.168.0.2:9700/etlweb/',
// prefix:'http://192.168.0.2:9700/etlweb/',
prefix
:
this
.
etlWeb
,
prefix
:
`http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/`
,
// 测试数据开始=====
// 测试数据开始=====
jobTreeList
:
[
jobTreeList
:
[
{
{
...
...
src/views/dashboard-kettle/components/designer/modules/node_menu2.vue
View file @
91571fd0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<div
<div
class=
"custom-tree-node"
class=
"custom-tree-node"
:key-id=
"data.children ? '' : 123"
:key-id=
"data.children ? '' : 123"
:id=
"data.id"
:id=
"data.id"
:icon=
"prefix+data.icon"
:icon=
"prefix+data.icon"
:pluginId=
"data.pluginId"
:pluginId=
"data.pluginId"
>
>
...
@@ -41,6 +41,7 @@ export default {
...
@@ -41,6 +41,7 @@ export default {
components
:
{},
components
:
{},
created
()
{
created
()
{
this
.
stepsFun
()
this
.
stepsFun
()
console
.
log
(
this
.
etlWeb
,
"yghjhkjhsakjhgkjashgkjsh"
);
},
},
mounted
()
{
mounted
()
{
...
...
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
View file @
91571fd0
...
@@ -1873,6 +1873,7 @@ previousField(){
...
@@ -1873,6 +1873,7 @@ previousField(){
.
map
((
attr
)
=>
`
${
attr
}
=
${
styleObj
[
attr
]}
`
)
.
map
((
attr
)
=>
`
${
attr
}
=
${
styleObj
[
attr
]}
`
)
.
join
(
";"
);
.
join
(
";"
);
this
.
toolItemData
=
toolItem
;
this
.
toolItemData
=
toolItem
;
console
.
log
(
toolItem
,
"yghgiiagsjfhasgaljgqhwygajhgiu"
);
try
{
try
{
let
pameStep
=
new
FormData
();
// 创建form对象
let
pameStep
=
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