Compare commits

..

No commits in common. "d8132e70e329ad71c1b7111c369ac18e11710b7a" and "69816883da36d5eba765a3b9c5df9bba0e686aa2" have entirely different histories.

5 changed files with 79 additions and 83 deletions

View File

@ -4,12 +4,12 @@ NODE_ENV=production
VITE_DEV=false VITE_DEV=false
# 请求路径 # 请求路径
VITE_BASE_URL='' VITE_BASE_URL='https://mt.ptzykjgs.com'
# 文件上传类型server - 后端上传, client - 前端直连上传仅支持S3服务 # 文件上传类型server - 后端上传, client - 前端直连上传仅支持S3服务
VITE_UPLOAD_TYPE=server VITE_UPLOAD_TYPE=server
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://mt.ptzykjgs.com/admin-api/infra/file/upload' VITE_UPLOAD_URL='https://mt.ptzykjgs.com/admin-api/infra/file/upload'
# 接口地址 # 接口地址
VITE_API_URL=/admin-api VITE_API_URL=/admin-api

View File

@ -103,7 +103,6 @@ export const getDictLabel = (dictType: string, value: any): string => {
export enum DICT_TYPE { export enum DICT_TYPE {
USER_TYPE = 'user_type', USER_TYPE = 'user_type',
COMMON_STATUS = 'common_status', COMMON_STATUS = 'common_status',
UPLINK_MESSAGE_STATUS = 'uplink_message_status',
TERMINAL = 'terminal', // 终端 TERMINAL = 'terminal', // 终端
DATE_INTERVAL = 'date_interval', // 数据间隔 DATE_INTERVAL = 'date_interval', // 数据间隔
@ -228,8 +227,5 @@ export enum DICT_TYPE {
// ========== TICKET - 票务系统模块 ========== // ========== TICKET - 票务系统模块 ==========
ASSET_STATUS_TYPE = 'asset_status_type', // 设备状态 ASSET_STATUS_TYPE = 'asset_status_type', // 设备状态
TRANSACTION_TYPE_NO = 'transaction_type_no', // 交易类型(订单类型) TRANSACTION_TYPE_NO = 'transaction_type_no', // 交易类型(订单类型)
CERTIFICATE_TYPE = 'certificate_type', // 证件类型 CERTIFICATE_TYPE = 'certificate_type' // 证件类型
// ========== LIFT_ROD - 远程抬杠模块 ==========
LIFTINGROD_STATUS = 'liftingrod_status'
} }

View File

@ -43,7 +43,7 @@
<!-- <el-card style="width: 100%; margin: 8px 0; text-align: center;" shadow="never"> --> <!-- <el-card style="width: 100%; margin: 8px 0; text-align: center;" shadow="never"> -->
<div class="flex flex-wrap gap-4" style="float: right;"> <div class="flex flex-wrap gap-4" style="float: right;">
<el-card <el-card
style="width: 170px;margin: 8px 0;text-align: center;color:#409eff; cursor: pointer;" shadow="hover" style="width: 230px;margin: 8px 0;text-align: center;color:#409eff; cursor: pointer;" shadow="hover"
@click="goToXXLJob">任务调度中心</el-card> @click="goToXXLJob">任务调度中心</el-card>
</div> </div>
<!-- </el-card> --> <!-- </el-card> -->
@ -383,7 +383,7 @@ style="width: 170px;margin: 8px 0;text-align: center;color:#409eff; cursor: poin
} }
const goToXXLJob = async () => { const goToXXLJob = async () => {
window.open('http://121.36.203.133/xxl-job-admin/'); window.open('https://mt.ptzykjgs.com/xxl-job-admin/');
} }
getAllApi() getAllApi()
</script> </script>

View File

@ -1,6 +1,12 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading"> <el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="停车场编号" prop="parkNumber"> <el-form-item label="停车场编号" prop="parkNumber">
<el-input v-model="formData.parkNumber" placeholder="请输入停车场编号" /> <el-input v-model="formData.parkNumber" placeholder="请输入停车场编号" />
</el-form-item> </el-form-item>
@ -47,7 +53,7 @@
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = type == 'upload' ? "下发指令" : t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
resetForm() resetForm()
// //
@ -73,7 +79,7 @@
const data = formData.value as unknown as LiftingRodVO const data = formData.value as unknown as LiftingRodVO
if (formType.value === 'create') { if (formType.value === 'create') {
await LiftingRodApi.createLiftingRod(data) await LiftingRodApi.createLiftingRod(data)
message.success('下发成功') message.success(t('common.createSuccess'))
} else { } else {
await LiftingRodApi.updateLiftingRod(data) await LiftingRodApi.updateLiftingRod(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))

View File

@ -6,7 +6,7 @@
:model="queryParams" :model="queryParams"
ref="queryFormRef" ref="queryFormRef"
:inline="true" :inline="true"
label-width="auto" label-width="68px"
> >
<el-form-item label="停车场编号" prop="parkNumber"> <el-form-item label="停车场编号" prop="parkNumber">
<el-input <el-input
@ -53,10 +53,10 @@
<el-button <el-button
type="primary" type="primary"
plain plain
@click="openForm('upload')" @click="openForm('create')"
v-hasPermi="['parking:lifting-rod:create']" v-hasPermi="['parking:lifting-rod:create']"
> >
<Icon icon="ep:plus" class="mr-5px" /> 下发指令 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-button <el-button
type="success" type="success"
@ -84,12 +84,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="状态" align="center" prop="status" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.LIFTINGROD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -129,7 +124,6 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { LiftingRodApi, LiftingRodVO } from '@/api/parking/instructiondelivery/liftingrod' import { LiftingRodApi, LiftingRodVO } from '@/api/parking/instructiondelivery/liftingrod'
import LiftingRodForm from './LiftingRodForm.vue' import LiftingRodForm from './LiftingRodForm.vue'
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
/** 远程抬杠日志 列表 */ /** 远程抬杠日志 列表 */
defineOptions({ name: 'LiftingRod' }) defineOptions({ name: 'LiftingRod' })