HB
/
yudao-web
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

任务

master
DX 2 weeks ago
parent
2dbda63961
commit
c62c2103be
4 changed files with 145 additions and 213 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. 8
      src/styles/variables.scss
  2. 10
      src/views/enterprises/index.vue
  3. 4
      src/views/task/create copy 2.vue
  4. 336
      src/views/task/index.vue

8
src/styles/variables.scss
Unescape View File

@ -6,7 +6,7 @@ $elNamespace: el;
.el-form--inline {
display: flex;
flex-flow: row wrap;
gap: 40px;
gap: 20px;
margin-bottom: 0;
.el-form-item {
margin-right: 0;
@ -19,13 +19,17 @@ $elNamespace: el;
.el-table {
border: 1px solid #ebeef5;
border-bottom: none;
--el-table-header-bg-color: #f5f7fa;
.el-table__header {
color: #909399;
}
}
.el-pagination--large .btn-next, .el-pagination--large .btn-prev, .el-pagination--large .el-pager li{
.el-pagination--large .btn-next,
.el-pagination--large .btn-prev,
.el-pagination--large .el-pager li {
height: fit-content;
line-height: normal;
}

10
src/views/enterprises/index.vue
Unescape View File

@ -17,16 +17,6 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="邀请人" prop="userId">-->
<!-- <el-select-->
<!-- v-model="queryParams.userId"-->
<!-- placeholder="请选择邀请人"-->
<!-- clearable-->
<!-- class="!w-240px"-->
<!-- >-->
<!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="企业类型" prop="type">
<el-select
v-model="queryParams.type"

4
src/views/task/create copy 2.vue
Unescape View File

@ -454,10 +454,6 @@ const filterList = (list: EnterprisesVO[]) => {
const typeMatch = qy ? item.region == qy : true;
//地区精确匹配
let test = hy.filter(h => item.tagList.includes(h))
console.log('test', test)
const hyMatch = hy ? hy.filter(h => item.tagList.includes(h)) : true
const userIdMatch = userId ? item.userId == userId : true

336
src/views/task/index.vue
Unescape View File

@ -1,98 +1,71 @@
<template>
<ContentWrap style="padding: 10px;">
<!-- 搜索工作栏 -->
<el-form
class="formClass"
:model="queryParams"
ref="queryFormRef"
:inline="true"
size="large"
>
<el-form-item label="" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入任务标题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="" prop="taskType">
<el-select
v-model="queryParams.taskType"
placeholder="请选择任务类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in taskTypeList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="taskType">
<el-select
v-model="queryParams.status"
placeholder="请选择任务状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.TASK_STATE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="taskType">
<el-select
v-model="queryParams.taskType"
placeholder="请选择任务类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in taskTypeList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="startDate" style="width: 100%;">
<el-select
v-model="queryParams.selectWeek"
placeholder="请选择日期范围"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.SELECT_WEEK)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
<ContentWrap style="padding: 10px">
<section class="flex flex-col gap-20px">
<el-form :model="queryParams" ref="queryFormRef" inline>
<el-form-item label="" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入任务标题"
clearable
@keyup.enter="handleQuery"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
</el-form-item>
<el-form-item class="mergeClass" >
<el-button
type="primary"
plain
v-hasPermi="['system:task-info:create']"
@click="push({ path: '/task/create' })"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<!-- <el-button
</el-form-item>
<el-form-item label="" prop="taskType">
<el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in taskTypeList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="taskType">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.TASK_STATE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="taskType">
<el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in taskTypeList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="startDate">
<el-select v-model="queryParams.selectWeek" placeholder="请选择日期范围" clearable>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.SELECT_WEEK)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary" plain
><Icon icon="ep:search" class="mr-5px" /> 查询</el-button
>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
</el-form-item>
<el-form-item class="last-children">
<el-button
type="primary"
v-hasPermi="['system:task-info:create']"
@click="push({ path: '/task/create' })"
>
<Icon icon="ep:circle-plus" class="mr-5px" /> 新增
</el-button>
<!-- <el-button
type="success"
plain
@click="handleExport"
@ -101,94 +74,86 @@
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button> -->
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
<el-table-column label="任务名称" align="left" prop="title" width="200"/>
<el-table-column label="任务类型" align="left" prop="taskType">
<template #default="scope">
<el-tag>{{ scope.row.taskTypeName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="发布部门" align="left" prop="deptName" />
<el-table-column label="任务状态" align="left" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.TASK_STATE" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="执法对象" align="left" min-width="100px">
<template #default="scope">
{{new Set(scope.row.enterpriseIdes?.map(e => e.type)).size }}个区域 ,
{{scope.row.enterpriseIdes.length}}家企业
</template>
</el-table-column>
<el-table-column
label="执行时间"
align="left"
prop="startDate"
>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="list"
:show-overflow-tooltip="true"
<template #default="scope">
{{scope.row.startDate}}
>
<el-table-column label="任务名称" align="left" prop="title" width="200" />
<el-table-column label="任务类型" align="left" prop="taskType">
<template #default="scope">
<el-tag>{{ scope.row.taskTypeName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="发布部门" align="left" prop="deptName" />
<el-table-column label="任务状态" align="left" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.TASK_STATE" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="执法对象" align="left" min-width="100px">
<template #default="scope">
{{ new Set(scope.row.enterpriseIdes?.map((e) => e.type)).size }}个区域 ,
{{ scope.row.enterpriseIdes.length }}家企业
</template>
</el-table-column>
<el-table-column label="执行时间" align="left" prop="startDate">
<template #default="scope">
{{ scope.row.startDate }}
{{ getDictLabel(DICT_TYPE.TASK_NOTICE_TIME, scope.row.execCycle) }}
</template>
</el-table-column>
<el-table-column label="操作选项" align="left" min-width="50px">
<template #default="scope">
<el-button
link
type="primary"
@click="
push({
path: 'create',
query: {
id: scope.row.id
}
})
"
v-hasPermi="['system:task-info:update']"
>
详情
</el-button>
<!-- <el-button link type="primary" @click="openForm(scope.row.id)"> 详情 </el-button> -->
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</template>
</el-table-column>
<el-table-column label="操作选项" align="center" width="100px">
<template #default="scope">
<el-button
link
type="primary"
@click="
push({
path: 'create',
query: {
id: scope.row.id
}
})
"
v-hasPermi="['system:task-info:update']"
>
详情
</el-button>
<!-- <el-button link type="primary" @click="openForm(scope.row.id)"> 详情 </el-button> -->
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<el-pagination
:total="total"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</section>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<TaskInfoForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getDictLabel, DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import download from '@/utils/download'
import { TaskInfoApi, TaskInfoVO } from '@/api/system/taskinfo'
import TaskInfoForm from './TaskInfoForm.vue'
import { TagLibraryApi } from '@/api/system/taglibrary'
/** 任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。 列表 */
defineOptions({ name: 'TaskList' })
@ -198,7 +163,7 @@ const { push } = useRouter()
const loading = ref(true) // 列表的加载中
const list = ref<TaskInfoVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const taskTypeMap=ref()
const taskTypeMap = ref()
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -222,11 +187,9 @@ const queryParams = reactive({
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const taskTypeList:any = ref([])
const taskTypeList: any = ref([])
const mydateFormatter3 = ()=> {
}
const mydateFormatter3 = () => {}
/** 查询列表 */
const getList = async () => {
@ -236,8 +199,6 @@ const getList = async () => {
list.value = data.list
total.value = data.total
//任务标签
const params = {
tagType: 2,
@ -246,7 +207,6 @@ const getList = async () => {
const tag = await TagLibraryApi.getTagLibraryPage(params)
taskTypeList.value = tag.list
} finally {
loading.value = false
}
@ -254,7 +214,6 @@ const getList = async () => {
// 立即执行
const taskExec = async (data) => {
loading.value = true
try {
@ -263,7 +222,6 @@ const taskExec = async (data) => {
getList()
} finally {
loading.value = false
}
}
@ -322,27 +280,11 @@ onMounted(() => {
})
</script>
<style scoped lang="scss">
.formClass {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-template-rows: 2fr;
align-items: center;
row-gap: 20px;
column-gap: 40px;
.mergeClass {
grid-column: 2 span;
:deep(.el-form-item__content) {
display: flex !important;
justify-content:flex-end !important;
}
}
:deep(.el-form-item) {
margin: 0 !important;
}
::v-deep(.el-form-item) {
width: calc(25% - 15px);
&:last-child {
margin-left: auto;
width: fit-content;
}
}
</style>

Write Preview
Loading…
Cancel
Save