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

Merge branch 'qr_branch'

Browse Source 
# Conflicts:
#	frontend/src/views/home/components/preTest.vue
#	frontend/src/views/home/components/test.vue
#	frontend/src/views/machine/device/components/devicePopup.vue
#	frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue
This commit is contained in:
caozehui
2025-12-26 13:27:26 +08:00
parent 051b4dfb15 29efbae717
commit a096690917
4 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
clearable
placeholder="请选择设备类型"
@change="handleDevTypeChange"
>
<el-option
v-for="item in devTypeOptions"
@@ -63,7 +63,7 @@
v-model="formContent.manufacturer"
clearable
placeholder="请选择设备厂家"
>
<el-option
v-for="item in dictStore.getDictData('Dev_Manufacturers')"
@@ -78,7 +78,7 @@
v-model="formContent.createDate"
:placeholder="`请选择${createDateTitle}`"
:disabled-date="disabledDate"
/>
</el-form-item>
<el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
@@ -92,7 +92,7 @@
v-model="formContent.inspectDate"
placeholder="请选择定检日期"
:disabled-date="disabledDate"
/>
</el-form-item>
<el-divider>参数信息</el-divider>
@@ -128,7 +128,7 @@
v-model="formContent.protocol"
clearable
placeholder="请选择通讯协议"
>
<el-option
v-for="item in dictStore.getDictData('Protocol')"
@@ -149,7 +149,7 @@
v-model="formContent.encryptionFlag"
clearable
placeholder="请选择是否加密"
>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
@@ -160,7 +160,7 @@
v-model="formContent.series"
placeholder="请输入识别码"
show-password
/>
</el-form-item>
<el-form-item label="密钥" prop="devKey" clearable v-if="formContent.encryptionFlag">
@@ -168,7 +168,7 @@
v-model="formContent.devKey"
placeholder="请输入密钥"
show-password
/>
</el-form-item>
<el-form-item label="样品编号" prop="sampleId" clearable v-if="DevIsShow && scene === '0'">
@@ -196,7 +196,7 @@
v-model="formContent.cityName"
clearable
placeholder="请输入所属地市"
/>
</el-form-item>
<el-form-item label="所属供电公司" prop="gdName" v-if="MonIsShow">
@@ -204,7 +204,7 @@
v-model="formContent.gdName"
clearable
placeholder="请输入所属供电公司"
/>
</el-form-item>
<el-form-item label="所属电站" prop="subName" v-if="MonIsShow">
@@ -212,7 +212,7 @@
v-model="formContent.subName"
clearable
placeholder="请输入所属电站"
/>
</el-form-item>
<el-form-item
@@ -649,6 +649,17 @@ const updateDeviceByType = (devTypeId: string) => {
value: String(i + 1),
label: String(i + 1)
}))
if(scene.value === '1'){
if (dev.name.includes('NPQS-581') || dev.name.includes('NPQS-580') || dev.name.includes('PQ-COM')) {
formContent.value.encryptionFlag = 1
formContent.value.series = 'Pqs&cn870299'
formContent.value.devKey = '!qaz@wsx3edc4rfv'
} else {
formContent.value.encryptionFlag = 0
formContent.value.series = null
formContent.value.devKey = null
}
}
} else {
// 默认值处理
formContent.devChns = 1