zianxin/jh-military-admin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:样式修改

Browse Source
This commit is contained in:
dzc committed 2025-11-05 14:02:59 +08:00
1 parent 654bfdef98
commit 3fbcabea80
9 files changed
+51 -247
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/components/Tag/TagOnline.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-wrap justify-center items-center gap-2 max-w-full">
<div class="flex justify-center flex-wrap items-center gap-2">
<div class="w-2 h-2 rounded-full" :class="{ 'bg-success': props.isOnline, 'bg-error': !props.isOnline }" />
<el-tag size="small" :type="props.isOnline ? 'success' : 'danger'">{{ props.isOnline ? '在线' : '离线' }}</el-tag>
</div>
src/components/Tag/TagSex.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-wrap items-center gap-2 max-w-full">
<div class="flex justify-center flex-wrap items-center gap-2">
<el-tag v-if="props.code == '0'" size="small" type="warning">未知</el-tag>
<el-tag v-if="props.code == '1'" size="small">男</el-tag>
<el-tag v-if="props.code == '2'" size="small" type="success">女</el-tag>
src/components/Tag/TagSync.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-wrap items-center gap-2 max-w-full">
<div class="flex justify-center flex-wrap items-center gap-2">
<div class="w-2 h-2 rounded-full" :class="{ 'bg-success': props.isSync, 'bg-warning': !props.isSync }" />
<el-tag size="small" :type="props.isSync ? 'success' : 'warning'">{{ props.isSync ? '同步大华' : '自建维护' }}</el-tag>
</div>
src/components/Tag/TagUserStatus.vue
+3 -3
View File
@@ -1,14 +1,14 @@
<template>
<div>
<div class="flex flex-wrap items-center gap-2 max-w-full" v-if="props.code == '0'">
<div class="flex justify-center flex-wrap items-center gap-2" v-if="props.code == '0'">
<div class="w-2 h-2 rounded-full bg-error" />
<el-tag size="small" type="danger">已删除</el-tag>
</div>
<div class="flex flex-wrap items-center gap-2 max-w-full" v-if="props.code == '1'">
<div class="flex justify-center flex-wrap items-center gap-2" v-if="props.code == '1'">
<div class="w-2 h-2 rounded-full bg-success" />
<el-tag size="small" type="success">正常</el-tag>
</div>
<div class="flex flex-wrap items-center gap-2 max-w-full" v-if="props.code == '2'">
<div class="flex justify-center flex-wrap items-center gap-2" v-if="props.code == '2'">
<div class="w-2 h-2 rounded-full bg-warning" />
<el-tag size="small" type="warning">冻结</el-tag>
</div>
src/views/car/carManage/form.vue
+7 -91
View File
@@ -1,85 +1,12 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="车辆品牌编号(字典)" prop="carBrand">
<el-input v-model="form.carBrand" placeholder="请输入车辆品牌编号(字典)" />
<el-form-item label="数据同步配置" prop="syncConfigType">
<dict-select :options="user_sync_config" v-model="form.syncConfigType" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车辆编号" prop="carCode">
<el-input v-model="form.carCode" placeholder="请输入车辆编号" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车辆颜色编号(字典)" prop="carColor">
<el-input v-model="form.carColor" placeholder="请输入车辆颜色编号(字典)" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车牌号码" prop="carNum">
<el-input v-model="form.carNum" placeholder="请输入车牌号码" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车牌颜色编号(字典)" prop="carNumColor">
<el-input v-model="form.carNumColor" placeholder="请输入车牌颜色编号(字典)" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车辆状态(0-未使用,1-使用)" prop="carStatus">
<el-input v-model="form.carStatus" placeholder="请输入车辆状态(0-未使用,1-使用)" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车辆类型(字典)" prop="carType">
<el-input v-model="form.carType" placeholder="请输入车辆类型(字典)" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="黑白名单编号(0正常,1白名单,2黑名单)" prop="listType">
<el-input v-model="form.listType" placeholder="请输入黑白名单编号(0正常,1白名单,2黑名单)" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车主id" prop="ownerId">
<el-input v-model="form.ownerId" placeholder="请输入车主id" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="停车类型编号" prop="parkType">
<el-input v-model="form.parkType" placeholder="请输入停车类型编号" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="所属车场编号" prop="parkingLotCode">
<el-input v-model="form.parkingLotCode" placeholder="请输入所属车场编号" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="备注信息" prop="memo">
<el-input v-model="form.memo" placeholder="请输入备注信息" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
@@ -103,27 +30,16 @@ const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
const { user_sync_config } = useDict("user_sync_config")
// 提交表单数据
const form = reactive({
id: '',
carBrand: '',
carCode: '',
carColor: '',
carNum: '',
carNumColor: '',
carStatus: '',
carType: '',
listType: '',
ownerId: '',
deptId: '',
parkType: '',
parkingLotCode: '',
memo: '',
syncConfigType: "",
});
// 定义校验规则
const dataRules = ref({
syncConfigType: [{ required: true, message: '数据同步配置不能为空', trigger: 'blur' },],
})
// 打开弹窗
src/views/car/carManage/index.vue
+6 -2
View File
@@ -78,13 +78,17 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="listType" label="黑白名单状态" min-width="120">
<template #default="{ row }">
<dict-tag :options="dh_car_list_type" :value="row.listType" />
</template>
</el-table-column>
<el-table-column prop="memo" label="备注信息" min-width="200" show-overflow-tooltip />
<el-table-column label="数据同步配置" min-width="150">
<template #default="{ row }">
<dict-tag :options="user_sync_config" :value="row.syncConfigType" />
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'car_carManage_edit'"
@@ -115,7 +119,7 @@ const storesPanel = usePanel()
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { dh_car_color, dh_car_num_color, dh_car_brand, dh_car_type, dh_car_status, dh_car_list_type, yes_no_type } = useDict("dh_car_color", "dh_car_num_color", "dh_car_brand", "dh_car_type", "dh_car_status", "dh_car_list_type", "yes_no_type")
const { dh_car_color, dh_car_num_color, dh_car_brand, dh_car_type, dh_car_status, dh_car_list_type, yes_no_type, user_sync_config } = useDict("dh_car_color", "dh_car_num_color", "dh_car_brand", "dh_car_type", "dh_car_status", "dh_car_list_type", "yes_no_type", "user_sync_config")
// 定义变量内容
const formDialogRef = ref()
src/views/door/components/doorTableDialog.vue
+9 -1
View File
@@ -36,6 +36,14 @@
@sort-change="sortChangeHandle">
<el-table-column prop="swingTime" label="抓拍时间" min-width="180" />
<el-table-column min-width="100" label="人员">
<el-table-column prop="personCode" min-width="100" label="人员编号">
<template #default="{ row }">
<div class="flex items-center justify-start gap-2" v-for="(v) in row.alarmDkList">
<el-tag v-if="v == '1'" type="danger">迟到</el-tag>
<el-tag v-if="v == '2'" type="danger">早退</el-tag>
</div>
</template>
</el-table-column>
<el-table-column prop="personCode" min-width="100" label="人员编号">
<template #default="{ row }">
<span v-if="row.personCode">{{ row.personCode }}</span>
@@ -130,7 +138,6 @@ const {
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
@@ -144,6 +151,7 @@ const resetQuery = () => {
// 打开弹窗
function openDialog(query: any) {
state.queryForm = query
state.queryForm.isDkErrorList = true
visible.value = true
getDataList();
}
src/views/sys/sysPerson/form.vue
+8 -141
View File
@@ -1,127 +1,12 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-form-item label="人员姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入人员姓名" />
<el-col :span="24" class="mb20">
<el-form-item label="数据同步配置" prop="syncConfigType">
<dict-select :options="user_sync_config" v-model="form.syncConfigType" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="人员编码" prop="code">
<el-input v-model="form.code" placeholder="请输入人员编码" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="证件类型(字典)" prop="paperType">
<el-input v-model="form.paperType" placeholder="请输入证件类型(字典)" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="证件类型名称" prop="paperTypeName">
<el-input v-model="form.paperTypeName" placeholder="请输入证件类型名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="证件号码" prop="paperNumber">
<el-input v-model="form.paperNumber" placeholder="请输入证件号码" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="证件地址" prop="paperAddress">
<el-input v-model="form.paperAddress" placeholder="请输入证件地址" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="部门ID" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门ID" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="电子邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入电子邮箱" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age" placeholder="请输入年龄" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="生日,格式:yyyy-MM-dd" prop="birthday">
<el-input v-model="form.birthday" placeholder="请输入生日,格式:yyyy-MM-dd" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="性别(字典)" prop="sex">
<el-input v-model="form.sex" placeholder="请输入性别(字典)" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="国家" prop="country">
<el-input v-model="form.country" placeholder="请输入国家" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="民族(字典)" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族(字典)" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="民族名称" prop="nationName">
<el-input v-model="form.nationName" placeholder="请输入民族名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="人员自编号" prop="selfCode">
<el-input v-model="form.selfCode" placeholder="请输入人员自编号" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="人员状态(字典)" prop="status">
<el-input v-model="form.status" placeholder="请输入人员状态(字典)" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="组织编码" prop="ownerCode">
<el-input v-model="form.ownerCode" placeholder="请输入组织编码" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="是否为同步" prop="isSync">
<el-input v-model="form.isSync" placeholder="请输入是否为同步" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
@@ -145,34 +30,16 @@ const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
const { user_sync_config } = useDict("user_sync_config")
// 提交表单数据
const form = reactive({
id: '',
name: '',
code: '',
paperType: '',
paperTypeName: '',
paperNumber: '',
paperAddress: '',
deptId: '',
deptName: '',
phone: '',
email: '',
age: '',
birthday: '',
sex: '',
country: '',
nation: '',
nationName: '',
selfCode: '',
status: '',
ownerCode: '',
isSync: '',
syncConfigType: '',
});
// 定义校验规则
const dataRules = ref({
syncConfigType: [{ required: true, message: '数据同步配置不能为空', trigger: 'blur' },],
})
// 打开弹窗
src/views/sys/sysPerson/index.vue
+15 -6
View File
@@ -98,12 +98,21 @@
<tag-sync :isSync="row.isSync == 1" />
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
<el-table-column label="数据同步配置" min-width="150">
<template #default="{ row }">
<dict-tag :options="user_sync_config" :value="row.syncConfigType" />
</template>
</el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template #default="{ row }">
<el-button icon="edit-pen" text type="primary" v-auth="'admin_sysPerson_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'admin_sysPerson_del'"
@click="handleDelete([scope.row.id])">删除</el-button>
@click="formDialogRef.openDialog(row.id)">
编辑
</el-button>
<el-button v-if="false" icon="delete" text type="primary" v-auth="'admin_sysPerson_del'"
@click="handleDelete([row.id])">
删除
</el-button>
</template>
</el-table-column>
</el-table>
@@ -126,7 +135,7 @@ import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { dh_paper_type } = useDict('dh_paper_type')
const { dh_paper_type, user_sync_config } = useDict('dh_paper_type', 'user_sync_config')
// 定义变量内容
const formDialogRef = ref()