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:
sjl
2025-07-09 20:12:40 +08:00
parent d2f0382bd9
commit cc848b1ffb
39 changed files with 2247 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
<template>
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
<el-tabs type="border-card">
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" align-center>
<el-tabs type="border-card" v-model="activeTab">
<el-tab-pane label="设备台账信息">
<div>
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
@@ -9,15 +9,16 @@
<el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" maxlength="32" show-word-limit/>
</el-form-item>
<el-form-item label="设备名称" prop="name">
<el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'" maxlength="32" show-word-limit/>
<el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1' || formContent.importFlag == 1" maxlength="32" show-word-limit />
</el-form-item>
<el-form-item label='设备类型' prop='devType'>
<el-select v-model="formContent.devType" filterable clearable placeholder="请选择设备类型" @change="handleDevTypeChange">
<el-select v-model="formContent.devType" filterable clearable placeholder="请选择设备类型" @change="handleDevTypeChange" :disabled="formContent.importFlag == 1">
<el-option
v-for="item in devTypeOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
@@ -31,31 +32,23 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label='设备模式' prop='pattern' >-->
<!-- <el-select v-model="formContent.pattern" clearable placeholder="请选择设备模式" disabled>-->
<!-- <el-option -->
<!-- v-for="item in dictStore.getDictData('Pattern')"-->
<!-- :key="item.id"-->
<!-- :label="item.name"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item> -->
<el-form-item label='设备厂家' prop='manufacturer' v-if="scene != '1'">
<el-select v-model="formContent.manufacturer" clearable placeholder="请选择设备厂家">
<el-select v-model="formContent.manufacturer" clearable placeholder="请选择设备厂家" :disabled="formContent.importFlag == 1">
<el-option
v-for="item in dictStore.getDictData('Dev_Manufacturers')"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="出厂日期" prop="createDate" v-if="scene === '0'">
<el-form-item :label="createDateTitle" prop="createDate" v-if="scene === '0'" >
<el-date-picker
v-model="formContent.createDate"
placeholder="请选择出厂日期"
:placeholder="`请选择${createDateTitle}`"
:disabled-date="disabledDate"
:disabled="formContent.importFlag == 1"
/>
</el-form-item>
@@ -65,46 +58,62 @@
<el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
<el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
</el-form-item>
<el-form-item label='定检日期' prop='inspectDate' v-if="MonIsShow">
<el-date-picker
v-model="formContent.inspectDate"
placeholder="请选择定检日期"
:disabled-date="disabledDate"
:disabled="formContent.importFlag == 1"
/>
</el-form-item>
<el-divider>参数信息</el-divider>
<el-form-item label="通道数" prop="devChns">
<el-form-item label="通道数" prop="devChns" v-if="DevIsShow">
<el-input v-model='formContent.devChns' :disabled="true"/>
</el-form-item>
<el-form-item label="额定电压(V)" prop="devVolt">
<el-form-item label="额定电压(V)" prop="devVolt" v-if="DevIsShow">
<el-input v-model='formContent.devVolt' :disabled="true"/>
</el-form-item>
<el-form-item label="额定电流(A)" prop="devCurr">
<el-form-item label="额定电流(A)" prop="devCurr" v-if="DevIsShow">
<el-input v-model='formContent.devCurr' :disabled="true"/>
</el-form-item>
<el-form-item label='被检通道' prop='inspectChannel' :label-width='100' v-if="MonIsShow">
<el-select v-model="formContent.inspectChannel" multiple collapse-tags :disabled="true" :max-collapse-tags="4" placeholder="请选择被检通道" clearable>
<el-option
v-for="(option, index) in pqChannelArray"
:key="index"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label='通讯协议' prop='protocol'>
<el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议">
<el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议" :disabled="formContent.importFlag == 1">
<el-option
v-for="item in dictStore.getDictData('Protocol')"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="IP地址" prop="ip">
<IPAddress v-model:value="formContent.ip"/>
</el-form-item> -->
<el-form-item label="IP地址" prop="ip" placeholder="请输入IP地址">
<el-input v-model="formContent.ip"/>
<el-input v-model="formContent.ip" :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item label="端口号" prop="port" placeholder="请输入端口号">
<el-input v-model="formContent.port"/>
<el-input v-model="formContent.port" :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item label='是否加密' prop='encryptionFlag'>
<el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密">
<el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密" :disabled="formContent.importFlag == 1">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label='识别码' prop='series' clearable v-if="formContent.encryptionFlag">
<el-input v-model='formContent.series' placeholder="请输入识别码" show-password/>
<el-input v-model='formContent.series' placeholder="请输入识别码" show-password :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item label='密钥' prop='devKey' clearable v-if="formContent.encryptionFlag">
<el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/>
<el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item label='样品编号' prop='sampleId' clearable v-if="DevIsShow && scene === '0'">
<el-input v-model='formContent.sampleId' placeholder="请输入样品编号"/>
@@ -127,13 +136,13 @@
</el-select>
</el-form-item>
<el-form-item label='所属地市' prop='cityName' clearable placeholder="请输入所属地市" v-if="MonIsShow">
<el-input v-model='formContent.cityName'/>
<el-input v-model='formContent.cityName' :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item label='所属供电公司' prop='gDName' clearable placeholder="请输入所属供电公司" v-if="MonIsShow">
<el-input v-model='formContent.gDName'/>
<el-form-item label='所属供电公司' prop='gdName' clearable placeholder="请输入所属供电公司" v-if="MonIsShow">
<el-input v-model='formContent.gdName' :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item label='所属电站' prop='subName' clearable placeholder="请输入所属电站" v-if="MonIsShow">
<el-input v-model='formContent.subName'/>
<el-input v-model='formContent.subName' :disabled="formContent.importFlag == 1"/>
</el-form-item>
<el-form-item v-auth.device="'factorFlag'" label="是否支持系数校准" prop='factorFlag' v-if="scene === '1'">
<el-radio-group v-model="formContent.factorFlag">
@@ -145,21 +154,19 @@
</div>
</el-tab-pane>
<!-- 监测点台账信息 tab pane -->
<MonitorTable :MonIsShow="MonIsShow"/>
</el-tabs>
<template #footer>
<div>
<el-button @click='close()'>取 消</el-button>
<el-button type="primary" @click='save()'>保存</el-button>
</div>
</template>
</el-dialog>
<!-- 监测点台账信息 tab pane -->
<MonitorTable @getParameter="getParameter" :MonIsShow="MonIsShow" :DevFormContent = "formContent"/>
</el-tabs>
<template #footer>
<div >
<el-button @click='close()'>取 消</el-button>
<el-button type="primary" @click='save()'>保存</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang='ts'>
import IPAddress from '@/components/IpAddress/index.vue'
import {dialogBig} from '@/utils/elementBind'
import {type Device} from '@/api/device/interface/device'
import {ElMessage, type FormItemRule} from 'element-plus'
@@ -171,18 +178,31 @@ import {CirclePlus, Delete, EditPen} from '@element-plus/icons-vue'
import dayjs from 'dayjs'
import MonitorTable from '@/views/machine/device/components/monitorTab.vue';
import {useAppSceneStore} from "@/stores/modules/mode";
import { generateUUID } from '@/utils'
import { Monitor } from '@/api/device/interface/monitor'
const AppSceneStore = useAppSceneStore()
const MonIsShow = ref(false)
const DevIsShow = ref(false)
// 存储设备类型选项
const devTypeOptions = ref<Device.ResDev[]>([])
const monitor = ref<Monitor.ResPqMon[]>([])
// const IsPasswordShow = ref(false)
const dictStore = useDictStore()
const mode = ref()
const scene = ref('')
// 定义弹出组件元信息
const dialogFormRef = ref()
const createDateTitle = ref('')
const activeTab = ref('0') // '0' 对应第一个 tab
const pqChannelArray = ref([
{
value: '1',
label: '1',
}
])
const disabledDate = (time: Date) => {
return time.getTime() > Date.now()
}
@@ -190,7 +210,7 @@ const disabledDate = (time: Date) => {
function useMetaInfo() {
const dialogVisible = ref(false)
const titleType = ref('add')
const formContent = ref<Device.ResPqDev>({
const formContent = reactive<Device.ResPqDev>({
id: '',
name: '',
pattern: mode.value,
@@ -207,13 +227,20 @@ function useMetaInfo() {
ip: '',
port: 102,
encryptionFlag: 0,
reCheckNum: 0,
recheckNum: 0,
state: 1,
factorFlag: 1,
icdId: '',
power: '',
preinvestmentPlan: '',
delegate:''
delegate:'',
inspectDate:dayjs().format('YYYY-MM-DD'),
cityName: '',
gdName: '',
subName: '',
importFlag:0,
inspectChannel:[],
monitorList:[]
})
return {dialogVisible, titleType, formContent}
}
@@ -221,31 +248,41 @@ function useMetaInfo() {
const {dialogVisible, titleType, formContent} = useMetaInfo()
// 清空formContent
const resetFormContent = () => {
formContent.value = {
id: '',
name: '',
pattern: mode.value,
devType: '',
devChns: 1,
devVolt: 57.74,
devCurr: 5,
manufacturer: '',
createDate: dayjs().format('YYYY-MM-DD'),
createId: '',
hardwareVersion: '',
softwareVersion: '',
protocol: 'MMS',
ip: '',
port: 102,
encryptionFlag: 0,
reCheckNum: 0,
state: 1,
factorFlag: 1,
icdId: '',
power: '',
preinvestmentPlan: '',
delegate:''
}
Object.assign(
formContent,{
id: '',
name: '',
pattern: mode.value,
devType: '',
devChns: 1,
devVolt: 57.74,
devCurr: 5,
manufacturer: '',
createDate: dayjs().format('YYYY-MM-DD'),
createId: '',
hardwareVersion: '',
softwareVersion: '',
protocol: 'MMS',
ip: '',
port: 102,
encryptionFlag: 0,
recheckNum: 0,
state: 1,
factorFlag: 1,
icdId: '',
power: '',
preinvestmentPlan: '',
delegate:'',
inspectDate:dayjs().format('YYYY-MM-DD'),
cityName: '',
gdName: '',
subName: '',
importFlag:0,
inspectChannel:[],
monitorList:[]
}
)
}
@@ -291,7 +328,7 @@ const rules = computed(() => {
const dynamicRules = {...baseRules};
if (scene.value === '0') {//只有电科院需要展示
dynamicRules.createDate = [{required: true, message: '出厂日期必填！', trigger: 'blur'}];
dynamicRules.createDate = [{required: true, message: createDateTitle.value + '必填！', trigger: 'blur'}];
}
if (scene.value === '1') {//只有楼下出厂需要展示
dynamicRules.preinvestmentPlan = [{required: true, message: '预投计划必选！', trigger: 'change'}];
@@ -310,7 +347,13 @@ const rules = computed(() => {
if (scene.value !== '2') {
dynamicRules.name = [{required: true, message: '设备名称必填！', trigger: 'blur'}];
dynamicRules.manufacturer = [{required: true, message: '生产厂家必选！', trigger: 'change'}];
}
if(mode.value === '比对式'){
dynamicRules.inspectDate = [{required: true, message: '定检日期必填！', trigger: 'blur'}];
dynamicRules.cityName = [{required: true, message: '所属地市必填！', trigger: 'blur'}];
dynamicRules.gdName = [{required: true, message: '所属供电公司必填！', trigger: 'blur'}];
dynamicRules.subName = [{required: true, message: '所属电站必填！', trigger: 'blur'}];
}
@@ -324,49 +367,75 @@ const close = () => {
resetFormContent()
// 重置表单
dialogFormRef.value?.resetFields()
}
// 保存数据
const save = () => {
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
//子组件监测点变化通知父组件设备台账
const getParameter = (data: Monitor.ResPqMon[]) => {
monitor.value = data
//保存监测点信息自动更新设备台账的被检通道
formContent.inspectChannel = monitor.value
.map(item => item.num.toString())
.sort((a, b) => parseFloat(a) - parseFloat(b));
}
// 保存数据
const save = () => {
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
if (formContent.encryptionFlag === 0) {
formContent.series = ''
formContent.devKey = ''
}
if (valid) {
formContent.createDate = dayjs(formContent.createDate).format('YYYY-MM-DD');
if (AppSceneStore.currentScene === '1') {
formContent.name = formContent.createId
}
if (formContent.value.encryptionFlag === 0) {
formContent.value.series = ''
formContent.value.devKey = ''
}
if (valid) {
formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD');
if (AppSceneStore.currentScene === '1') {
formContent.value.name = formContent.value.createId
if (formContent.arrivedDate) {
formContent.arrivedDate = dayjs(formContent.arrivedDate).format('YYYY-MM-DD');
}
if (formContent.value.arrivedDate) {
formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
if(mode.value == '比对式'){
if (formContent.inspectDate) {
formContent.inspectDate = dayjs(formContent.inspectDate).format('YYYY-MM-DD');
}
//可检通道转为字符串逗号分隔
// 确保 inspectChannel 是数组再执行 join
if (Array.isArray(formContent.inspectChannel)) {
formContent.inspectChannel = formContent.inspectChannel
.map(Number) // 将值转为数字以保证正确排序
.sort((a, b) => a - b) // 数字升序排序
.map(String) // 恢复为字符串用于保存
.join(',');
}
}
//保存时判是否加密，把识别码密钥字段清空
if (formContent.value.encryptionFlag === 0) {
formContent.value.series = null
formContent.value.devKey = null
if (formContent.encryptionFlag === 0) {
formContent.series = null
formContent.devKey = null
}
if (formContent.value.id) {
await updatePqDev(formContent.value);
formContent.monitorList = monitor.value
if (titleType.value != 'add') {
await updatePqDev(formContent);
ElMessage.success({message: `${dialogTitle.value}成功！`})
} else {
// 新增需要把设备模式转成字典ID
const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.pattern);
if (patternItem) {
formContent.value.pattern = patternItem.id;
formContent.pattern = patternItem.id;
}
// 新增需要把通讯协议转成字典ID
const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.value.protocol);
const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.protocol);
if (protocolItem) {
formContent.value.protocol = protocolItem.id;
formContent.protocol = protocolItem.id;
}
await addPqDev(formContent.value);
await addPqDev(formContent);
ElMessage.success({message: `${dialogTitle.value}成功！`})
}
@@ -385,92 +454,100 @@ const save = () => {
// 打开弹窗，可能是新增，也可能是编辑
const open = async (sign: string, data: Device.ResPqDev, currentMode: string, currentScene: string, devType: Device.ResDev[]) => {
dialogFormRef.value?.resetFields()
devTypeOptions.value = devType
mode.value = currentMode
scene.value = currentScene
titleType.value = sign
dialogVisible.value = true
activeTab.value = '0' // 强制回到第一个 tab
if (currentMode === '比对式') {
createDateTitle.value = '投运日期'
DevIsShow.value = false
MonIsShow.value = true
} else {
createDateTitle.value = '出厂日期'
DevIsShow.value = true
MonIsShow.value = false
}
if (data.encryptionFlag === 1) {
//handleEncryptionChange(1)
} else {
//handleEncryptionChange(0)
}
if (data.id) {
formContent.value = {...data}
updateDeviceByType(data.devType)
Object.assign(formContent,{ ...data })
if (typeof formContent.inspectChannel === 'string') {
formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean)
}
} else {
resetFormContent()
if (scene.value === '2') {
//只有比对式设备ID由前端传
if(currentMode === '比对式')
formContent.id = generateUUID().replaceAll("-","")
if(scene.value === '2'){
const manufacturers = dictStore.getDictData('Dev_Manufacturers');
const nanjingCanxuan = manufacturers.find(item => item.name === '南京灿能');
if (nanjingCanxuan) {
formContent.value.manufacturer = nanjingCanxuan.id;
formContent.manufacturer = nanjingCanxuan.id;
}
}
//handleEncryptionChange(1)
// 设置默认设备参数
updateDeviceByType('') // 可传空或默认类型
}
// 重置表单
dialogFormRef.value?.resetFields()
}
// const handleEncryptionChange = (value: number) => {
// // 根据是否加密来显示或隐藏识别码和密钥
// if(value === 1){
// IsPasswordShow.value = true
//
// }else
// {
// IsPasswordShow.value = false
// // formContent.value.series = ''
// // formContent.value.devKey = ''
// // rules.value.series = [];
// // rules.value.devKey = [];
// }
// }
const updateDeviceByType = (devTypeId: string) => {
const dev = devTypeOptions.value.find(t => t.id === devTypeId)
if (dev) {
formContent.devChns = dev.devChns
formContent.devCurr = dev.devCurr
formContent.devVolt = dev.devVolt
formContent.icdId = dev.icd
formContent.power = dev.power
// 动态设置 pqChannelArray 从 1 到 dev.devChns.length
pqChannelArray.value = Array.from({ length: dev.devChns }, (_, i) => ({
value: String(i + 1),
label: String(i + 1),
}))
} else {
// 默认值处理
formContent.devChns = 1
formContent.devCurr = 1
formContent.devVolt = 57.74
pqChannelArray.value = [{ value: '1', label: '1' }]
}
}
const handleDevTypeChange = (value: string) => {
// 在这里处理选中事件的逻辑
const dev = devTypeOptions.value.find(t => t.id === value)
if (dev) {
formContent.value.devChns = dev.devChns; // 默认值为1
formContent.value.devCurr = dev.devCurr; // 默认值为1
formContent.value.devVolt = dev.devVolt; // 默认值为1
formContent.value.icdId = dev.icd
formContent.value.power = dev.power
// if (dev.name.includes('882B')) {
// formContent.value.ip = '172.17.102.220'
// } else if (dev.name.includes('882A')) {
// formContent.value.ip = '172.17.102.221'
// } else {
// formContent.value.ip = '172.17.102.200'
// }
} else {
formContent.value.devChns = 1; // 默认值为1
formContent.value.devCurr = 1; // 默认值为1
formContent.value.devVolt = 57.74; // 默认值为1
//formContent.value.ip = '172.17.102.200'
updateDeviceByType(value)
const maxChannel = formContent.devChns
// 过滤掉超出新通道数范围的选项
if (Array.isArray(formContent.inspectChannel)) {
formContent.inspectChannel = formContent.inspectChannel.filter(
(channel) => parseInt(channel, 10) <= maxChannel
)
}
//切换设备类型时，删除超出最大通道数的监测点台账
monitor.value = monitor.value.filter(
(monitor) => parseInt(monitor.num.toString(), 10) <= maxChannel
)
formContent.monitorList = monitor.value
}
}
const handleInput = (value: string) => {
// 在这里处理选中事件的逻辑
if (scene.value === '1') {
formContent.value.name = value
formContent.name = value
}
}