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
2025-03-20 16:31:15 +08:00
parent b729e4efa1
commit ffb44ea909
3 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/api/device/interface/device.ts
View File

@@ -20,6 +20,7 @@ export namespace Device {
export interface ReqDevReportParams extends ReqPage { export interface ReqDevReportParams extends ReqPage {
planId?: string; // 计划id planId?: string; // 计划id
devId?: string; // 装置id devId?: string; // 装置id
scriptId?: string; // 脚本id
} }
/** /**
@@ -44,7 +45,7 @@ export namespace Device {
encryptionFlag: number; //装置是否为加密版本 encryptionFlag: number; //装置是否为加密版本
series?: string | null; //装置识别码（3ds加密） series?: string | null; //装置识别码（3ds加密）
devKey?: string | null; //装置秘钥（3ds加密） devKey?: string | null; //装置秘钥（3ds加密）
sampleID?: string| null; //样品编号 sampleId?: string | null; //样品编号
arrivedDate?: string; //送样日期 arrivedDate?: string; //送样日期
cityName?: string | null; //所属地市名称 cityName?: string | null; //所属地市名称
gDName?: string | null; //所属供电公司名称 gDName?: string | null; //所属供电公司名称
@@ -81,7 +82,6 @@ export namespace Device {
} }
/** /**
* 被检设备表格查询分页返回的对象； * 被检设备表格查询分页返回的对象；
*/ */

2
frontend/src/views/home/components/table.vue
View File

@@ -1064,7 +1064,7 @@ const openDrawer = async (title: string, row: any) => {
if (title === '报告生成') { if (title === '报告生成') {
await generateDevReport({'planId': checkStore.plan.id, 'devId': row.id}) await generateDevReport({'planId': checkStore.plan.id, 'devId': row.id,'scriptId':checkStore.plan.scriptId})
emit('batchGenerateClicked') // 触发事件 emit('batchGenerateClicked') // 触发事件
ElMessage.success({message: `报告生成成功！`}) ElMessage.success({message: `报告生成成功！`})
} }

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

@@ -103,8 +103,8 @@
<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-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