Browse Source

页面优化

master
DX 3 weeks ago
parent
commit
9e61ad4711
  1. 39
      src/views/enterprises/index.vue
  2. 2
      src/views/enterprises/update.vue
  3. 16
      src/views/task/createEnterprise2.vue
  4. 16
      src/views/task/index.vue

39
src/views/enterprises/index.vue

@ -97,11 +97,9 @@
<el-form-item class="btnClass">
<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-button type="primary" plain @click="
push({
path: 'update'
})
">
<el-button type="primary" plain v-hasPermi="['system:enterprise:create']"
@click="push({ path: 'update' })
">
<Icon icon="ep:plus" class="mr-5px" @click="
push({
path: 'update',
@ -111,7 +109,7 @@
})
" /> 新增
</el-button>
<el-button type="success" plain @click="handleExport" :loading="exportLoading">
<el-button type="success" plain @click="handleExport" :loading="exportLoading" v-hasPermi="['system:enterprise:export']">
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
@ -121,38 +119,33 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
<el-table-column label="企业名称" align="center" fixed="left" prop="enterprisesName" />
<el-table-column label="专管员" align="center" prop="inviterName" fixed="left" />
<el-table-column label="企业类型" align="center" prop="type" fixed="left" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.ENTERPRISES_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="企业所属区域" align="center" prop="region" fixed="left">
<el-table-column label="企业名称" align="left" fixed="left" prop="enterprisesName" width="200" />
<el-table-column label="专管员" align="left" prop="inviterName" fixed="left" />
<el-table-column label="企业所属区域" align="left" prop="region" fixed="left">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ENTERPRISES_AREA" :value="scope.row.region" />
</template>
</el-table-column>
<el-table-column label="企业地址" align="center" prop="address" />
<el-table-column label="环保负责人姓名" align="center" prop="contactName" />
<el-table-column label="企业地址" align="left" prop="address" />
<el-table-column label="负责人姓名" align="left" prop="contactName" />
<el-table-column
label="企业环保负责人联系电话"
label="联系电话"
align="center"
prop="environmentalContactPhone"
/>
<el-table-column label="企业注册号" align="center" prop="registrationNumber" />
<el-table-column label="企业图文介绍" align="center" prop="introduction" />
<el-table-column label="企业注册号" align="left" prop="registrationNumber" />
<el-table-column label="企业图文介绍" align="left" prop="introduction" />
<!-- <el-table-column label="企业成立时间" align="center" prop="establishmentDate" />
<el-table-column label="企业经纬度" align="center" prop="gpsLocation" />-->
<el-table-column
label="创建时间"
align="center"
align="left"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" min-width="120px">
<el-table-column label="操作" align="left" min-width="120px">
<template #default="scope">
<el-button
@ -166,11 +159,11 @@
}
})
"
v-hasPermi="['system:task-info:update']"
v-hasPermi="['system:enterprise:update']"
>
详情
</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:enterprise:delete']"> 删除 </el-button>
<!--
<el-button link type="danger" @click="detailformRef(scope.row.id)"> 详情 </el-button> -->

2
src/views/enterprises/update.vue

@ -234,7 +234,7 @@
</template>
<script setup lang="ts">
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
import { EnterprisesApi } from '@/api/enterprises'
import { EnterpriseQualificationApi, EnterpriseQualificationVO } from '@/api/qualification'
import { UserVO, getSimpleUserListByUserType } from '@/api/system/user'
import EnterpriseQualificationForm from '@/views/qualification/EnterpriseQualificationForm.vue'

16
src/views/task/createEnterprise2.vue

@ -186,7 +186,7 @@
<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 { TagLibraryApi } from '@/api/system/taglibrary'
import { getSimpleUserZGList } from '@/api/system/user'
const loading = ref(true) //
const emit = defineEmits(['update:modelValue', 'success'])
@ -209,20 +209,11 @@ const enterprise = ref({
inviterName: undefined,
id: undefined,
userId: undefined,
tagList: []
tagList: [],
isAudit: true
}),
total: ref(0)
})
const queryParams = ref({
enterprisesName: undefined,
hy: undefined,
st: undefined,
wr: undefined,
region: undefined,
userId: undefined,
// registrationNumber: undefined,
id: undefined
})
//
const visible = ref(false) //
@ -261,6 +252,7 @@ async function getEnterPriseList() {
console.log('enterprise.value.queryParams', enterprise.value.queryParams)
if (enterprise.value.queryParams.hy ||
enterprise.value.queryParams.st ||
enterprise.value.queryParams.wr

16
src/views/task/index.vue

@ -85,19 +85,19 @@
<!-- 列表 -->
<ContentWrap>
<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">
<el-table-column label="任务名称" align="left" prop="title" width="200"/>
<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="center" prop="title" />
<!-- <el-table-column label="执行周期" align="center" prop="execCycle">
<template #default="scope">
<dict-tag :type="DICT_TYPE.TASK_EXEC_TIME" :value="scope.row.execCycle" />
</template>
</el-table-column> -->
<el-table-column label="任务类型" align="center" prop="taskType">
<el-table-column label="任务类型" align="left" prop="taskType">
<template #default="scope">
<el-tag>{{ scope.row.taskTypeName }}</el-tag>
</template>
@ -108,7 +108,7 @@
</template>
</el-table-column> -->
<el-table-column label="发布部门" align="center" prop="deptName" />
<el-table-column label="发布部门" align="left" prop="deptName" />
<el-table-column
label="开始时间"
align="center"
@ -128,7 +128,7 @@
:formatter="dateFormatter"
width="180px"
/> -->
<el-table-column label="创建人" align="center" prop="createName" />
<el-table-column label="创建人" align="left" prop="createName" />
<!-- <el-table-column label="父任务id" align="center" prop="parentId" />
<el-table-column label="父子任务类型" align="center" prop="parentType">
<template #default="scope">
@ -137,7 +137,7 @@
</el-table-column> -->
<!-- <el-table-column label="执行到第几" align="center" prop="taskStep" /> -->
<el-table-column label="执法对象" align="center" min-width="50px">
<el-table-column label="执法对象" align="left" min-width="50px">
<template #default="scope">
<el-button link type="primary" @click="
@ -155,7 +155,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120px">
<el-table-column label="" align="center" min-width="120px">
<template #default="scope">
<el-button
link

Loading…
Cancel
Save