更新小功能
parent
4f8b6729cc
commit
e967d65d64
@ -1,5 +1,4 @@
|
||||
import type { ApiResult } from '@/api/types'
|
||||
|
||||
export const isSuccess = (result: ApiResult) => {
|
||||
return result.code === 200
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,52 @@
|
||||
import httpClient from '@/utils/axios'
|
||||
import type { ApiResult } from '@/api/types'
|
||||
import type { AddConfig, settingPageParam, comparisonPageParam, fileUpload } from './types'
|
||||
|
||||
// 新增对外链接
|
||||
export function createStore(data: AddConfig) {
|
||||
return httpClient.post<ApiResult<void>>('/push/clue/config/add', data)
|
||||
}
|
||||
|
||||
// 修改对外链接
|
||||
export function updateStore(data: AddConfig) {
|
||||
return httpClient.post<ApiResult<void>>('/push/clue/config/update', data)
|
||||
}
|
||||
|
||||
// 对外链接查询
|
||||
export function getConfig() {
|
||||
return httpClient.get<ApiResult>('/push/clue/config/query')
|
||||
}
|
||||
//
|
||||
export function pageQueryPage(pageParams: settingPageParam) {
|
||||
return httpClient.get<ApiResult>('/push/clue/page', {
|
||||
params: pageParams
|
||||
})
|
||||
}
|
||||
// 资源对比-人员列表
|
||||
export function getFindAll(roleId: number) {
|
||||
return httpClient.get('/system/user/findAll/' + roleId)
|
||||
}
|
||||
|
||||
// 资源比对-列表
|
||||
export function pageQueryPageFile(pageParams: comparisonPageParam) {
|
||||
return httpClient.get<ApiResult>('/api/file/contrast/page', {
|
||||
params: pageParams
|
||||
})
|
||||
}
|
||||
// 资源比对-文件列表
|
||||
export function pageRecordPage() {
|
||||
return httpClient.get<ApiResult>('/api/file/contrast/record/page')
|
||||
}
|
||||
|
||||
// 资源对比-创建任务
|
||||
export function createTask(data: any) {
|
||||
return httpClient.post('/api/file/contrast/create', data)
|
||||
}
|
||||
// 资源对比-追加资源
|
||||
export function fileContrastAddition(data: any) {
|
||||
return httpClient.post('/api/file/contrast/addition', data)
|
||||
}
|
||||
// 资源比对-资源比对
|
||||
export function fileContrastBuild(data: any) {
|
||||
return httpClient.post('/api/file/contrast/build', data)
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
import type { PageParam } from '@/api/types'
|
||||
import type { UploadFile } from 'ant-design-vue/lib/upload/interface'
|
||||
export interface AddConfig {
|
||||
userId: number | undefined
|
||||
status?: number
|
||||
pushUrl?: string
|
||||
}
|
||||
export type settingParam = {
|
||||
requestId?: string | undefined
|
||||
startTime?: string | undefined
|
||||
endTime?: string | undefined
|
||||
reservationDate?: string
|
||||
}
|
||||
|
||||
export type settingData = {
|
||||
id?: number
|
||||
userId: number | undefined
|
||||
clueId?: number
|
||||
requestId?: string
|
||||
pushInfo?: string
|
||||
pushStatus?: number
|
||||
status: number
|
||||
pushUrl?: string
|
||||
sendNum?: number
|
||||
}
|
||||
|
||||
export type fileUpload = {
|
||||
files: UploadFile
|
||||
userIds: number[]
|
||||
taskName: string
|
||||
}
|
||||
|
||||
export type comparisonParam = {
|
||||
taskName?: string
|
||||
startTime?: string | undefined
|
||||
endTime?: string | undefined
|
||||
}
|
||||
export type comparisonPageParam = comparisonParam & PageParam
|
||||
export type settingPageParam = settingParam & PageParam
|
@ -0,0 +1,150 @@
|
||||
<template>
|
||||
<!-- 头部 -->
|
||||
<a-card :bordered="false" :body-style="{ paddingBottom: 0 }">
|
||||
<div class="resourceList-title">资源比对</div>
|
||||
</a-card>
|
||||
<!-- 工具栏 -->
|
||||
<clueComparisonSearch :loading="tableRef?.loading" @search="searchTable" />
|
||||
<!-- 批量操作、更多操作 -->
|
||||
<a-card :bordered="false" :body-style="{ paddingBottom: 0 }">
|
||||
<div class="operationButtonArea">
|
||||
<a-button type="primary" @click="batchImport">新建任务</a-button>
|
||||
</div>
|
||||
</a-card>
|
||||
<!-- 底部表格 -->
|
||||
<pro-table
|
||||
ref="tableRef"
|
||||
row-key="customId"
|
||||
:request="tableRequest"
|
||||
:columns="columns"
|
||||
:scroll="{ x: 1100 }"
|
||||
:tool-bar-render="false"
|
||||
class="protable"
|
||||
:pagination="{ showQuickJumper: true }"
|
||||
>
|
||||
<template #bodyCell="{ column, record }">
|
||||
<template v-if="column.key === 'contrastUsername'">
|
||||
<div v-for="(item, index) in record.contrastUsername" :key="index">
|
||||
{{ item }}
|
||||
</div>
|
||||
</template>
|
||||
<template v-if="column.key === 'operate'">
|
||||
<operation-group>
|
||||
<a @click="batchImport(record.id)">详情</a>
|
||||
</operation-group>
|
||||
</template>
|
||||
</template>
|
||||
</pro-table>
|
||||
<!-- 批量导入新建弹窗 -->
|
||||
<clue-comparison-modal
|
||||
ref="clueComparisonModalRef"
|
||||
@submit-success="reloadTable"
|
||||
></clue-comparison-modal>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
//底部表格
|
||||
import ProTable from '#/table'
|
||||
import type { ProTableInstanceExpose, TableRequest, ProColumns } from '#/table'
|
||||
import { mergePageParam } from '@/utils/page-utils'
|
||||
import { FormAction } from '@/hooks/form'
|
||||
import clueComparisonSearch from './clueComparisonSearch.vue'
|
||||
import { pageQueryPageFile } from '@/api/system/setup/index'
|
||||
import clueComparisonModal from './clueComparisonModal.vue'
|
||||
import type { comparisonParam, comparisonPageParam } from '@/api/system/setup/types'
|
||||
|
||||
defineOptions({ name: 'ClueComparison' })
|
||||
|
||||
//获取当前账号角色
|
||||
import { useUserStore } from '@/stores/user-store'
|
||||
const { userInfo } = useUserStore()
|
||||
const salesmanType = ref<number | undefined>()
|
||||
onMounted(() => {
|
||||
salesmanType.value = userInfo?.salesmanType
|
||||
})
|
||||
//底部表格
|
||||
const clueComparisonModalRef = ref<InstanceType<typeof clueComparisonModal>>()
|
||||
// 表格组件引用
|
||||
const tableRef = ref<ProTableInstanceExpose>()
|
||||
// 查询参数
|
||||
let searchParams: comparisonParam = {}
|
||||
|
||||
//远程加载表格数据
|
||||
const tableRequest: TableRequest = (params, sorter, filter) => {
|
||||
const pageParam = mergePageParam(params, sorter, filter, salesmanType.value)
|
||||
return pageQueryPageFile({ ...pageParam, ...searchParams })
|
||||
}
|
||||
|
||||
//刷新表格
|
||||
const reloadTable = (resetPageIndex?: boolean) => {
|
||||
tableRef.value?.actionRef?.reload(resetPageIndex)
|
||||
}
|
||||
|
||||
//查询表格
|
||||
const searchTable = (params: comparisonPageParam) => {
|
||||
searchParams = params
|
||||
reloadTable(true) // 会调用 tableRequest
|
||||
}
|
||||
// 资源比对
|
||||
const batchImport = (id?: number) => {
|
||||
clueComparisonModalRef.value?.open({
|
||||
newFormAction: FormAction.CREATE,
|
||||
id
|
||||
})
|
||||
}
|
||||
const columns: ProColumns[] = [
|
||||
{
|
||||
title: 'ID',
|
||||
width: 160,
|
||||
dataIndex: 'id'
|
||||
},
|
||||
{
|
||||
title: '任务名称',
|
||||
dataIndex: 'taskName'
|
||||
},
|
||||
{
|
||||
title: '任务数量',
|
||||
width: 80,
|
||||
dataIndex: 'contrastNum'
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
dataIndex: 'createTime',
|
||||
width: 150,
|
||||
align: 'center',
|
||||
customRender: function ({ record }: any) {
|
||||
if (record.createTime) {
|
||||
return record.createTime
|
||||
} else if (record.createTime === null) {
|
||||
return '--'
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
key: 'operate',
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
width: 70,
|
||||
fixed: 'right'
|
||||
}
|
||||
]
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.resourceList-title {
|
||||
font-size: 17px;
|
||||
font-weight: 600;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
//批量操作、更多操作
|
||||
.operationButtonArea {
|
||||
padding-bottom: 20px;
|
||||
::v-deep .ant-btn-primary {
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
.editable-row-operations a {
|
||||
margin-right: 8px;
|
||||
}
|
||||
</style>
|
@ -0,0 +1,79 @@
|
||||
<template>
|
||||
<a-card :bordered="false" style="margin-bottom: 16px" :body-style="{ paddingBottom: 0 }">
|
||||
<a-form :model="formModel" :label-col="labelCol">
|
||||
<a-row :gutter="16">
|
||||
<a-col :xl="8" :md="12" :sm="24">
|
||||
<a-form-item label="任务名">
|
||||
<a-input v-model:value="formModel.taskName" allow-clear placeholder="请输入" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="8" :md="12" :sm="24">
|
||||
<a-form-item label="创建时间">
|
||||
<a-range-picker
|
||||
v-model:value="searchTimeValue"
|
||||
show-time
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
:ranges="{
|
||||
Today: [dayjs().startOf('date'), dayjs()]
|
||||
}"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="24" :md="24" :sm="24">
|
||||
<search-actions :loading="props.loading" @search="search" @reset="reset" />
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Form } from 'ant-design-vue'
|
||||
import type { comparisonParam } from '@/api/system/setup/types'
|
||||
import dayjs from 'dayjs'
|
||||
import type { Dayjs } from 'dayjs'
|
||||
|
||||
const useForm = Form.useForm
|
||||
|
||||
// 表单 label 全局配置
|
||||
const labelCol = { md: { span: 6 } }
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
loading?: boolean
|
||||
}>(),
|
||||
{ loading: false }
|
||||
)
|
||||
|
||||
const emits = defineEmits<{
|
||||
(e: 'search', params: Record<string, any>): void
|
||||
}>()
|
||||
|
||||
const searchTimeValue = ref<[Dayjs, Dayjs]>()
|
||||
const formModel = reactive<comparisonParam>({
|
||||
taskName: ''
|
||||
})
|
||||
|
||||
const { resetFields } = useForm(formModel)
|
||||
|
||||
const search = () => {
|
||||
const param = toRaw(formModel)
|
||||
if (searchTimeValue.value && searchTimeValue.value.length == 2) {
|
||||
param.startTime = searchTimeValue.value[0].format('YYYY-MM-DD HH:mm:ss')
|
||||
param.endTime = searchTimeValue.value[1].format('YYYY-MM-DD HH:mm:ss')
|
||||
} else {
|
||||
param.startTime = ''
|
||||
param.endTime = ''
|
||||
}
|
||||
emits('search', param)
|
||||
}
|
||||
|
||||
const reset = () => {
|
||||
// 清空表单其他元素
|
||||
resetFields()
|
||||
// 清空时间
|
||||
searchTimeValue.value = undefined
|
||||
search()
|
||||
}
|
||||
</script>
|
@ -0,0 +1,143 @@
|
||||
<template>
|
||||
<!-- 头部 -->
|
||||
<a-card :bordered="false" :body-style="{ paddingBottom: 0 }">
|
||||
<div class="geopoliticalCustomers-title">对外开放</div>
|
||||
</a-card>
|
||||
<!-- 搜索 -->
|
||||
<setting-search :loading="tableRef?.loading" @search="searchTable" />
|
||||
<!-- 工具栏 -->
|
||||
<a-card :bordered="false" :body-style="{ paddingBottom: 0 }">
|
||||
<div class="operationButtonArea">
|
||||
<a-button type="primary" @click="editSetting">设置</a-button>
|
||||
<!-- 更多操作 -->
|
||||
</div>
|
||||
</a-card>
|
||||
<!-- 底部表格 -->
|
||||
<pro-table
|
||||
ref="tableRef"
|
||||
row-key="customId"
|
||||
:request="tableRequest"
|
||||
:columns="columns"
|
||||
:scroll="{ x: 1100 }"
|
||||
:tool-bar-render="false"
|
||||
class="protable"
|
||||
:pagination="{ showQuickJumper: true }"
|
||||
>
|
||||
<template #bodyCell="{ column, record }">
|
||||
<template v-if="column.key == 'pushStatus'">
|
||||
<a-tag :color="record.pushStatus == 1 ? 'success' : 'error'">{{
|
||||
record.pushStatus == 1 ? '推送成功' : '推送失败'
|
||||
}}</a-tag>
|
||||
</template>
|
||||
</template>
|
||||
</pro-table>
|
||||
<!-- 新建/编辑弹窗 -->
|
||||
<setting-modal ref="settingModalRef" @submit-success="reloadTable" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import settingSearch from './settingSearch.vue'
|
||||
import settingModal from './settingModal.vue'
|
||||
import ProTable from '#/table'
|
||||
import type { ProTableInstanceExpose, TableRequest, ProColumns } from '#/table'
|
||||
import { mergePageParam } from '@/utils/page-utils'
|
||||
import { FormAction } from '@/hooks/form'
|
||||
import type { settingParam } from '@/api/system/setup/types'
|
||||
import { pageQueryPage } from '@/api/system/setup/index'
|
||||
defineOptions({ name: 'SettingIndex' })
|
||||
|
||||
//底部表格
|
||||
// 表格组件引用
|
||||
const tableRef = ref<ProTableInstanceExpose>()
|
||||
// add ref
|
||||
const settingModalRef = ref<InstanceType<typeof settingModal>>()
|
||||
// 查询参数
|
||||
let searchParams: settingParam = {}
|
||||
|
||||
//刷新表格
|
||||
const reloadTable = (resetPageIndex?: boolean) => {
|
||||
tableRef.value?.actionRef?.reload(resetPageIndex)
|
||||
}
|
||||
|
||||
//查询表格
|
||||
const searchTable = (params: settingParam) => {
|
||||
searchParams = params
|
||||
reloadTable(true) // 会调用 tableRequest
|
||||
}
|
||||
|
||||
//远程加载表格数据
|
||||
const tableRequest: TableRequest = (params, sorter, filter) => {
|
||||
const pageParam = mergePageParam(params, sorter, filter)
|
||||
return pageQueryPage({ ...pageParam, ...searchParams })
|
||||
}
|
||||
|
||||
const editSetting = () => {
|
||||
settingModalRef.value?.open(FormAction.UPDATE)
|
||||
}
|
||||
const columns: ProColumns[] = [
|
||||
{
|
||||
title: '线索ID',
|
||||
dataIndex: 'clueId'
|
||||
},
|
||||
{
|
||||
title: '请求ID',
|
||||
dataIndex: 'requestId'
|
||||
},
|
||||
{
|
||||
title: '推送内容',
|
||||
dataIndex: 'pushInfo'
|
||||
},
|
||||
{
|
||||
title: '推送状态',
|
||||
dataIndex: 'pushStatus'
|
||||
// customRender: function ({ record }: any) {
|
||||
// if (record.pushStatus === 0) {
|
||||
// return h('div', '推送失败')
|
||||
// } else if (record.pushStatus === 1) {
|
||||
// return h('div', '推送成功')
|
||||
// }
|
||||
// }
|
||||
},
|
||||
{
|
||||
title: '第几次推送',
|
||||
dataIndex: 'sendNum'
|
||||
},
|
||||
{
|
||||
title: '创建日期',
|
||||
dataIndex: 'createTime',
|
||||
width: 150,
|
||||
align: 'center',
|
||||
customRender: function ({ record }: any) {
|
||||
if (record.createTime) {
|
||||
return record.createTime
|
||||
} else if (record.createTime == null) {
|
||||
return '--'
|
||||
}
|
||||
}
|
||||
}
|
||||
// {
|
||||
// key: 'operate',
|
||||
// title: '操作',
|
||||
// align: 'center',
|
||||
// width: 150,
|
||||
// fixed: 'right'
|
||||
// }
|
||||
]
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.geopoliticalCustomers-title {
|
||||
font-size: 17px;
|
||||
font-weight: 600;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
//批量操作、更多操作
|
||||
.operationButtonArea {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
.editable-row-operations a {
|
||||
margin-right: 8px;
|
||||
}
|
||||
</style>
|
@ -0,0 +1,87 @@
|
||||
<template>
|
||||
<a-card :bordered="false" style="margin-bottom: 16px" :body-style="{ paddingBottom: 0 }">
|
||||
<a-form :model="formModel" :label-col="labelCol">
|
||||
<a-row :gutter="16">
|
||||
<!-- v-if="userInfoCurrent === 'ROLE_ADMIN'" -->
|
||||
<a-col :xl="8" :md="12" :sm="24">
|
||||
<a-form-item label="请求ID">
|
||||
<a-input v-model:value="formModel.requestId" allow-clear placeholder="请输入" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="8" :md="12" :sm="24">
|
||||
<a-form-item label="创建日期">
|
||||
<a-range-picker
|
||||
v-model:value="formModel.reservationDate"
|
||||
format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="24" :md="24" :sm="24">
|
||||
<search-actions :loading="props.loading" @search="search" @reset="reset" />
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</a-card>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { Form } from 'ant-design-vue'
|
||||
import type { settingParam } from '@/api/system/setup/types'
|
||||
import dayjs from 'dayjs'
|
||||
//获取当前账号角色
|
||||
import { useUserStore } from '@/stores/user-store'
|
||||
const { userInfo } = useUserStore()
|
||||
|
||||
const userInfoCurrent = ref<string | undefined>('')
|
||||
onMounted(() => {
|
||||
userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
|
||||
})
|
||||
|
||||
const useForm = Form.useForm
|
||||
// 表单 label 全局配置
|
||||
const labelCol = { md: { span: 6 } }
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
loading?: boolean
|
||||
}>(),
|
||||
{ loading: false }
|
||||
)
|
||||
|
||||
const emits = defineEmits<{
|
||||
(e: 'search', params: Record<string, any>): void
|
||||
}>()
|
||||
|
||||
const formModel = reactive<settingParam>({
|
||||
requestId: '',
|
||||
reservationDate: undefined
|
||||
})
|
||||
watch(
|
||||
() => formModel.reservationDate,
|
||||
nval => {
|
||||
if (nval && nval.length == 2) {
|
||||
formModel.startTime = dayjs(nval[0]).format('YYYY-MM-DD')
|
||||
formModel.endTime = dayjs(nval[1]).format('YYYY-MM-DD')
|
||||
} else {
|
||||
formModel.reservationDate = undefined
|
||||
formModel.startTime = undefined
|
||||
formModel.endTime = undefined
|
||||
}
|
||||
}
|
||||
)
|
||||
const { resetFields } = useForm(formModel)
|
||||
|
||||
const search = () => {
|
||||
const param = toRaw(formModel)
|
||||
if (param.reservationDate && param.reservationDate.length == 2) {
|
||||
delete param.reservationDate
|
||||
}
|
||||
emits('search', param)
|
||||
}
|
||||
|
||||
const reset = () => {
|
||||
// 清空表单其他元素
|
||||
resetFields()
|
||||
search()
|
||||
}
|
||||
</script>
|
Loading…
Reference in New Issue