This commit is contained in:
sjl
2025-01-06 14:07:28 +08:00
8 changed files with 8 additions and 634 deletions

View File

@@ -19,6 +19,6 @@ VITE_API_URL=/api
# 开发环境跨域代理,支持配置多个
VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
# VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
#VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
# VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文

View File

@@ -1,8 +1,5 @@
import type { ResPage } from '@/api/interface'
import type { Plan } from './interface'
import http from '@/api'
import type { TestSource } from '../device/interface/testSource'
import type { TestScript } from '../device/interface/testScript'
import type { ErrorSystem } from '../device/interface/error'
import type { Device } from '../device/interface/device'

View File

@@ -1,7 +1,7 @@
.el-main {
box-sizing: border-box;
padding: 20px;//主体padding
overflow-x: hidden;
padding: 15px;//主体padding
overflow: hidden;
background-color: var(--el-bg-color-page);
}
.el-footer {

View File

@@ -1,80 +0,0 @@
<!--双列-->
<template>
<el-dialog v-model='dialogVisible' :title='title' v-bind='dialogMiddle' >
<el-scrollbar>
<el-form :inline="false" label-width="auto" ref="formRef" class='form-two'>
<el-form-item label="姓名" prop="username" >
<el-input
></el-input>
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-input
></el-input>
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input
></el-input>
</el-form-item>
<el-form-item label="身份证号" prop="id">
<el-input
></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input
></el-input>
</el-form-item>
<el-form-item label="居住地址" prop="address">
<el-input
></el-input>
</el-form-item>
<el-form-item label="手机" prop="phone">
<el-input
></el-input>
</el-form-item>
<el-form-item label="来源" prop="source">
<el-input
></el-input>
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<div class='dialog-footer'>
<el-button @click='close()'>取消</el-button>
<el-button type='primary' @click='confirmForm()'>确定</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang='ts'>
import { dialogMiddle } from '@/utils/elementBind'
const dialogVisible = ref(false)
const title = ref('单列弹出框')
const open = (textTitle: string) => {
dialogVisible.value = true
title.value = textTitle
}
const close = () => {
dialogVisible.value = false
}
const confirmForm = () => {
ElMessage.info('业务数据提交')
}
defineExpose({ open })
</script>
<style>
</style>

View File

@@ -1,200 +0,0 @@
<template>
<div class='table-box' ref='popupBaseView'>
<ProTable
ref='proTable'
:columns='columns'
:data='userData'
>
<!-- 表格 header 按钮 -->
<template #tableHeader='scope'>
<el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增')">新增用户</el-button>
<el-button type='primary' :icon='Upload' plain @click='batchAdd'>批量添加用户</el-button>
<el-button type='primary' :icon='Download' plain @click='downloadFile'>导出用户数据</el-button>
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
删除用户
</el-button>
</template>
<!-- 表格操作 -->
<template #operation='scope'>
<el-button type='primary' link :icon='View'
@click="openDrawer('查看', scope.row)">查看
</el-button>
<el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
<el-button type='primary' link :icon='Refresh' @click='resetPass(scope.row)'>重置密码</el-button>
<el-button type='primary' link :icon='CirclePlus' @click='deleteAccount()'>下钻</el-button>
</template>
</ProTable>
</div>
<single-column ref='singleColumn' />
<double-column ref='doubleColumn' />
<open :width='viewWidth' :height='viewHeight' ref='openView' />
</template>
<script setup lang='tsx' name='useProTable'>
import { ref, reactive } from 'vue'
import { useHandleData } from '@/hooks/useHandleData'
import { useAuthButtons } from '@/hooks/useAuthButtons'
import ProTable from '@/components/ProTable/index.vue'
import ImportExcel from '@/components/ImportExcel/index.vue'
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
import { CirclePlus, Delete, EditPen, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
import { useDictStore } from '@/stores/modules/dict'
import SingleColumn from '@/views/demo/proTable/singleColumn.vue'
import Open from '@/views/demo/proTable/Open.vue'
import DoubleColumn from '@/views/demo/proTable/doubleColumn.vue'
import { useViewSize } from '@/hooks/useViewSize'
const { popupBaseView, viewWidth, viewHeight } = useViewSize()
const dictStore = useDictStore()
import {
getUserList,
deleteUser,
} from '@/api/user/user'
import { ElMessageBox } from 'element-plus'
const userData = userDataList
const singleColumn = ref()
const doubleColumn = ref()
const openView = ref()
// ProTable 实例
const proTable = ref<ProTableInstance>()
// 如果表格需要初始化请求参数,直接定义传给 ProTable (之后每次请求都会自动带上该参数,此参数更改之后也会一直带上,改变此参数会自动刷新表格数据)
const initParam = reactive({ type: 1 })
// dataCallback 是对于返回的表格数据做处理,如果你后台返回的数据不是 list && total 这些字段,可以在这里进行处理成这些字段
// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
const dataCallback = (data: any) => {
return {
list: data.list,
total: data.total,
}
}
// 如果你想在请求之前对当前请求参数做一些操作可以自定义如下函数params 为当前所有的请求参数(包括分页),最后返回请求列表接口
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params))
newParams.createTime && (newParams.startTime = newParams.createTime[0])
newParams.createTime && (newParams.endTime = newParams.createTime[1])
delete newParams.createTime
return getUserList(newParams)
}
// 页面按钮权限(按钮权限既可以使用 hooks也可以直接使用 v-auth 指令指令适合直接绑定在按钮上hooks 适合根据按钮权限显示不同的内容)
const { BUTTONS } = useAuthButtons()
// 表格配置项
const columns = reactive<ColumnProps<any>[]>([
{ type: 'selection', fixed: 'left', width: 70 },
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
{
prop: 'username',
label: '姓名',
width: 120,
search: { el: 'input' },
},
{
prop: 'gender',
label: '性别',
// 字典数据(本地数据)
enum: dictStore.getDictData('sex'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{
prop: 'age',
label: '年龄',
search: {
// 自定义 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>
)
},
},
},
{ prop: 'idCard', label: '身份证号' },
{ prop: 'email', label: '邮箱' },
{ prop: 'address', label: '居住地址', width: 120 },
{
prop: 'status',
label: '状态',
enum: dictStore.getDictData('status'),
search: { el: 'tree-select', props: { filterable: true } },
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>
)}
</>
)
},
},
{
prop: 'createTime',
label: '创建时间',
width: 180,
search: {
el: 'date-picker',
span: 1,
props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
defaultValue: ['2024-11-12', '2024-12-12'],
},
},
{ prop: 'operation', label: '操作', fixed: 'right', width: 330 },
])
// 下钻
const deleteAccount = async () => {
openView.value.open('测试弹出框')
}
// 批量删除用户信息
const batchDelete = async (id: string[]) => {
await useHandleData(deleteUser, { id }, '删除所选用户信息')
proTable.value?.clearSelection()
proTable.value?.getTableList()
}
// 重置用户密码
const resetPass = async (params: any) => {
// await useHandleData(resetUserPassWord, { id: params.id }, `重置【${params.username}】用户密码`)
// proTable.value?.getTableList()
doubleColumn.value.open('双列弹出框')
}
// 切换用户状态
const changeStatus = async (row: any) => {
// await useHandleData(changeUserStatus, {
// id: row.id,
// status: row.status == 1 ? 0 : 1,
// }, `切换【${row.username}】用户状态`)
proTable.value?.getTableList()
}
// 导出用户列表
const downloadFile = async () => {
}
// 批量添加用户
const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
const batchAdd = () => {
const params = {
title: '用户',
getTableList: proTable.value?.getTableList,
}
dialogRef.value?.acceptParams(params)
}
// 打开 drawer(新增、查看、编辑)
const openDrawer = (title: string, row: Partial<any> = {}) => {
singleColumn.value.open('单列弹出框')
}
</script>

View File

@@ -1,177 +0,0 @@
<!--单列-->
<template>
<el-dialog class='table-box'
v-model='dialogVisible'
top='114px'
:style="{height:height+'px',maxHeight:height+'px',overflow:'hidden'}"
:title='title'
:width='width'
:modal='false'>
<div class='table-box' :style="{height:(height-64)+'px',maxHeight:(height-64)+'px',overflow:'hidden'}">
<ProTable
ref='proTable'
:columns='columns'
:data='userData'
>
<!-- 表格 header 按钮 -->
<template #tableHeader='scope'>
<el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增')">新增用户</el-button>
</template>
<!-- 表格操作 -->
<template #operation='scope'>
<el-button type='primary' link :icon='View'
@click="openDrawer('查看', scope.row)">查看
</el-button>
<el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
<el-button type='primary' link :icon='Refresh' @click='resetPass(scope.row)'>重置密码</el-button>
<el-button type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
</template>
</ProTable>
</div>
</el-dialog>
</template>
<script setup lang='tsx'>
import { CirclePlus, Delete, EditPen, Refresh, View } from '@element-plus/icons-vue'
import ProTable from '@/components/ProTable/index.vue'
import { useHandleData } from '@/hooks/useHandleData'
import { useAuthButtons } from '@/hooks/useAuthButtons'
import { reactive } from 'vue'
import { ColumnProps } from '@/components/ProTable/interface'
import { User } from '@/api/user/interface'
import { useDictStore } from '@/stores/modules/dict'
const dictStore = useDictStore()
import {
changeUserStatus,
} from '@/api/user/user'
import userDataList from '@/api/user/userData'
const userData = userDataList
const proTable = ref()
const dialogVisible = ref(false)
const title = ref('单列弹出框')
const { BUTTONS } = useAuthButtons()
// 表格配置项
const columns = reactive<ColumnProps<User.ResUserList>[]>([
{ type: 'selection', fixed: 'left', width: 70 },
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
{
prop: 'username',
label: '姓名',
width: 120,
search: { el: 'input' },
},
{
prop: 'gender',
label: '性别',
// 字典数据(本地数据)
enum: dictStore.getDictData('sex'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{
prop: 'age',
label: '年龄',
search: {
// 自定义 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>
)
},
},
},
{ prop: 'idCard', label: '身份证号', search: { el: 'input' } },
{ prop: 'email', label: '邮箱' },
{ prop: 'address', label: '居住地址', width: 120 },
{
prop: 'status',
label: '状态',
enum: dictStore.getDictData('status'),
search: { el: 'tree-select', props: { filterable: true } },
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>
)}
</>
)
},
},
{
prop: 'createTime',
label: '创建时间',
width: 180,
search: {
el: 'date-picker',
span: 1,
props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
defaultValue: ['2024-11-12', '2024-12-12'],
},
},
{ prop: 'operation', label: '操作', fixed: 'right', width: 330 },
])
const open = (textTitle: string) => {
dialogVisible.value = true
title.value = textTitle
}
defineExpose({ open })
const props = defineProps({
width: {
type: Number,
default: 800,
},
height: {
type: Number,
default: 744,
},
})
// 切换用户状态
const changeStatus = async (row: User.ResUserList) => {
await useHandleData(changeUserStatus, {
id: row.id,
status: row.status == 1 ? 0 : 1,
}, `切换【${row.username}】用户状态`)
proTable.value?.getTableList()
}
// 删除用户信息
const deleteAccount = async (params: User.ResUserList) => {
}
// 重置用户密码
const resetPass = async (params: User.ResUserList) => {
}
// 打开 drawer(新增、查看、编辑)
const openDrawer = (title: string, row: Partial<User.ResUserList> = {}) => {
}
</script>
<style>
</style>

View File

@@ -1,169 +0,0 @@
<!--单列-->
<template>
<el-dialog v-model='dialogVisible' :title='title' v-bind='dialogSmall'>
<el-scrollbar>
<el-form
:model='form'
:inline='false'
label-width='auto'
ref='formRuleRef'
:rules='rules'
>
<el-form-item label='姓名' prop='username'>
<el-input
v-model='form.username'
placeholder='请输入姓名'
></el-input>
</el-form-item>
<el-form-item label='性别' prop='gender'>
<el-radio-group v-model='form.gender'>
<el-radio-button :label='0'></el-radio-button>
<el-radio-button :label='1'></el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label='年龄' prop='age'>
<el-input
v-model='form.age'
placeholder='年龄'
></el-input>
</el-form-item>
<el-form-item label='身份证号' prop='idCard'>
<el-input
v-model='form.idCard'
placeholder='身份证号'
></el-input>
</el-form-item>
<el-form-item label='邮箱' prop='email'>
<el-input
v-model='form.email'
placeholder='邮箱'
></el-input>
</el-form-item>
<el-form-item label='居住地址' prop='address'>
<el-input
v-model='form.address'
placeholder='居住地址'
></el-input>
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<div class='dialog-footer'>
<el-button @click='close()'>取消</el-button>
<el-button type='primary' @click='confirmForm()'>确定</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang='ts'>
import { dialogSmall } from '@/utils/elementBind'
import { FormInstance, FormItemRule } from 'element-plus'
interface userForm {
id?: string; //用户ID作为唯一标识
username: string; //用户名
gender: number; // 性别
age: number; // 年龄
idCard: string; // 身份证
email: string; // 邮箱
address?: string; // 地址
}
const form: Ref<userForm> = ref({
username: '',
gender: 0,
age: 1,
idCard: '',
email: '',
})
const formRuleRef = ref<FormInstance>()
//定义校验规则
const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
username: [{ required: true, message: '用户名必填!', trigger: 'blur' }],
age: [
{ required: true, message: '年龄必填!', trigger: 'blur' },
// 指定正则,此处是数字正则
{ pattern: /^[1-9][0-9]?$|^100$/, message: '年龄必须在1到100之间', trigger: 'blur' },
],
idCard: [
{ required: true, message: '身份证必填!', trigger: 'blur' },
// 指定正则,此处是身份证正则
{ pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确的身份证号码', trigger: 'blur' },
],
email: [
{ required: true, message: '邮箱必填!', trigger: 'blur' },
// 指定校验类型
{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] },
],
})
/**
* 重置表单
*/
const resetForm = () => {
form.value = {
username: '',
gender: 0,
age: 1,
idCard: '',
email: '',
address: '',
}
}
const dialogVisible = ref(false)
const title = ref('单列弹出框')
const open = (textTitle: string) => {
dialogVisible.value = true
title.value = textTitle
}
// 关闭弹出框
const close = () => {
//重置表单内容
//取消表单校验状态
formRuleRef.value && formRuleRef.value.resetFields()
dialogVisible.value = false
resetForm()
}
/**
* 校验表单数据
* 数据没问题,提交数据,并根据业务情况请求新增接口还是修改接口
*/
const confirmForm = () => {
ElMessage.info('业务数据提交')
try {
formRuleRef.value?.validate((valid: boolean) => {
if (valid) {
// 将表单数据转为json,发送到后端
let confirmFormData = JSON.parse(JSON.stringify(form.value))
if ('是否新增') {
// 执行新增接口
} else {
// 执行修改接口
}
} else {
ElMessage.error('表单验证失败!')
}
})
} catch (error) {
console.error('验证过程中发生错误', error)
}
}
defineExpose({ open })
</script>
<style>
</style>

View File

@@ -599,7 +599,7 @@ const sortTable = ({
//顶部功能切换时修改activeTabs
const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
form.value.activeTabs = val;
form.value.activeChildTabs= val2;
deviceData.value = tabledata;
@@ -989,4 +989,7 @@ defineExpose({ changeActiveTabs });
}
}
}
:deep(.card){
border: 0 !important;
}
</style>