diff --git a/src/views/DataAnalyse/diagram/components/DiagramTables.vue b/src/views/DataAnalyse/diagram/components/DiagramTables.vue index 7d87c8f9..a7f5e1e8 100644 --- a/src/views/DataAnalyse/diagram/components/DiagramTables.vue +++ b/src/views/DataAnalyse/diagram/components/DiagramTables.vue @@ -114,6 +114,7 @@ function init(data) { key: item.key, fixed: index === 0 ? 'left' : null, sorter: ([8].includes(props.data.question_type) || item.key === 'index') ? false : setSort(item, data.head), + sortDirections: ["descend", "ascend"], slots: { customRender: item.key }, width: 140, // align: "center", diff --git a/src/views/DataAnalyse/diagram/components/MultiChart.vue b/src/views/DataAnalyse/diagram/components/MultiChart.vue index ac0b9fbb..919d5f18 100644 --- a/src/views/DataAnalyse/diagram/components/MultiChart.vue +++ b/src/views/DataAnalyse/diagram/components/MultiChart.vue @@ -182,8 +182,8 @@ export default defineComponent({ if (columnKey) { tableData.sort((a, b) => { switch(order) { - case "descend": return a[columnKey] - b[columnKey]; - case "ascend": return b[columnKey] - a[columnKey]; + case "ascend": return a[columnKey] - b[columnKey]; + case "descend": return b[columnKey] - a[columnKey]; default: return 0; } }); @@ -223,6 +223,7 @@ export default defineComponent({ width: 100, // align: "center", sorter: true, + sortDirections: ["descend", "ascend"], }; } else { return { @@ -258,6 +259,7 @@ export default defineComponent({ // align: "center", fixed: (index === 0 || hasRowGroup && index === 1) ? 'left' : null, sorter: (index === 0 || hasRowGroup && index === 1) ? null : true, + sortDirections: ["descend", "ascend"], customRender, }); } else { @@ -306,6 +308,7 @@ export default defineComponent({ // align: "center", fixed: (index === 0 || hasRowGroup && index === 1) ? 'left' : null, sorter: (index === 0 || hasRowGroup && index === 1) ? null : true, + sortDirections: ["descend", "ascend"], customRender, }; } else { diff --git a/src/views/DataAnalyse/diagram/components/SingleChart.vue b/src/views/DataAnalyse/diagram/components/SingleChart.vue index b63a8fb1..6bdef1b8 100644 --- a/src/views/DataAnalyse/diagram/components/SingleChart.vue +++ b/src/views/DataAnalyse/diagram/components/SingleChart.vue @@ -124,8 +124,8 @@ export default defineComponent({ return 0; } switch(order) { - case "descend": return a[columnKey] - b[columnKey]; - case "ascend": return b[columnKey] - a[columnKey]; + case "ascend": return a[columnKey] - b[columnKey]; + case "descend": return b[columnKey] - a[columnKey]; default: return 0; } }); @@ -159,6 +159,7 @@ export default defineComponent({ // align: "center", fixed: index === 0 ? "left" : null, sorter: true, + sortDirections: ["descend", "ascend"], customRender, }; } else { diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue b/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue index a71a7ab9..c4fa8281 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue @@ -135,6 +135,7 @@ export default defineComponent({ // align: "center", fixed: index === 0 ? 'left' : null, sorter: (a, b) => { return a[item.key] > b[item.key]? -1 : 1 }, + sortDirections: ["descend", "ascend"], }; } else { return { diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue index 70f45832..3cc19c6a 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue @@ -148,6 +148,7 @@ watch( // align: "center", fixed: index === 0 ? "left" : null, sorter: (a, b) => { return a.number > b.number? -1 : 1 }, + sortDirections: ["descend", "ascend"], }; }else{ return { diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue index 3a6212ad..ccc34b85 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue @@ -143,6 +143,7 @@ watch( // align: "center", fixed: index === 0 ? "left" : null, sorter: (a, b) => { return a.number > b.number? -1 : 1 }, + sortDirections: ["descend", "ascend"], }; }else{ return { diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue index 64b7e703..1e828b6c 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue @@ -151,6 +151,7 @@ watch( // align: "center", fixed: index === 0 ? "left" : null, sorter: (a, b) => { return a.number > b.number? -1 : 1 }, + sortDirections: ["descend", "ascend"], }; }else{ return { diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue index 1d75d193..1e16628c 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue @@ -151,6 +151,7 @@ watch( // align: "center", fixed: index === 0 ? "left" : null, sorter: (a, b) => { return a.number > b.number? -1 : 1 }, + sortDirections: ["descend", "ascend"], }; }else{ return {