-
- {{ info.fit }}
-
-
+
+
@@ -54,6 +52,7 @@
分组人数占比
{{ fitInteger }}.{{ fitDecimal }}
@@ -95,37 +94,37 @@
:pagination="false"
:scroll="{ y: 500, x: 800 }"
rowKey="option_index">
+
+ #[col.key]="data">
@@ -142,34 +141,35 @@
:scroll="{ y: 500, x:800 }">
+ #[col.dataIndex]=" data ">
- ![]()
- {{ text.value }}
-
+
- {{ text.value }}
-
+
+
- {{ text.value }}
-
- {{ text.value }}
+ {{ data.text.value }}
+ {{ data.text.value }}
-
-
- ![]()
+
-
{{ text.value }}
+ {{ data.text.value}}
{{ text.value }}
+ style="color: #923139">{{ data.text.value}}
- ![]()
-
- {{ text.value }}
-
+
- {{ text.value }}
-
+
+
- {{ text.value }}
-
- {{ text.value }}
+ {{ data.text.value }}
+ {{ data.text.value }}
- ![]()
+
-
@@ -187,7 +187,7 @@ import barchart from "./barchart.vue";
import barchart2 from "./barchart2.vue";
import CommonApi from "@/api/common";
import createOSS from "@/utils/aliyunOssUpLoad";
-import { uploadDocumentFile } from "@/api/data-analyse";
+// import { uploadDocumentFile } from "@/api/data-analyse";
import { fract } from '@/utils/number'
const props = defineProps({
info: {
@@ -282,19 +282,22 @@ async function download (type) {
size: file.size
}
]
- uploadDocumentFile({
- url: JSON.stringify(urlData),
- parent_sn: sn,
- import_type: 6, //图表分析
- })
+ // uploadDocumentFile({
+ // url: JSON.stringify(urlData),
+ // parent_sn: sn,
+ // import_type: 6, //图表分析
+ // })
}
watch(() => props.info, (info) => {
- const data = JSON.parse(JSON.stringify(info.raw_data.data))
+ const data = JSON.parse(JSON.stringify(info.zero_data.data))
if (!info) return
fitChartData.value = info.fit_chart
if (typeof info.fit === 'string') {
- fit.value = info.fit
+ const fit = info.fit + ''
+ const splitIndex = fit.indexOf('.')
+ fitInteger.value = fit.slice(0, splitIndex)
+ fitDecimal.value = fit.slice(splitIndex + 1)
}
if (typeof info.fit === 'number') {
const fit = info.fit + ''
@@ -307,12 +310,12 @@ watch(() => props.info, (info) => {
barData.value = barChartData;
const _c1 = [].concat(info.raw_data.columns)
c1.value = []
- c1.value = _c1.map((item) => {
+ c1.value = _c1.map((item,index) => {
if (item?.children) {
- item.children.map((e) => { e.dataIndex = e.key; childrenlist.push(e.key) })
+ item.children.map((e,index) => { e.dataIndex = e.key;e.index =index; childrenlist.push(e.key) })
}
if (item?.children) {
- item.children.map((e) => { e.dataIndex = e.key; childrenlist.push(e.key) })
+ item.children.map((e,index) => { e.dataIndex = e.key;e.index =index;childrenlist.push(e.key) })
} else {
item.slots = { customRender: item.key }
item.dataIndex = item.key
@@ -327,14 +330,14 @@ watch(() => props.info, (info) => {
}
})
// 处理表格data数据
- debugger;
+ // debugger;
d1.value = info.raw_data.data.map((item, index) => {
for (let i in item) {
if (childrenlist.indexOf(i) > -1 && item[i].value == 0) {
- item[i] ="0"
+ item[i] =parseFloat(0).toFixed(5)
}
if (childrenlist.indexOf(i) > -1 && item[i].value) {
- item[i] = item[i].value
+ item[i] =item[i].value
}
}
return {
@@ -347,9 +350,10 @@ watch(() => props.info, (info) => {
c2.value = []
// 带children的key存进去
- c2.value = _c2.map(item => {
+ c2.value = _c2.map((item) => {
if (item?.children) {
- item.children.map((e) => { e.dataIndex = e.key; childrenlist2.push(e.key) })
+ item.children.map((e) => { e.dataIndex = e.key;
+ childrenlist2.push(e.key) })
} else {
item.slots = { customRender: item.key }
item.dataIndex = item.key
@@ -362,11 +366,11 @@ watch(() => props.info, (info) => {
align: 'center'
}
})
- debugger;
+ // debugger;
d2.value = info.zero_data.data.map((item, index) => {
for (let i in item) {
if (childrenlist2.indexOf(i) > -1 && item[i].value == 0) {
- item[i] ="0"
+ item[i] =parseFloat(0).toFixed(5)
}
if (childrenlist2.indexOf(i) > -1 && item[i].value) {
item[i] = item[i].value
@@ -528,4 +532,7 @@ onMounted(() => {
margin-top: 30px;
height: 213px;
}
+:deep(thead th[rowspan="2"]:nth-child(-n+3)){
+ color:#3f85ff;
+}
diff --git a/src/views/DataAnalyse/kndiagram/components/maxdiff/piechart.vue b/src/views/DataAnalyse/kndiagram/components/maxdiff/piechart.vue
index 86debfcc..e5e84ec5 100644
--- a/src/views/DataAnalyse/kndiagram/components/maxdiff/piechart.vue
+++ b/src/views/DataAnalyse/kndiagram/components/maxdiff/piechart.vue
@@ -27,7 +27,7 @@ export default defineComponent({
legend: {
orient: 'horizontal',
left: 'center',
- top:'80%'
+ top:'85%'
},
series: [
{
diff --git a/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue b/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue
index 043529f7..8bbff122 100644
--- a/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue
+++ b/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue
@@ -7,17 +7,35 @@
{{ text.value }}
+
+
{{ data.text.value }}
{{ text.value }}
+ style="color: #923139">{{ data.text.value }}