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
4e9ff468
Commit
4e9ff468
authored
May 12, 2021
by
莫晓莉
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://139.159.239.83:9093/mxl/ETL-admin
parents
d6c7fb0a
65791538
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
100 additions
and
109 deletions
+100
-109
src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue
+14
-14
src/views/job-dialog/homework.vue
+60
-62
src/views/kettle/home2.vue
+9
-14
src/views/watch/transform.vue
+17
-19
No files found.
src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue
View file @
4e9ff468
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
</span>
</span>
</el-dialog>
</el-dialog>
<estab-dialog
<estab-dialog
ref=
"establishDia"
ref=
"establishDia"
...
@@ -229,7 +229,7 @@ export default {
...
@@ -229,7 +229,7 @@ export default {
created
()
{
created
()
{
this
.
listDatabasesFun
();
this
.
listDatabasesFun
();
},
// 监听编号好后获取选择的数据库的树形里列表
},
// 监听编号好后获取选择的数据库的树形里列表
// watch: {
// watch: {
// formDataBaseName: {
// formDataBaseName: {
// handler(newValue, oldValue) {
// handler(newValue, oldValue) {
...
@@ -251,7 +251,7 @@ export default {
...
@@ -251,7 +251,7 @@ export default {
},
500
);
},
500
);
},
},
tableInputName
()
{
tableInputName
()
{
this
.
stepName
;
this
.
stepName
;
},
},
...
@@ -259,7 +259,7 @@ export default {
...
@@ -259,7 +259,7 @@ export default {
// //获取新建弹窗返回来的值
// //获取新建弹窗返回来的值
getSonValue
(
res
)
{
getSonValue
(
res
)
{
if
(
typeof
res
==
"string"
)
{
if
(
typeof
res
==
"string"
)
{
this
.
formDataBaseName
=
res
;
this
.
formDataBaseName
=
res
;
console
.
log
(
"接收子组件的值1111111----"
,
this
.
formDataBaseName
);
console
.
log
(
"接收子组件的值1111111----"
,
this
.
formDataBaseName
);
}
else
if
(
typeof
res
==
"object"
)
{
}
else
if
(
typeof
res
==
"object"
)
{
...
@@ -303,7 +303,7 @@ export default {
...
@@ -303,7 +303,7 @@ export default {
getGraphDataBases
()
{
getGraphDataBases
()
{
// var graph = this.getGraph();
// var graph = this.getGraph();
var
root
=
this
.
newGraph
.
getDefaultParent
(),
var
root
=
this
.
newGraph
.
getDefaultParent
(),
data
=
[];
data
=
[];
if
(
root
.
getAttribute
(
"databases"
)
!=
null
)
if
(
root
.
getAttribute
(
"databases"
)
!=
null
)
...
@@ -327,7 +327,7 @@ export default {
...
@@ -327,7 +327,7 @@ export default {
this
.
dialogVisibleFourth
=
true
;
this
.
dialogVisibleFourth
=
true
;
// this.$refs.establishDia.database();
// this.$refs.establishDia.database();
// this.$refs.establishDia.accessMethod(); //获取连接方式
// this.$refs.establishDia.accessMethod(); //获取连接方式
this
.
$refs
.
establishDia
.
clickFun
(
this
.
newGraph
);
//先把画布传过去
this
.
$refs
.
establishDia
.
clickFun
(
this
.
newGraph
);
//先把画布传过去
this
.
$refs
.
establishDia
.
getTransDatabase
();
this
.
$refs
.
establishDia
.
getTransDatabase
();
this
.
$refs
.
establishDia
.
accessMethod
();
//获取连接方式
this
.
$refs
.
establishDia
.
accessMethod
();
//获取连接方式
...
@@ -338,7 +338,7 @@ export default {
...
@@ -338,7 +338,7 @@ export default {
dialogVisibleFourthFun
()
{
dialogVisibleFourthFun
()
{
this
.
dialogVisibleFourth
=
true
;
this
.
dialogVisibleFourth
=
true
;
// this.$refs.establishDia.database(this.connectionName);
// this.$refs.establishDia.database(this.connectionName);
this
.
$refs
.
establishDia
.
clickFun
(
this
.
newGraph
);
//先把画布传过去
this
.
$refs
.
establishDia
.
clickFun
(
this
.
newGraph
);
//先把画布传过去
if
(
this
.
form
.
connection
)
{
if
(
this
.
form
.
connection
)
{
this
.
dialogVisibleFourth
=
true
;
this
.
dialogVisibleFourth
=
true
;
...
@@ -346,8 +346,8 @@ export default {
...
@@ -346,8 +346,8 @@ export default {
this
.
$refs
.
establishDia
.
accessMethod
();
//获取连接方式
this
.
$refs
.
establishDia
.
accessMethod
();
//获取连接方式
}
}
// this.$refs.establishDia.database(this.selectName);
// this.$refs.establishDia.database(this.selectName);
},
},
lastStep
()
{
lastStep
()
{
...
@@ -390,7 +390,7 @@ export default {
...
@@ -390,7 +390,7 @@ export default {
mps
.
append
(
"table"
,
this
.
tableDetails
.
text
);
mps
.
append
(
"table"
,
this
.
tableDetails
.
text
);
tableFields
(
mps
).
then
((
res
)
=>
{
tableFields
(
mps
).
then
((
res
)
=>
{
// console.log(res);
// console.log(res);
for
(
let
i
=
0
;
i
<
res
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
res
.
length
;
i
++
)
{
...
@@ -398,7 +398,7 @@ export default {
...
@@ -398,7 +398,7 @@ export default {
// this.fieldName = this.fieldName + element + ","
// this.fieldName = this.fieldName + element + ","
if
(
!
i
==
0
)
{
if
(
!
i
==
0
)
{
this
.
fieldName
=
this
.
fieldName
+
","
+
element
;
this
.
fieldName
=
this
.
fieldName
+
"
\
n
,"
+
element
;
}
else
{
}
else
{
this
.
fieldName
=
element
;
this
.
fieldName
=
element
;
}
}
...
@@ -406,7 +406,7 @@ export default {
...
@@ -406,7 +406,7 @@ export default {
console
.
log
(
this
.
fieldName
,
464564564
);
console
.
log
(
this
.
fieldName
,
464564564
);
}
}
this
.
form
.
sql
=
`select
${
this
.
fieldName
}
from
${
this
.
tableDetails
.
nodeId
}
.
${
this
.
tableDetails
.
text
}
`
;
this
.
form
.
sql
=
`select
`
+
"
\
n"
+
`
${
this
.
fieldName
}
`
+
"
\
n"
+
`from `
+
"
\
n"
+
`
${
this
.
tableDetails
.
nodeId
}
.
${
this
.
tableDetails
.
text
}
`
;
});
});
},
},
...
@@ -414,7 +414,7 @@ export default {
...
@@ -414,7 +414,7 @@ export default {
if
(
this
.
form
.
connection
)
{
if
(
this
.
form
.
connection
)
{
this
.
browsing
=
!
this
.
browsing
;
this
.
browsing
=
!
this
.
browsing
;
this
.
scanFlag
=
true
;
this
.
scanFlag
=
true
;
}
else
{
}
else
{
this
.
$message
.
error
(
"请选择数据库"
);
this
.
$message
.
error
(
"请选择数据库"
);
console
.
log
(
this
.
stepName
);
console
.
log
(
this
.
stepName
);
...
@@ -463,7 +463,7 @@ export default {
...
@@ -463,7 +463,7 @@ export default {
handleNodeClick
(
data
,
node
)
{
handleNodeClick
(
data
,
node
)
{
console
.
log
(
"点击当前节点node==="
,
node
);
console
.
log
(
"点击当前节点node==="
,
node
);
console
.
log
(
"点击当前节点data==="
,
data
);
console
.
log
(
"点击当前节点data==="
,
data
);
this
.
tableDetails
=
data
;
this
.
tableDetails
=
data
;
},
},
...
...
src/views/job-dialog/homework.vue
View file @
4e9ff468
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<el-form-item
label=
"步骤名称:"
>
<el-form-item
label=
"步骤名称:"
>
<el-input
v-model=
"myForm.label"
></el-input>
<el-input
v-model=
"myForm.label"
></el-input>
</el-form-item>
</el-form-item>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tabs
v-model=
"activeName"
type=
"border-card"
>
<el-tab-pane
label=
"作业设置"
name=
"first"
>
<el-tab-pane
label=
"作业设置"
name=
"first"
>
<el-radio-group
v-model=
"myForm.specification_method"
style=
"width:100%;"
>
<el-radio-group
v-model=
"myForm.specification_method"
style=
"width:100%;"
>
...
@@ -21,22 +21,22 @@
...
@@ -21,22 +21,22 @@
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
<el-radio
label=
"filename"
>
作业文件名
</el-radio>
<el-radio
label=
"filename"
>
作业文件名
</el-radio>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label-width=
"100px"
>
<el-form-item
label-width=
"100px"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"myForm.filename"
:disabled=
"myForm.specification_method=='filename'? false:true"
></el-input>
<el-input
v-model=
"myForm.filename"
:disabled=
"myForm.specification_method=='filename'? false:true"
></el-input>
</el-col>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-col
class=
"line"
:span=
"3"
>
<el-button
:disabled=
"myForm.specification_method=='filename'? false:true"
size=
"mini"
@
click=
"chooseFile('filename')"
>
选择
</el-button></el-col
<el-button
:disabled=
"myForm.specification_method=='filename'? false:true"
size=
"mini"
@
click=
"chooseFile('filename')"
>
选择
</el-button></el-col
>
>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
</div>
</div>
<div
style=
"position:relative;border:1px solid #b5b8c8;margin:10px auto;"
>
<div
style=
"position:relative;border:1px solid #b5b8c8;margin:10px auto;"
>
...
@@ -44,9 +44,9 @@
...
@@ -44,9 +44,9 @@
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
<el-radio
label=
"rep_name"
>
通过目录与名称指定转换
</el-radio>
<el-radio
label=
"rep_name"
>
通过目录与名称指定转换
</el-radio>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label-width=
"100px"
>
<el-form-item
label-width=
"100px"
>
<el-row
:gutter=
"10"
label-width=
"100px"
>
<el-row
:gutter=
"10"
label-width=
"100px"
>
<el-col
:span=
"22"
>
<el-col
:span=
"22"
>
...
@@ -59,34 +59,34 @@
...
@@ -59,34 +59,34 @@
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-input
:disabled=
"myForm.specification_method=='rep_name'? false:true"
v-model=
"myForm.jobname"
></el-input>
<el-input
:disabled=
"myForm.specification_method=='rep_name'? false:true"
v-model=
"myForm.jobname"
></el-input>
</el-col>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-col
class=
"line"
:span=
"3"
>
<el-button
:disabled=
"myForm.specification_method=='rep_name'? false:true"
size=
"mini"
@
click=
"chooseExportTreeDialog('directory','jobname')"
>
选择
</el-button></el-col
<el-button
:disabled=
"myForm.specification_method=='rep_name'? false:true"
size=
"mini"
@
click=
"chooseExportTreeDialog('directory','jobname')"
>
选择
</el-button></el-col
>
>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
</div>
</div>
<div
style=
"position:relative;border:1px solid #b5b8c8;"
>
<div
style=
"position:relative;border:1px solid #b5b8c8;"
>
<el-form-item
label-width=
"100px"
>
<el-form-item
label-width=
"100px"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
<el-radio
label=
"rep_ref"
>
通过引用指定作业
</el-radio>
<el-radio
label=
"rep_ref"
>
通过引用指定作业
</el-radio>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label-width=
"100px"
>
<el-form-item
label-width=
"100px"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-input
:disabled=
"myForm.specification_method=='rep_ref'? false:true"
v-model=
"myForm.referenceName"
></el-input>
<el-input
:disabled=
"myForm.specification_method=='rep_ref'? false:true"
v-model=
"myForm.referenceName"
></el-input>
</el-col>
</el-col>
<!--
<el-col
class=
"line"
:span=
"3"
>
<!--
<el-col
class=
"line"
:span=
"3"
>
<el-button
:disabled=
"myForm.specification_method=='rep_ref'? false:true"
size=
"mini"
@
click=
"chooseFile('template_filename')"
>
选择
</el-button></el-col>
-->
<el-button
:disabled=
"myForm.specification_method=='rep_ref'? false:true"
size=
"mini"
@
click=
"chooseFile('template_filename')"
>
选择
</el-button></el-col>
-->
</el-row>
</el-row>
</el-form-item>
</el-form-item>
</div>
</div>
<el-button
size=
"mini"
style=
"margin-top:10px;"
>
新建转换
</el-button>
<el-button
size=
"mini"
style=
"margin-top:10px;"
>
新建转换
</el-button>
</el-radio-group>
</el-radio-group>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"高级"
name=
"second"
>
<el-tab-pane
label=
"高级"
name=
"second"
>
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
<el-select
v-model=
"myForm.slave_server_name"
style=
"width: 100%"
>
<el-select
v-model=
"myForm.slave_server_name"
style=
"width: 100%"
>
<el-option
v-for=
"(item,index) in serverList"
:key=
"index"
:label=
"item.name"
:value=
"item.name"
></el-option>
<el-option
v-for=
"(item,index) in serverList"
:key=
"index"
:label=
"item.name"
:value=
"item.name"
></el-option>
</el-select>
</el-select>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label=
"等待远程作业执行结束:"
label-width=
"250px"
>
<el-form-item
label=
"等待远程作业执行结束:"
label-width=
"250px"
>
...
@@ -157,21 +157,21 @@
...
@@ -157,21 +157,21 @@
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
<el-checkbox
v-model=
"myForm.set_logfile"
true-label=
'Y'
false-label=
"N"
></el-checkbox>
<el-checkbox
v-model=
"myForm.set_logfile"
true-label=
'Y'
false-label=
"N"
></el-checkbox>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label=
"添加到日志文件尾:"
>
<el-form-item
label=
"添加到日志文件尾:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
<el-checkbox
:disabled=
"myForm.set_logfile=='Y'? false:true"
v-model=
"myForm.set_append_logfile"
true-label=
'Y'
false-label=
"N"
></el-checkbox>
<el-checkbox
:disabled=
"myForm.set_logfile=='Y'? false:true"
v-model=
"myForm.set_append_logfile"
true-label=
'Y'
false-label=
"N"
></el-checkbox>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label=
"日志文件名:"
>
<el-form-item
label=
"日志文件名:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-input
v-model=
"myForm.logfile"
:disabled=
"myForm.set_logfile=='Y'? false:true"
></el-input>
<el-input
v-model=
"myForm.logfile"
:disabled=
"myForm.set_logfile=='Y'? false:true"
></el-input>
</el-col>
</el-col>
<el-col
class=
"line"
:span=
"3"
>
<el-col
class=
"line"
:span=
"3"
>
<el-button
size=
"mini"
@
click=
"chooseFile('logfile')"
:disabled=
"myForm.set_logfile=='Y'? false:true"
>
浏览
</el-button></el-col
<el-button
size=
"mini"
@
click=
"chooseFile('logfile')"
:disabled=
"myForm.set_logfile=='Y'? false:true"
>
浏览
</el-button></el-col
>
>
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
<el-col
:span=
"23"
>
<el-col
:span=
"23"
>
<el-checkbox
:disabled=
"myForm.set_logfile=='Y'? false:true"
v-model=
"myForm.create_parent_folder"
true-label=
'Y'
false-label=
"N"
></el-checkbox>
<el-checkbox
:disabled=
"myForm.set_logfile=='Y'? false:true"
v-model=
"myForm.create_parent_folder"
true-label=
'Y'
false-label=
"N"
></el-checkbox>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label=
"日志文件后缀名:"
>
<el-form-item
label=
"日志文件后缀名:"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
<el-select
v-model=
"myForm.loglevel"
style=
"width: 100%"
>
<el-select
v-model=
"myForm.loglevel"
style=
"width: 100%"
>
<el-option
v-for=
"(item,index) in logLevelList"
:key=
"index"
:label=
"item.desc"
:value=
"item.code"
></el-option>
<el-option
v-for=
"(item,index) in logLevelList"
:key=
"index"
:label=
"item.desc"
:value=
"item.code"
></el-option>
</el-select>
</el-select>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
</el-tab-pane>
</el-tab-pane>
...
@@ -233,7 +233,7 @@
...
@@ -233,7 +233,7 @@
<!-- 编辑弹窗结束============ -->
<!-- 编辑弹窗结束============ -->
</el-card>
</el-card>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"命名"
name=
"fifth"
>
<el-tab-pane
label=
"命名"
name=
"fifth"
>
<el-card
class=
"box-card"
style=
"margin-top:15px;"
>
<el-card
class=
"box-card"
style=
"margin-top:15px;"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
slot=
"header"
class=
"clearfix"
>
...
@@ -399,7 +399,7 @@ export default ({
...
@@ -399,7 +399,7 @@ export default ({
}
}
},
},
props
:[
"jobHomeworkVisible"
,
"jobWorkFormSend"
,
"excelOutPutVisible"
,
"saveOutputDialog"
,
"doubleClickCell"
],
props
:[
"jobHomeworkVisible"
,
"jobWorkFormSend"
,
"excelOutPutVisible"
,
"saveOutputDialog"
,
"doubleClickCell"
],
watch
:{
watch
:{
...
@@ -410,7 +410,7 @@ export default ({
...
@@ -410,7 +410,7 @@ export default ({
if
(
val
.
arguments
){
if
(
val
.
arguments
){
var
ny
=
JSON
.
parse
(
val
.
arguments
);
var
ny
=
JSON
.
parse
(
val
.
arguments
);
this
.
tableData
=
ny
;
this
.
tableData
=
ny
;
}
}
if
(
val
.
parameters
){
if
(
val
.
parameters
){
var
na
=
JSON
.
parse
(
val
.
parameters
);
var
na
=
JSON
.
parse
(
val
.
parameters
);
...
@@ -420,7 +420,7 @@ export default ({
...
@@ -420,7 +420,7 @@ export default ({
},
},
// 解决子组件改变父组件传进来的变量的属性不报错start------
// 解决子组件改变父组件传进来的变量的属性不报错start------
},
},
created
(){
created
(){
// this.formatFunc();//获取时间日期格式
// this.formatFunc();//获取时间日期格式
// this.getCodeList();//获取编码列表
// this.getCodeList();//获取编码列表
...
@@ -439,9 +439,8 @@ export default ({
...
@@ -439,9 +439,8 @@ export default ({
getLogLevelList
(){
getLogLevelList
(){
var
formData
=
new
FormData
();
var
formData
=
new
FormData
();
formData
.
append
(
'query'
,
''
);
formData
.
append
(
'query'
,
''
);
getLogLevelList
(
formData
).
then
(
res
=>
{
getLogLevelList
(
formData
).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
console
.
log
(
'获取日志级别=='
,
res
);
this
.
logLevelList
=
res
;
this
.
logLevelList
=
res
;
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
errMsg
)
this
.
$message
.
error
(
res
.
errMsg
)
...
@@ -449,7 +448,7 @@ export default ({
...
@@ -449,7 +448,7 @@ export default ({
})
})
},
},
// radioChoose(val){
// radioChoose(val){
// let that = this
// let that = this
// switch(val){
// switch(val){
// case 0:
// case 0:
// this.myForm.specification_method="filename";
// this.myForm.specification_method="filename";
...
@@ -477,9 +476,9 @@ export default ({
...
@@ -477,9 +476,9 @@ export default ({
// formatFunc(){
// formatFunc(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// formatFunc(formData).then(res=>{
// formatFunc(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('时间日期格式==',res);
// console.log('时间日期格式==',res);
// this.formatTimeList=res;
// this.formatTimeList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -490,9 +489,9 @@ export default ({
...
@@ -490,9 +489,9 @@ export default ({
// getCodeList(){
// getCodeList(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getCodeList(formData).then(res=>{
// getCodeList(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('编码列表==',res);
// console.log('编码列表==',res);
// this.codeList=res;
// this.codeList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -503,9 +502,9 @@ export default ({
...
@@ -503,9 +502,9 @@ export default ({
// getFontname(){
// getFontname(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getFontname(formData).then(res=>{
// getFontname(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('表头字体==',res);
// console.log('表头字体==',res);
// this.headFontList=res;
// this.headFontList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -516,9 +515,9 @@ export default ({
...
@@ -516,9 +515,9 @@ export default ({
// getFontunderline(){
// getFontunderline(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getFontunderline(formData).then(res=>{
// getFontunderline(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('表头字体下划线==',res);
// console.log('表头字体下划线==',res);
// this.headFontUnderlineList=res;
// this.headFontUnderlineList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -529,9 +528,9 @@ export default ({
...
@@ -529,9 +528,9 @@ export default ({
// getFontoriention(){
// getFontoriention(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getFontoriention(formData).then(res=>{
// getFontoriention(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('表头字体方向==',res);
// console.log('表头字体方向==',res);
// this.entionList=res;
// this.entionList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -542,9 +541,9 @@ export default ({
...
@@ -542,9 +541,9 @@ export default ({
// getFontcolor(){
// getFontcolor(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getFontcolor(formData).then(res=>{
// getFontcolor(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('表头字体方向==',res);
// console.log('表头字体方向==',res);
// this.colorList=res;
// this.colorList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -555,9 +554,9 @@ export default ({
...
@@ -555,9 +554,9 @@ export default ({
// getFontalignment(){
// getFontalignment(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getFontalignment(formData).then(res=>{
// getFontalignment(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('表头对齐方式==',res);
// console.log('表头对齐方式==',res);
// this.alignList=res;
// this.alignList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -571,9 +570,9 @@ export default ({
...
@@ -571,9 +570,9 @@ export default ({
this
.
fileDialogVisible
=
true
;
this
.
fileDialogVisible
=
true
;
},
},
confirm
(){
confirm
(){
// console.log('步骤名称==:',this.stepName);
// console.log('步骤名称==:',this.stepName);
// this.excelForm.label=this.stepName.name;
// this.excelForm.label=this.stepName.name;
this
.
myForm
.
arguments
=
JSON
.
stringify
(
this
.
tableData
);
//更新字段
this
.
myForm
.
arguments
=
JSON
.
stringify
(
this
.
tableData
);
//更新字段
this
.
myForm
.
parameters
=
JSON
.
stringify
(
this
.
tableDataUpdate
);
//更新字段
this
.
myForm
.
parameters
=
JSON
.
stringify
(
this
.
tableDataUpdate
);
//更新字段
...
@@ -602,15 +601,15 @@ export default ({
...
@@ -602,15 +601,15 @@ export default ({
console
.
log
(
'添加的字段==='
,
this
.
fieldForm
);
console
.
log
(
'添加的字段==='
,
this
.
fieldForm
);
if
(
this
.
dataState
)
{
if
(
this
.
dataState
)
{
this
.
tableData
.
push
(
this
.
fieldForm
);
this
.
tableData
.
push
(
this
.
fieldForm
);
}
}
},
},
// 获取字段类型
// 获取字段类型
// getValueMetaStore(){
// getValueMetaStore(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('query', '');
// formData.append('query', '');
// getValueMetaStore(formData).then(res=>{
// getValueMetaStore(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('字段类型==',res);
// console.log('字段类型==',res);
// this.metaStoreList=res;
// this.metaStoreList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -621,9 +620,9 @@ export default ({
...
@@ -621,9 +620,9 @@ export default ({
// getValueFormatStore(){
// getValueFormatStore(){
// var formData = new FormData();
// var formData = new FormData();
// formData.append('valueType', 'all');
// formData.append('valueType', 'all');
// getValueFormatStore(formData).then(res=>{
// getValueFormatStore(formData).then(res=>{
// if (res) {
// if (res) {
// console.log('字段格式==',res);
// console.log('字段格式==',res);
// this.formatStoreList=res;
// this.formatStoreList=res;
// }else {
// }else {
// this.$message.error(res.errMsg)
// this.$message.error(res.errMsg)
...
@@ -632,7 +631,7 @@ export default ({
...
@@ -632,7 +631,7 @@ export default ({
// },
// },
// 获取字段
// 获取字段
inputOutputFields
(){
inputOutputFields
(){
if
(
this
.
doubleClickCell
){
if
(
this
.
doubleClickCell
){
var
title
=
this
.
doubleClickCell
.
value
.
attributes
.
label
.
value
var
title
=
this
.
doubleClickCell
.
value
.
attributes
.
label
.
value
}
}
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
console
.
log
(
'获取cell888888==='
,
this
.
doubleClickCell
);
...
@@ -683,7 +682,7 @@ export default ({
...
@@ -683,7 +682,7 @@ export default ({
console
.
log
(
'添加的字段==='
,
this
.
fieldFormUpdate
);
console
.
log
(
'添加的字段==='
,
this
.
fieldFormUpdate
);
if
(
this
.
dataState
)
{
if
(
this
.
dataState
)
{
this
.
tableDataUpdate
.
push
(
this
.
fieldFormUpdate
);
this
.
tableDataUpdate
.
push
(
this
.
fieldFormUpdate
);
}
}
},
},
// -----更新end------------------
// -----更新end------------------
...
@@ -715,4 +714,4 @@ export default ({
...
@@ -715,4 +714,4 @@ export default ({
.el-form-item--small.el-form-item
{
.el-form-item--small.el-form-item
{
margin-bottom
:
5px
!important
;
margin-bottom
:
5px
!important
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/views/kettle/home2.vue
View file @
4e9ff468
...
@@ -1208,22 +1208,17 @@ props: ["dragItem"],
...
@@ -1208,22 +1208,17 @@ props: ["dragItem"],
},
},
// 新建任务
// 新建任务
createJob
(){
createJob
(){
if
(
this
.
curNodeIconCls
==
'imageFolder'
){
this
.
estabDialogVisible
=
true
;
this
.
estabDialogVisible
=
true
;
this
.
estabTitle
=
'任务'
;
this
.
estabTitle
=
'任务'
;
}
else
{
this
.
$message
.
error
(
'请选择资源库中的一个目录'
);
}
},
},
// 新建目录
// 新建目录
createFile
(){
createFile
(){
if
(
this
.
curNodeIconCls
==
'imageFolder'
){
this
.
estabDialogVisible
=
true
;
this
.
estabDialogVisible
=
true
;
this
.
estabTitle
=
'目录'
;
this
.
estabTitle
=
'目录'
;
}
else
{
this
.
$message
.
error
(
'请选择资源库中的一个目录'
);
}
},
},
// 删除资源库文件
// 删除资源库文件
...
@@ -1255,7 +1250,7 @@ props: ["dragItem"],
...
@@ -1255,7 +1250,7 @@ props: ["dragItem"],
this
.
curNode
=
node
;
//当前选中节点
this
.
curNode
=
node
;
//当前选中节点
this
.
nodePath
=
data
.
path
;
//当前选择数
this
.
nodePath
=
data
.
path
;
//当前选择数
this
.
curNodeIconCls
=
node
.
data
.
iconCls
;
this
.
curNodeIconCls
=
node
.
data
.
iconCls
;
console
.
log
(
'当前节点的文件夹路径:'
,
this
.
nodePath
);
console
.
log
(
'当前节点的文件夹路径:'
,
this
.
nodePath
);
if
(
node
.
data
.
leaf
){
if
(
node
.
data
.
leaf
){
this
.
curNodeText
=
node
.
data
.
text
;
//当前节点
this
.
curNodeText
=
node
.
data
.
text
;
//当前节点
...
@@ -1269,7 +1264,7 @@ props: ["dragItem"],
...
@@ -1269,7 +1264,7 @@ props: ["dragItem"],
// this.tabShowFlag=true;//核心对象显项卡显示
// this.tabShowFlag=true;//核心对象显项卡显示
//mxl判断作业和转换----------------------
//mxl判断作业和转换----------------------
if
(
node
.
data
.
type
==
"transformation"
){
if
(
node
.
data
.
type
==
"transformation"
){
this
.
$refs
.
nodeMenu2
.
stepsFun
();
this
.
$refs
.
nodeMenu2
.
stepsFun
();
let
that
=
this
;
let
that
=
this
;
setTimeout
(
function
(){
setTimeout
(
function
(){
...
@@ -1302,10 +1297,10 @@ props: ["dragItem"],
...
@@ -1302,10 +1297,10 @@ props: ["dragItem"],
// this.$message.error('请选择一个资源库!');
// this.$message.error('请选择一个资源库!');
// return;
// return;
// }
// }
// console.log(data,'当前节点的父节点:',node.parent.data);
// console.log(data,'当前节点的父节点:',node.parent.data);
},
},
//修改资源库
//修改资源库
...
@@ -1340,7 +1335,7 @@ props: ["dragItem"],
...
@@ -1340,7 +1335,7 @@ props: ["dragItem"],
console
.
log
(
'导出资源库===='
);
console
.
log
(
'导出资源库===='
);
this
.
exportDialogVisible
=
true
;
this
.
exportDialogVisible
=
true
;
},
},
// 导入资源库弹窗
// 导入资源库弹窗
importTreeDialog
(){
importTreeDialog
(){
console
.
log
(
'导入资源库===='
);
console
.
log
(
'导入资源库===='
);
...
...
src/views/watch/transform.vue
View file @
4e9ff468
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
</div>
</div>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<div
class=
"grid-content bg-purpleThree"
>
<div
class=
"grid-content bg-purpleThree"
>
<i
class=
"el-icon-circle-close grid-icon"
></i>
<i
class=
"el-icon-circle-close grid-icon"
></i>
<div
class=
"num-content"
>
<div
class=
"num-content"
>
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
@
current-change=
"pageChange"
@
current-change=
"pageChange"
/>
/>
</div>
</div>
<!-- 分页end -->
<!-- 分页end -->
</div>
</div>
</el-card>
</el-card>
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
{{
transStatusList
[
scope
.
row
.
recordStatus
]
}}
{{
transStatusList
[
scope
.
row
.
recordStatus
]
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop
label=
"操作"
width=
"200"
align=
"center"
>
<el-table-column
prop
label=
"操作"
width=
"200"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
...
@@ -195,9 +195,9 @@
...
@@ -195,9 +195,9 @@
<pre
v-highlightjs=
"logContent"
><code
class=
"java"
/></pre>
<pre
v-highlightjs=
"logContent"
><code
class=
"java"
/></pre>
</el-dialog>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -350,7 +350,7 @@ export default {
...
@@ -350,7 +350,7 @@ export default {
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
errMsg
)
this
.
$message
.
error
(
res
.
errMsg
)
}
}
});
});
},
},
// 获取总列表
// 获取总列表
...
@@ -361,7 +361,7 @@ export default {
...
@@ -361,7 +361,7 @@ export default {
if
(
res
.
success
){
if
(
res
.
success
){
this
.
allTableData
=
res
.
data
;
this
.
allTableData
=
res
.
data
;
}
}
});
});
},
},
...
@@ -373,7 +373,7 @@ export default {
...
@@ -373,7 +373,7 @@ export default {
this
.
alRunningTransNum
=
res
.
data
;
this
.
alRunningTransNum
=
res
.
data
;
this
.
panelArr
[
0
].
num
=
this
.
alRunningTransNum
;
this
.
panelArr
[
0
].
num
=
this
.
alRunningTransNum
;
}
}
});
});
},
},
...
@@ -385,7 +385,7 @@ export default {
...
@@ -385,7 +385,7 @@ export default {
this
.
allSuccessCount
=
res
.
data
;
this
.
allSuccessCount
=
res
.
data
;
this
.
panelArr
[
1
].
num
=
this
.
allSuccessCount
;
this
.
panelArr
[
1
].
num
=
this
.
allSuccessCount
;
}
}
});
});
},
},
// 获取总执行失败次数
// 获取总执行失败次数
...
@@ -396,7 +396,7 @@ export default {
...
@@ -396,7 +396,7 @@ export default {
this
.
allFailCount
=
res
.
data
;
this
.
allFailCount
=
res
.
data
;
this
.
panelArr
[
2
].
num
=
this
.
allFailCount
;
this
.
panelArr
[
2
].
num
=
this
.
allFailCount
;
}
}
});
});
},
},
...
@@ -418,8 +418,7 @@ export default {
...
@@ -418,8 +418,7 @@ export default {
//查看详情
//查看详情
checkDetail
(
row
)
{
checkDetail
(
row
)
{
console
.
log
(
'打开查看详情弹窗id不为为null'
);
this
.
pageLog
.
transId
=
row
.
transId
;
this
.
pageLog
.
transId
=
row
.
id
;
this
.
getKettleTransRecordList
();
// 分页获取转换执行日志记录列表
this
.
getKettleTransRecordList
();
// 分页获取转换执行日志记录列表
this
.
getSimpleList
();
//获取我添加的作业列表 搜索下拉框列表
this
.
getSimpleList
();
//获取我添加的作业列表 搜索下拉框列表
this
.
dialogShow
=
true
;
this
.
dialogShow
=
true
;
...
@@ -427,7 +426,6 @@ export default {
...
@@ -427,7 +426,6 @@ export default {
//获取转换下拉列表
//获取转换下拉列表
getSimpleList
(){
getSimpleList
(){
getList
().
then
((
res
)
=>
{
getList
().
then
((
res
)
=>
{
console
.
log
(
'获取转换日志下拉列表:'
,
res
);
if
(
res
.
success
){
if
(
res
.
success
){
this
.
simpleList
=
res
.
data
;
this
.
simpleList
=
res
.
data
;
}
}
...
@@ -510,28 +508,28 @@ export default {
...
@@ -510,28 +508,28 @@ export default {
}
}
}
}
fileName
=
decodeURIComponent
(
fileName
)
fileName
=
decodeURIComponent
(
fileName
)
// 获取数据类型
// 获取数据类型
let
type
=
res
.
data
.
headers
[
'Content-Type'
][
0
];
let
type
=
res
.
data
.
headers
[
'Content-Type'
][
0
];
let
blob
=
new
Blob
([
res
.
data
],
{
type
:
type
})
let
blob
=
new
Blob
([
res
.
data
],
{
type
:
type
})
const
a
=
document
.
createElement
(
'a'
)
const
a
=
document
.
createElement
(
'a'
)
// 创建URL
// 创建URL
const
blobUrl
=
window
.
URL
.
createObjectURL
(
blob
)
const
blobUrl
=
window
.
URL
.
createObjectURL
(
blob
)
a
.
download
=
fileName
;
a
.
download
=
fileName
;
a
.
href
=
blobUrl
;
a
.
href
=
blobUrl
;
document
.
body
.
appendChild
(
a
);
document
.
body
.
appendChild
(
a
);
// 下载文件
// 下载文件
a
.
click
()
a
.
click
()
// 释放内存
// 释放内存
URL
.
revokeObjectURL
(
blobUrl
)
URL
.
revokeObjectURL
(
blobUrl
)
document
.
body
.
removeChild
(
a
)
document
.
body
.
removeChild
(
a
)
}
else
{
}
else
{
console
.
log
(
'error'
,
data
)
console
.
log
(
'error'
,
data
)
}
}
// var returnUrl=res.data;
// var returnUrl=res.data;
// var httpUrl= process.env.VUE_APP_BASE_API+returnUrl;
// var httpUrl= process.env.VUE_APP_BASE_API+returnUrl;
// this.downLoadFile(httpUrl);
// this.downLoadFile(httpUrl);
...
@@ -568,7 +566,7 @@ export default {
...
@@ -568,7 +566,7 @@ export default {
this
.
getKettleTransRecordList
();
this
.
getKettleTransRecordList
();
},
},
},
},
};
};
</
script
>
</
script
>
...
...
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