比对系数下发全局配置
This commit is contained in:
@@ -35,9 +35,25 @@ export namespace StandardDevice {
|
|||||||
updateBy?: string | null; //更新用户
|
updateBy?: string | null; //更新用户
|
||||||
updateTime?: string | null; //更新时间
|
updateTime?: string | null; //更新时间
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
|
gainList?:Gain[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
interface Gain{
|
||||||
|
stdDevMonitorId:string;
|
||||||
|
uaGain:number;
|
||||||
|
ubGain:number;
|
||||||
|
ucGain:number;
|
||||||
|
u0Gain:number;
|
||||||
|
iaGain:number;
|
||||||
|
ibGain:number;
|
||||||
|
icGain:number;
|
||||||
|
i0Gain:number;
|
||||||
|
uabGain:number;
|
||||||
|
ubcGain:number;
|
||||||
|
ucaGain:number;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 标准设备表格查询分页返回的对象;
|
* 标准设备表格查询分页返回的对象;
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -57,3 +57,14 @@ export const getPublicKey = (username: string) => {
|
|||||||
export const getAutoGenerate = () => {
|
export const getAutoGenerate = () => {
|
||||||
return http.get('/sysTestConfig/getAutoGenerate', {}, {loading: false})
|
return http.get('/sysTestConfig/getAutoGenerate', {}, {loading: false})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取比对模式下是否能够进行系数校准
|
||||||
|
*/
|
||||||
|
export const getCanCoefficient=()=>{
|
||||||
|
return http.get('/prepare/canCoefficient', {}, {loading: false})
|
||||||
|
}
|
||||||
|
|
||||||
|
export const startCoefficient=()=>{
|
||||||
|
return http.get('/prepare/startCoefficient', {}, {loading: false})
|
||||||
|
}
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ import {CheckData} from '@/api/check/interface'
|
|||||||
import {useCheckStore} from '@/stores/modules/check'
|
import {useCheckStore} from '@/stores/modules/check'
|
||||||
import {ElMessage, ElMessageBox} from 'element-plus'
|
import {ElMessage, ElMessageBox} from 'element-plus'
|
||||||
import {getBigTestItem} from '@/api/check/test'
|
import {getBigTestItem} from '@/api/check/test'
|
||||||
import {getAutoGenerate} from '@/api/user/login'
|
import {getAutoGenerate, getCanCoefficient, startCoefficient} from '@/api/user/login'
|
||||||
import { generateDevReport } from '@/api/plan/plan'
|
import { generateDevReport } from '@/api/plan/plan'
|
||||||
import {useModeStore} from '@/stores/modules/mode' // 引入模式 store
|
import {useModeStore} from '@/stores/modules/mode' // 引入模式 store
|
||||||
import {useDictStore} from '@/stores/modules/dict'
|
import {useDictStore} from '@/stores/modules/dict'
|
||||||
@@ -157,11 +157,6 @@ const props = defineProps({
|
|||||||
|
|
||||||
const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
'update:testStatus',
|
'update:testStatus',
|
||||||
'update:webMsgSend',
|
|
||||||
'sendPause',
|
|
||||||
'sendResume',
|
|
||||||
'sendReCheck',
|
|
||||||
'closeWebSocket'
|
|
||||||
])
|
])
|
||||||
|
|
||||||
// 用来保存测试项进度抽屉是否打开
|
// 用来保存测试项进度抽屉是否打开
|
||||||
@@ -684,6 +679,20 @@ const updatePercentage = async () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
stopTimeCount(1)
|
stopTimeCount(1)
|
||||||
|
|
||||||
|
let { data: canCoefficient } = await getCanCoefficient()
|
||||||
|
if(canCoefficient) {
|
||||||
|
ElMessageBox.confirm('存在系数偏差,是否进行系数校准?', '系数校准', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning',
|
||||||
|
}).then(async ()=>{
|
||||||
|
// 调用系数校准接口
|
||||||
|
await startCoefficient()
|
||||||
|
ElMessage.success({ message: '系数下发中,请稍等...', duration: 15000 ,onClose() {
|
||||||
|
ElMessage.success('系数下发成功!')
|
||||||
|
},})
|
||||||
|
}).catch(()=>{
|
||||||
ElMessageBox.alert(
|
ElMessageBox.alert(
|
||||||
'检测全部结束,你可以停留在此页面查看检测结果,或返回首页进行复检、报告生成和归档等操作',
|
'检测全部结束,你可以停留在此页面查看检测结果,或返回首页进行复检、报告生成和归档等操作',
|
||||||
'检测完成',
|
'检测完成',
|
||||||
@@ -691,9 +700,8 @@ const updatePercentage = async () => {
|
|||||||
confirmButtonText: '确定'
|
confirmButtonText: '确定'
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
// 关闭WebSocket连接
|
})
|
||||||
emit('closeWebSocket')
|
}
|
||||||
//clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// ========== 时间计数器管理函数 ==========
|
// ========== 时间计数器管理函数 ==========
|
||||||
@@ -862,7 +870,6 @@ const handleClick = (item: any, chnNum: number, scriptType: string) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const handlePause = () => {
|
const handlePause = () => {
|
||||||
//emit('sendPause')
|
|
||||||
testLogList.push({
|
testLogList.push({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
log: `${new Date().toLocaleString()}:当前测试小项正在执行中,将在该小项执行结束后暂停...`
|
log: `${new Date().toLocaleString()}:当前测试小项正在执行中,将在该小项执行结束后暂停...`
|
||||||
|
|||||||
@@ -72,6 +72,37 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
<el-tab-pane label="通道系数">
|
||||||
|
<el-tabs type="border-card" height="100%">
|
||||||
|
<el-tab-pane v-for="(item, index) in formContent.gainList" :label="'通道'+(index+1)">
|
||||||
|
<!-- <el-table :data="item" :border="true" style="width: 100%">-->
|
||||||
|
<!-- <el-table-column label="ua" prop="uaGain" />-->
|
||||||
|
<!-- <el-table-column label="ub" prop="ubGain" />-->
|
||||||
|
<!-- <el-table-column label="uc" prop="ucGain" />-->
|
||||||
|
<!-- <el-table-column lable="cc" prop="u0Gain" />-->
|
||||||
|
<!-- <el-table-column label="ia" prop="iaGain" />-->
|
||||||
|
<!-- <el-table-column label="ib" prop="ibGain" />-->
|
||||||
|
<!-- <el-table-column label="ic" prop="icGain" />-->
|
||||||
|
<!-- <el-table-column label="i0" prop="i0Gain" />-->
|
||||||
|
<!-- <el-table-column label="uab" prop="uabGain" />-->
|
||||||
|
<!-- <el-table-column label="ubc" prop="ubcGain" />-->
|
||||||
|
<!-- <el-table-column label="uca" prop="ucaGain" />-->
|
||||||
|
<!-- </el-table>-->
|
||||||
|
<el-form :model='item' ref='gainFormRef' :rules='rules' :disabled="true" class="form-three">
|
||||||
|
<el-form-item label="ua" prop="uaGain">
|
||||||
|
<el-input v-model="item.uaGain"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="ub" prop="ubGain"/>
|
||||||
|
<el-form-item label="uc" prop="ucGain"/>
|
||||||
|
<el-form-item label="u0" prop="u0Gain"/>
|
||||||
|
<el-form-item label="ia" prop="iaGain"/>
|
||||||
|
<el-form-item label="ib" prop="ibGain"/>
|
||||||
|
<el-form-item label="ic" prop="icGain"/>
|
||||||
|
<el-form-item label="i0" prop="i0Gain"/>
|
||||||
|
</el-form>
|
||||||
|
</el-tab-pane>
|
||||||
|
</el-tabs>
|
||||||
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div >
|
<div >
|
||||||
@@ -95,6 +126,7 @@ 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 dayjs from 'dayjs'
|
||||||
|
import {tr} from "element-plus/es/locale";
|
||||||
|
|
||||||
// 存储设备类型选项
|
// 存储设备类型选项
|
||||||
const devTypeOptions = ref<Device.ResDev[]>([])
|
const devTypeOptions = ref<Device.ResDev[]>([])
|
||||||
@@ -265,6 +297,7 @@ const open = async (sign: string, data: StandardDevice.ResPqStandardDevice,devTy
|
|||||||
titleType.value = sign
|
titleType.value = sign
|
||||||
if (data.id) {
|
if (data.id) {
|
||||||
Object.assign(formContent,{ ...data })
|
Object.assign(formContent,{ ...data })
|
||||||
|
console.log(formContent)
|
||||||
if (typeof formContent.inspectChannel === 'string') {
|
if (typeof formContent.inspectChannel === 'string') {
|
||||||
formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean)
|
formContent.inspectChannel = formContent.inspectChannel.split(',').filter(Boolean)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user