Browse Source

Merge remote-tracking branch 'origin/master'

master
parent
commit
08f28b85e9
  1. 24
      src/components/UploadFile/src/UploadExcel.vue
  2. 6
      src/components/UploadFile/src/useUpload.ts
  3. 88
      src/views/airqualitycollection/index.vue
  4. 9
      src/views/system/role/index.vue
  5. 11
      src/views/system/user/examine.vue
  6. 36
      src/views/system/user/index.vue
  7. 11
      src/views/task/index.vue

24
src/components/UploadFile/src/UploadExcel.vue

@ -25,25 +25,6 @@
<Icon icon="ep:upload" />
&nbsp;上传Excel
</el-button>
<template #file="row">
<div class="flex items-center">
<span>{{ row.file.name }}</span>
<div class="ml-10px">
<el-link
:href="row.file.url"
:underline="false"
download
target="_blank"
type="primary"
>
下载
</el-link>
</div>
<div class="ml-10px">
<el-button link type="danger" @click="handleRemove(row.file)"> 删除</el-button>
</div>
</div>
</template>
</el-upload>
</div>
@ -89,9 +70,9 @@ const uploadList = ref<UploadUserFile[]>([])
const fileList = ref<UploadUserFile[]>([])
const uploadNumber = ref<number>(0)
console.log('props.type', props.type)
const { uploadUrl, httpRequest } = useExcelUpload(props.type)
const { uploadUrl, httpRequest } = useExcelUpload()
//
const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
@ -126,6 +107,7 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
//
const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
message.success('上传成功')
emit('success')
//
const index = fileList.value.findIndex((item) => item.response?.data === res.data)
fileList.value.splice(index, 1)

6
src/components/UploadFile/src/useUpload.ts

@ -67,7 +67,7 @@ export const useUpload = () => {
}
export const useExcelUpload = (type: any) => {
export const useExcelUpload = () => {
//excel 上传地址
const uploadUrl = getImportExcel()
// 是否使用前端直连上传
@ -94,11 +94,11 @@ export const useExcelUpload = (type: any) => {
return { data: presignedInfo.url }
})
} else {
// 模式二:后端上传
// 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子
return new Promise((resolve, reject) => {
QualityCollectionApi.exportQualityCollection({ file: options.file, type: type })
QualityCollectionApi.exportQualityCollection({ file: options.file})
.then((res) => {
if (res.code === 0) {
resolve(res)

88
src/views/airqualitycollection/index.vue

@ -2,20 +2,37 @@
<!-- 列表 -->
<ContentWrap>
<section class="flex flex-col gap-20px">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane
v-for="dict in getIntDictOptions(DICT_TYPE.AIR_COLLECTION_TYPE)"
:key="dict.value"
:label="dict.label"
:name="dict.value"
>
<el-form
<section class="content">
<el-tabs class="demo-tabs" @tab-click="handleClick" v-model="activeName">
<el-tab-pane
v-for="dict in getIntDictOptions(DICT_TYPE.AIR_COLLECTION_TYPE)"
:key="dict.value"
:label="dict.label"
:name="dict.value"
>
<!-- 保持空内容 -->
</el-tab-pane>
</el-tabs>
<div>
<UploadExcel
v-model="fileUrls"
:file-type="['xlsx', 'xls']"
:file-size="1"
@success="getList"
/>
</div>
</section>
<el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
size="large"
label-width="68px"
label-position="right"
class="formClass"
>
<el-form-item label="站点" prop="siteName">
<el-input
@ -29,7 +46,7 @@
<el-form-item label="时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
v-model="queryParams.times"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
@ -40,49 +57,38 @@
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"
><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
><Icon icon="ep:search" class="mr-5px" /> 查询 </el-button
>
<el-button @click="resetQuery"
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
>
<UploadExcel
v-model="fileUrls"
:file-type="['xlsx', 'xls']"
:file-size="1"
class="mr-5px"
:type="activeName"
/>
</el-form-item>
</el-form>
<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" style="margin-top: 25px">
<template #empty>
<el-empty description="暂无数据" />
</template>
<el-table-column label="站点名称" align="center" prop="siteName" />
<el-table-column
label="时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
prop="time"
width="220px"
:cell-style="{ borderBottom: '1px solid #EBEEF5' }"
:header-cell-style="{
borderBottom: '1px solid #EBEEF5',
backgroundColor: '#F5F7FA'
}"
/>
<el-table-column label="数据类型" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.AIR_COLLECTION_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="PM2.s(ugim3)" align="center" prop="pm25" />
<el-table-column label="PMo(ug/m3)" align="center" prop="pm10" />
<el-table-column label="sOz(ug/m3)" align="center" prop="so2" />
<el-table-column label="NOz(ug/m3)" align="center" prop="no2" />
<el-table-column label="NO(Hg/m3)" align="center" prop="no" />
<el-table-column label="NOx(Hg/m3)" align="center" prop="nOx" />
<el-table-column label="NOx(Hg/m3)" align="center" prop="nox" />
<el-table-column label="CO(mg/m3)" align="center" prop="co" />
<el-table-column label="Oз(ug/m3)" align="center" prop="o3" />
@ -97,8 +103,8 @@
@change="getList"
class="ml-auto"
/>
</el-tab-pane>
</el-tabs>
</section>
</ContentWrap>
@ -113,6 +119,7 @@ import download from '@/utils/download'
import { QualityCollectionApi, QualityCollectionVO } from '@/api/airqualitycollection'
import QualityCollectionForm from './QualityCollectionForm.vue'
const activeName = ref(1)
import { UploadExcel } from '@/components/UploadFile'
/** 空气质量采集 列表 */
@ -124,12 +131,12 @@ const { t } = useI18n() // 国际化
const loading = ref(true) //
const list = ref<QualityCollectionVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
const queryParams:any = reactive({
pageNo: 1,
pageSize: 10,
siteName: undefined,
city: undefined,
type: undefined,
type: 1,
pm25: undefined,
pm10: undefined,
so2: undefined,
@ -140,7 +147,8 @@ const queryParams = reactive({
o3: undefined,
remark: undefined,
remark2: undefined,
createTime: []
createTime: [],
times: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
@ -159,8 +167,15 @@ const getList = async () => {
}
}
const currentActiveType = computed(() => activeName.value)
const handleClick = (tab: TabsPaneContext, event: Event) => {
console.log(tab.props, event)
queryParams.type = tab.props.name
activeName.value = Number(tab.props.name) //
nextTick(getList)
}
/** 搜索按钮操作 */
@ -224,6 +239,13 @@ onMounted(() => {
}
}
.content {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.demo-tabs > .el-tabs__content {
color: #6b778c;
font-size: 32px;

9
src/views/system/role/index.vue

@ -1,8 +1,6 @@
<template>
<ContentWrap>
<section class="flex flex-col gap-20px">
<!-- 搜索工作栏 -->
<el-form
ref="queryFormRef"
@ -80,10 +78,6 @@
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column align="center" label="角色编号" prop="id" />
<el-table-column align="center" label="角色名称" prop="name" />
@ -155,6 +149,7 @@
:total="total"
@pagination="getList"
/>
</section>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->

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

@ -1,5 +1,7 @@
<template>
<section class="app-container">
<ContentWrap style="padding: 10px">
<section class="flex flex-col gap-20px">
<el-form
:model="queryParams"
ref="queryRef"
@ -7,7 +9,7 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="用户名称" prop="userName">
<el-form-item label="" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
@ -16,7 +18,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" style="width: 308px">
<el-form-item label="" style="width: 308px">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
@ -26,7 +28,7 @@
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item label="审批状态" style="width: 308px">
<el-form-item label="" style="width: 308px">
<el-select placeholder="请选择审批状态" v-model="queryParams.audit">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.USER_AUDIT_TYPE)"
@ -146,6 +148,7 @@
@pagination="getList"
/>
</section>
</ContentWrap>
<ExamineForm ref="examineFormRef" @success="getList" />
<EnterprisesDetail ref="enterprisesDetailRef" />
</template>

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

@ -9,6 +9,7 @@
<el-col :span="20" :xs="24">
<!-- 搜索 -->
<ContentWrap>
<section class="flex flex-col gap-20px">
<el-form
class="-mb-15px"
:model="queryParams"
@ -16,7 +17,7 @@
:inline="true"
label-width="68px"
>
<el-form-item label="用名称" prop="username">
<el-form-item label="用名称" prop="username">
<el-input
v-model="queryParams.realName"
placeholder="请输入用户名称"
@ -25,7 +26,7 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="手机号码" prop="mobile">
<el-form-item label="" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入手机号码"
@ -34,7 +35,7 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status" v-if="!isInset">
<el-form-item label="" prop="status" v-if="!isInset">
<el-select
v-model="queryParams.status"
placeholder="用户状态"
@ -49,7 +50,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime" v-if="!isInset">
<el-form-item label="" prop="createTime" v-if="!isInset">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
@ -92,8 +93,7 @@
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column
label="头像"
@ -106,7 +106,6 @@
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>
@ -204,12 +203,17 @@
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 分页 -->
<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>
</el-col>
</el-row>
@ -237,12 +241,6 @@ defineOptions({ name: 'SystemUser' })
const closeParent = inject('closeParent')
const props = defineProps({
isInset: {
type: Boolean,
default: false
}
})
const message = useMessage() //
const { t } = useI18n() //

11
src/views/task/index.vue

@ -65,7 +65,7 @@
>
<Icon icon="ep:circle-plus" class="mr-5px" /> 新增
</el-button>
<!-- <el-button
<el-button
type="success"
plain
@click="handleExport"
@ -73,19 +73,19 @@
v-hasPermi="['system:task-info:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button> -->
</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="list"
:show-overflow-tooltip="true"
>
<el-table-column label="任务名称" align="left" prop="title" width="200" />
<el-table-column label="任务类型" align="left" prop="taskType">
<template #default="scope">
<el-tag size="nimi" round>{{ scope.row.taskTypeName }}</el-tag>
{{ scope.row.taskTypeName }}
</template>
</el-table-column>
<el-table-column label="发布部门" align="left" prop="deptName" />
@ -211,8 +211,6 @@ const getList = async () => {
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
@ -228,7 +226,6 @@ const resetQuery = () => {
/** 添加/修改操作 */
const formRef = ref()
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {

Loading…
Cancel
Save