TreeData
/
cloud-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

wangxinyuan
lwj 2024-08-23 08:43:44 +08:00
parent 1e31ff1748 772c03c7d5
commit 2c82dd8e91
2 changed files with 69 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/task/task.js
View File

@ -4,7 +4,7 @@ import request from '@/utils/request'
export function selectTaskList(data){ export function selectTaskList(data){
return request({ return request({
url: "/task/task/list", url: "/task/task/list",
method: "get", method: "post",
data:data data:data
}) })
} }

113
src/views/task/task/index.vue
View File

@ -3,7 +3,7 @@
<el-form label-width="80px" :model="taskReq" ref="queryForm" :inline="true" class="demo-form-inline" size="small"> <el-form label-width="80px" :model="taskReq" ref="queryForm" :inline="true" class="demo-form-inline" size="small">
<el-form-item label="任务包含名称"> <el-form-item label="任务包含名称">
<el-input v-model="taskReq.taskName"></el-input> <el-input v-model="taskReq.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="优先级选择"> <el-form-item label="优先级选择">
<el-select v-model="taskReq.weigh" placeholder="请选择等级"> <el-select v-model="taskReq.weigh" placeholder="请选择等级">
@ -15,10 +15,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务执行状态"> <el-form-item label="任务执行状态">
<el-select v-model="taskReq.weigh" placeholder="请选择等级">
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
<el-option label="待执行" value="0"></el-option> <el-option label="待执行" value="0"></el-option>
<el-option label="正在执行" value="1"></el-option> <el-option label="正在执行" value="1"></el-option>
<el-option label="执行完毕" value="2"></el-option> <el-option label="执行完毕" value="2"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-button @click="findSelectTaskList()"> <el-button @click="findSelectTaskList()">
查询 查询
@ -35,16 +37,6 @@
<!-- >删除--> <!-- >删除-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button
v-hasPermi="['tool:gen:import']"
icon="el-icon-upload"
plain
size="mini"
type="info"
@click="findSelectSourceExport"
>导出
</el-button>
<el-button <el-button
icon="el-icon-delete" icon="el-icon-delete"
@ -56,26 +48,23 @@
</el-button> </el-button>
<el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible"> <!-- <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">-->
<el-form :model="sourceAddReq"> <!-- <el-form :model="sourceAddReq">-->
<el-form-item label="id"> <!-- <el-form-item label="id">-->
<el-input v-model="sourceAddReq.dataResourceName"></el-input> <!-- <el-input v-model="sourceAddReq.id"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="任务名称"> <!-- <el-form-item label="任务名称">-->
<el-input v-model="sourceAddReq.dataSourcesSystemName"></el-input> <!-- <el-input v-model="sourceAddReq.name"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="任务执行状态"> <!-- <el-form-item label="任务执行状态">-->
<el-input v-model="sourceAddReq.host"></el-input> <!-- <el-input v-model="sourceAddReq.weigh"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="任务完成度"> <!-- <el-form-item label="任务完成度">-->
<el-input v-model="sourceAddReq.port"></el-input> <!-- <el-input v-model="sourceAddReq.status"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="操作"> <!-- </el-form>-->
<el-input v-model="sourceAddReq.databaseType"></el-input> <!-- </el-dialog>-->
</el-form-item>
</el-form>
</el-dialog>
@ -83,11 +72,14 @@
<el-table <el-table
:data="source" :data="taskList"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
width="55"> width="55">
@ -96,27 +88,53 @@
<el-table-column <el-table-column
label="id" label="id"
prop="dataResourceName"> width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="任务名称" label="任务名称"
prop="dataSourcesSystemName"> width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.name }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="任务权重级别" label="任务权重级别"
prop="host"> width="180">
<template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.weigh ==1 ">紧急</span>
<span style="margin-left: 10px" v-if="scope.row.weigh ==2 ">底</span>
<span style="margin-left: 10px" v-if="scope.row.weigh ==3 ">中</span>
<span style="margin-left: 10px" v-if="scope.row.weigh ==4 ">高</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="人物执行状态" label="任务执行状态"
prop="port"> width="180">
<template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.status ==0 ">待执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==1 ">正在执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==2 ">执行完毕</span>
<span style="margin-left: 10px">{{ scope.row.status }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="任务完成度" label="任务完成度"
prop="databaseType"> width="180">
<template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.status ==0 ">待执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==1 ">正在执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==2 ">执行完毕</span>
<span style="margin-left: 10px">{{ scope.row.status }}</span>
</template>
</el-table-column> </el-table-column>
@ -180,28 +198,25 @@ export default {
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
textP(){
connectionTest(this.sourceAddReq).then(res=>{
if (res.code===200){
alert("测试连接成功")
}else{
alert("连接失败")
}
})
},
//测试连接
findSelectTaskList(){ findSelectTaskList(){
selectTaskList(this.taskReq).then(res=>{ selectTaskList(this.taskReq).then(res=>{
this.taskList=res.data.rows; console.log(res.data);
this.taskList=res.data;
console.log(this.taskList);
}) })
}, },
insertAdd(){
},
handleSelectionChange(row){ handleSelectionChange(row){
}, },
}, },
//生命周期 - 创建完成（可以访问当前this实例）", //生命周期 - 创建完成（可以访问当前this实例）",
created() { created() {
this.findSelectSourceList(); this.findSelectTaskList();
}, },
//生命周期 - 挂载完成（可以访问DOM元素）", //生命周期 - 挂载完成（可以访问DOM元素）",
mounted() { mounted() {