{{ row.row.comparisonOperators4
@@ -92,7 +85,7 @@ import { defaultAttribute } from '@/components/table/defaultAttribute'
import { mainHeight } from '@/utils/layout'
import { queyDetail, addCarryc, restore } from '@/api/advance-boot/bearingCapacity'
import { ElMessage, ElMessageBox } from 'element-plus'
-
+import { VxeTablePropTypes } from 'vxe-table'
defineOptions({
name: 'Advancedanalysis/eventcorrelation'
})
@@ -147,32 +140,35 @@ const info = () => {
queyDetail().then(res => {
photovoltaicData.value = []
let title = ['安全', 'III级预警', 'II级预警', 'I级预警']
- // photovoltaicData.value = res.data
- for (let i: number = 1; i < 5; i++) {
- photovoltaicData.value.push({
- ...setData(res.data.filter(item => item.indexResult == i)),
- name: title[i - 1]
+ let p = 0
+ res.data.forEach((item: any, i: any) => {
+ item.capacityStrategysingleVOList.forEach((item1: any, i1: any) => {
+ photovoltaicData.value.push({
+ name: title[i],
+ id: item1.id,
+ result: item.result
+ })
+ p++
+ item1.carryCapacityStrategyIndexVOList.forEach((item2: any) => {
+ photovoltaicData.value[p - 1]['comparisonOperators' + item2.indexResult] = item2.comparisonOperators
+ photovoltaicData.value[p - 1]['count' + item2.indexResult] = item2.count
+ })
})
- }
+ })
+ console.log('🚀 ~ queyDetail ~ photovoltaicData.value:', photovoltaicData.value)
})
}
-// 处理返回数据
-const setData = (row: any) => {
- let data = {}
- row.forEach((item: any) => {
- data[`comparisonOperators${item.result}`] = item.comparisonOperators
- data[`count${item.result}`] = item.count
- })
- return data
-}
+
//
const cells = (row: any, comparisonOperators: any, count: any) => {
form.value = {
comparisonOperators: comparisonOperators,
count: count,
- result: row.columnIndex,
- indexResult: row.rowIndex + 1
+ result: row.row.result,
+ id: row.row.id,
+ indexResult: row.columnIndex
}
+
groupChang(comparisonOperators)
dialogVisible.value = true
}
@@ -200,6 +196,26 @@ const restores = () => {
info()
})
}
+// 通用行合并函数（将相同多列数据合并为一行）
+const mergeRowMethod: VxeTablePropTypes.SpanMethod = ({ row, _rowIndex, column, visibleData }) => {
+ const fields = ['name']
+ const cellValue = row[column.field]
+ if (cellValue && fields.includes(column.field)) {
+ const prevRow = visibleData[_rowIndex - 1]
+ let nextRow = visibleData[_rowIndex + 1]
+ if (prevRow && prevRow[column.field] === cellValue) {
+ return { rowspan: 0, colspan: 0 }
+ } else {
+ let countRowspan = 1
+ while (nextRow && nextRow[column.field] === cellValue) {
+ nextRow = visibleData[++countRowspan + _rowIndex]
+ }
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 }
+ }
+ }
+ }
+}
onMounted(() => {
info()
})
diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue
index ad1a92d2..4ef9604e 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/index.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue
@@ -206,7 +206,7 @@ const tableStore = new TableStore({
loadCallback: () => {}
})
tableStore.table.params.evaluateType = ''
-tableStore.table.params.userId = dictData.state.area[0].id
+tableStore.table.params.id = dictData.state.area[0].id
provide('tableStore', tableStore)
onMounted(() => {
diff --git a/src/views/pqs/supervise/interfere/components/undocumented.vue b/src/views/pqs/supervise/interfere/components/undocumented.vue
index b62af1a1..c0b18f83 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented.vue
@@ -24,7 +24,7 @@
新增
- 上传
+ 上传
关联
导出
@@ -72,15 +72,106 @@
取消
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 入网评估报告上传
+
+
+
+
+ 上传文件
+
+
+
+
+ 入网评估结论填报
+
+
+ 是
+ 否
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 保存
+ 取消
+
+
+
+
diff --git a/src/views/pqs/supervise/technology/components/overview.vue b/src/views/pqs/supervise/technology/components/overview.vue
index 446e809d..28d99d04 100644
--- a/src/views/pqs/supervise/technology/components/overview.vue
+++ b/src/views/pqs/supervise/technology/components/overview.vue
@@ -13,8 +13,8 @@