@@ -8872,6 +8887,14 @@
+ -
+
+
fuzhilianjie
+ #icon-fuzhilianjie
+
+
-
diff --git a/src/views/DataAnalyse/insight/components/InsightShare.vue b/src/views/DataAnalyse/insight/components/InsightShare.vue
index e00810ee..a2e08542 100644
--- a/src/views/DataAnalyse/insight/components/InsightShare.vue
+++ b/src/views/DataAnalyse/insight/components/InsightShare.vue
@@ -13,7 +13,7 @@ import { selectionList, sectionIds } from '../consts';
import useCopy from '@/composables/useCopy';
const route = useRoute();
-const emits = defineEmits(['regenerate']);
+const emits = defineEmits(['regenerate', 'set-group']);
const props = defineProps({
report: { type: Object, default: () => Object.assign({}) },
saving: { type: Number, default: 0 },
@@ -157,6 +157,7 @@ function checkIntegrity() {
// errorMsg += res.map((item) => item[dataIndex]).join('、');
// errorMsg += ';'
scrollTo(sectionIds.decisionIndicators);
+ emits('set-group', group);
message.warning('决策标准达标情况未填写完整,请检查后重试!');
return false;
@@ -323,8 +324,7 @@ function onUpdateReport() {
-
-
+
复制链接和密码
@@ -571,16 +571,9 @@ function onUpdateReport() {
.icon {
width: 16px;
height: 16px;
+ line-height: 16px;
margin-right: 6px;
}
-
- &:hover .icon.static {
- display: none;
- }
-
- &:not(:hover) .icon.active {
- display: none;
- }
}
}
diff --git a/src/views/DataAnalyse/insight/consts.js b/src/views/DataAnalyse/insight/consts.js
index a62b70a4..8a7623ad 100644
--- a/src/views/DataAnalyse/insight/consts.js
+++ b/src/views/DataAnalyse/insight/consts.js
@@ -138,6 +138,7 @@ export const switchTypeEnum = {
export const defaultSectionEmits = ['change', 'switch'];
export const defaultSectionProps = {
report: { type: Object, default: () => Object.assign({}) },
+ groupId: { type: [String, Number], default: undefined },
readonly: { type: Boolean, default: false },
updating: { type: Boolean, default: false } // 报告更新中
};
diff --git a/src/views/DataAnalyse/insight/report/Report.vue b/src/views/DataAnalyse/insight/report/Report.vue
index 95266059..fa323901 100644
--- a/src/views/DataAnalyse/insight/report/Report.vue
+++ b/src/views/DataAnalyse/insight/report/Report.vue
@@ -1,5 +1,5 @@
@@ -129,6 +137,7 @@ function onSwitch(evt) {
:report="report"
:readonly="readonly"
:updating="updating"
+ :group-id="groupId"
@change="onChange"
@switch="onSwitch"
/>
diff --git a/src/views/DataAnalyse/insight/report/section/GroupTab.vue b/src/views/DataAnalyse/insight/report/section/GroupTab.vue
index 67420a1d..110ec86d 100644
--- a/src/views/DataAnalyse/insight/report/section/GroupTab.vue
+++ b/src/views/DataAnalyse/insight/report/section/GroupTab.vue
@@ -9,7 +9,7 @@ const props = defineProps(defaultSectionProps);
const groupList = computed(() => props.report?.groupList || [props.report]);
const showGroupList = computed(() => groupList.value?.length > 1);
-const activeId = ref();
+const activeId = ref(props.groupId || null);
watch(
groupList,
@@ -23,6 +23,8 @@ watch(
}
);
+watch(() => props.groupId, () => activeId.value = props.groupId)
+
function onActive(item) {
activeId.value = item.group;
emits('switch', { type: switchTypeEnum.group, group: item.group });