微调
This commit is contained in:
@@ -70,6 +70,7 @@ export namespace Device {
|
|||||||
icdId: string | null;
|
icdId: string | null;
|
||||||
power: string | null;//工作电源
|
power: string | null;//工作电源
|
||||||
preinvestmentPlan: string | null;
|
preinvestmentPlan: string | null;
|
||||||
|
delegate: string | null; //委托方
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
|
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
|
||||||
<el-tabs type="border-card">
|
<el-tabs type="border-card">
|
||||||
<el-tab-pane label="设备台账信息">
|
<el-tab-pane label="设备台账信息">
|
||||||
<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="createId" >
|
<el-form-item label="装置编号" prop="createId">
|
||||||
<el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" />
|
<el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备名称" prop="name" >
|
<el-form-item label="设备名称" prop="name">
|
||||||
<el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'"/>
|
<el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'"/>
|
||||||
</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"
|
||||||
@@ -31,16 +31,16 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label='设备模式' prop='pattern' >-->
|
<!-- <el-form-item label='设备模式' prop='pattern' >-->
|
||||||
<!-- <el-select v-model="formContent.pattern" clearable placeholder="请选择设备模式" disabled>-->
|
<!-- <el-select v-model="formContent.pattern" clearable placeholder="请选择设备模式" disabled>-->
|
||||||
<!-- <el-option -->
|
<!-- <el-option -->
|
||||||
<!-- v-for="item in dictStore.getDictData('Pattern')"-->
|
<!-- v-for="item in dictStore.getDictData('Pattern')"-->
|
||||||
<!-- :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' v-if="scene != '1'">
|
<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="请选择设备厂家">
|
||||||
<el-option
|
<el-option
|
||||||
@@ -65,18 +65,18 @@
|
|||||||
<el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
|
<el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
|
||||||
<el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
|
<el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-divider >参数信息</el-divider>
|
<el-divider>参数信息</el-divider>
|
||||||
<el-form-item label="通道数" prop="devChns" >
|
<el-form-item label="通道数" prop="devChns">
|
||||||
<el-input v-model='formContent.devChns' :disabled="true"/>
|
<el-input v-model='formContent.devChns' :disabled="true"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="额定电压(V)" prop="devVolt" >
|
<el-form-item label="额定电压(V)" prop="devVolt">
|
||||||
<el-input v-model='formContent.devVolt' :disabled="true"/>
|
<el-input v-model='formContent.devVolt' :disabled="true"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="额定电流(A)" prop="devCurr" >
|
<el-form-item label="额定电流(A)" prop="devCurr">
|
||||||
<el-input v-model='formContent.devCurr' :disabled="true"/>
|
<el-input v-model='formContent.devCurr' :disabled="true"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<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"
|
||||||
@@ -85,13 +85,13 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="IP地址" prop="ip" >
|
<el-form-item label="IP地址" prop="ip">
|
||||||
<IPAddress v-model:value="formContent.ip"/>
|
<IPAddress v-model:value="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='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>
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
<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-item label='样品编号' prop='sampleId' clearable v-if="DevIsShow && scene === '0'">
|
<el-form-item label='样品编号' prop='sampleId' clearable v-if="DevIsShow && scene === '0'">
|
||||||
<el-input v-model='formContent.sampleId' placeholder="请输入样品编号" />
|
<el-input v-model='formContent.sampleId' placeholder="请输入样品编号"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label='送样日期' prop='arrivedDate' v-if="scene === '0'">
|
<el-form-item label='送样日期' prop='arrivedDate' v-if="scene === '0'">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
@@ -113,17 +113,27 @@
|
|||||||
:disabled-date="disabledDate"
|
:disabled-date="disabledDate"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label='委托方' prop='delegate' v-if="scene === '0'">
|
||||||
|
<el-select v-model="formContent.delegate" clearable placeholder="请选择委托方">
|
||||||
|
<el-option
|
||||||
|
v-for="item in dictStore.getDictData('Delegate')"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label='所属地市' prop='cityName' clearable placeholder="请输入所属地市" v-if="MonIsShow">
|
<el-form-item label='所属地市' prop='cityName' clearable placeholder="请输入所属地市" v-if="MonIsShow">
|
||||||
<el-input v-model='formContent.cityName' />
|
<el-input v-model='formContent.cityName'/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label='所属供电公司' prop='gDName' clearable placeholder="请输入所属供电公司" v-if="MonIsShow">
|
<el-form-item label='所属供电公司' prop='gDName' clearable placeholder="请输入所属供电公司" v-if="MonIsShow">
|
||||||
<el-input v-model='formContent.gDName' />
|
<el-input v-model='formContent.gDName'/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label='所属电站' prop='subName' clearable placeholder="请输入所属电站" v-if="MonIsShow">
|
<el-form-item label='所属电站' prop='subName' clearable placeholder="请输入所属电站" v-if="MonIsShow">
|
||||||
<el-input v-model='formContent.subName' />
|
<el-input v-model='formContent.subName'/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-auth.device="'factorFlag'" label="是否支持系数校准" prop='factorFlag' v-if="scene === '1'">
|
<el-form-item v-auth.device="'factorFlag'" label="是否支持系数校准" prop='factorFlag' v-if="scene === '1'">
|
||||||
<el-radio-group v-model="formContent.factorFlag" >
|
<el-radio-group v-model="formContent.factorFlag">
|
||||||
<el-radio :value="1">是</el-radio>
|
<el-radio :value="1">是</el-radio>
|
||||||
<el-radio :value="0">否</el-radio>
|
<el-radio :value="0">否</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
@@ -136,7 +146,7 @@
|
|||||||
<MonitorTable :MonIsShow="MonIsShow"/>
|
<MonitorTable :MonIsShow="MonIsShow"/>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div >
|
<div>
|
||||||
<el-button @click='close()'>取 消</el-button>
|
<el-button @click='close()'>取 消</el-button>
|
||||||
<el-button type="primary" @click='save()'>保存</el-button>
|
<el-button type="primary" @click='save()'>保存</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -147,13 +157,13 @@
|
|||||||
<script setup lang='ts'>
|
<script setup lang='ts'>
|
||||||
|
|
||||||
import IPAddress from '@/components/IpAddress/index.vue'
|
import IPAddress from '@/components/IpAddress/index.vue'
|
||||||
import { dialogBig } from '@/utils/elementBind'
|
import {dialogBig} from '@/utils/elementBind'
|
||||||
import { type Device } from '@/api/device/interface/device'
|
import {type Device} from '@/api/device/interface/device'
|
||||||
import { ElMessage, type FormItemRule } from 'element-plus'
|
import {ElMessage, type FormItemRule} from 'element-plus'
|
||||||
import { addPqDev, updatePqDev } from '@/api/device/device'
|
import {addPqDev, updatePqDev} from '@/api/device/device'
|
||||||
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 {CirclePlus, Delete, EditPen} from '@element-plus/icons-vue'
|
||||||
// 使用 dayjs 库格式化
|
// 使用 dayjs 库格式化
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
import MonitorTable from '@/views/machine/device/components/monitorTab.vue';
|
import MonitorTable from '@/views/machine/device/components/monitorTab.vue';
|
||||||
@@ -174,47 +184,17 @@ const disabledDate = (time: Date) => {
|
|||||||
return time.getTime() > Date.now()
|
return time.getTime() > Date.now()
|
||||||
}
|
}
|
||||||
|
|
||||||
function useMetaInfo() {
|
function useMetaInfo() {
|
||||||
const dialogVisible = ref(false)
|
const dialogVisible = ref(false)
|
||||||
const titleType = ref('add')
|
const titleType = ref('add')
|
||||||
const formContent = ref<Device.ResPqDev>({
|
const formContent = ref<Device.ResPqDev>({
|
||||||
id: '',
|
id: '',
|
||||||
name: '',
|
name: '',
|
||||||
pattern:mode.value,
|
pattern: mode.value,
|
||||||
devType:'',
|
devType: '',
|
||||||
devChns:1,
|
devChns: 1,
|
||||||
devVolt:57.74,
|
devVolt: 57.74,
|
||||||
devCurr:5,
|
devCurr: 5,
|
||||||
manufacturer:'',
|
|
||||||
createDate: dayjs().format('YYYY-MM-DD'),
|
|
||||||
createId: '',
|
|
||||||
hardwareVersion: '',
|
|
||||||
softwareVersion: '',
|
|
||||||
protocol: 'MMS',
|
|
||||||
ip: '172.17.102.200',
|
|
||||||
port: 102,
|
|
||||||
encryptionFlag: 0,
|
|
||||||
reCheckNum:0,
|
|
||||||
state: 1,
|
|
||||||
factorFlag:1,
|
|
||||||
icdId:'',
|
|
||||||
power:'',
|
|
||||||
preinvestmentPlan:''
|
|
||||||
})
|
|
||||||
return { dialogVisible, titleType, formContent }
|
|
||||||
}
|
|
||||||
|
|
||||||
const { dialogVisible, titleType, formContent } = useMetaInfo()
|
|
||||||
// 清空formContent
|
|
||||||
const resetFormContent = () => {
|
|
||||||
formContent.value = {
|
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
pattern:mode.value,
|
|
||||||
devType:'',
|
|
||||||
devChns:1,
|
|
||||||
devVolt:57.74,
|
|
||||||
devCurr:5,
|
|
||||||
manufacturer: '',
|
manufacturer: '',
|
||||||
createDate: dayjs().format('YYYY-MM-DD'),
|
createDate: dayjs().format('YYYY-MM-DD'),
|
||||||
createId: '',
|
createId: '',
|
||||||
@@ -224,97 +204,128 @@ const disabledDate = (time: Date) => {
|
|||||||
ip: '172.17.102.200',
|
ip: '172.17.102.200',
|
||||||
port: 102,
|
port: 102,
|
||||||
encryptionFlag: 0,
|
encryptionFlag: 0,
|
||||||
reCheckNum:0,
|
reCheckNum: 0,
|
||||||
state: 1,
|
state: 1,
|
||||||
factorFlag:1,
|
factorFlag: 1,
|
||||||
icdId:'',
|
icdId: '',
|
||||||
power:'',
|
power: '',
|
||||||
preinvestmentPlan:''
|
preinvestmentPlan: '',
|
||||||
}
|
delegate:''
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
let dialogTitle = computed(() => {
|
|
||||||
return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
|
|
||||||
})
|
})
|
||||||
|
return {dialogVisible, titleType, formContent}
|
||||||
|
}
|
||||||
|
|
||||||
|
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: '172.17.102.200',
|
||||||
|
port: 102,
|
||||||
|
encryptionFlag: 0,
|
||||||
|
reCheckNum: 0,
|
||||||
|
state: 1,
|
||||||
|
factorFlag: 1,
|
||||||
|
icdId: '',
|
||||||
|
power: '',
|
||||||
|
preinvestmentPlan: '',
|
||||||
|
delegate:''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
let dialogTitle = computed(() => {
|
||||||
|
return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
// 定义表单校验规则
|
// 定义表单校验规则
|
||||||
const baseRules: Record<string, Array<FormItemRule>> = {
|
const baseRules: Record<string, Array<FormItemRule>> = {
|
||||||
devType: [{ required: true, message: '设备类型必选!', trigger: 'change' }],
|
devType: [{required: true, message: '设备类型必选!', trigger: 'change'}],
|
||||||
pattern: [{ required: true, message: '设备模式必填!', trigger: 'blur' }],
|
pattern: [{required: true, message: '设备模式必填!', trigger: 'blur'}],
|
||||||
devChns: [
|
devChns: [
|
||||||
{ required: true, message: '设备通道数必填!', trigger: 'blur' },
|
{required: true, message: '设备通道数必填!', trigger: 'blur'},
|
||||||
{ pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur' }
|
{pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur'}
|
||||||
],
|
],
|
||||||
devVolt: [
|
devVolt: [
|
||||||
{ required: true, message: '额定电压必填!', trigger: 'blur' },
|
{required: true, message: '额定电压必填!', trigger: 'blur'},
|
||||||
{ pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur' }
|
{pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur'}
|
||||||
],
|
],
|
||||||
devCurr: [
|
devCurr: [
|
||||||
{ required: true, message: '额定电流必填!', trigger: 'blur' },
|
{required: true, message: '额定电流必填!', trigger: 'blur'},
|
||||||
{ pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur' }
|
{pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur'}
|
||||||
],
|
],
|
||||||
createId: [{ required: true, message: '装置编号必填!', trigger: 'blur' }
|
createId: [{required: true, message: '装置编号必填!', trigger: 'blur'}
|
||||||
],
|
],
|
||||||
ip: [
|
ip: [
|
||||||
{ required: true, message: 'IP地址必填!', trigger: 'blur' },
|
{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' }
|
{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: [
|
port: [
|
||||||
{ required: true, message: '端口号必填!', trigger: 'blur' },
|
{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' }
|
{pattern: /^(6553[0-5]|655[0-2][0-9]|64[0-9]{3}|[1-5]?[0-9]{1,4})$/, message: '端口号范围0到65535的整数', trigger: 'blur'}
|
||||||
],
|
],
|
||||||
encryptionFlag: [{ required: true, message: '是否加密必选!', trigger: 'change' }],
|
encryptionFlag: [{required: true, message: '是否加密必选!', trigger: 'change'}],
|
||||||
protocol: [{ required: true, message: '通讯协议必选!', trigger: 'change' }],
|
protocol: [{required: true, message: '通讯协议必选!', trigger: 'change'}],
|
||||||
series: [{ required: true, message: '请输入识别码', trigger: 'blur' }],
|
series: [{required: true, message: '请输入识别码', trigger: 'blur'}],
|
||||||
devKey: [{ required: true, message: '请输入密钥', trigger: 'blur' }]
|
devKey: [{required: true, message: '请输入密钥', trigger: 'blur'}]
|
||||||
};
|
};
|
||||||
|
|
||||||
// 使用计算属性根据 scene 动态生成规则
|
// 使用计算属性根据 scene 动态生成规则
|
||||||
const rules = computed(() => {
|
const rules = computed(() => {
|
||||||
const dynamicRules = { ...baseRules };
|
const dynamicRules = {...baseRules};
|
||||||
|
|
||||||
if (scene.value === '0'){//只有电科院需要展示
|
if (scene.value === '0') {//只有电科院需要展示
|
||||||
dynamicRules.createDate= [{ required: true, message: '出厂日期必填!', trigger: 'blur' }];
|
dynamicRules.createDate = [{required: true, message: '出厂日期必填!', trigger: 'blur'}];
|
||||||
}
|
}
|
||||||
if (scene.value === '1'){//只有楼下出厂需要展示
|
if (scene.value === '1') {//只有楼下出厂需要展示
|
||||||
dynamicRules.preinvestmentPlan= [{ required: true, message: '预投计划必选!', trigger: 'change' }];
|
dynamicRules.preinvestmentPlan = [{required: true, message: '预投计划必选!', trigger: 'change'}];
|
||||||
dynamicRules.createId= [{ required: true, message: '装置编号必填!', trigger: 'blur' },
|
dynamicRules.createId = [{required: true, message: '装置编号必填!', trigger: 'blur'},
|
||||||
{ pattern: /^\d+$/, message: '装置编号为数字', trigger: 'blur' }
|
{pattern: /^\d+$/, message: '装置编号为数字', trigger: 'blur'}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
if (scene.value !== '0') {
|
if (scene.value !== '0') {
|
||||||
dynamicRules.name = [{ required: true, message: '设备名称必填!', trigger: 'blur' }];
|
dynamicRules.name = [{required: true, message: '设备名称必填!', trigger: 'blur'}];
|
||||||
dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填!', trigger: 'blur' }];
|
dynamicRules.hardwareVersion = [{required: true, message: '固件版本必填!', trigger: 'blur'}];
|
||||||
dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填!', trigger: 'blur' }];
|
dynamicRules.softwareVersion = [{required: true, message: '软件版本必填!', trigger: 'blur'}];
|
||||||
dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选!', trigger: 'change' }];
|
dynamicRules.manufacturer = [{required: true, message: '生产厂家必选!', trigger: 'change'}];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (scene.value !== '2') {
|
if (scene.value !== '2') {
|
||||||
dynamicRules.name = [{ required: true, message: '设备名称必填!', trigger: 'blur' }];
|
dynamicRules.name = [{required: true, message: '设备名称必填!', trigger: 'blur'}];
|
||||||
dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选!', trigger: 'change' }];
|
dynamicRules.manufacturer = [{required: true, message: '生产厂家必选!', trigger: 'change'}];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return dynamicRules;
|
return dynamicRules;
|
||||||
});
|
});
|
||||||
|
|
||||||
// 关闭弹窗
|
// 关闭弹窗
|
||||||
const close = () => {
|
const close = () => {
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
// 清空dialogForm中的值
|
// 清空dialogForm中的值
|
||||||
resetFormContent()
|
resetFormContent()
|
||||||
// 重置表单
|
// 重置表单
|
||||||
dialogFormRef.value?.resetFields()
|
dialogFormRef.value?.resetFields()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 保存数据
|
// 保存数据
|
||||||
const save = () => {
|
const save = () => {
|
||||||
try {
|
try {
|
||||||
dialogFormRef.value?.validate(async (valid: boolean) => {
|
dialogFormRef.value?.validate(async (valid: boolean) => {
|
||||||
|
|
||||||
@@ -328,20 +339,19 @@ const rules = computed(() => {
|
|||||||
formContent.value.name = formContent.value.createId
|
formContent.value.name = formContent.value.createId
|
||||||
}
|
}
|
||||||
|
|
||||||
if (formContent.value.arrivedDate)
|
if (formContent.value.arrivedDate) {
|
||||||
{
|
|
||||||
formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
|
formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
|
||||||
}
|
}
|
||||||
|
|
||||||
//保存时判是否加密,把识别码密钥字段清空
|
//保存时判是否加密,把识别码密钥字段清空
|
||||||
if(formContent.value.encryptionFlag === 0){
|
if (formContent.value.encryptionFlag === 0) {
|
||||||
formContent.value.series = null
|
formContent.value.series = null
|
||||||
formContent.value.devKey = null
|
formContent.value.devKey = null
|
||||||
}
|
}
|
||||||
|
|
||||||
if (formContent.value.id) {
|
if (formContent.value.id) {
|
||||||
await updatePqDev(formContent.value);
|
await updatePqDev(formContent.value);
|
||||||
ElMessage.success({ message: `${dialogTitle.value}成功!` })
|
ElMessage.success({message: `${dialogTitle.value}成功!`})
|
||||||
} else {
|
} else {
|
||||||
// 新增需要把设备模式转成字典ID
|
// 新增需要把设备模式转成字典ID
|
||||||
const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
|
const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
|
||||||
@@ -354,7 +364,7 @@ const rules = computed(() => {
|
|||||||
formContent.value.protocol = protocolItem.id;
|
formContent.value.protocol = protocolItem.id;
|
||||||
}
|
}
|
||||||
await addPqDev(formContent.value);
|
await addPqDev(formContent.value);
|
||||||
ElMessage.success({ message: `${dialogTitle.value}成功!` })
|
ElMessage.success({message: `${dialogTitle.value}成功!`})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -371,17 +381,17 @@ const rules = computed(() => {
|
|||||||
|
|
||||||
|
|
||||||
// 打开弹窗,可能是新增,也可能是编辑
|
// 打开弹窗,可能是新增,也可能是编辑
|
||||||
const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => {
|
const open = async (sign: string, data: Device.ResPqDev, currentMode: string, currentScene: string, devType: Device.ResDev[]) => {
|
||||||
devTypeOptions.value = devType
|
devTypeOptions.value = devType
|
||||||
mode.value = currentMode
|
mode.value = currentMode
|
||||||
scene.value = currentScene
|
scene.value = currentScene
|
||||||
titleType.value = sign
|
titleType.value = sign
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
|
|
||||||
if( currentMode ==='比对式'){
|
if (currentMode === '比对式') {
|
||||||
DevIsShow.value = false
|
DevIsShow.value = false
|
||||||
MonIsShow.value = true
|
MonIsShow.value = true
|
||||||
}else{
|
} else {
|
||||||
DevIsShow.value = true
|
DevIsShow.value = true
|
||||||
MonIsShow.value = false
|
MonIsShow.value = false
|
||||||
}
|
}
|
||||||
@@ -392,13 +402,13 @@ const open = async (sign: string, data: Device.ResPqDev,currentMode: string,curr
|
|||||||
//handleEncryptionChange(0)
|
//handleEncryptionChange(0)
|
||||||
}
|
}
|
||||||
if (data.id) {
|
if (data.id) {
|
||||||
formContent.value = { ...data }
|
formContent.value = {...data}
|
||||||
} else {
|
} else {
|
||||||
resetFormContent()
|
resetFormContent()
|
||||||
if(scene.value === '2'){
|
if (scene.value === '2') {
|
||||||
const manufacturers = dictStore.getDictData('Dev_Manufacturers');
|
const manufacturers = dictStore.getDictData('Dev_Manufacturers');
|
||||||
const nanjingCanxuan = manufacturers.find(item => item.name === '南京灿能');
|
const nanjingCanxuan = manufacturers.find(item => item.name === '南京灿能');
|
||||||
if(nanjingCanxuan){
|
if (nanjingCanxuan) {
|
||||||
formContent.value.manufacturer = nanjingCanxuan.id;
|
formContent.value.manufacturer = nanjingCanxuan.id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -426,18 +436,18 @@ const open = async (sign: string, data: Device.ResPqDev,currentMode: string,curr
|
|||||||
|
|
||||||
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) {
|
||||||
formContent.value.devChns = dev.devChns; // 默认值为1
|
formContent.value.devChns = dev.devChns; // 默认值为1
|
||||||
formContent.value.devCurr = dev.devCurr; // 默认值为1
|
formContent.value.devCurr = dev.devCurr; // 默认值为1
|
||||||
formContent.value.devVolt = dev.devVolt; // 默认值为1
|
formContent.value.devVolt = dev.devVolt; // 默认值为1
|
||||||
formContent.value.icdId = dev.icd
|
formContent.value.icdId = dev.icd
|
||||||
formContent.value.power = dev.power
|
formContent.value.power = dev.power
|
||||||
if(dev.name.includes('882B')){
|
if (dev.name.includes('882B')) {
|
||||||
formContent.value.ip = '172.17.102.220'
|
formContent.value.ip = '172.17.102.220'
|
||||||
}else if(dev.name.includes('882A')){
|
} else if (dev.name.includes('882A')) {
|
||||||
formContent.value.ip = '172.17.102.221'
|
formContent.value.ip = '172.17.102.221'
|
||||||
}else{
|
} else {
|
||||||
formContent.value.ip = '172.17.102.200'
|
formContent.value.ip = '172.17.102.200'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,22 +464,18 @@ const handleDevTypeChange = (value: string) => {
|
|||||||
|
|
||||||
const handleInput = (value: string) => {
|
const handleInput = (value: string) => {
|
||||||
// 在这里处理选中事件的逻辑
|
// 在这里处理选中事件的逻辑
|
||||||
if(scene.value === '1'){
|
if (scene.value === '1') {
|
||||||
formContent.value.name = value
|
formContent.value.name = value
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 对外映射
|
// 对外映射
|
||||||
defineExpose({ open })
|
defineExpose({open})
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
refreshTable: (() => Promise<void>) | undefined;
|
refreshTable: (() => Promise<void>) | undefined;
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
Reference in New Issue
Block a user