From 562ce63382d15a5227eb0fae29027d5f73d65708 Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Sat, 29 Jun 2024 00:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/upload/index.vue         |  6 +-
 admin/src/views/monitor_client/index.vue      | 77 ++++++++++---------
 .../tpl_utils/templates/vue/index.vue.tpl     |  2 +-
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/admin/src/components/upload/index.vue b/admin/src/components/upload/index.vue
index ea90591..a2caee3 100644
--- a/admin/src/components/upload/index.vue
+++ b/admin/src/components/upload/index.vue
@@ -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}`
diff --git a/admin/src/views/monitor_client/index.vue b/admin/src/views/monitor_client/index.vue
index 3d6d63a..63157d2 100644
--- a/admin/src/views/monitor_client/index.vue
+++ b/admin/src/views/monitor_client/index.vue
@@ -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) {}
diff --git a/server/admin/generator/tpl_utils/templates/vue/index.vue.tpl b/server/admin/generator/tpl_utils/templates/vue/index.vue.tpl
index 410ab66..ee6a1fb 100644
--- a/server/admin/generator/tpl_utils/templates/vue/index.vue.tpl
+++ b/server/admin/generator/tpl_utils/templates/vue/index.vue.tpl
@@ -54,7 +54,7 @@
                 </el-button>
                     <upload
                     class="ml-3 mr-3"
-                    :url="{{{.ModuleName}}}_export_file"
+                    :url="{{{.ModuleName}}}_import_file"
                     :data="{ cid: 0 }"
                     type="file"
                     :show-progress="true"