@@ -35,7 +43,7 @@
-
+
保存
diff --git a/src/views/count/list.vue b/src/views/count/list.vue
index 5aa3f4b..82842f1 100644
--- a/src/views/count/list.vue
+++ b/src/views/count/list.vue
@@ -44,7 +44,7 @@
},
])
const target = (row: any) => {
- document.querySelector(`#${row.point}`).scrollIntoView({ behavior: 'smooth', block: 'end', inline: 'nearest' })
+ (document.querySelector(`#${row.point}`) as Element).scrollIntoView({ behavior: 'smooth', block: 'end', inline: 'nearest' })
}
diff --git a/src/views/count/table.vue b/src/views/count/table.vue
index bf9761d..28920a4 100644
--- a/src/views/count/table.vue
+++ b/src/views/count/table.vue
@@ -11,7 +11,26 @@
const heatRef = ref()
const electricityRef = ref()
const photovoltaicRef = ref()
-// 获取子组件数据
+const saveData = () => {
+ // 固定燃烧数据
+ const fixData = fixRef.value.tableData
+ sessionStorage.setItem('固定燃烧-table', JSON.stringify(fixData))
+ // 移动燃烧数据
+ const mobileData = mobileRef.value.tableData
+ sessionStorage.setItem('移动燃烧-table', JSON.stringify(mobileData))
+ // 能源加工转换
+ const energyData = energyRef.value.tableData
+ sessionStorage.setItem('能源加工转换-table', JSON.stringify(energyData))
+ // 购入热力
+ const heatData = heatRef.value.tableData
+ sessionStorage.setItem('购入热力-table', JSON.stringify(heatData))
+ // 购入电力
+ const electricityData = electricityRef.value.tableData
+ sessionStorage.setItem('购入电力-table', JSON.stringify(electricityData))
+ // 光伏
+ const photovoltaicData = photovoltaicRef.value.tableData
+ sessionStorage.setItem('光伏-table', JSON.stringify(photovoltaicData))
+}
const getData = () => {
// 固定燃烧数据
const fixData = fixRef.value.sumArr
@@ -69,7 +88,7 @@
sessionStorage.setItem('光伏', JSON.stringify(value6))
}
defineExpose({
- getData,
+ getData, saveData,
})
diff --git a/src/views/data/collect/collectAdd.vue b/src/views/data/collect/collectAdd.vue
index a14279d..eea2cbd 100644
--- a/src/views/data/collect/collectAdd.vue
+++ b/src/views/data/collect/collectAdd.vue
@@ -14,6 +14,7 @@
uploadTime: '',
frequency: '',
deviceStat: '',
+ collectionType: '',
}) // 表单
const textMap: { [key: string]: string } = {
update: '编辑',
@@ -26,6 +27,7 @@
frequency: [{ required: true, message: '请输入上传频率', trigger: ['blur', 'change'] }],
uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
deviceStat: [{ required: true, message: '请选择设备状态', trigger: ['blur', 'change'] }],
+ collectionType: [{ required: true, message: '请选择采集类型', trigger: ['blur', 'change'] }],
} // 前端校验规则
// 重置表单
@@ -151,8 +153,8 @@
-
-
+
+
-
-
+
+
diff --git a/src/views/data/electricity/showPhoto.vue b/src/views/data/electricity/showPhoto.vue
index 111fe48..db0b676 100644
--- a/src/views/data/electricity/showPhoto.vue
+++ b/src/views/data/electricity/showPhoto.vue
@@ -42,7 +42,7 @@
:style="{ width: props.width, height: props.height }"
:src="url"
:preview-src-list="[url]"
- fit="cover"
+ fit="fill"
/>