apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-12-24 08:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复生成模板

Browse Source
This commit is contained in:
xiangheng
2024-06-29 00:45:42 +08:00
parent c1c16abe8a
commit 562ce63382
3 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/src/components/upload/index.vue
View File

@@ -85,8 +85,10 @@ export default defineComponent({
const userStore = useUserStore()
const uploadRefs = shallowRef<InstanceType<typeof ElUpload>>()
let action = ''
if (props.url) {
if (props.url.startsWith('http')) {
if (props.url && typeof props.url === 'string') {
console.log('props.url', props.url)
if (props.url.indexOf('http') === 0) {
action = props.url
} else {
action = `${config.baseUrl}${config.urlPrefix}${props.url}`

77
admin/src/views/monitor_client/index.vue
View File

@@ -1,39 +1,42 @@
<template>
<div class="index-lists">
<el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true" label-width="70px"
label-position="left">
<el-form-item label="项目key" prop="projectKey" class="w-[280px]">
<el-select
v-model="queryParams.projectKey"
clearable
>
<el-form
ref="formRef"
class="mb-[-16px]"
:model="queryParams"
:inline="true"
label-width="70px"
label-position="left"
>
<el-form-item label="项目key" prop="projectKey" class="w-[280px]">
<el-select v-model="queryParams.projectKey" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="sdk生成的客户端id" prop="clientId" class="w-[280px]">
<el-input v-model="queryParams.clientId" />
<el-input v-model="queryParams.clientId" />
</el-form-item>
<el-form-item label="用户id" prop="userId" class="w-[280px]">
<el-input v-model="queryParams.userId" />
<el-input v-model="queryParams.userId" />
</el-form-item>
<el-form-item label="系统" prop="os" class="w-[280px]">
<el-input v-model="queryParams.os" />
<el-input v-model="queryParams.os" />
</el-form-item>
<el-form-item label="浏览器" prop="browser" class="w-[280px]">
<el-input v-model="queryParams.browser" />
<el-input v-model="queryParams.browser" />
</el-form-item>
<el-form-item label="城市" prop="city" class="w-[280px]">
<el-input v-model="queryParams.city" />
<el-input v-model="queryParams.city" />
</el-form-item>
<el-form-item label="屏幕" prop="width" class="w-[280px]">
<el-input v-model="queryParams.width" />
<el-input v-model="queryParams.width" />
</el-form-item>
<el-form-item label="屏幕高度" prop="height" class="w-[280px]">
<el-input v-model="queryParams.height" />
<el-input v-model="queryParams.height" />
</el-form-item>
<el-form-item label="ua记录" prop="ua" class="w-[280px]">
<el-input v-model="queryParams.ua" />
<el-input v-model="queryParams.ua" />
</el-form-item>
<el-form-item label="创建时间" prop="createTime" class="w-[280px]">
<daterange-picker
@@ -55,15 +58,19 @@
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<div>
<el-button v-perms="['admin:monitor_client:add']" type="primary" @click="handleAdd()">
<el-button
v-perms="['admin:monitor_client:add']"
type="primary"
@click="handleAdd()"
>
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<upload
<upload
class="ml-3 mr-3"
:url="monitor_client_export_file"
:url="monitor_client_import_file"
:data="{ cid: 0 }"
type="file"
:show-progress="true"
@@ -83,12 +90,7 @@
导出
</el-button>
</div>
<el-table
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
>
<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
<el-table-column label="项目key" prop="projectKey" min-width="130" />
<el-table-column label="sdk生成的客户端id" prop="clientId" min-width="130" />
<el-table-column label="用户id" prop="userId" min-width="130" />
@@ -125,22 +127,22 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
@success="getLists"
@close="showEdit = false"
/>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup>
import { monitor_client_delete, monitor_client_list,monitor_client_import_file, monitor_client_export_file } from '@/api/monitor_client'
import type { type_monitor_client,type_monitor_client_query } from "@/api/monitor_client";
import {
monitor_client_delete,
monitor_client_list,
monitor_client_import_file,
monitor_client_export_file
} from '@/api/monitor_client'
import type { type_monitor_client, type_monitor_client_query } from '@/api/monitor_client'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
defineOptions({
name:"monitor_client"
name: 'monitor_client'
})
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const showEdit = ref(false)
@@ -151,13 +153,13 @@ const queryParams = reactive<type_monitor_client_query>({
os: '',
browser: '',
city: '',
width: '',
height: '',
width: null,
height: null,
ua: '',
createTimeStart: '',
createTimeEnd: '',
clientTimeStart: '',
clientTimeEnd: '',
clientTimeEnd: ''
})
const { pager, getLists, resetPage, resetParams } = usePaging<type_monitor_client>({
@@ -165,7 +167,6 @@ const { pager, getLists, resetPage, resetParams } = usePaging<type_monitor_clien
params: queryParams
})
const handleAdd = async () => {
showEdit.value = true
await nextTick()
@@ -182,7 +183,7 @@ const handleEdit = async (data: any) => {
const handleDelete = async (id: number) => {
try {
await feedback.confirm('确定要删除？')
await monitor_client_delete( id )
await monitor_client_delete(id)
feedback.msgSuccess('删除成功')
getLists()
} catch (error) {}