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-24 19:56:11 +08:00
parent d7df999cf2
commit 312490ce59
2 changed files with 116 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
View File

@@ -1,63 +1,62 @@
<template> <template>
<el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig"> <el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
<div class="table-container"> <div class="table-container">
<el-table :data="errorData.value" <el-table :data="errorData.value"
height="500" height="500"
:header-cell-style="rowClass" :header-cell-style="rowClass"
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
style="width: 100%" style="width: 100%"
:span-method="spanMethod" :span-method="spanMethod"
:border="true" :border="true"
class="custom-table" class="custom-table"
> >
<el-table-column label="被测量"> <el-table-column label="被测量">
<el-table-column prop="col1" width="150"/> <el-table-column prop="col1" width="150"/>
<el-table-column prop="col2" width="120" /> <el-table-column prop="col2" width="120"/>
</el-table-column> </el-table-column>
<el-table-column prop="deviceLevel" label="检测装置级别" width="120"/> <el-table-column prop="deviceLevel" label="检测装置级别" width="120"/>
<el-table-column prop="measurementType" label="测量类型" /> <el-table-column prop="measurementType" label="测量类型"/>
<el-table-column prop="condition" label="测量条件" /> <el-table-column prop="condition" label="测量条件"/>
<el-table-column prop="maxErrorValue" label="最大误差" /> <el-table-column prop="maxErrorValue" label="最大误差"/>
</el-table> </el-table>
</div> </div>
<div> <div>
<label class="left-align-label">注1：UN：测量的标称电压；IN：测量仪器的标称电流；Uh和Ih：测量值，h表示谐波次数。</label> <label class="left-align-label">注1：UN：测量的标称电压；IN：测量仪器的标称电流；Uh和Ih：测量值，h表示谐波次数。</label>
</div> </div>
<div> <div>
<label class="left-align-label">注2：对于数字式接入监测终端，与电能质量信号采集单元联合准确度需满足本表要求。</label> <label class="left-align-label">注2：对于数字式接入监测终端，与电能质量信号采集单元联合准确度需满足本表要求。</label>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script lang="ts" setup name="IndicatorTypeDialog"> <script lang="ts" setup name="IndicatorTypeDialog">
import { defineProps, defineEmits, reactive,watch,ref,computed, type CSSProperties } from 'vue'; import {computed, type CSSProperties, defineProps, ref} from 'vue';
import { dialogBig} from '@/utils/elementBind' import {dialogBig} from '@/utils/elementBind'
import type { ColumnProps } from '@/components/ProTable/interface' import type {ErrorSystem} from '@/api/device/interface/error'
import type { ErrorSystem } from '@/api/device/interface/error' import errorDataList from '@/api/device/error/errorData'
import errorDataList from '@/api/device/error/errorData' import type {TableColumnCtx} from 'element-plus'
import type { TableColumnCtx } from 'element-plus' import {useDictStore} from '@/stores/modules/dict'
import { useDictStore } from '@/stores/modules/dict'
const dictStore = useDictStore() const dictStore = useDictStore()
const errorData = ref<ErrorSystem.Error_detail[]>([]); const errorData = ref<ErrorSystem.Error_detail[]>([]);
const dialogTitle = ref() const dialogTitle = ref()
const devLevelName = ref<string>('') // 假设 devLevelName 是一个 ref const devLevelName = ref<string>('') // 假设 devLevelName 是一个 ref
function useMetaInfo() { function useMetaInfo() {
const dialogVisible = ref(false) const dialogVisible = ref(false)
const formContent = ref<ErrorSystem.ErrorSystemList>({ const formContent = ref<ErrorSystem.ErrorSystemList>({
id: '', id: '',
name: '', name: '',
standardName:'', standardName: '',
standardTime:'', standardTime: '',
devLevel:'', devLevel: '',
enable:1, enable: 1,
state:1, state: 1,
}) })
return { dialogVisible, formContent } return {dialogVisible, formContent}
} }
const { dialogVisible, formContent } = useMetaInfo() const {dialogVisible, formContent} = useMetaInfo()
interface SpanMethodProps { interface SpanMethodProps {
row: ErrorSystem.ErrorSystemDetail row: ErrorSystem.ErrorSystemDetail
@@ -66,14 +65,14 @@ interface SpanMethodProps {
columnIndex: number columnIndex: number
} }
const rowClass = ({ row, column, rowIndex, columnIndex }: { row: any; column: any; rowIndex: number; columnIndex: number }): CSSProperties => { const rowClass = ({row, column, rowIndex, columnIndex}: { row: any; column: any; rowIndex: number; columnIndex: number }): CSSProperties => {
let res: CSSProperties = { let res: CSSProperties = {
textAlign: 'center' as CSSProperties['textAlign'], textAlign: 'center' as CSSProperties['textAlign'],
backgroundColor: 'var(--el-color-primary)', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
} }
if (rowIndex === 1) { if (rowIndex === 1) {
res = { ...res, display: 'none' } res = {...res, display: 'none'}
} }
return res return res
} }
@@ -84,11 +83,11 @@ const spanMethod = computed(() => {
}) })
const spanAMethod = ({ const spanAMethod = ({
row, row,
column, column,
rowIndex, rowIndex,
columnIndex, columnIndex,
}: SpanMethodProps) => { }: SpanMethodProps) => {
if (columnIndex === 0) { if (columnIndex === 0) {
if (rowIndex <= 1 || rowIndex === 7 || rowIndex == 20) {//0电压偏差，1频率偏差，7闪变，20功率，简单的跨两列 if (rowIndex <= 1 || rowIndex === 7 || rowIndex == 20) {//0电压偏差，1频率偏差，7闪变，20功率，简单的跨两列
return { return {
@@ -166,11 +165,11 @@ const spanAMethod = ({
const spanSMethod = ({ const spanSMethod = ({
row, row,
column, column,
rowIndex, rowIndex,
columnIndex, columnIndex,
}: SpanMethodProps) => { }: SpanMethodProps) => {
if (columnIndex === 0) { if (columnIndex === 0) {
if (rowIndex <= 1 || rowIndex === 8 || rowIndex == 17) {//0电压偏差，1频率偏差，7闪变，20功率，简单的跨两列 if (rowIndex <= 1 || rowIndex === 8 || rowIndex == 17) {//0电压偏差，1频率偏差，7闪变，20功率，简单的跨两列
return { return {
@@ -205,7 +204,7 @@ const spanSMethod = ({
colspan: 2, colspan: 2,
} }
} }
if (rowIndex === 18 ) {//电流跨两行两列 if (rowIndex === 18) {//电流跨两行两列
return { return {
rowspan: 2, rowspan: 2,
colspan: 2, colspan: 2,
@@ -235,9 +234,9 @@ const spanSMethod = ({
colspan: 1, colspan: 1,
} }
} }
if (rowIndex === 3 || rowIndex === 7 || if (rowIndex === 3 || rowIndex === 7 ||
rowIndex === 10 || rowIndex === 12 || rowIndex === 10 || rowIndex === 12 ||
rowIndex === 14 || rowIndex === 16 || rowIndex === 14 || rowIndex === 16 ||
rowIndex === 19 || rowIndex === 22) { rowIndex === 19 || rowIndex === 22) {
return { return {
rowspan: 0, rowspan: 0,
@@ -245,18 +244,18 @@ const spanSMethod = ({
} }
} }
} }
if(columnIndex === 3){ if (columnIndex === 3) {
if (rowIndex === 2 || rowIndex === 6 || rowIndex === 9 || if (rowIndex === 2 || rowIndex === 6 || rowIndex === 9 ||
rowIndex === 11 || rowIndex === 13 ||rowIndex === 15 || rowIndex === 11 || rowIndex === 13 || rowIndex === 15 ||
rowIndex === 18 || rowIndex === 21){ rowIndex === 18 || rowIndex === 21) {
return { return {
rowspan: 2, rowspan: 2,
colspan: 1, colspan: 1,
} }
} }
if (rowIndex === 3 || rowIndex === 7 || rowIndex === 10 || if (rowIndex === 3 || rowIndex === 7 || rowIndex === 10 ||
rowIndex === 12 || rowIndex === 14 ||rowIndex === 16 || rowIndex === 12 || rowIndex === 14 || rowIndex === 16 ||
rowIndex === 19 || rowIndex === 22){ rowIndex === 19 || rowIndex === 22) {
return { return {
rowspan: 0, rowspan: 0,
colspan: 0, colspan: 0,
@@ -267,34 +266,34 @@ const spanSMethod = ({
// 关闭弹窗 // 关闭弹窗
const close = () => { const close = () => {
dialogVisible.value = false dialogVisible.value = false
} }
// 打开弹窗，可能是新增，也可能是编辑 // 打开弹窗，可能是新增，也可能是编辑
const open = async (sign: string, data: ErrorSystem.ErrorSystemList) => { const open = async (sign: string, data: ErrorSystem.ErrorSystemList) => {
dialogTitle.value = sign + ' 误差体系' dialogTitle.value = sign + ' 误差体系'
dialogVisible.value = true dialogVisible.value = true
if (data.id) { if (data.id) {
formContent.value = data as ErrorSystem.ErrorSystemList; formContent.value = data as ErrorSystem.ErrorSystemList;
devLevelName.value = dictStore.getDictData('Dev_Level').find(item => item.id === data.devLevel)?.name || '';
devLevelName.value = dictStore.getDictData('Dev_Level').find(item => item.id === data.devLevel)?.name || '';; if (devLevelName.value === 'A级' || data.devLevel === 'A级') {
errorData.value = errorDataList.errorADetail as unknown as ErrorSystem.Error_detail[];
if(devLevelName.value === 'A级'){ } else {
errorData.value = errorDataList.errorADetail as unknown as ErrorSystem.Error_detail[]; errorData.value = errorDataList.errorSDetail as unknown as ErrorSystem.Error_detail[];
}else{ }
errorData.value = errorDataList.errorSDetail as unknown as ErrorSystem.Error_detail[];
}
} }
} }
// 对外映射 // 对外映射
defineExpose({ open }) defineExpose({open})
const props = defineProps<{ const props = defineProps<{
refreshTable: (() => Promise<void>) | undefined; refreshTable: (() => Promise<void>) | undefined;
}>() }>()
</script> </script>
<style> <style>
.table-container { .table-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -316,4 +315,4 @@ const props = defineProps<{
} }
</style> </style>

11
frontend/src/views/plan/planList/index.vue
View File

@@ -219,9 +219,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
width: 360, width: 360,
render: scope => { render: scope => {
return ( return (
<el-link type='primary' link onClick={() => showTestScript(scope.row.scriptId)}> <span>{scope.row.scriptName}</span>
{scope.row.scriptName}
</el-link>
) )
}, },
}, },
@@ -231,7 +229,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
width: 200, width: 200,
render: scope => { render: scope => {
return ( return (
<el-link type='primary' link onClick={() => showData(scope.row.errorSysName || '')}> <el-link type='primary' link onClick={() => showData(scope.row)}>
{scope.row.errorSysName} {scope.row.errorSysName}
</el-link> </el-link>
) )
@@ -282,8 +280,9 @@ function isVisible(row: Plan.ReqPlan) {
} }
function showData(row: string) { function showData(row: any) {
errorStandardPopup.value?.open(row, row) let split = row.errorSysName.split('-')
errorStandardPopup.value?.open(row.errorSysName, {id:row.errorSysId,devLevel:split[split.length-1]})
} }
async function showTestSource(row:string) { async function showTestSource(row:string) {