Skip to content

E
ETL-admin
Commit 3302a397 by 李耀琨
Options

ff

parent 33b34b14
Showing with 600 additions and 25 deletions
.env.development
......@@ -2,8 +2,8 @@ ENV = 'development'
VUE_APP_BASE_API = 'http://192.168.0.44:9888/'
VUE_APP_WS_API = 'ws://192.168.0.44:9888/'
VUE_APP_BASE_API = 'http://147.1.3.180:9888/'
VUE_APP_WS_API = 'ws://147.1.3.180:9888/'
......
src/main.js
......@@ -78,8 +78,8 @@ 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 = "http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/"
Vue.prototype.etlWeb = "http://192.168.0.44:9888/ETLWEB-SERVER/etlweb/"
Vue.prototype.etlWeb = "http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/"
// Vue.prototype.etlWeb = "http://192.168.0.44:9888/ETLWEB-SERVER/etlweb/"
new Vue({
router,
......
src/views/dashboard-kettle/components/appBulletFrame/importXmlFile.vue
......@@ -10,6 +10,7 @@
<el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input>
</el-form-item>
{{8^100}}
</el-form>
<el-tabs type="border-card">
......@@ -208,7 +209,9 @@ export default {
props: ["importXmlFileDialog"],
data() {
return {
form: {},
form: {
},
conversionForm: {},
fields: [],
liList: [
......@@ -266,7 +269,9 @@ export default {
switchState: 1,
};
},
created() {},
created() {
},
methods: {
switchJournal(val) {
this.switchState = val.id;
......
src/views/dashboard-kettle/components/appBulletFrame/mappingInput.vue 0 → 100644
<template>
<div class="getSystemInformation">
<el-dialog
title="映射输入规范"
:visible.sync="mappingInputDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" label-width="0px">
<el-button type="text" @click="addSheet(true)" style="margin: 10px"
>添加字段</el-button
>
<el-form-item>
对于这个mapping (sub-transformation)要求的输入字段:
</el-form-item>
<el-form-item>
<el-table :data="fields" style="width: 100%">
<el-table-column label="字段">
<el-table-column prop="name" label="名称"> </el-table-column>
<el-table-column prop="type" label="类型"> </el-table-column>
<el-table-column prop="type" label="长度"> </el-table-column>
<el-table-column prop="type" label="精度"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@click="addSheet(false, scope.row)"
type="text"
size="small"
>编辑</el-button
>
<el-button
type="text"
size="small"
@click="deleteRow(scope.$index, fields)"
>删除</el-button
>
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-form-item >
<el-form-item >
<el-checkbox
v-model="form.capture_step_performance"
true-label="Y"
false-label="N"
></el-checkbox>
Include unspecified fields, ordered by name
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="mappingInputDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog
title="添加字段"
:visible.sync="addField"
width="500px"
:before-close="handleClose"
:modal="false"
>
<el-form ref="form" :model="fiel" label-width="160px">
<el-form-item label="名称:">
<el-input v-model="fiel.name"></el-input>
</el-form-item>
<el-form-item label="类型:">
<el-select v-model="fiel.type" style="width: 100%" clearable>
<el-option
v-for="item in type"
:key="item.code"
:label="item.descrp"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addField = false">取 消</el-button>
<el-button type="primary" @click="addFieldDetermine">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { systemDataTypes } from "@/api/kettle/link";
export default {
props: ["form", "mappingInputDialog", "saveOutputDialog", "nodeData"],
data() {
return {
addField: false,
fields: [],
type: {},
dataStatus: false,
fiel: {},
};
},
created() {
this.systemDataTypesFun();
},
methods: {
clickFun(graph, val) {
console.log(graph, "双击获取值");
this.newGraph = graph;
console.log(val, "拿到form");
this.fields = JSON.parse(val.fields);
},
handleCloseFun() {
this.$emit("update:mappingInputDialog", false);
},
mappingInputDialogFun() {
this.handleCloseFun();
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form);
},
addFieldDetermine() {
this.addField = !this.addField;
if (this.dataStatus) {
this.fields.push(this.fiel);
} else {
}
},
// 关闭弹框
handleClose(done) {
this.$confirm("确认关闭？")
.then((_) => {
done();
})
.catch((_) => {});
},
deleteRow(index, rows) {
rows.splice(index, 1);
},
addSheet(state, val) {
this.addField = !this.addField;
this.dataStatus = state;
if (state) {
this.fiel = {};
} else {
this.fiel = val;
}
},
systemDataTypesFun() {
systemDataTypes().then((res) => {
this.type = res;
});
},
},
};
</script>
<style lang="scss" scoped>
* {
outline: none;
}
</style>
src/views/dashboard-kettle/components/appBulletFrame/mappingOutput.vue 0 → 100644
<template>
<div class="getSystemInformation">
<el-dialog
title="映射输出规范"
:visible.sync="mappingOutputDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCloseFun">取 消</el-button>
<el-button type="primary" @click="mappingOutputDialogFun"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog
title="添加字段"
:visible.sync="addField"
width="500px"
:before-close="handleClose"
:modal="false"
>
<el-form ref="form" :model="fiel" label-width="160px">
<el-form-item label="名称:">
<el-input v-model="fiel.name"></el-input>
</el-form-item>
<el-form-item label="类型:">
<el-select v-model="fiel.type" style="width: 100%" clearable>
<el-option
v-for="item in type"
:key="item.code"
:label="item.descrp"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addField = false">取 消</el-button>
<el-button type="primary" @click="addFieldDetermine">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { systemDataTypes } from "@/api/kettle/link";
export default {
props: ["form", "mappingOutputDialog", "saveOutputDialog", "nodeData"],
data() {
return {
addField: false,
fields: [],
type: {},
dataStatus: false,
fiel: {},
};
},
created() {
this.systemDataTypesFun();
},
methods: {
clickFun(graph, val) {
console.log(graph, "双击获取值");
this.newGraph = graph;
console.log(val, "拿到form");
this.fields = JSON.parse(val.fields);
},
handleCloseFun() {
this.$emit("update:mappingOutputDialog", false);
},
mappingOutputDialogFun() {
this.handleCloseFun();
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form);
},
addFieldDetermine() {
this.addField = !this.addField;
if (this.dataStatus) {
this.fields.push(this.fiel);
} else {
}
},
// 关闭弹框
handleClose(done) {
this.$confirm("确认关闭？")
.then((_) => {
done();
})
.catch((_) => {});
},
deleteRow(index, rows) {
rows.splice(index, 1);
},
addSheet(state, val) {
this.addField = !this.addField;
this.dataStatus = state;
if (state) {
this.fiel = {};
} else {
this.fiel = val;
}
},
systemDataTypesFun() {
systemDataTypes().then((res) => {
this.type = res;
});
},
},
};
</script>
<style lang="scss" scoped>
* {
outline: none;
}
</style>
src/views/dashboard-kettle/components/appBulletFrame/nullOperation.vue 0 → 100644
<template>
<div class="getSystemInformation">
<el-dialog
title="空操作（什么也不做）"
:visible.sync="nullOperationDialog"
width="800px"
:before-close="handleCloseFun"
>
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="步骤名称:">
<el-input v-model="form.label"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="cd">取 消</el-button>
<el-button type="primary" @click="fetch"
>确 定</el-button
>
</span>
</el-dialog>
<el-dialog
title="添加字段"
:visible.sync="addField"
width="500px"
:before-close="handleClose"
:modal="false"
>
<el-form ref="form" :model="fiel" label-width="160px">
<el-form-item label="名称:">
<el-input v-model="fiel.name"></el-input>
</el-form-item>
<el-form-item label="类型:">
<el-select v-model="fiel.type" style="width: 100%" clearable>
<el-option
v-for="item in type"
:key="item.code"
:label="item.descrp"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addField = false">取 消</el-button>
<el-button type="primary" @click="addFieldDetermine">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { systemDataTypes } from "@/api/kettle/link";
export default {
props: ["form", "nullOperationDialog", "saveOutputDialog", "nodeData"],
data() {
return {
addField: false,
fields: [],
type: {},
dataStatus: false,
fiel: {},
};
},
created() {
this.systemDataTypesFun();
},
methods: {
cd(){
var arr = [0, 1, 1, 6, 0, 3, 1, 2, 5, 2, 8, 0]
var q = []
for (let i = 0; i < arr.length; i++) {
if(q.indexOf(arr[i]) == -1){
q.push(arr[i]);
}
}
return console.log(q);;
},
fetch(){
var list = [{
typeId: 10,
typeName: '大菜',
foodId: 1,
foodName: '鱼香肉丝'
},
{
typeId: 9,
typeName: '小菜',
foodId: 2,
foodName: '手拍黄瓜'
},
{
typeId: 10,
typeName: '大菜',
foodId: 3,
foodName: '红烧排骨'
}
]
var newListq = []
var newList = []
for (let i = 0; i < list.length; i++) {
let newLists = []
if (list[i].typeId== 10 || list[i].typeName=='大菜') {
newLists.typeId = 10
newLists.typeName = "大菜"
newLists.foodList = [{foodId:list[i].foodId,foodName:list[i].foodName}]
newListq.push(newLists)
}else if (list[i].typeId== 9 || list[i].typeName=='小菜') {
newLists.typeId = 9
newLists.typeName = "小菜"
newLists.foodList = [{foodId:list[i].foodId,foodName:list[i].foodName}]
newListq.push(newLists)
}
}
return console.log([]==[]);
},
clickFun(graph, val) {
console.log(graph, "双击获取值");
this.newGraph = graph;
console.log(val, "拿到form");
this.fields = JSON.parse(val.fields);
},
handleCloseFun() {
this.$emit("update:nullOperationDialog", false);
},
nullOperationDialogFun() {
this.handleCloseFun();
this.form.fields = JSON.stringify(this.fields);
this.saveOutputDialog(this.form);
},
addFieldDetermine() {
this.addField = !this.addField;
if (this.dataStatus) {
this.fields.push(this.fiel);
} else {
}
},
// 关闭弹框
handleClose(done) {
this.$confirm("确认关闭？")
.then((_) => {
done();
})
.catch((_) => {});
},
deleteRow(index, rows) {
rows.splice(index, 1);
},
addSheet(state, val) {
this.addField = !this.addField;
this.dataStatus = state;
if (state) {
this.fiel = {};
} else {
this.fiel = val;
}
},
systemDataTypesFun() {
systemDataTypes().then((res) => {
this.type = res;
});
},
},
};
</script>
<style lang="scss" scoped>
* {
outline: none;
}
</style>
src/views/dashboard-kettle/components/designer/modules/node_menu.vue
......@@ -87,8 +87,8 @@ export default {
data() {
return {
// prefix:'http://192.168.0.2:9700/etlweb/',
// prefix:`http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/`,
prefix:`http://192.168.0.44:9888/ETLWEB-SERVER/etlweb/`,
prefix:`http://147.1.3.180:9888/ETLWEB-SERVER/etlweb/`,
// prefix:`http://192.168.0.44:9888/ETLWEB-SERVER/etlweb/`,
// 测试数据开始=====
jobTreeList: [
{
......
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
......@@ -909,7 +909,36 @@
:mappingDialog.sync="mappingDialog"
:saveOutputDialog="saveOutputDialog"
></mapping>
<!-- 映射输入 -->
<mappingInput
ref="mappingInput"
:disabed="true"
:form="form"
:nodeData="nodeData"
:mappingInputDialog.sync="mappingInputDialog"
:saveOutputDialog="saveOutputDialog"
></mappingInput>
<!-- 映射输出 -->
<mappingOutput
ref="mappingOutput"
:disabed="true"
:form="form"
:nodeData="nodeData"
:mappingOutputDialog.sync="mappingOutputDialog"
:saveOutputDialog="saveOutputDialog"
></mappingOutput>
<!-- 空操作 -->
<nullOperation
ref="nullOperation"
:disabed="true"
:form="form"
:nodeData="nodeData"
:nullOperationDialog.sync="nullOperationDialog"
:saveOutputDialog="saveOutputDialog"
></nullOperation>
<!-- Get data from XML -->
<xmlFileInput
ref="xmlFileInput"
:disabed="true"
......@@ -918,6 +947,25 @@
:xmlFileInputDialog.sync="xmlFileInputDialog"
:saveOutputDialog="saveOutputDialog"
></xmlFileInput>
<!-- 转换属性设置 -->
<conversionSettings
ref="conversionSettings"
:conversionSettingsDialog.sync="conversionSettingsDialog"
:doubleClickCell="doubleClickCell"
></conversionSettings>
<!-- 作业属性设置 -->
<jobSettings
ref="jobSettings"
:jobSettingsDialog.sync="jobSettingsDialog"
:doubleClickCell="doubleClickCell"
></jobSettings>
<!-- 输入xml文件 -->
<importXmlFile
ref="importXmlFile"
:importXmlFileDialog.sync="importXmlFileDialog"
:doubleClickCell="doubleClickCell"
></importXmlFile>
......@@ -1104,23 +1152,7 @@
<!-- 执行作业结束 -->
<conversionSettings
ref="conversionSettings"
:conversionSettingsDialog.sync="conversionSettingsDialog"
></conversionSettings>
<jobSettings
ref="jobSettings"
:jobSettingsDialog.sync="jobSettingsDialog"
></jobSettings>
<importXmlFile
ref="importXmlFile"
:importXmlFileDialog.sync="importXmlFileDialog"
></importXmlFile>
......@@ -1190,7 +1222,12 @@ import mergeRecords from "../appBulletFrame/mergeRecords"; //合并记录
import selectField from "../appBulletFrame/selectField"; //选择字段
import toRepeat from "../appBulletFrame/toRepeat" //去除重复
import mapping from "../appBulletFrame/mapping" //映射(子转换)
import mappingInput from "../appBulletFrame/mappingInput" //映射输入
import mappingOutput from "../appBulletFrame/mappingOutput" //映射输出
import xmlFileInput from "../appBulletFrame/xmlFileInput" //xml文件输入
import nullOperation from "../appBulletFrame/nullOperation" //空操作
import conversionSettings from "../appBulletFrame/conversionSettings" //转换设置
import jobSettings from "../appBulletFrame/jobSettings" //作业设置
......@@ -1317,6 +1354,9 @@ export default {
jobSettingsDialog:false,//作业设置
toRepeatDialog:false,//去除重复
mappingDialog:false,//映射(子转换)
mappingInputDialog:false,//映射输入
mappingOutputDialog:false,//映射输出
nullOperationDialog:false,//空操作
xmlFileInputDialog:false,//xml文件输入
importXmlFileDialog:false,//导出资源库到XML文件
......@@ -1421,6 +1461,9 @@ export default {
jobSettings,//作业设置
toRepeat,//去除重复
mapping,//映射 (子转换)
mappingInput,//映射输入
mappingOutput,//映射输出
nullOperation,//空操作
xmlFileInput,//xml 文件输入
importXmlFile,//导出资源库到XML文件
// 作业弹簧组件end----------------------
......@@ -2456,6 +2499,21 @@ export default {
this.mappingDialog = !this.mappingDialog
});
menu.addItem("映射输入规范", null, () => {
console.log(cell, "当前节点");
this.mappingInputDialog = !this.mappingInputDialog
});
menu.addItem("映射输出规范", null, () => {
console.log(cell, "当前节点");
this.mappingOutputDialog = !this.mappingOutputDialog
});
menu.addItem("空操作", null, () => {
console.log(cell, "当前节点");
this.nullOperationDialog = !this.nullOperationDialog
});
menu.addItem("Get data from XML", null, () => {
console.log(cell, "当前节点");
this.xmlFileInputDialog = !this.xmlFileInputDialog
......@@ -2472,6 +2530,8 @@ export default {
menu.addItem("导出资源库到XML文件", null, () => {
console.log(cell, "当前节点");
this.importXmlFileDialog = !this.importXmlFileDialog
console.log(typeof this.form.q);
});
menu.addSeparator();
}
......
src/views/task/transform.vue
......@@ -33,7 +33,7 @@
>
<el-table-column prop="id" label="转换编号" align="center" width="100"/>
<el-table-column prop="name" label="转换名称" align="center"/>
<el-table-column prop="description" label="转换策略" align="center" />
<el-table-column prop="customerQuarz" label="转换策略" align="center" />
<el-table-column prop="updateTime" label="转换更新时间" align="center">
<template slot-scope="scope">
{{ scope.row.updateTime | dateformat("YYYY-MM-DD HH:mm:mm") }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment