|
@@ -131,7 +131,6 @@ const columns = computed(() => {
|
|
minWidth: 90,
|
|
minWidth: 90,
|
|
formatter(row: any) {
|
|
formatter(row: any) {
|
|
let r = unref(props.result) || []
|
|
let r = unref(props.result) || []
|
|
- console.log('rrrrr:', r)
|
|
|
|
const { markingGroupNumber } = row
|
|
const { markingGroupNumber } = row
|
|
let compareTarget = r.find((item: any) => item.markingGroupNumber == markingGroupNumber)
|
|
let compareTarget = r.find((item: any) => item.markingGroupNumber == markingGroupNumber)
|
|
let allTarget = r.find((item: any) => item.markingGroupNumber == 0)
|
|
let allTarget = r.find((item: any) => item.markingGroupNumber == 0)
|
|
@@ -267,7 +266,12 @@ const myDbClick = (row: any) => {
|
|
if (currentView.value && !!currentView.value.markingGroupNumber) {
|
|
if (currentView.value && !!currentView.value.markingGroupNumber) {
|
|
push({
|
|
push({
|
|
name: 'AnalysisPersonnelStatisticsMarker',
|
|
name: 'AnalysisPersonnelStatisticsMarker',
|
|
- query: { markerId: currentView.value.markerId, markerName: currentView.value.markerName, source: '人员数据统计' },
|
|
|
|
|
|
+ query: {
|
|
|
|
+ markerId: currentView.value.markerId,
|
|
|
|
+ markerName: currentView.value.markerName,
|
|
|
|
+ source: '人员数据统计',
|
|
|
|
+ subjectCode: props.params?.subjectCode,
|
|
|
|
+ },
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|