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

任务创建优化

master
DX 2 months ago
parent
2f611229ed
commit
a9225c01e2
2 changed files with 335 additions and 229 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. 270
      src/views/task/create copy.vue
  2. 294
      src/views/task/createEnterprise.vue

270
src/views/task/create copy.vue
Unescape View File

@ -2,10 +2,10 @@
<ContentWrap>
<section class="taskForm">
<div class="title">基本信息</div>
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="auto" class="formClass">
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="auto" class="formClass" size="large">
<el-form-item label="标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入任务标题" size="large" />
<el-input v-model="formData.title" placeholder="请输入任务标题" />
</el-form-item>
<el-form-item label="时间周期" prop="planTime">
<el-date-picker
@ -29,7 +29,7 @@
placeholder="请输入描述"
/>
</el-form-item>
<el-form-item label="类型" prop="taskType">
<el-form-item label="任务类型" prop="taskType">
<el-tree-select
v-model="formData.taskType"
:data="tagList"
@ -50,7 +50,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="优先级" prop="priority">
<el-form-item label="类型选项" prop="priority">
<el-select v-model="formData.priority" placeholder="请选择任务优先级" size="large">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.TASK_PRIORITY)"
@ -76,7 +76,7 @@
class="search-form"
>
<div class="form-container">
<el-form-item label="" prop="region" class="form-item">
<el-form-item label="" prop="region" class="form-item" >
<el-select
v-model="enterprise.queryParams.qy"
placeholder="请选择所属区域"
@ -100,7 +100,7 @@
v-for="dict in hyList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
:value="dict.tagName"
/>
</el-select>
</el-form-item>
@ -130,13 +130,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="enterprisesName" class="form-item">
<el-input
v-model="enterprise.queryParams.inviterName"
placeholder="请选择执法人员"
clearable
/>
<el-form-item label="" prop="userId" class="form-item">
<el-select v-model="enterprise.queryParams.userId" placeholder="请选择执法人员" clearable>
<el-option
v-for="dict in userList"
:key="dict.id"
:label="dict.deptName +'_'+ dict.realName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="enterprisesName" class="form-item">
<el-input
v-model="enterprise.queryParams.enterprisesName"
@ -178,7 +182,7 @@
</template>
<el-table-column type="selection" width="30" />
<el-table-column property="enterprisesName" label="企业名称" min-width="100" />
<el-table-column property="region" label="区域" min-width="100">
<el-table-column property="region" label="区域">
<template #default="scope">
{{
getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA).find(
@ -187,10 +191,40 @@
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="行业" min-width="100" />
<el-table-column property="enterprisesName" label="生态" min-width="100" />
<el-table-column property="enterprisesName" label="类型" min-width="100" />
<el-table-column property="enterprisesName" label="执法人员" min-width="100" />
<el-table-column property="enterprisesName" label="行业">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 1)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="生态">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 2)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="类型">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 4)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="inviterName" label="执法人员" min-width="100" />
<el-table-column label="操作" align="center" min-width="80px">
<template #default="scope">
<el-button
@ -204,18 +238,34 @@
</el-table-column>
</el-table>
</section>
<pagination
v-show="enterprise.total > 0"
:total="enterprise.total"
:show-page-size="false"
size="small"
v-model:page="enterprise.queryParams.pageNo"
v-model:limit="enterprise.queryParams.pageSize"
@pagination="getEnterPriseList"
<div class="pageArea" v-show="enterprise.total > 0">
<div class="selected">已选择 {{ selectedEnterprises.length }} / {{ enterprise.total }}
<el-button
link
type="primary"
@click="deletedSelected"
v-show="selectedEnterprises.length > 0"
>
删除所选
</el-button>
</div>
<el-pagination
:total="enterprise.total"
:show-page-size="false"
size="small"
layout="total, prev, pager, next"
v-model:page="enterprise.queryParams.pageNo"
v-model:limit="enterprise.queryParams.pageSize"
@pagination="getEnterPriseList"
class="page"
/>
</div>
</section>
<div class="footer">
<el-button type="primary" @click="submitForm">提 交</el-button>
<el-button @click="submitForm">返回列表</el-button>
<el-button
type="primary"
@click="submitForm"
@ -231,7 +281,7 @@
</div>
</section>
</ContentWrap>
<CreateEnterprise ref="formRef" @success="getList" />
<CreateEnterprise ref="formCreateRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
@ -242,6 +292,7 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
import { defaultProps } from '@/utils/tree'
import CreateEnterprise from './createEnterprise.vue'
import { cloneDeep } from 'lodash-es';
import { getSimpleUserZGList } from '@/api/system/user'
defineOptions({ name: 'CreateTask' })
@ -269,6 +320,7 @@ const formData = ref({
const router = useRouter()
const route = useRoute()
const tagView = useTagsViewStore()
const formCreateRef = ref()
const message = useMessage() // 消息弹窗
const formRules = reactive({
title: [{ required: true, message: '任务标题不能为空', trigger: 'blur' }],
@ -289,21 +341,44 @@ const enterprise = ref({
list: [] as any,
queryParams: reactive({
pageNo: 1,
pageSize: 9,
pageSize: 10,
enterprisesName: undefined,
qy: undefined,
hy: undefined,
st: undefined,
wr: undefined,
inviterName: undefined
inviterName: undefined,
userId: undefined,
tagList: []
}),
total: ref(0) as any
})
//删除所选
const deletedSelected = async () => {
await message.delConfirm()
const handleDelete = (id: number) => {
selectedEnterprises.value.forEach(item=> {
deleteHandle(item.id)
})
}
const selectedEnterprises = ref<EnterprisesVO[]>([])
const handleSelectionChange = (selectedItems: EnterprisesVO[]) => {
selectedEnterprises.value = selectedItems
}
const handleDelete = async (id: number) => {
// 删除的二次确认
await message.delConfirm()
// 找到目标索引
const targetIndex = enterprise.value.list.findIndex(item => item.id === id);
deleteHandle(id)
}
const deleteHandle = (id: number) => {
const targetIndex = enterprise.value.list.findIndex(item => item.id === id);
if (targetIndex === -1) return;
@ -330,17 +405,20 @@ const enterprise_copy = ref({
list: [] as any,
queryParams: reactive({
pageNo: 1,
pageSize: 9,
pageSize: 10,
enterprisesName: undefined,
qy: undefined,
hy: undefined,
st: undefined,
wr: undefined,
inviterName: undefined
userId: undefined
}),
total: ref(0) as any
})
const userList:any = ref()
// 检查是否所有条件均为空
const isAllConditionsEmpty = computed(() => {
const params = enterprise.value.queryParams;
@ -350,7 +428,7 @@ const isAllConditionsEmpty = computed(() => {
!params.hy &&
!params.st &&
!params.wr &&
!params.inviterName
!params.userId
);
});
@ -358,9 +436,8 @@ const isAllConditionsEmpty = computed(() => {
/** 搜索按钮操作 */
const handleQuery = () => {
const list = filterList(enterprise.value.list)
console.log('listlist', list)
const list = filterList(enterprise.value.list)
enterprise.value.list = list
enterprise.value.total = list?.length
@ -370,7 +447,8 @@ const handleQuery = () => {
const filterList = (list: EnterprisesVO[]) => {
if (isAllConditionsEmpty.value) return enterprise_copy.value.list; // 直接返回完整列表
if (list.length > 0) {
const { enterprisesName, qy, hy, st, wr , inviterName } = enterprise.value.queryParams;
const { enterprisesName, qy, hy, st, wr , userId } = enterprise.value.queryParams;
return list.filter(item => {
// 名称匹配（模糊查询）
@ -378,43 +456,32 @@ const filterList = (list: EnterprisesVO[]) => {
item.enterprisesName?.toLowerCase().includes(enterprisesName.toLowerCase()) : true;
// 类型精确匹配
const typeMatch = qy ? item.region == qy : true;
// 地区精确匹配
// const regionMatch = hy ? item.region === region : true;
// // 注册号精确匹配
//地区精确匹配
const hyMatch = hy ? item.tagList.includes(hy) : true
const stMatch = st ? item.tagList.includes(st) : true
const wrMatch = wr ? item.tagList.includes(wr) : true
const userIdMatch = userId ? item.userId == userId : true
// 注册号精确匹配
// const regNumMatch = registrationNumber ?
// item.registrationNumber === registrationNumber : true;
// // ID精确匹配
// const idMatch = id !== undefined ? item.id === id : true;
// return nameMatch && typeMatch && regionMatch && regNumMatch && idMatch;
return nameMatch && typeMatch && hyMatch && stMatch && wrMatch && userIdMatch;
return nameMatch && typeMatch
});
}
}
// // 计算属性：过滤后的全部数据
// const filteredData = computed(() => {
// return filterList(enterprise.value.list);
// });
// 计算属性：当前页数据
// const pagedData = computed(() => {
// const { pageNo, pageSize } = enterprise.value.queryParams;
// const start = (pageNo - 1) * pageSize;
// const end = start + pageSize;
// return filteredData.value.slice(start, end);
// });
// // 更新总条数（监听过滤结果变化）
// watch(filteredData, (newList) => {
// enterprise.value.total = newList.length;
// }, { immediate: true });
const insertEnterprise = () => {
formRef.value.open()
formCreateRef.value.open()
}
/** 重置按钮操作 */
const resetQuery = () => {
@ -445,35 +512,6 @@ const defaultProps = {
children: 'children' // 如果存在子节点，则使用 'children' 字段
}
/**
* 全选
*/
async function selectAll() {
loading.value = true
const data = JSON.parse(JSON.stringify(enterprise.value.queryParams))
data.pageSize = -1
delete data.pageNo
const { list } = await EnterprisesApi.getEnterprisesPage(data)
const arr = [...formData.value.enterprises, ...list]
formData.value.enterprises = uniqueFunc(arr, 'id')
loading.value = false
}
/**
* 取消全选
*/
async function cancelAll() {
loading.value = true
const data = JSON.parse(JSON.stringify(enterprise.value.queryParams))
data.pageSize = -1
delete data.pageNo
const { list } = await EnterprisesApi.getEnterprisesPage(data)
if (list) {
formData.value.enterprises = formData.value.enterprises.filter((e) => {
return !list.some((r) => e.id == r.id)
})
}
loading.value = false
}
/**
* 单选企业
* @param enterprise
@ -502,6 +540,8 @@ function uniqueFunc(arr, uniId) {
* 提交表单
*/
async function submitForm() {
//把所有数据转成 id的数组
const validate = await unref(formRef).validate()
if (validate) {
const data = JSON.parse(JSON.stringify(formData.value))
@ -509,34 +549,40 @@ async function submitForm() {
data.status = 1
console.log('任务类型：', formData.value.taskType)
data.enterpriseIds = formData.value.enterprises.map((i) => i.id)
if (data.enterpriseIds.length == 0) {
message.success('温馨提示：请您选择执法对象')
} else {
if (data.status < 2) {
data.startDate = data.planTime[0]
data.endDate = data.planTime[1]
if (data.id) {
TaskInfoApi.updateTaskInfo(data).then(() => {
message.success('操作成功')
tagView.delView(route)
router.go(-1)
})
} else {
TaskInfoApi.createTaskInfo(data).then(() => {
message.success('操作成功')
tagView.delView(route)
router.go(-1)
})
}
console.log('data', data)
// if (data.id) {
// TaskInfoApi.updateTaskInfo(data).then(() => {
// message.success('操作成功')
// tagView.delView(route)
// router.go(-1)
// })
// } else {
// TaskInfoApi.createTaskInfo(data).then(() => {
// message.success('操作成功')
// tagView.delView(route)
// router.go(-1)
// })
// }
} else {
message.success('温馨提示：该任务已经执行,无法再进行修改')
}
}
}
}
function init() {
async function init() {
const userData = await getSimpleUserZGList()
userList.value = userData
if (query.id) {
TaskInfoApi.getTaskInfo(query.id).then((res) => {
@ -550,6 +596,8 @@ function init() {
function getList(data) {
enterprise.value.list.push(...data)
//去重
enterprise.value.list = uniqueFunc(enterprise.value.list, 'id')
enterprise.value.total = enterprise.value.list.length
enterprise_copy.value = cloneDeep(enterprise.value);
@ -563,6 +611,8 @@ onMounted(() => {
</script>
<style scoped lang="scss">
.title {
font-size: 16px;
font-weight: bold;
@ -595,6 +645,14 @@ onMounted(() => {
}
.pageArea{
display: flex;
flex-direction: row;
justify-content: space-between;
font-size: 13px;
padding: 20px 1.5%;
}
.enterprise-area {
flex: 1;
@ -632,6 +690,9 @@ onMounted(() => {
box-shadow: 0 0 1px 1px #ccc;
}
}
}
.check-area {
border: 1px dashed #ccc;
@ -679,6 +740,7 @@ onMounted(() => {
grid-template-rows: 1fr;
grid-template-columns: minmax(0, 1fr);
align-items: center;
gap: 20px;
::v-deep(.select-area .el-form) {
margin-bottom: 15px;
.el-form-item {

294
src/views/task/createEnterprise.vue
Unescape View File

@ -1,36 +1,38 @@
<template>
<el-dialog
v-model="visible"
title="新增企业"
width="1200px"
:close-on-click-modal="false"
append-to-body
v-model="visible"
title="新增企业"
width="1200px"
:close-on-click-modal="false"
append-to-body
>
<div class="enterprise-container">
<div class="enterprise-container">
<!-- 搜索区域 -->
<div class="search-area">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="0" size="large" class="search-form">
<el-form
:model="enterprise.queryParams"
ref="queryFormRef"
:inline="true"
label-width="0"
size="large"
class="search-form"
>
<div class="form-container">
<el-form-item label="" prop="region" class="form-item">
<el-select
v-model="queryParams.region"
placeholder="请选择所属区域"
>
<el-select v-model="enterprise.queryParams.region" placeholder="请选择所属区域" clearable>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="type" class="form-item">
<el-select
v-model="queryParams.hy"
placeholder="请选择行业"
>
<el-select v-model="enterprise.queryParams.hy" placeholder="请选择行业" clearable>
<el-option
v-for="dict in hyList"
:key="dict.id"
@ -41,10 +43,7 @@
</el-form-item>
<el-form-item label="" prop="region" class="form-item">
<el-select
v-model="queryParams.st"
placeholder="请选择生态"
>
<el-select v-model="enterprise.queryParams.st" placeholder="请选择生态" clearable>
<el-option
v-for="dict in stList"
:key="dict.id"
@ -55,10 +54,7 @@
</el-form-item>
<el-form-item label="" prop="type" class="form-item">
<el-select
v-model="queryParams.wr"
placeholder="请选择污染程度"
>
<el-select v-model="enterprise.queryParams.wr" placeholder="请选择污染程度" clearable>
<el-option
v-for="dict in wrList"
:key="dict.id"
@ -69,93 +65,111 @@
</el-form-item>
<el-form-item label="" prop="type" class="form-item">
<el-select
v-model="queryParams.inviterName"
placeholder="请选择执法人员"
>
<el-select v-model="enterprise.queryParams.userId" placeholder="请选择执法人员" clearable>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.ENTERPRISES_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in userList"
:key="dict.id"
:label="dict.deptName +'_'+ dict.realName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="enterprisesName" class="form-item">
<el-input
v-model="queryParams.enterprisesName"
placeholder="请输入企业名称"
/>
<el-input v-model="enterprise.queryParams.enterprisesName" placeholder="请输入企业名称" />
</el-form-item>
<el-form-item class="form-item">
<el-form-item class="form-item">
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery" class="mr-10px">
<Icon icon="ep:refresh" class="mr-5px" /> 重置 </el-button
>
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
</div>
</el-form>
</div>
<!-- 表格区域 -->
<el-table
ref="multipleTableRef"
:data="enterprise.list"
@selection-change="handleSelectionChange"
style="width: 100%; border: 1px solid #EBEEF5"
:cell-style="{ borderBottom: '1px solid #EBEEF5' }"
:header-cell-style="{
borderBottom: '1px solid #EBEEF5',
backgroundColor: '#F5F7FA'
}"
>
<el-table-column type="selection" />
<el-table-column property="enterprisesName" label="企业名称" />
<el-table-column property="region" label="区域">
<template #default="scope">
{{ getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA).find(dict => dict.value == scope.row.region)?.label || '未知区域' }}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="行业" >
<template #default="scope">
{{ scope.row.tagListName && scope.row.tagListName.filter(item => item.value == 1).map(item => item.label).join(', ') }}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="生态">
<template #default="scope">
{{ scope.row.tagListName && scope.row.tagListName.filter(item => item.value == 2).map(item => item.label).join(', ') }}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="类型">
<template #default="scope">
{{ scope.row.tagListName && scope.row.tagListName.filter(item => item.value == 4).map(item => item.label).join(', ') }}
</template>
</el-table-column>
<el-table-column property="inviterName" label="执法人员" />
</el-table>
ref="multipleTableRef"
:data="enterprise.list"
@select="handleSelectionChange"
@select-all="selectAll"
style="width: 100%; border: 1px solid #ebeef5"
:cell-style="{ borderBottom: '1px solid #EBEEF5' }"
height="400px"
row-key="id"
:header-cell-style="{
borderBottom: '1px solid #EBEEF5',
backgroundColor: '#F5F7FA'
}"
>
<el-table-column type="selection" :reserve-selection="true" />
<el-table-column property="enterprisesName" label="企业名称" />
<el-table-column property="region" label="区域">
<template #default="scope">
{{
getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA).find(
(dict) => dict.value == scope.row.region
)?.label || '未知区域'
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="行业">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 1)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="生态">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 2)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="类型">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 4)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="inviterName" label="执法人员" />
</el-table>
<!-- 分页 -->
<div class="pagination-container">
<pagination
<div class="selected">已选择 {{ selectedEnterprises.length }} / {{ enterprise.total }}</div>
<el-pagination
v-show="enterprise.total > 0"
:total="enterprise.total"
:show-page-size="false"
layout="total, prev, pager, next"
size="small"
v-model:page="enterprise.queryParams.pageNo"
v-model:limit="enterprise.queryParams.pageSize"
v-model:current-page="enterprise.queryParams.pageNo"
@update:current-page="getEnterPriseList"
v-model:page-size="enterprise.queryParams.pageSize"
@pagination="getEnterPriseList"
/>
</div>
<!-- 底部按钮 -->
<div class="footer">
<el-button type="primary" @click="confirmSelect">确认选择</el-button>
@ -163,12 +177,12 @@
</div>
</div>
</el-dialog>
</template>
<script setup lang="ts">
</template>
<script setup lang="ts">
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
import {TagLibraryVO, TagLibraryApi} from '@/api/system/taglibrary'
import { array } from 'vue-types'
import { TagLibraryVO, TagLibraryApi } from '@/api/system/taglibrary'
import { getSimpleUserZGList } from '@/api/system/user'
const loading = ref(true) // 列表的加载中
const emit = defineEmits(['update:modelValue', 'success'])
const props = defineProps({
@ -181,12 +195,16 @@ const enterprise = ref({
list: ref<EnterprisesVO[]>(),
queryParams: reactive({
pageNo: 1,
pageSize: 9,
pageSize: 20,
enterprisesName: undefined,
type: undefined,
region: undefined,
registrationNumber: undefined,
id:undefined
hy: undefined,
st: undefined,
wr: undefined,
inviterName: undefined,
id: undefined,
userId: undefined,
tagList: []
}),
total: ref(0)
})
@ -196,58 +214,70 @@ const queryParams = ref({
st: undefined,
wr: undefined,
region: undefined,
inviterName:undefined,
userId: undefined,
// registrationNumber: undefined,
id:undefined
id: undefined
})
// 控制弹窗显示
const visible = ref(false) // 弹窗的是否展示
const visible = ref(true) // 弹窗的是否展示
// ... 其他变量保持不变 ...
// 关闭弹窗
const handleClose = () => {
visible.value = false
}
const selectedEnterprises = ref<EnterprisesVO[]>([]);
const selectedEnterprises = ref<EnterprisesVO[]>([])
const handleSelectionChange = (selectedItems: EnterprisesVO[]) => {
selectedEnterprises.value = selectedItems;
selectedEnterprises.value = selectedItems
}
const selectAll = (selection) => {
selectedEnterprises.value = selection
}
//确认选择
const confirmSelect = () => {
emit('success', selectedEnterprises.value)
}
// 确认选择
const handleConfirm = () => {
// TODO: 处理选择逻辑
visible.value = false
}
// 分页数据选中事件
// const handleSelectionChange = (selection) => {
// const currentPageIds = selection.map(item => item.id);
// currentPageIds.forEach(id => selectedIds.value.add(id));
// };
/**
* 获取企业列表
*/
async function getEnterPriseList() {
async function getEnterPriseList() {
loading.value = true
console.log('enterprise.value.queryParams', enterprise.value.queryParams)
if (enterprise.value.queryParams.hy ||
enterprise.value.queryParams.st ||
enterprise.value.queryParams.wr
) {
enterprise.value.queryParams.tagList.push(enterprise.value.queryParams.hy)
enterprise.value.queryParams.tagList.push(enterprise.value.queryParams.st)
enterprise.value.queryParams.tagList.push(enterprise.value.queryParams.wr)
}
try {
const data = await EnterprisesApi.getEnterpriseByUserId(enterprise.value.queryParams)
enterprise.value.list = data.list
enterprise.value.total = data.total
} finally {
loading.value = false
enterprise.value.queryParams.tagList = []
}
}
// 打开弹窗时的初始化
const open = async () => {
// TODO: 初始化数据，例如获取列表等
visible.value = true
queryParams.value = {
enterprisesName: undefined,
type: undefined, // 确保这里是 undefined
region: undefined,
registrationNumber: undefined,
id: undefined
}
}
/** 搜索按钮操作 */
@ -262,35 +292,41 @@ const resetQuery = () => {
}
//行业
const hyList:any = ref([])
const hyList: any = ref([])
//生态
const stList:any = ref([])
const stList: any = ref([])
//污染程度
const wrList:any = ref([])
const wrList: any = ref([])
//执法人员列表
const userList:any = ref()
async function init() {
try {
const codeList = 'codeList=hy&codeList=st&codeList=wr'
const data = await TagLibraryApi.tagLibraryList(codeList)
hyList.value = data[0].children
stList.value = data[1].children
wrList.value = data[2].children
} finally {
}
const userData = await getSimpleUserZGList()
userList.value = userData
}
getEnterPriseList()
onMounted(()=>{
init()
onMounted(() => {
init()
})
defineExpose({ open })
</script>
<style scoped lang="scss">
.enterprise-container {
// ... 样式保持不变 ...
.search-form {
@ -298,18 +334,18 @@ defineExpose({ open })
padding: 20px 20px 0px 20px;
border-radius: 4px;
position: relative;
margin: 0 20px; // 改用 margin 控制间距
margin: 0 20px; // 改用 margin 控制间距
.form-container {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 24px;
margin-bottom: 20px;
}
.form-item {
margin: 0;
width: 100%;
:deep(.el-input),
:deep(.el-select) {
width: 100%;
@ -320,7 +356,7 @@ defineExpose({ open })
right: 10px;
bottom: 0px;
}
.button-container {
display: flex;
justify-content: center;
@ -329,8 +365,16 @@ defineExpose({ open })
}
.pagination-container {
display: flex;
justify-content: right;
flex-direction: row;
justify-content: space-between;
margin-top: 20px; // 确保分页和按钮之间有间距
.selected {
font-size: 12px;
margin-left: 10px;
font-weight: bold;
}
}
.footer {
display: flex;
@ -340,4 +384,4 @@ defineExpose({ open })
margin-top: 20px; // 添
}
}
</style>
</style>

Write Preview
Loading…
Cancel
Save