ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
hongawen
2024-11-14 19:33:33 +08:00
parent 534cc0ab76
commit 91eea8cc8a
2 changed files with 421 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
frontend/src/views/machine/device/components/devicePopup.vue
View File

@@ -1,188 +1,189 @@
<template>
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
<el-tabs type="border-card">
<el-tab-pane label="设备台账信息">
<div class="form-grid">
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false">
<el-row :gutter="24" >
<el-col :span="8">
<el-form-item label="设备名称" prop="name">
<el-input v-model='formContent.name' placeholder="请输入设备名称"/>
<el-dialog :title='dialogTitle' v-model='dialogVisible' @close='close' v-bind='dialogBig'>
<el-tabs type='border-card'>
<el-tab-pane label='设备台账信息'>
<div class='form-grid'>
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled='false'>
<el-row :gutter='24'>
<el-col :span='8'>
<el-form-item label='设备名称' prop='name'>
<el-input v-model='formContent.name' placeholder='请输入设备名称' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span='8'>
<el-form-item label='设备类型' prop='devType'>
<el-select v-model="formContent.devType" clearable placeholder="请选择设备类型">
<el-select v-model='formContent.devType' clearable placeholder='请选择设备类型'>
<el-option
v-for="item in dictStore.getDictData('Dev_Type')"
:key="item.id"
:label="item.name"
:value="item.code"
:key='item.id'
:label='item.name'
:value='item.code'
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span='8'>
<el-form-item label='通讯协议' prop='protocol'>
<el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议">
<el-select v-model='formContent.protocol' clearable placeholder='请选择通讯协议'>
<el-option
v-for="item in dictStore.getDictData('Event_Type')"
:key="item.id"
:label="item.name"
:value="item.code"
:key='item.id'
:label='item.name'
:value='item.code'
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-form-item label="设备通道数" prop="devChns">
<el-select v-model="formContent.devChns" clearable placeholder="请选择设备通道数">
<el-row :gutter='24'>
<el-col :span='8'>
<el-form-item label='设备通道数' prop='devChns'>
<el-select v-model='formContent.devChns' clearable placeholder='请选择设备通道数'>
<el-option
v-for="item in dictStore.getDictData('Dev_Chns')"
:key="item.id"
:label="item.name"
:value="item.code"
:key='item.id'
:label='item.name'
:value='item.code'
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="额定电压(V)" prop="devVolt">
<el-select v-model="formContent.devVolt" clearable placeholder="请选择额定电压">
<el-col :span='8'>
<el-form-item label='额定电压(V)' prop='devVolt'>
<el-select v-model='formContent.devVolt' clearable placeholder='请选择额定电压'>
<el-option
v-for="item in dictStore.getDictData('Dev_Volt')"
:key="item.id"
:label="item.name"
:value="item.code"
:key='item.id'
:label='item.name'
:value='item.code'
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="额定电流(A)" prop="devCurr" >
<el-select v-model="formContent.devCurr" clearable placeholder="请选择额定电流">
<el-col :span='8'>
<el-form-item label='额定电流(A)' prop='devCurr'>
<el-select v-model='formContent.devCurr' clearable placeholder='请选择额定电流'>
<el-option
v-for="item in dictStore.getDictData('Dev_Curr')"
:key="item.id"
:label="item.name"
:value="item.code"
:key='item.id'
:label='item.name'
:value='item.code'
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-row :gutter='24'>
<el-col :span='8'>
<el-form-item label='生产厂商' prop='manufacturer'>
<el-select v-model="formContent.manufacturer" clearable placeholder="请选择生产厂商">
<el-select v-model='formContent.manufacturer' clearable placeholder='请选择生产厂商'>
<el-option
v-for="item in dictStore.getDictData('Dev_Manufacturers')"
:key="item.id"
:label="item.name"
:value="item.code"
:key='item.id'
:label='item.name'
:value='item.code'
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产日期" prop="createDate">
<el-col :span='8'>
<el-form-item label='生产日期' prop='createDate'>
<el-date-picker
v-model="formContent.createDate"
placeholder="请选择生产日期"
:disabled-date="disabledDate"
v-model='formContent.createDate'
placeholder='请选择生产日期'
:disabled-date='disabledDate'
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出厂编号" prop="createId" placeholder="请输入出厂编号">
<el-input v-model="formContent.createId" />
<el-col :span='8'>
<el-form-item label='出厂编号' prop='createId' placeholder='请输入出厂编号'>
<el-input v-model='formContent.createId' />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-form-item label="固件版本" prop="hardwareVersion">
<el-input v-model="formContent.hardwareVersion" placeholder="请输入固件版本"/>
<el-row :gutter='24'>
<el-col :span='8'>
<el-form-item label='固件版本' prop='hardwareVersion'>
<el-input v-model='formContent.hardwareVersion' placeholder='请输入固件版本' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="软件版本" prop="softwareVersion">
<el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
<el-col :span='8'>
<el-form-item label='软件版本' prop='softwareVersion'>
<el-input v-model='formContent.softwareVersion' placeholder='请输入软件版本' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span='8'>
<el-form-item label='设备模式' prop='pattern'>
<el-input v-model='formContent.pattern' disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-form-item label="IP地址" prop="ip">
<IPAddress v-model:value="formContent.ip"/>
<el-row :gutter='24'>
<el-col :span='8'>
<el-form-item label='IP地址' prop='ip'>
<IPAddress v-model:value='formContent.ip' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="端口号" prop="port" placeholder="请输入端口号">
<el-input v-model="formContent.port" />
<el-col :span='8'>
<el-form-item label='端口号' prop='port' placeholder='请输入端口号'>
<el-input v-model='formContent.port' />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-row :gutter='24'>
<el-col :span='8'>
<el-form-item label='是否加密' prop='encryptionFlag'>
<el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密" @change="handleEncryptionChange">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
<el-select v-model='formContent.encryptionFlag' clearable placeholder='请选择是否加密'
@change='handleEncryptionChange'>
<el-option label='是' :value='1'></el-option>
<el-option label='否' :value='0'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" v-if="IsPasswordShow">
<el-form-item label='识别码' prop='series' clearable placeholder="请输入识别码">
<el-col :span='8' v-if='IsPasswordShow'>
<el-form-item label='识别码' prop='series' clearable placeholder='请输入识别码'>
<el-input v-model='formContent.series' show-password />
</el-form-item>
</el-col>
<el-col :span="8" v-if="IsPasswordShow">
<el-form-item label='密钥' prop='devKey' clearable placeholder="请输入密钥">
<el-col :span='8' v-if='IsPasswordShow'>
<el-form-item label='密钥' prop='devKey' clearable placeholder='请输入密钥'>
<el-input v-model='formContent.devKey' show-password />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" v-if="DevIsShow">
<el-col :span="8">
<el-form-item label='样品编号' prop='sampleID' clearable placeholder="请输入样品编号">
<el-row :gutter='24' v-if='DevIsShow'>
<el-col :span='8'>
<el-form-item label='样品编号' prop='sampleID' clearable placeholder='请输入样品编号'>
<el-input v-model='formContent.sampleID' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span='8'>
<el-form-item label='送样日期' prop='arrivedDate'>
<el-date-picker
v-model="formContent.arrivedDate"
placeholder="请选择送样日期"
:disabled-date="disabledDate"
v-model='formContent.arrivedDate'
placeholder='请选择送样日期'
:disabled-date='disabledDate'
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" v-if="MonIsShow">
<el-col :span="8">
<el-form-item label='所属地市' prop='cityName' clearable placeholder="请输入所属地市">
<el-row :gutter='24' v-if='MonIsShow'>
<el-col :span='8'>
<el-form-item label='所属地市' prop='cityName' clearable placeholder='请输入所属地市'>
<el-input v-model='formContent.cityName' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='所属供电公司' prop='gDName' clearable placeholder="请输入所属供电公司">
<el-col :span='8'>
<el-form-item label='所属供电公司' prop='gDName' clearable placeholder='请输入所属供电公司'>
<el-input v-model='formContent.gDName' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='所属电站' prop='subName' clearable placeholder="请输入所属电站">
<el-col :span='8'>
<el-form-item label='所属电站' prop='subName' clearable placeholder='请输入所属电站'>
<el-input v-model='formContent.subName' />
</el-form-item>
</el-col>
@@ -190,7 +191,7 @@
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="监测点台账信息" v-if="MonIsShow">
<el-tab-pane label='监测点台账信息' v-if='MonIsShow'>
<div class='table-box' ref='popupBaseView'>
<ProTable
ref='proTable'
@@ -216,7 +217,7 @@
<template #footer>
<div>
<el-button @click='close()'>取 消</el-button>
<el-button type="primary" @click='save()'>保存</el-button>
<el-button type='primary' @click='save()'>保存</el-button>
</div>
</template>
</el-dialog>
@@ -230,15 +231,15 @@
import { type Device } from '@/api/device/interface'
import { ElMessage, type FormItemRule } from 'element-plus'
import { addPqDev, updatePqDev } from '@/api/device/device.ts'
import { computed, reactive, type Ref, ref } from 'vue';
import { computed, reactive, type Ref, ref } from 'vue'
import { useDictStore } from '@/stores/modules/dict'
import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
// 使用 dayjs 库格式化
import dayjs from 'dayjs';
import {getPqMonList,deletePqMon,} from '@/api/monitor/monitor.ts'
import dayjs from 'dayjs'
import { getPqMonList } from '@/api/monitor/monitor.ts'
import { type ColumnProps } from '@/components/ProTable/interface'
import { type Monitor } from '@/api/monitor/interface'
import { el } from 'element-plus/es/locale'
const MonIsShow = ref(false)
const DevIsShow = ref(false)
const IsPasswordShow = ref(false)
@@ -248,6 +249,7 @@ import { el } from 'element-plus/es/locale'
const disabledDate = (time: Date) => {
return time.getTime() > Date.now()
}
function useMetaInfo() {
const dialogVisible = ref(false)
const titleType = ref('add')
@@ -304,7 +306,6 @@ import { el } from 'element-plus/es/locale'
})
// 定义表单校验规则
const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
devType: [{ required: true, message: '设备类型必选！', trigger: 'change' }],
@@ -344,18 +345,16 @@ import { el } from 'element-plus/es/locale'
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD');
if (formContent.value.arrivedDate)
{
formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD')
if (formContent.value.arrivedDate) {
formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD')
}
if (formContent.value.id) {
await updatePqDev(formContent.value);
await updatePqDev(formContent.value)
ElMessage.success({ message: `${dialogTitle.value}成功！` })
} else {
await addPqDev(formContent.value);
await addPqDev(formContent.value)
ElMessage.success({ message: `${dialogTitle.value}成功！` })
}
close()
// 刷新表格
@@ -371,16 +370,12 @@ import { el } from 'element-plus/es/locale'
const open = (sign: string, data: Device.ResPqDev) => {
titleType.value = sign
dialogVisible.value = true
if (data.encryptionFlag === 1) {
handleEncryptionChange(1)
} else {
handleEncryptionChange(0)
}
if(data.pattern == '比对式')
{
if (data.pattern == '比对式') {
MonIsShow.value = true
DevIsShow.value = false
} else {
@@ -407,8 +402,7 @@ import { el } from 'element-plus/es/locale'
// 根据是否加密来显示或隐藏识别码和密钥
if (value === 1) {
IsPasswordShow.value = true
}else
{
} else {
IsPasswordShow.value = false
formContent.value.series = ''
formContent.value.devKey = ''

10
frontend/src/views/machine/device/index.vue
View File

@@ -40,7 +40,6 @@ import DevicePopup from '@/views/machine/device/components/devicePopup.vue'
import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
import { useDictStore } from '@/stores/modules/dict'
import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device.ts'
import { onMounted, reactive, ref } from 'vue'
import { ElMessageBox } from 'element-plus'
const dictStore = useDictStore()
@@ -84,7 +83,6 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
return (
<div class='flx-flex-start'>
<TimeControl
default={'月'}
onUpdate-dates={handleDateChange}
/>
@@ -151,12 +149,10 @@ const handleDelete = async (params: Device.ResPqDev) => {
// 导出设备
const downloadFile = async () => {
// 获取当前的搜索参数
const searchParam = proTable.value?.searchParam || {};
const searchParam = proTable.value?.searchParam || {}
// 将开始时间和结束时间添加到搜索参数中
searchParam.searchBeginTime = startDate.value;
searchParam.searchEndTime = endDate.value;
searchParam.searchBeginTime = startDate.value
searchParam.searchEndTime = endDate.value
ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
useDownload(exportPqDev, '被检设备导出数据', proTable.value?.searchParam, false, '.xlsx'),
)