jianzhenyu
/
Changsha_tupu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

任务

small-tupu
hanyuqing 7 months ago
parent
2e5741eb17
commit
f3f3cf8cb9
7 changed files with 90 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      gyxtp/src/view/small.vue
  2. 8
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java
  3. 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java
  4. 10
      ruoyi-system/src/main/resources/mapper/system/ZhyTaskInfoMapper.xml
  5. 7
      ruoyi-ui/src/api/system/task.js
  6. 79
      ruoyi-ui/src/views/system/info/index.vue
  7. 7
      ruoyi-ui/src/views/system/task/index.vue

12
gyxtp/src/view/small.vue
View File

@ -99,7 +99,9 @@
<el-table :data="tableData" style="width: 95%;margin-left: 2.5%;height: 97%; background: transparent;" v-if="drawer">
<el-table-column prop="title" label="文档名称" style="padding-bottom: 2vh;">
<template #default="scope">
<div @click="goArticle(scope.row)" style="cursor: pointer; padding: 8px;">
{{scope.row.title}}
</div>
</template>
</el-table-column>
</el-table>
@ -348,6 +350,16 @@ export default {
params: { id: nodeObject.id }
})
},
goArticle(row){
console.log(row.id)
this.$router.push({
path: '/articleInfo',
query: {
id: row.id
}
})
},
getColor(type){
let res = "rgb(227,203,0)"
if (type=="author"){

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java
View File

@ -47,6 +47,14 @@ public class ZhyTaskController extends BaseController
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('system:task:list')")
@GetMapping("/getAll")
public TableDataInfo getAll(ZhyTask zhyTask)
{
List<ZhyTask> list = zhyTaskService.selectZhyTaskList(zhyTask);
return getDataTable(list);
}
/**
* 导出任务列表
*/

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java
View File

@ -37,6 +37,7 @@ public class ZhyTaskInfoController extends BaseController
{
startPage();
List<ZhyTaskInfo> list = zhyTaskInfoService.selectZhyTaskInfoList(zhyTaskInfo);
System.out.println(list);
return getDataTable(list);
}

10
ruoyi-system/src/main/resources/mapper/system/ZhyTaskInfoMapper.xml
View File

@ -19,12 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectZhyTaskInfoList" parameterType="ZhyTaskInfo" resultMap="ZhyTaskInfoResult">
<include refid="selectZhyTaskInfoVo"/>
<where>
<if test="name1 != null and name1 != ''"> and name1 = #{name1}</if>
<if test="name2 != null and name2 != ''"> and name2 = #{name2}</if>
<where>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="groupId != null "> and group_id = #{groupId}</if>
<if test="taskId != null "> and task_id = #{taskId}</if>
<if test="name1 != null and name1 != ''">
AND name1 LIKE CONCAT('%', #{name1}, '%')
</if>
<if test="name1 != null and name1 != ''">
OR name2 LIKE CONCAT('%', #{name1}, '%')
</if>
</where>
</select>

7
ruoyi-ui/src/api/system/task.js
View File

@ -8,6 +8,13 @@ export function listTask(query) {
params: query
})
}
export function getAll(query) {
return request({
url: '/system/task/getAll',
method: 'get',
params: query
})
}
// 查询任务详细
export function getTask(id) {

79
ruoyi-ui/src/views/system/info/index.vue
View File

@ -1,38 +1,48 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键词1" prop="name1">
<el-form-item label="关键词" prop="name1">
<el-input
v-model="queryParams.name1"
placeholder="请输入关键词1"
placeholder="请输入关键词"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="关键词2" prop="name2">
<el-input
v-model="queryParams.name2"
placeholder="请输入关键词2"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分组id" prop="groupId">
<el-input
v-model="queryParams.groupId"
placeholder="请输入分组id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务id" prop="taskId">
<el-input
v-model="queryParams.taskId"
placeholder="请输入任务id"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="任务编号" prop="name1">
<el-select v-model="queryParams.taskId" placeholder="请选择">
<el-option
v-for="item in taskList"
:key="item.id"
:label="'TASK-'+item.id"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="关键词2" prop="name2">-->
<!-- <el-input-->
<!-- v-model="queryParams.name2"-->
<!-- placeholder="请输入关键词2"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分组id" prop="groupId">-->
<!-- <el-input-->
<!-- v-model="queryParams.groupId"-->
<!-- placeholder="请输入分组id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务id" prop="taskId">-->
<!-- <el-input-->
<!-- v-model="queryParams.taskId"-->
<!-- placeholder="请输入任务id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -87,8 +97,15 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务id" align="center" prop="taskId" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="任务编号" align="center" prop="taskId" >
<template slot-scope="scope">
<span>
TASK-{{scope.row.taskId}}
</span>
</template>
</el-table-column>
<!-- <el-table-column label="任务id" align="center" prop="taskId" />-->
<!-- <el-table-column label="id" align="center" prop="id" />-->
<el-table-column label="关键词1" align="center" prop="name1" />
<el-table-column label="关键词2" align="center" prop="name2" />
<el-table-column label="状态" align="center" prop="status">
@ -157,6 +174,7 @@
<script>
import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/system/info";
import {proceed} from "../../../api/doc";
import {getAll} from "../../../api/system/task";
export default {
name: "Info",
@ -194,11 +212,16 @@ export default {
form: {},
// 表单校验
rules: {
}
},
taskList:[]
};
},
created() {
this.getList();
getAll().then(res=>{
this.taskList=res.rows
console.log(this.taskList)
})
},
methods: {
/** 查询任务信息列表 */

7
ruoyi-ui/src/views/system/task/index.vue
View File

@ -55,11 +55,11 @@
<el-table v-loading="loading" :element-loading-text="taskInfoTip.msg" :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务id" align="center" prop="id" />
<el-table-column label="任务编号" align="center" prop="createTime" >
<!-- <el-table-column label="任务id" align="center" prop="id" />-->
<el-table-column label="任务编号" align="center" prop="id" >
<template slot-scope="scope">
<span>
TASK-{{scope.row.createTime.replace(/[-:\s]/g, '')}}
TASK-{{scope.row.id}}
</span>
</template>
</el-table-column>
@ -78,6 +78,7 @@
<span v-if="scope.row.status==1">已完成</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button-->

Write Preview
Loading…
Cancel
Save