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:
caozehui
2026-01-21 13:59:57 +08:00
parent 31e44cfc69
commit 820a6bb233
3 changed files with 245 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/extraResources/java/application.yml.template
View File

@@ -115,3 +115,6 @@ activate:
private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo=" private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB" public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"
error:
removeCount: 14

BIN
build/extraResources/java/entrance.jar
View File

Binary file not shown.

475
frontend/src/views/machine/standardDevice/components/standardDevicePopup.vue
View File

@@ -1,132 +1,138 @@
<template> <template>
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" align-center> <el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" align-center>
<el-tabs type="border-card"> <el-tabs type="border-card" v-model="activeName">
<el-tab-pane label="设备台账信息"> <el-tab-pane label="设备台账信息" name="devInfo">
<div > <div>
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three"> <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
<el-divider >设备信息</el-divider> <el-divider>设备信息</el-divider>
<el-form-item label="设备名称" prop="name" > <el-form-item label="设备名称" prop="name">
<el-input v-model='formContent.name' placeholder="请输入设备名称" maxlength="32" show-word-limit/> <el-input v-model='formContent.name' placeholder="请输入设备名称" maxlength="32" show-word-limit/>
</el-form-item> </el-form-item>
<el-form-item label='设备类型' prop='devType' > <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">
<el-option <el-option
v-for="item in devTypeOptions" v-for="item in devTypeOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='设备厂家' prop='manufacturer'> <el-form-item label='设备厂家' prop='manufacturer'>
<el-select v-model="formContent.manufacturer" clearable placeholder="请选择设备厂家"> <el-select v-model="formContent.manufacturer" clearable placeholder="请选择设备厂家">
<el-option <el-option
v-for="item in dictStore.getDictData('Dev_Manufacturers')" v-for="item in dictStore.getDictData('Dev_Manufacturers')"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-divider >参数信息</el-divider> <el-divider>参数信息</el-divider>
<el-form-item label='通讯协议' prop='protocol'> <el-form-item label='通讯协议' prop='protocol'>
<el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议"> <el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议">
<el-option <el-option
v-for="item in dictStore.getDictData('Protocol')" v-for="item in dictStore.getDictData('Protocol')"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="IP地址" prop="ip" placeholder="请输入IP地址"> <el-form-item label="IP地址" prop="ip" placeholder="请输入IP地址">
<el-input v-model="formContent.ip"/> <el-input v-model="formContent.ip"/>
</el-form-item> </el-form-item>
<el-form-item label="端口号" prop="port" placeholder="请输入端口号" > <el-form-item label="端口号" prop="port" placeholder="请输入端口号">
<el-input v-model="formContent.port" /> <el-input v-model="formContent.port"/>
</el-form-item> </el-form-item>
<el-form-item label='可检通道数' prop='inspectChannel' > <el-form-item label='可检通道数' prop='inspectChannel'>
<el-select v-model="formContent.inspectChannel" multiple collapse-tags :max-collapse-tags="4" placeholder="请选择可检通道数" clearable> <el-select v-model="formContent.inspectChannel" multiple collapse-tags :max-collapse-tags="4" placeholder="请选择可检通道数" clearable>
<el-option <el-option
v-for="(option, index) in pqChannelArray" v-for="(option, index) in pqChannelArray"
:key="index" :key="index"
:label="option.label" :label="option.label"
:value="option.value" :value="option.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='是否加密' prop='encryptionFlag' > <el-form-item label='是否加密' prop='encryptionFlag'>
<el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密"> <el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密">
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label='识别码' prop='series' clearable v-if="formContent.encryptionFlag"> <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/>
</el-form-item> </el-form-item>
<el-form-item label='密钥' prop='devKey' clearable v-if="formContent.encryptionFlag"> <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/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="通道系数"> <el-tab-pane label="通道系数" name="gainInfo">
<el-tabs type="border-card" height="100%"> <el-tabs type="border-card" style="margin: 15px 0px;">
<el-tab-pane v-for="(item, index) in formContent.gainList" :label="'通道'+(index+1)"> <el-tab-pane v-for="(item, index) in formContent.gainList" :label="'通道'+(index+1)">
<!-- <el-table :data="item" :border="true" style="width: 100%">--> <el-form :model='item' ref='gainFormRef' :disabled="true" class="form-four">
<!-- <el-table-column label="ua" prop="uaGain" />--> <el-form-item label-width="30" label-position="left" label="ua" prop="uaGain">
<!-- <el-table-column label="ub" prop="ubGain" />--> <el-input v-model="item.uaGain"/>
<!-- <el-table-column label="uc" prop="ucGain" />--> </el-form-item>
<!-- <el-table-column lable="cc" prop="u0Gain" />--> <el-form-item label-width="30" label-position="left" label="ub" prop="ubGain">
<!-- <el-table-column label="ia" prop="iaGain" />--> <el-input v-model="item.ubGain"/>
<!-- <el-table-column label="ib" prop="ibGain" />--> </el-form-item>
<!-- <el-table-column label="ic" prop="icGain" />--> <el-form-item label-width="30" label-position="left" label="uc" prop="ucGain">
<!-- <el-table-column label="i0" prop="i0Gain" />--> <el-input v-model="item.ucGain"/>
<!-- <el-table-column label="uab" prop="uabGain" />--> </el-form-item>
<!-- <el-table-column label="ubc" prop="ubcGain" />--> <el-form-item label-width="30" label-position="left" label="u0" prop="u0Gain">
<!-- <el-table-column label="uca" prop="ucaGain" />--> <el-input v-model="item.u0Gain"/>
<!-- </el-table>--> </el-form-item>
<el-form :model='item' ref='gainFormRef' :rules='rules' :disabled="true" class="form-three"> <el-form-item label-width="30" label-position="left" label="ia" prop="iaGain">
<el-form-item label="ua" prop="uaGain"> <el-input v-model="item.iaGain"/>
<el-input v-model="item.uaGain"/> </el-form-item>
</el-form-item> <el-form-item label-width="30" label-position="left" label="ib" prop="ibGain">
<el-form-item label="ub" prop="ubGain"/> <el-input v-model="item.ibGain"/>
<el-form-item label="uc" prop="ucGain"/> </el-form-item>
<el-form-item label="u0" prop="u0Gain"/> <el-form-item label-width="30" label-position="left" label="ic" prop="icGain">
<el-form-item label="ia" prop="iaGain"/> <el-input v-model="item.icGain"/>
<el-form-item label="ib" prop="ibGain"/> </el-form-item>
<el-form-item label="ic" prop="icGain"/> <el-form-item label-width="30" label-position="left" label="i0" prop="i0Gain">
<el-form-item label="i0" prop="i0Gain"/> <el-input v-model="item.i0Gain"/>
</el-form> </el-form-item>
</el-tab-pane> <el-form-item label-width="30" label-position="left" label="uab" prop="uabGain">
</el-tabs> <el-input v-model="item.uabGain"/>
</el-form-item>
<el-form-item label-width="30" label-position="left" label="ubc" prop="uabGain">
<el-input v-model="item.ubcGain"/>
</el-form-item>
<el-form-item label-width="30" label-position="left" label="uca" prop="ucaGain">
<el-input v-model="item.ucaGain"/>
</el-form-item>
</el-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<template #footer> </el-tab-pane>
<div > </el-tabs>
<el-button @click='close()'>取 消</el-button> <template #footer>
<el-button type="primary" @click='save()'>保存</el-button> <div>
</div> <el-button @click='close()'>取 消</el-button>
</template> <el-button type="primary" @click='save()'>保存</el-button>
</el-dialog> </div>
</template>
</el-dialog>
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import IPAddress from '@/components/IpAddress/index.vue' import {dialogBig} from '@/utils/elementBind'
import { dialogBig } from '@/utils/elementBind'
import {type StandardDevice} from '@/api/device/interface/standardDevice.ts' import {type StandardDevice} from '@/api/device/interface/standardDevice.ts'
import { ElMessage, type FormItemRule } from 'element-plus' import {ElMessage, type FormItemRule} from 'element-plus'
import { addPqStandardDev, updatePqStandardDev} from '@/api/device/standardDevice/index.ts' import {addPqStandardDev, updatePqStandardDev} from '@/api/device/standardDevice/index.ts'
import { computed, reactive, type Ref, ref } from 'vue' import {computed, reactive, type Ref, ref} from 'vue'
import { useDictStore } from '@/stores/modules/dict' import {useDictStore} from '@/stores/modules/dict'
import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
import {type Device} from '@/api/device/interface/device.ts' import {type Device} from '@/api/device/interface/device.ts'
// 使用 dayjs 库格式化 // 使用 dayjs 库格式化
import dayjs from 'dayjs'
import {tr} from "element-plus/es/locale";
// 存储设备类型选项 // 存储设备类型选项
const devTypeOptions = ref<Device.ResDev[]>([]) const devTypeOptions = ref<Device.ResDev[]>([])
@@ -152,112 +158,114 @@ const pqChannelArray = ref([
label: '4', label: '4',
}, },
]) ])
const activeName=ref('devInfo')
function useMetaInfo() {
const dialogVisible = ref(false) function useMetaInfo() {
const titleType = ref('add') const dialogVisible = ref(false)
const formContent = reactive<StandardDevice.ResPqStandardDevice>({ const titleType = ref('add')
id: '', const formContent = reactive<StandardDevice.ResPqStandardDevice>({
name: '', id: '',
devType:'', name: '',
manufacturer:'', devType: '',
protocol: 'MMS', manufacturer: '',
ip: '', protocol: 'MMS',
port: 102, ip: '',
inspectChannel:'', port: 102,
encryptionFlag: 0, inspectChannel: '',
state: 1, encryptionFlag: 0,
}) state: 1,
return { dialogVisible, titleType, formContent } })
} return {dialogVisible, titleType, formContent}
}
const { dialogVisible, titleType, formContent } = useMetaInfo()
// 清空formContent const {dialogVisible, titleType, formContent} = useMetaInfo()
const resetFormContent = () => { // 清空formContent
Object.assign( const resetFormContent = () => {
formContent,{ Object.assign(
formContent, {
id: '', id: '',
name: '', name: '',
devType:'', devType: '',
manufacturer:'', manufacturer: '',
protocol: 'MMS', protocol: 'MMS',
ip: '', ip: '',
port: 102, port: 102,
inspectChannel:'', inspectChannel: '',
encryptionFlag: 0, encryptionFlag: 0,
state: 1, state: 1,
}
)
}
let dialogTitle = computed(() => {
return titleType.value === 'add' ? '新增标准设备' : '编辑标准设备'
})
//定义校验规则
const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
name: [{required: true, message: '设备名称必填！', trigger: 'blur'}],
devType: [{required: true, message: '设备类型必选！', trigger: 'change'}],
manufacturer: [{required: true, message: '生产厂家必选！', trigger: 'change'}],
ip: [
{required: true, message: 'IP地址必填！', trigger: 'blur'},
{pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur'}
],
port: [
{required: true, message: '端口号必填！', trigger: 'blur'},
{pattern: /^(6553[0-5]|655[0-2][0-9]|64[0-9]{3}|[1-5]?[0-9]{1,4})$/, message: '端口号范围0到65535的整数', trigger: 'blur'}
],
inspectChannel: [{required: true, message: '可检通道数必选', trigger: 'change'}],
encryptionFlag: [{required: true, message: '是否加密必选！', trigger: 'change'}],
series: [{required: true, message: '请输入识别码', trigger: 'blur'}],
devKey: [{required: true, message: '请输入密钥', trigger: 'blur'}],
protocol: [{required: true, message: '通讯协议必选！', trigger: 'change'}],
})
// 关闭弹窗
const close = () => {
dialogVisible.value = false
// 清空dialogForm中的值
resetFormContent()
// 重置表单
dialogFormRef.value?.resetFields()
}
// 保存数据
const save = () => {
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
if (formContent.encryptionFlag === 0) {
formContent.series = ''
formContent.devKey = ''
}
if (valid) {
//保存时判是否加密，把识别码密钥字段清空
if (formContent.encryptionFlag === 0) {
formContent.series = null
formContent.devKey = null
} }
)
}
let dialogTitle = computed(() => {
return titleType.value === 'add' ? '新增标准设备' : '编辑标准设备'
})
//定义校验规则
const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
name : [{ required: true, message: '设备名称必填！', trigger: 'blur' }],
devType: [{ required: true, message: '设备类型必选！', trigger: 'change' }],
manufacturer:[{ required: true, message: '生产厂家必选！', trigger: 'change' }],
ip: [
{ required: true, message: 'IP地址必填！', trigger: 'blur' },
{ pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur' }
],
port: [
{ required: true, message: '端口号必填！', trigger: 'blur' },
{ pattern: /^(6553[0-5]|655[0-2][0-9]|64[0-9]{3}|[1-5]?[0-9]{1,4})$/, message: '端口号范围0到65535的整数', trigger: 'blur' }
],
inspectChannel:[ { required: true, message: '可检通道数必选', trigger: 'change' }],
encryptionFlag: [{ required: true, message: '是否加密必选！', trigger: 'change' }],
series: [{ required: true, message: '请输入识别码', trigger: 'blur' }],
devKey: [{ required: true, message: '请输入密钥', trigger: 'blur' }],
protocol: [{required: true, message: '通讯协议必选！', trigger: 'change'}],
})
// 关闭弹窗
const close = () => {
dialogVisible.value = false
// 清空dialogForm中的值
resetFormContent()
// 重置表单
dialogFormRef.value?.resetFields()
}
// 保存数据
const save = () => {
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
if (formContent.encryptionFlag === 0) {
formContent.series = ''
formContent.devKey = ''
}
if (valid) {
//保存时判是否加密，把识别码密钥字段清空
if(formContent.encryptionFlag === 0){
formContent.series = null
formContent.devKey = null
}
// 可检通道转为字符串逗号分隔（保存前临时转换） // 可检通道转为字符串逗号分隔（保存前临时转换）
let originalInspectChannel = formContent.inspectChannel; // 保存原始值 let originalInspectChannel = formContent.inspectChannel; // 保存原始值
//可检通道转为字符串逗号分隔 //可检通道转为字符串逗号分隔
// 确保 inspectChannel 是数组再执行 join // 确保 inspectChannel 是数组再执行 join
if (Array.isArray(formContent.inspectChannel)) { if (Array.isArray(formContent.inspectChannel)) {
formContent.inspectChannel = formContent.inspectChannel formContent.inspectChannel = formContent.inspectChannel
.map(Number) // 将值转为数字以保证正确排序 .map(Number) // 将值转为数字以保证正确排序
.sort((a, b) => a - b) // 数字升序排序 .sort((a, b) => a - b) // 数字升序排序
.map(String) // 恢复为字符串用于保存 .map(String) // 恢复为字符串用于保存
.join(','); .join(',');
} }
try { try {
if (formContent.id) { if (formContent.id) {
await updatePqStandardDev(formContent); await updatePqStandardDev(formContent);
ElMessage.success({ message: `${dialogTitle.value}成功！` }) ElMessage.success({message: `${dialogTitle.value}成功！`})
} else { } else {
// 新增需要把通讯协议转成字典ID // 新增需要把通讯协议转成字典ID
const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.protocol); const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.protocol);
if (protocolItem) { if (protocolItem) {
@@ -265,7 +273,7 @@ const pqChannelArray = ref([
} }
await addPqStandardDev(formContent); await addPqStandardDev(formContent);
ElMessage.success({ message: `${dialogTitle.value}成功！` }) ElMessage.success({message: `${dialogTitle.value}成功！`})
} }
close() close()
// 刷新表格 // 刷新表格
@@ -281,7 +289,7 @@ const pqChannelArray = ref([
formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean); formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean);
} }
} }
}) })
} catch (err) { } catch (err) {
console.error('验证过程中出现错误', err) console.error('验证过程中出现错误', err)
@@ -290,21 +298,22 @@ const pqChannelArray = ref([
// 打开弹窗，可能是新增，也可能是编辑 // 打开弹窗，可能是新增，也可能是编辑
const open = async (sign: string, data: StandardDevice.ResPqStandardDevice,devType:Device.ResDev[]) => { const open = async (sign: string, data: StandardDevice.ResPqStandardDevice, devType: Device.ResDev[]) => {
// 重置表单 activeName.value = 'devInfo'
dialogFormRef.value?.resetFields() // 重置表单
devTypeOptions.value = devType dialogFormRef.value?.resetFields()
titleType.value = sign devTypeOptions.value = devType
if (data.id) { titleType.value = sign
Object.assign(formContent,{ ...data }) if (data.id) {
console.log(formContent) Object.assign(formContent, {...data})
if (typeof formContent.inspectChannel === 'string') { console.log(formContent)
formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean) if (typeof formContent.inspectChannel === 'string') {
} formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean)
//handleDevTypeChange(data.devType)
} else {
resetFormContent()
} }
//handleDevTypeChange(data.devType)
} else {
resetFormContent()
}
dialogVisible.value = true dialogVisible.value = true
@@ -314,38 +323,38 @@ const open = async (sign: string, data: StandardDevice.ResPqStandardDevice,devTy
const handleDevTypeChange = (value: string) => { const handleDevTypeChange = (value: string) => {
// 在这里处理选中事件的逻辑 // 在这里处理选中事件的逻辑
const dev = devTypeOptions.value.find(t =>t.id === value) const dev = devTypeOptions.value.find(t => t.id === value)
if (dev) { if (dev) {
const maxChannel = dev.devChns const maxChannel = dev.devChns
// 动态设置 pqChannelArray 从 1 到 dev.devChns.length // 动态设置 pqChannelArray 从 1 到 dev.devChns.length
pqChannelArray.value = Array.from({ length: dev.devChns }, (_, i) => ({ pqChannelArray.value = Array.from({length: dev.devChns}, (_, i) => ({
value: String(i + 1), value: String(i + 1),
label: String(i + 1), label: String(i + 1),
})) }))
//if(titleType.value == 'add') // 默认全选所有通道 //if(titleType.value == 'add') // 默认全选所有通道
formContent.inspectChannel = pqChannelArray.value.map(channel => channel.value) formContent.inspectChannel = pqChannelArray.value.map(channel => channel.value)
// 过滤掉超出新通道数范围的选项 // 过滤掉超出新通道数范围的选项
if (Array.isArray(formContent.inspectChannel)) { if (Array.isArray(formContent.inspectChannel)) {
formContent.inspectChannel = formContent.inspectChannel.filter( formContent.inspectChannel = formContent.inspectChannel.filter(
(channel) => parseInt(channel, 10) <= maxChannel (channel) => parseInt(channel, 10) <= maxChannel
) )
} }
} else { } else {
// 可选：恢复默认值 // 可选：恢复默认值
pqChannelArray.value = [ pqChannelArray.value = [
{ value: '1', label: '1' }, {value: '1', label: '1'},
{ value: '2', label: '2' }, {value: '2', label: '2'},
{ value: '3', label: '3' }, {value: '3', label: '3'},
{ value: '4', label: '4' }, {value: '4', label: '4'},
] ]
} }
} }
// 对外映射 // 对外映射
defineExpose({ open }) defineExpose({open})
const props = defineProps<{ const props = defineProps<{
refreshTable: (() => Promise<void>) | undefined; refreshTable: (() => Promise<void>) | undefined;
}>() }>()