Browse Source

页面优化

master
DX 3 weeks ago
parent
commit
96c69a522f
  1. 21
      src/views/system/user/examine.vue
  2. 20
      src/views/system/user/index.vue
  3. 85
      src/views/task/create copy 2.vue
  4. 20
      src/views/task/createEnterprise2.vue
  5. 2
      src/views/task/index.vue

21
src/views/system/user/examine.vue

@ -55,6 +55,27 @@
:data="userList"
@selection-change="handleSelectionChange"
>
<template #empty>
<el-empty description="暂无数据" />
</template>
<el-table-column
label="头像"
align="center"
prop="realName"
:show-overflow-tooltip="true"
>
<template #default="scope">
<el-image
style="width: 60px; height: 60px;border-radius: 50%;"
:src="scope.row.avatar"
:preview-src-list="[scope.row.avatar]"
z-index="99"
:preview-teleported="true"
/>
</template>
</el-table-column>
<el-table-column
label="姓名"
align="center"

20
src/views/system/user/index.vue

@ -95,6 +95,22 @@
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column
label="头像"
align="center"
prop="realName"
:show-overflow-tooltip="true"
>
<template #default="scope">
<el-image
style="width: 60px; height: 60px;border-radius: 50%;"
:src="scope.row.avatar"
:preview-src-list="[scope.row.avatar]"
z-index="99"
:preview-teleported="true"
/>
</template>
</el-table-column>
<el-table-column label="用户编号" align="center" key="id" prop="id" />
<el-table-column
label="用户名称"
@ -219,7 +235,7 @@ import DeptTree from './DeptTree.vue'
defineOptions({ name: 'SystemUser' })
const closeParent = inject('closeParent');
const closeParent = inject('closeParent')
const props = defineProps({
isInset: {
@ -260,7 +276,7 @@ const getList = async () => {
const selectUser = (id) => {
emit('selectUser', id)
closeParent();
closeParent()
}
/** 搜索按钮操作 */

85
src/views/task/create copy 2.vue

@ -32,7 +32,7 @@
/>
</el-form-item>
<el-form-item label="任务类型" prop="taskTopType">
<el-select v-model="formData.taskTopType" placeholder="请选择任务优先级" size="large" @change="selectChild">
<el-select v-model="formData.taskTopType" placeholder="请选择任务类型" size="large" @change="selectChild">
<el-option
v-for="dict in taskTagTopList"
:key="dict.id"
@ -52,7 +52,7 @@
</el-select>
</el-form-item> -->
<el-form-item label="类型选项" prop="taskType">
<el-select v-model="formData.taskType" placeholder="请选择任务选项" >
<el-select v-model="formData.taskType" placeholder="请选择任务选项" :disabled="isReadonly" >
<el-option
v-for="dict in tagChildList"
:key="dict.id"
@ -116,12 +116,13 @@
<el-select
v-model="enterprise.queryParams.st"
placeholder="请选择生态" size="large"
clearable
>
<el-option
v-for="dict in stList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
:value="dict.tagName"
/>
</el-select>
<div class="btn">
@ -139,12 +140,13 @@
v-model="enterprise.queryParams.wr"
placeholder="请选择污染程度"
size="large"
clearable
>
<el-option
v-for="dict in wrList"
:key="dict.id"
:label="dict.tagName"
:value="dict.id"
:value="dict.tagName"
/>
</el-select>
<div class="btn2">
@ -165,6 +167,7 @@
borderBottom: '1px solid #EBEEF5',
backgroundColor: '#F5F7FA'
}"
size="large"
>
<template #empty>
<el-empty description="暂无数据" />
@ -307,6 +310,7 @@ const formData = ref({
tags: [],
enterprises: [] as any
})
const isReadonly = ref(true)
const router = useRouter()
const route = useRoute()
const tagView = useTagsViewStore()
@ -334,7 +338,7 @@ const { query } = useRoute()
const formRef = ref() // Ref`
const tagList = ref([])
const queryFormRef = ref() //
const enterprise = ref({
const enterprise:any = ref({
list: [] as any,
queryParams: reactive({
pageNo: 1,
@ -393,9 +397,9 @@ const deleteHandle = (id: number) => {
if (targetIndex === -1) return;
//
enterprise.value.list.splice(targetIndex, 1);
enterprise.value.list.splice(targetIndex, 1)
enterprise_copy.value = cloneDeep(enterprise.value);
enterprise_copy.value = cloneDeep(enterprise.value)
enterprise.value.total = enterprise.value.list.length
@ -404,7 +408,7 @@ const deleteHandle = (id: number) => {
const itemsOnCurrentPage = enterprise.value.list.slice(
(pageNo - 1) * pageSize,
pageNo * pageSize
);
)
if (itemsOnCurrentPage.length === 0 && pageNo > 1) {
enterprise.value.queryParams.pageNo = pageNo - 1;
@ -456,36 +460,32 @@ const handleQuery = () => {
//
const filterList = (list: EnterprisesVO[]) => {
console.log('isAllConditionsEmpty.value', isAllConditionsEmpty.value)
if (isAllConditionsEmpty.value) return enterprise_copy.value.list; //
if (list.length > 0) {
const { enterprisesName, qy, hy, st, wr , userId } = enterprise.value.queryParams;
return list.filter(item => {
//
const nameMatch = enterprisesName ?
item.enterprisesName?.toLowerCase().includes(enterprisesName.toLowerCase()) : true;
//
const typeMatch = qy ? item.region == qy : 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
return list.filter(item => {
if (item.tagList) {
//
const nameMatch = enterprisesName ?
item.enterprisesName?.toLowerCase().includes(enterprisesName.toLowerCase()) : true;
//
const typeMatch = qy ? item.region == qy : true;
//
const hyMatch = hy ? item.tagList.includes(hy) : true
//
// const regNumMatch = registrationNumber ?
// item.registrationNumber === registrationNumber : true;
// // ID
// const idMatch = id !== undefined ? item.id === id : true;
const stMatch = st ? item.tagList.includes(st) : true
return nameMatch && typeMatch && hyMatch && stMatch && wrMatch && userIdMatch;
const wrMatch = wr ? item.tagList.includes(wr) : true
const userIdMatch = userId ? item.userId == userId : true
return nameMatch && typeMatch && hyMatch && stMatch && wrMatch && userIdMatch;
}
});
}
}
@ -496,7 +496,22 @@ const insertEnterprise = () => {
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
// queryFormRef.value.resetFields()
enterprise.value.queryParams = {
pageNo: 1,
pageSize: 10,
enterprisesName: undefined,
qy: undefined,
hy: undefined,
st: undefined,
wr: undefined,
userId: undefined
}
enterprise.value = cloneDeep(enterprise_copy.value);
handleQuery()
}
@ -617,16 +632,26 @@ async function init() {
formData.value.tags = res.taskTagIdes.map((t) => t.tagId)
enterprise.value.list = res.enterpriseIdes
enterprise.value.total = res.enterpriseIdes.length
//
enterprise_copy.value = cloneDeep(enterprise.value);
}
}
const selectChild = (value: any) => {
const data = taskTagTopList.value.find(item=>item.id == value)
isReadonly.value = false
tagChildList.value = data.children
}
function getList(data) {
enterprise.value.list.push(...data)
const diff = data.filter(item => !enterprise.value.list.includes(item));
// 2.
enterprise.value.list = [...diff, ...enterprise.value.list];
//
enterprise.value.list = uniqueFunc(enterprise.value.list, 'id')
enterprise.value.total = enterprise.value.list.length

20
src/views/task/createEnterprise2.vue

@ -35,7 +35,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="type" class="form-item">
<el-form-item label="" prop="hy" class="form-item">
<el-select v-model="enterprise.queryParams.hy" placeholder="请选择行业" clearable>
<el-option
v-for="dict in hyList"
@ -46,7 +46,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="region" class="form-item">
<el-form-item label="" prop="st" class="form-item">
<el-select v-model="enterprise.queryParams.st" placeholder="请选择生态" clearable>
<el-option
v-for="dict in stList"
@ -57,7 +57,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="type" class="form-item">
<el-form-item label="" prop="wr" class="form-item">
<el-select v-model="enterprise.queryParams.wr" placeholder="请选择污染程度" clearable>
<el-option
v-for="dict in wrList"
@ -68,7 +68,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="type" class="form-item">
<el-form-item label="" prop="userId" class="form-item">
<el-select v-model="enterprise.queryParams.userId" placeholder="请选择执法人员" filterable clearable>
<el-option
v-for="dict in userList"
@ -104,6 +104,7 @@
style="width: 100%; border: 1px solid #ebeef5"
:cell-style="{ borderBottom: '1px solid #EBEEF5', textAlign: 'left'}"
height="400px"
size="large"
row-key="id"
:header-cell-style="{
borderBottom: '1px solid #EBEEF5',
@ -176,8 +177,8 @@
<!-- 底部按钮 -->
<div class="footer">
<el-button type="primary" @click="confirmSelect">确认选择</el-button>
<el-button @click="handleClose">关闭窗口</el-button>
<el-button type="primary" @click="confirmSelect" size="large">确认选择</el-button>
<el-button @click="handleClose" size="large">关闭窗口</el-button>
</div>
</div>
</el-dialog>
@ -241,6 +242,7 @@ const selectAll = (selection) => {
//
const confirmSelect = () => {
visible.value = false
emit('success', selectedEnterprises.value)
}
@ -289,10 +291,12 @@ const handleQuery = () => {
enterprise.value.queryParams.pageNo = 1
getEnterPriseList()
}
const queryFormRef = ref()
/** 重置按钮操作 */
const resetQuery = () => {
// queryFormRef.value.resetFields()
// handleQuery()
queryFormRef.value.resetFields()
getEnterPriseList()
}
//

2
src/views/task/index.vue

@ -84,7 +84,7 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
<el-table-column label="发布时间" align="center" width="180px" prop="createTime" :formatter="dateFormatter"/>
<el-table-column label="任务状态" align="center" prop="status">
<template #default="scope">

Loading…
Cancel
Save