切换导航条
此项目
正在载入...
登录
朱兆平
/
vue_cli
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
小范
3 years ago
提交
9efcbb8ca640e97f91219dd8bd3eccf2d5ed56b5
1 个父辈
a9bb2eb8
任务管理界面更新
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
283 行增加
和
81 行删除
src/api/technological.js
src/views/technological/task.vue
static/nmmsVer.json
src/api/technological.js
查看文件 @
9efcbb8
...
...
@@ -13,6 +13,8 @@ export const create = params => { return http.post(`${baseUrl}/deployment/create
export
const
instanceList
=
params
=>
{
return
http
.
get
(
`
$
{
baseUrl
}
/process/i
nstanceList
`
,
params
);
};
//任务管理
export
const
allTask
=
params
=>
{
return
http
.
get
(
`
$
{
baseUrl
}
/task/
allTask
`
,
params
);
};
export
const
allTaskHistory
=
params
=>
{
return
http
.
get
(
`
$
{
baseUrl
}
/task/
allTaskHistory
`
,
params
);
};
export
const
uploadPath
=
`
/
api
/
$
{
baseUrl
}
/file/
upload
`
;
...
...
src/views/technological/task.vue
查看文件 @
9efcbb8
<template>
<el-container>
<el-main>
<!--检索条件-->
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
<el-col :span="6">
<el-input v-model="queryinfo.name" placeholder="任务名称" style="width: 200px" clearable>
<template slot="prepend">任务名称</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryinfo.taskDefinitionKey " placeholder="关键字" style="width: 200px" clearable>
<template slot="prepend">关键字</template>
</el-input>
</el-col>
<el-col :span="8">
<el-button type="primary" v-on:click="getList">查询</el-button>
<!-- <el-button type="success" v-on:click="toAddDialog">新增</el-button>-->
</el-col>
</el-row>
<el-row>
<template>
<el-table
v-loading="tableloading"
:data="tableData"
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
>
<el-table-column
prop="name"
label="任务名称"
width="160">
</el-table-column>
<el-table-column
prop="taskDefinitionKey "
label="关键字">
</el-table-column>
<el-table-column
prop="owner"
label="所有者">
</el-table-column>
<el-table-column
prop="assignee "
label="执行者"
width="160"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="createTime"
label="开始时间"
width="160">
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- label="操作"-->
<!-- width="280">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="success" size="mini" @click="sendForm()">实例管理</el-button>-->
<!-- <el-button type="warning" size="mini" @click="remove(scope.$index,scope.row)">删除</el-button>-->
<!-- <el-button type="danger" size="mini" @click="removeDel(scope.$index,scope.row)">彻底删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</template>
</el-row>
<!--分页模块-->
<el-row style="float: right;margin-top: 20px">
<el-col>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="queryinfo.pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="queryinfo.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-col>
<el-tabs type="border-card" @tab-click="handleClick">
<el-tab-pane label="待办任务">
<!--检索条件-->
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
<el-col :span="6">
<el-input v-model="queryinfo.name" placeholder="任务名称" style="width: 200px" clearable>
<template slot="prepend">任务名称</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryinfo.taskDefinitionKey " placeholder="关键字" style="width: 200px" clearable>
<template slot="prepend">关键字</template>
</el-input>
</el-col>
<el-col :span="8">
<el-button type="primary" v-on:click="getList">查询</el-button>
<!-- <el-button type="success" v-on:click="toAddDialog">新增</el-button>-->
</el-col>
</el-row>
<template>
<el-table
v-loading="tableloading"
:data="tableData"
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="mini"
>
<el-table-column
prop="name"
label="任务名称"
width="160">
</el-table-column>
<el-table-column
prop="taskDefinitionKey "
label="关键字">
</el-table-column>
<el-table-column
prop="owner"
label="所有者">
</el-table-column>
<el-table-column
prop="assignee "
label="执行者"
width="160"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="createTime"
label="开始时间"
width="160">
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- label="操作"-->
<!-- width="280">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="success" size="mini" @click="sendForm()">实例管理</el-button>-->
<!-- <el-button type="warning" size="mini" @click="remove(scope.$index,scope.row)">删除</el-button>-->
<!-- <el-button type="danger" size="mini" @click="removeDel(scope.$index,scope.row)">彻底删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</template>
<!--分页模块-->
<el-row style="float: right;margin-top: 20px">
<el-col>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="queryinfo.pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="queryinfo.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="已办任务">
<!--检索条件-->
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
<el-col :span="6">
<el-input v-model="queryinfo.name" placeholder="任务名称" style="width: 200px" clearable>
<template slot="prepend">任务名称</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryinfo.taskDefinitionKey " placeholder="关键字" style="width: 200px" clearable>
<template slot="prepend">关键字</template>
</el-input>
</el-col>
<el-col :span="8">
<el-button type="primary" v-on:click="getAllList">查询</el-button>
<!-- <el-button type="success" v-on:click="toAddDialog">新增</el-button>-->
</el-col>
</el-row>
<template>
<el-table
v-loading="tableloading"
:data="tableData"
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="mini"
>
<el-table-column
prop="name"
label="任务名称"
width="160">
</el-table-column>
<el-table-column
prop="taskDefinitionKey "
label="关键字">
</el-table-column>
<el-table-column
prop="owner"
label="所有者">
</el-table-column>
<el-table-column
prop="assignee "
label="执行者"
width="160"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="createTime"
label="开始时间"
width="160">
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- label="操作"-->
<!-- width="280">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="success" size="mini" @click="sendForm()">实例管理</el-button>-->
<!-- <el-button type="warning" size="mini" @click="remove(scope.$index,scope.row)">删除</el-button>-->
<!-- <el-button type="danger" size="mini" @click="removeDel(scope.$index,scope.row)">彻底删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</template>
<!--分页模块-->
<el-row style="float: right;margin-top: 20px">
<el-col>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="queryinfo.pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="queryinfo.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="我发起的">
<!--检索条件-->
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
<el-col :span="6">
<el-input v-model="queryinfo.name" placeholder="任务名称" style="width: 200px" clearable>
<template slot="prepend">任务名称</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryinfo.taskDefinitionKey " placeholder="关键字" style="width: 200px" clearable>
<template slot="prepend">关键字</template>
</el-input>
</el-col>
<el-col :span="8">
<el-button type="primary" v-on:click="getMyList">查询</el-button>
<!-- <el-button type="success" v-on:click="toAddDialog">新增</el-button>-->
</el-col>
</el-row>
<template>
<el-table
v-loading="tableloading"
:data="tableData"
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="mini"
>
<el-table-column
prop="name"
label="任务名称"
width="160">
</el-table-column>
<el-table-column
prop="taskDefinitionKey "
label="关键字">
</el-table-column>
<el-table-column
prop="owner"
label="所有者">
</el-table-column>
<el-table-column
prop="assignee "
label="执行者"
width="160"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="createTime"
label="开始时间"
width="160">
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- label="操作"-->
<!-- width="280">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="success" size="mini" @click="sendForm()">实例管理</el-button>-->
<!-- <el-button type="warning" size="mini" @click="remove(scope.$index,scope.row)">删除</el-button>-->
<!-- <el-button type="danger" size="mini" @click="removeDel(scope.$index,scope.row)">彻底删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</template>
<!--分页模块-->
<el-row style="float: right;margin-top: 20px">
<el-col>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="queryinfo.pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="queryinfo.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</el-row>
</el-main>
</el-container>
</template>
<script>
import {allTask} from "../../api/technological";
import {allTask
,allTaskHistory
} from "../../api/technological";
export default {
name: "task",
...
...
@@ -140,6 +308,38 @@
})
},
handleClick(tab, event){
if (tab.index == 0) {
this.getList();
} else if (tab.index == 1) {
this.getAllList();
} else {
this.getMyList();
}
},
//查询
getAllList() {
const _this = this
this.tableloading = true;
allTaskHistory(this.queryinfo).then((response) => {
const res = response.data
if (res.code != '200') {
return _this.$message.error('获取消息收发记录，失败！')
}
// 获取列表数据
_this.tableData = res.data
// 获取列表的总记录数
_this.total = res.total
this.tableloading = false;
_this.$message.success('获取消息收发记录，成功！')
}).catch(error => {
// 关闭加载
_this.$message.error(error.toString())
this.tableloading = false;
})
},
}
}
...
...
static/nmmsVer.json
查看文件 @
9efcbb8
{
"nmmsVer"
:
"1.2
4
"
"nmmsVer"
:
"1.2
5
"
}
...
...
请
注册
或
登录
后发表评论
