Commit f716f69c by 莫晓莉

etl弹窗

parent 4f3dcb0b
......@@ -14,7 +14,7 @@
<!-- <el-button class="btn-brush" icon="el-icon-plus" @click="centerDialogVisible = true"
 @click="addTask">新增数据库资源库</el-button
> -->
<el-button class="btn-brush" icon="el-icon-plus" @click="centerDialogVisible = true">新增数据库资源库</el-button>
<el-button class="btn-brush" icon="el-icon-plus"  @click="addModal" >新增数据库资源库</el-button>
<div>
<el-table
v-loading="loading"
......@@ -45,12 +45,19 @@
</el-table-column>
<el-table-column prop label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
<!-- <el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="editRow(scope.row, false)"
>编辑</el-button
> -->
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="editModal(1)"
>编辑</el-button
>
<el-button
size="mini"
......@@ -81,13 +88,14 @@
<!-- 新增和编辑弹窗start -->
<el-dialog
title="添加数据库资源库"
:title="curId?dialogMsgEdit:dialogMsgAdd"
:visible.sync="centerDialogVisible"
width="60%"
center>
center
top="2%">
<el-row :gutter="20">
<el-col :span="12" :offset="6">
<el-form ref="form" :model="form" label-width="250px">
<el-form ref="form" :model="form" label-width="auto">
<el-form-item label="资源库名称:">
<el-input placeholder="请输入资源库名称" v-model="form.name"></el-input>
</el-form-item>
......@@ -139,7 +147,8 @@
<span slot="footer" class="dialog-footer">
<el-button class="btn-brush" type="success" icon="el-icon-check" @click="centerDialogVisible = true">测试链接</el-button>
<el-button class="btn-brush" type="success" icon="el-icon-check" @click="centerDialogVisible = false">保存</el-button>
<el-button class="btn-brush" type="success" icon="el-icon-plus" @click="centerDialogVisible = true">取消</el-button>
<el-button v-if="curId" class="btn-brush" type="success" icon="el-icon-check" @click="centerDialogVisible = false">重置</el-button>
<el-button class="btn-brush" type="success" icon="el-icon-plus" @click="centerDialogVisible = false">取消</el-button>
<!-- <el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="centerDialogVisible = false">确 定</el-button> -->
</span>
......@@ -157,14 +166,7 @@ import {
} from "@/api/communication/announcement";
import { getDoctorList } from "@/api/hospitalapi/doctor";
import { getToken } from "@/utils/auth";
// import { quillEditor } from "vue-quill-editor";
// import "quill/dist/quill.core.css";
// import "quill/dist/quill.snow.css";
// import "quill/dist/quill.bubble.css";
export default {
// components: {
// quillEditor,
// },
filters: {
interceptionDate: function (value) {
if (!value) return;
......@@ -174,21 +176,15 @@ export default {
data() {
return {
tableData: [],
// dialogVisible: false,
pageInfo: {
page: 1,
size: 10,
},
loading: false,
// editorOption: {},
// article: {},
// addStaus: true,
// doctor: {},
headers: {}, // 头部信息
// fileList: [],
centerDialogVisible: false,
centerDialogVisible: false,
form: {},
options: [{
options: [{
value: '选项1',
label: '黄金糕'
}, {
......@@ -204,7 +200,11 @@ export default {
value: '选项5',
label: '北京烤鸭'
}],
value: ''
value: '',
dialogMsgAdd:'添加数据库资源库',
dialogMsgEdit:'编辑数据库资源库',
curId:null,
};
},
created() {
......@@ -268,6 +268,18 @@ export default {
}
});
},
// 新增数据库资源库
addModal() {
      console.log('新增时候id为null');
this.centerDialogVisible=true
      
    },
//新增数据库资源库
editModal(id) {
this.curId=1;
      console.log('编辑时候id不为为null');
this.centerDialogVisible=true    
    },
// 添加活动
//     addTask() {
......@@ -298,7 +310,7 @@ export default {
background-color: #23c6c8;
color: #ffffff;
font-size: 14px;
font-weight: bold;
font-weight: bolder;
}
/* .el-card__header {
padding: 15px 20px;
......
......@@ -14,7 +14,7 @@
</div>
<el-button class="btn-brush" icon="el-icon-plus"
 @click="addTask">新增策略</el-button
 @click="addModalOne">新增策略</el-button
>
<div>
<el-table
......@@ -48,7 +48,7 @@
size="mini"
type="primary"
icon="el-icon-edit"
@click="editRow(scope.row, false)"
@click="editModal(scope.row)"
>编辑</el-button
>
<el-button
......@@ -78,6 +78,34 @@
</el-card>
<!-- 1、新增资源库作业start -->
<el-dialog
:title="curId?dialogMsgEdit:dialogMsgAdd"
:visible.sync="DialogVisibleOne"
width="60%"
center
top="2%">
<el-row :gutter="20">
<el-col :span="12" :offset="5">
<el-form ref="form" :model="form" label-width="auto">
<el-form-item label="策略描述:">
<el-input placeholder="请输入策略描述,例如每天凌晨一点执行" v-model="form.name" show-password class="input-length"></el-input>
</el-form-item>
<el-form-item label="策略Cron:">
<el-input placeholder="请输入策略Cron" v-model="form.name" show-password class="input-length"></el-input>
<span>生成cron表达式(生成后填入上面的框中)</span>
</el-form-item>
</el-form>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button class="btn-brush" type="success" icon="el-icon-check" @click="DialogVisibleOne = true">保存</el-button>
<el-button class="btn-brush" type="success" icon="el-icon-plus" @click="DialogVisibleOne = false">取消</el-button>
</span>
</el-dialog>
<!--1、 新增资源库作业end -->
</div>
</template>
......@@ -107,18 +135,36 @@ export default {
data() {
return {
tableData: [],
// dialogVisible: false,
pageInfo: {
page: 1,
size: 10,
},
loading: false,
// editorOption: {},
// article: {},
// addStaus: true,
// doctor: {},
headers: {}, // 头部信息
// fileList: [],
jobShow: false, //作业监控记录
DialogVisibleOne: false,//新增资源库作业弹窗
form: {},
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
value: '',
dialogMsgAdd:'添加用户',
dialogMsgEdit:'编辑用户',
curId: null,
};
},
created() {
......@@ -127,6 +173,16 @@ export default {
},
methods: {
// 新增
addModalOne() {
this.DialogVisibleOne=true;   
    },
//编辑
editModal(id) {
this.curId=1;
      console.log('编辑时候id不为为null');
this.DialogVisibleOne=true    
    },
setHeaders() {
this.headers = {
contentType: "application/x-www-form-urlencoded",
......@@ -234,4 +290,10 @@ export default {
color: #c4c4c4;
margin-right: 5px;
}
.right{
float:right;
}
.input-length{
width: 500px;
}
</style>
......@@ -14,7 +14,7 @@
</div>
<el-button class="btn-brush" icon="el-icon-plus"
 @click="addTask">新增用户</el-button
 @click="addModalOne">新增用户</el-button
>
<div>
<el-table
......@@ -54,7 +54,7 @@
size="mini"
type="primary"
icon="el-icon-edit"
@click="editRow(scope.row, false)"
@click="editModal(scope.row)"
>编辑</el-button
>
<el-button
......@@ -84,6 +84,91 @@
</el-card>
<!-- 1、新增资源库作业start -->
<el-dialog
:title="curId?dialogMsgEdit:dialogMsgAdd"
:visible.sync="DialogVisibleOne"
width="60%"
center
top="2%">
<el-row :gutter="20">
<el-col :span="12" :offset="4">
<el-form ref="form" :model="form" label-width="auto">
<!-- <el-form-item label="资源库:">
<el-select v-model="value" clearable placeholder="请选择资源库" class="input-length">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="作业:">
<el-select v-model="value" clearable placeholder="请选择作业" class="input-length">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="用户账号:">
<el-input placeholder="请输入用户账号,例如admin" v-model="form.name" show-password class="input-length"></el-input>
</el-form-item>
<el-form-item label="用户密码:">
<el-input :placeholder="curId?'请输入用户密码':'不输入不代表修改密码'" v-model="form.name" show-password class="input-length"></el-input>
</el-form-item>
<el-form-item label="用户姓名:">
<el-input placeholder="请输入用户姓名,例如张三" v-model="form.name" show-password class="input-length"></el-input>
</el-form-item>
<el-form-item label="用户邮箱:">
<el-input placeholder="请输入用户邮箱" v-model="form.name" show-password class="input-length"></el-input>
</el-form-item>
<el-form-item label="用户电话:">
<el-input placeholder="请输入用户电话" v-model="form.name" show-password class="input-length"></el-input>
</el-form-item>
<!-- <el-form-item label="作业执行策略:">
<el-select v-model="value" clearable placeholder="请选择转换执行策略(请在菜单:系统管理 -> 策略配置中进行维护)" class="input-length">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="记录日志级别:">
<el-select v-model="value" clearable placeholder="请选择日志级别" class="input-length">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="作业描述:">
<el-input
v-model="form.name"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
placeholder="请输入作业描述,不超过500字"
class="input-length"/>
</el-form-item> -->
</el-form>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button class="btn-brush" type="success" icon="el-icon-check" @click="DialogVisibleOne = true">保存</el-button>
<el-button class="btn-brush" type="success" icon="el-icon-plus" @click="DialogVisibleOne = false">取消</el-button>
</span>
</el-dialog>
<!--1、 新增资源库作业end -->
</div>
</template>
......@@ -113,18 +198,37 @@ export default {
data() {
return {
tableData: [],
// dialogVisible: false,
pageInfo: {
page: 1,
size: 10,
},
loading: false,
// editorOption: {},
// article: {},
// addStaus: true,
// doctor: {},
headers: {}, // 头部信息
// fileList: [],
jobShow: false, //作业监控记录
DialogVisibleOne: false,//新增资源库作业弹窗
form: {},
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
value: '',
dialogMsgAdd:'添加用户',
dialogMsgEdit:'编辑用户',
curId: null,
};
},
created() {
......@@ -133,6 +237,16 @@ export default {
},
methods: {
// 新增
addModalOne() {
this.DialogVisibleOne=true;   
    },
//编辑
editModal(id) {
this.curId=1;
      console.log('编辑时候id不为为null');
this.DialogVisibleOne=true    
    },
setHeaders() {
this.headers = {
contentType: "application/x-www-form-urlencoded",
......@@ -240,4 +354,10 @@ export default {
color: #c4c4c4;
margin-right: 5px;
}
.right{
float:right;
}
.input-length{
width: 500px;
}
</style>
......@@ -78,7 +78,7 @@
size="mini"
type="success"
icon="el-icon-view"
@click="editRow(scope.row, false)"
@click="seeDeatail()"
>查看详细</el-button
>
</template>
......@@ -101,6 +101,94 @@
</el-card>
<!-- 查看详情模态弹窗start -->
<el-dialog
:visible="dialogShow"
top="30px"
width="1200px"
title="日志执行日志记录"
:before-close="dialogShowChange"
>
<!-- 搜索start -->
<div>
<el-form :inline="true" size="small">
<el-form-item>
<el-select v-model="value" clearable placeholder="请选择日志" class="input-length">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button class="btn-brush right" icon="el-icon-plus" @click="pageChange()">搜索</el-button>
</el-form-item>
</el-form>
</div>
<!-- 搜索end -->
<el-table
v-loading="loading"
:data="tableData"
border
style="width: 100%"
:header-cell-style="{ color: '#606266' }"
>
<el-table-column prop="id" label="记录编号" width="100" align="center" />
<el-table-column label="作业名称" align="center">
工程数据抽取
</el-table-column>
<el-table-column label="日志执行起始时间" align="center">
2020-11-29 14:08:00
</el-table-column>
<el-table-column label="日志执行结束时间" align="center">
2020-11-29 14:08:00
</el-table-column>
<el-table-column label="日志执行状态" align="center">
1
</el-table-column>
<el-table-column prop label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-view"
@click="info(scope.row.id)"
>查看</el-button
>
<el-button
size="mini"
type="success"
icon="el-icon-download"
@click="seeDeatail()"
>下载</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<div class="pagination" style="text-align:right;">
<el-pagination
background
layout="total ,prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
/>
</div>
</el-dialog>
<!-- 查看详情模态弹窗end -->
<!-- 日志弹窗 -->
<el-dialog :visible.sync="dialog" title="转换日志记录" append-to-body top="100px" width="600px">
<pre v-highlightjs="errorInfo"><code class="java" /></pre>
</el-dialog>
</div>
</template>
......@@ -113,14 +201,7 @@ import {
} from "@/api/communication/announcement";
import { getDoctorList } from "@/api/hospitalapi/doctor";
import { getToken } from "@/utils/auth";
// import { quillEditor } from "vue-quill-editor";
// import "quill/dist/quill.core.css";
// import "quill/dist/quill.snow.css";
// import "quill/dist/quill.bubble.css";
export default {
// components: {
// quillEditor,
// },
filters: {
interceptionDate: function (value) {
if (!value) return;
......@@ -129,19 +210,34 @@ export default {
},
data() {
return {
jobShow:true,
tableData: [],
// dialogVisible: false,
pageInfo: {
page: 1,
size: 10,
},
loading: false,
// editorOption: {},
// article: {},
// addStaus: true,
// doctor: {},
headers: {}, // 头部信息
// fileList: [],
dialogShow:false,//查看详情弹窗
dialog:false,//查看日志详情
errorInfo:'',//日志详情
value:'',
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
};
},
created() {
......@@ -150,6 +246,21 @@ export default {
},
methods: {
// 新增资源库作业弹窗
seeDeatail() {
this.dialogShow=true;   
    },
//关闭模态框操作
dialogShowChange() {
this.dialogShow = false
},
// 获取异常详情
info(id) {
this.dialog = true;
this.errorInfo = "me.zhengjie.exception.BadRequestException: 演示环境不可操作"
},
setHeaders() {
this.headers = {
contentType: "application/x-www-form-urlencoded",
......@@ -298,4 +409,12 @@ export default {
.right{
float:right;
}
.el-dialog__body {
padding: 0 20px 10px 20px !important;
}
.java.hljs {
color: #444;
background: #ffffff !important;
height: 400px !important;
}
</style>
......@@ -78,7 +78,7 @@
size="mini"
type="success"
icon="el-icon-view"
@click="editRow(scope.row, false)"
@click="seeDeatail()"
>查看详细</el-button
>
</template>
......@@ -101,6 +101,95 @@
</el-card>
<!-- 查看详情模态弹窗start -->
<el-dialog
:visible="dialogShow"
top="30px"
width="1200px"
title="转换执行日志记录"
:before-close="dialogShowChange"
>
<!-- 搜索start -->
<div>
<el-form :inline="true" size="small">
<el-form-item>
<el-select v-model="value" clearable placeholder="请选择转换" class="input-length">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button class="btn-brush right" icon="el-icon-plus" @click="pageChange()">搜索</el-button>
</el-form-item>
</el-form>
</div>
<!-- 搜索end -->
<el-table
v-loading="loading"
:data="tableData"
border
style="width: 100%"
:header-cell-style="{ color: '#606266' }"
>
<el-table-column prop="id" label="记录编号" width="100" align="center" />
<el-table-column label="转换名称" align="center">
工程数据抽取
</el-table-column>
<el-table-column label="转换执行起始时间" align="center">
2020-11-29 14:08:00
</el-table-column>
<el-table-column label="转换执行结束时间" align="center">
2020-11-29 14:08:00
</el-table-column>
<el-table-column label="转换执行状态" align="center">
运行成功
</el-table-column>
<el-table-column prop label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-view"
@click="info(scope.row.id)"
>查看</el-button
>
<el-button
size="mini"
type="success"
icon="el-icon-download"
@click="seeDeatail()"
>下载</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<div class="pagination" style="text-align:right;">
<el-pagination
background
layout="total ,prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
/>
</div>
</el-dialog>
<!-- 查看详情模态弹窗end -->
<!-- 日志弹窗 -->
<el-dialog :visible.sync="dialog" title="转换日志记录" append-to-body top="100px" width="600px">
<pre v-highlightjs="errorInfo"><code class="java" /></pre>
</el-dialog>
</div>
</template>
......@@ -113,14 +202,7 @@ import {
} from "@/api/communication/announcement";
import { getDoctorList } from "@/api/hospitalapi/doctor";
import { getToken } from "@/utils/auth";
// import { quillEditor } from "vue-quill-editor";
// import "quill/dist/quill.core.css";
// import "quill/dist/quill.snow.css";
// import "quill/dist/quill.bubble.css";
export default {
// components: {
// quillEditor,
// },
filters: {
interceptionDate: function (value) {
if (!value) return;
......@@ -129,19 +211,34 @@ export default {
},
data() {
return {
jobShow:true,
tableData: [],
// dialogVisible: false,
pageInfo: {
page: 1,
size: 10,
},
loading: false,
// editorOption: {},
// article: {},
// addStaus: true,
// doctor: {},
headers: {}, // 头部信息
// fileList: [],
dialogShow:false,//查看详情弹窗
dialog:false,//查看日志详情
errorInfo:'',//日志详情
value:'',
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
};
},
created() {
......@@ -150,6 +247,19 @@ export default {
},
methods: {
// 新增资源库作业弹窗
seeDeatail() {
this.dialogShow=true;   
    },
//关闭模态框操作
dialogShowChange() {
this.dialogShow = false
},
// 获取异常详情
info(id) {
this.dialog = true;
this.errorInfo = "me.zhengjie.exception.BadRequestException: 演示环境不可操作"
},
setHeaders() {
this.headers = {
contentType: "application/x-www-form-urlencoded",
......
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