微调-调整日期组件

2024-10-22 14:47:25 +08:00
parent 97d6329d82
commit 0d25e477d7
15 changed files with 586 additions and 554 deletions
--- a/frontend/src/views/demo/proTable/index.vue
+++ b/frontend/src/views/demo/proTable/index.vue
@@ -1,9 +1,9 @@
 <template>
  <div class='table-box'>
    <ProTable
-        ref='proTable'
-        :columns='columns'
-        :data='userData'
+      ref='proTable'
+      :columns='columns'
+      :data='userData'
    >
      <!-- 表格 header 按钮 -->
      <template #tableHeader='scope'>
@@ -26,11 +26,11 @@
      </template>
    </ProTable>
  </div>
-  <single-column  ref='singleColumn' />
-  <double-column  ref='doubleColumn' />
+  <single-column ref='singleColumn' />
+  <double-column ref='doubleColumn' />
 </template>
 <script setup lang='tsx' name='useProTable'>
-import { ref ,reactive} from 'vue'
+import { ref, reactive } from 'vue'
 import { User } from '@/api/user/interface'
 import { useHandleData } from '@/hooks/useHandleData'
 import { useDownload } from '@/hooks/useDownload'
@@ -43,6 +43,7 @@ import userDataList from '@/api/user/userData'
 import { useDictStore } from '@/stores/modules/dict'
 import SingleColumn from '@/views/demo/proTable/singleColumn.vue'
 import DoubleColumn from '@/views/demo/proTable/doubleColumn.vue'
+
 const dictStore = useDictStore()
 import {
  getUserList,
@@ -54,6 +55,8 @@ import {
  getUserStatus,
 } from '@/api/user/user'
 import { ElMessageBox } from 'element-plus'
+import router from '@/routers'
+
 const userData = userDataList
 const singleColumn = ref()
 const doubleColumn = ref()
@@ -88,7 +91,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
    prop: 'username',
    label: '姓名',
    width: 120,
-    search: { el: 'input'},
+    search: { el: 'input' },
  },
  {
    prop: 'gender',
@@ -105,11 +108,11 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
      // 自定义 search 显示内容
      render: ({ searchParam }) => {
        return (
-            <div class='flx-center'>
-              <el-input vModel_trim={searchParam.minAge} placeholder='最小年龄' />
-              <span class='mr10 ml10'>-</span>
-              <el-input vModel_trim={searchParam.maxAge} placeholder='最大年龄' />
-            </div>
+          <div class='flx-center'>
+            <el-input vModel_trim={searchParam.minAge} placeholder='最小年龄' />
+            <span class='mr10 ml10'>-</span>
+            <el-input vModel_trim={searchParam.maxAge} placeholder='最大年龄' />
+          </div>
        )
      },
    },
@@ -125,19 +128,19 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
    fieldNames: { label: 'userLabel', value: 'userStatus' },
    render: scope => {
      return (
-          <>
-            {BUTTONS.value.status ? (
-                <el-switch
-                    model-value={scope.row.status}
-                    active-text={scope.row.status ? '启用' : '禁用'}
-                    active-value={1}
-                    inactive-value={0}
-                    onClick={() => changeStatus(scope.row)}
-                />
-            ) : (
-                <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
-            )}
-          </>
+        <>
+          {BUTTONS.value.status ? (
+            <el-switch
+              model-value={scope.row.status}
+              active-text={scope.row.status ? '启用' : '禁用'}
+              active-value={1}
+              inactive-value={0}
+              onClick={() => changeStatus(scope.row)}
+            />
+          ) : (
+            <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
+          )}
+        </>
      )
    },
  },
@@ -156,8 +159,9 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
 ])
 // 删除用户信息
 const deleteAccount = async (params: User.ResUserList) => {
-  await useHandleData(deleteUser, { id: [params.id] }, `删除【${params.username}】用户`)
-  proTable.value?.getTableList()
+  // await useHandleData(deleteUser, { id: [params.id] }, `删除【${params.username}】用户`)
+  // proTable.value?.getTableList()
+  router.push('/plan/autoTest')
 }
 // 批量删除用户信息
 const batchDelete = async (id: string[]) => {
@@ -169,7 +173,7 @@ const batchDelete = async (id: string[]) => {
 const resetPass = async (params: User.ResUserList) => {
  // await useHandleData(resetUserPassWord, { id: params.id }, `重置【${params.username}】用户密码`)
  // proTable.value?.getTableList()
-  doubleColumn.value.open("双列弹出框")
+  doubleColumn.value.open('双列弹出框')
 }
 // 切换用户状态
 const changeStatus = async (row: User.ResUserList) => {
@@ -182,7 +186,7 @@ const changeStatus = async (row: User.ResUserList) => {
 // 导出用户列表
 const downloadFile = async () => {
  ElMessageBox.confirm('确认导出用户数据?', '温馨提示', { type: 'warning' }).then(() =>
-      useDownload(exportUserInfo, '用户列表', proTable.value?.searchParam),
+    useDownload(exportUserInfo, '用户列表', proTable.value?.searchParam),
  )
 }
 // 批量添加用户
@@ -198,6 +202,6 @@ const batchAdd = () => {
 }
 // 打开 drawer(新增、查看、编辑)
 const openDrawer = (title: string, row: Partial<User.ResUserList> = {}) => {
-  singleColumn.value.open("单列弹出框")
+  singleColumn.value.open('单列弹出框')
 }
 </script>
--- a/frontend/src/views/log/index.vue
+++ b/frontend/src/views/log/index.vue
@@ -4,26 +4,27 @@
      ref='proTable'
      :columns='columns'
      :data='logData'
-      @selection-change="handleSelectionChange" 
-      type="selection"
+      @selection-change='handleSelectionChange'
+      type='selection'
    >
-     <!-- 表格 header 按钮 -->
-     <template #tableHeader>
-          <el-button type='primary' :icon='Upload'>导出csv</el-button>
-        </template>
+      <!-- 表格 header 按钮 -->
+      <template #tableHeader>
+        <el-button type='primary' :icon='Upload'>导出csv</el-button>
+      </template>
    </ProTable>
  </div>

 </template>
 <script setup lang='tsx' name='useProTable'>
-import TimeControl from '@/components/TimeControl/index.vue'; // 根据实际路径调整
-import { defineComponent,ref ,reactive} from 'vue'
-import {type Log } from '@/api/log/interface'
+// 根据实际路径调整
+import TimeControl from '@/components/TimeControl/index.vue'
+import { type Log } from '@/api/log/interface'
 import ProTable from '@/components/ProTable/index.vue'
-import {Upload} from '@element-plus/icons-vue'
+import { Upload } from '@element-plus/icons-vue'
 import logDataList from '@/api/log/logData'
 import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
-let multipleSelection = ref<string[]>([]);
+
+let multipleSelection = ref<string[]>([])
 const logData = logDataList

 // ProTable 实例
@@ -40,23 +41,13 @@ const columns = reactive<ColumnProps<Log.LogList>[]>([
    prop: 'record_Time',
    label: '记录时间',
    width: 180,
-    search: {
-      // 自定义 search 显示内容
-      render: ({ searchParam }) => {
-        return (
-          <div class='flx-center'>
-            <TimeControl/>
-          </div>
-        )
-      },
-    },
  },
  {
    prop: 'user',
    label: '操作用户',
    search: { el: 'select', props: { filterable: true } },
  },
-  
+
  {
    prop: 'type',
    label: '日志类型',
@@ -67,14 +58,29 @@ const columns = reactive<ColumnProps<Log.LogList>[]>([
    label: '日志等级',
    search: { el: 'select', props: { filterable: true } },
  },
+  {
+    prop: 'record_Time',
+    label: '记录时间',
+    isShow: false,
+    search: {
+      span: 2,
+      render: ({ searchParam }) => {
+        return (
+          <div class='flx-flex-start'>
+            <TimeControl />
+          </div>
+        )
+      },
+    },
+  },
 ])

 //选中
 // 处理选择变化
-const handleSelectionChange = (selection:Log.LogList[]) => {
-  multipleSelection.value = selection.map(row => row.id); // 更新选中的行
-  
-};
+const handleSelectionChange = (selection: Log.LogList[]) => {
+  multipleSelection.value = selection.map(row => row.id) // 更新选中的行
+
+}
 </script>

 <style scoped>
--- a/frontend/src/views/plan/autoTest/components/tree.vue
+++ b/frontend/src/views/plan/autoTest/components/tree.vue
@@ -51,8 +51,6 @@ const getTreeData = (val: any) => {
  defaultChecked.value = [];
  data.value = val;
  defaultChecked.value.push(data.value[0].children[0].children[0].id);
-  console.log(defaultChecked.value, "+++++++++++++");
-  console.log(treeList.value);
  treeRef.value.setCurrentKey(defaultChecked.value);
 };
 const filterText = ref("");
--- a/frontend/src/views/plan/autoTest/index.vue
+++ b/frontend/src/views/plan/autoTest/index.vue
@@ -271,7 +271,6 @@ const dataCallback = (data: any) => {
    total: data.length || data.total, //total
  };
 };
-console.log(proTable.value, "proTable.value?proTable.value?proTable.value?");
 // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = (params: any) => {
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -240,7 +240,6 @@ const dataCallback = (data: any) => {
    total: data.length || data.total,
  };
 };
-console.log(proTable.value, "proTable.value?proTable.value?proTable.value?");
 // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = (params: any) => {
--- a/frontend/src/views/plan/singlePlanList/index.vue
+++ b/frontend/src/views/plan/singlePlanList/index.vue
@@ -240,7 +240,6 @@ const dataCallback = (data: any) => {
    total: data.length || data.total,
  };
 };
-console.log(proTable.value, "proTable.value?proTable.value?proTable.value?");
 // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = (params: any) => {