|
@@ -1249,7 +1249,7 @@
|
|
|
const sameObject = _.intersectionWith(t.category, cc1, _.isEqual);
|
|
|
if(sameObject.length === 1) {
|
|
|
const index = _.findIndex(chart_category_data.data1, function (item) {
|
|
|
- return _.isEqual(item, sameObject);
|
|
|
+ return _.isEqual(_.sortBy(item, 'cid'), _.sortBy(sameObject, 'cid'));
|
|
|
});
|
|
|
if (index !== -1) {
|
|
|
chart_option5_data.data1[index].value = ZhCalc.add(chart_option5_data.data1[index].value, (t.total_price ? t.total_price : 0));
|
|
@@ -1265,7 +1265,7 @@
|
|
|
const sameObject = _.intersectionWith(t.category, cc2, _.isEqual);
|
|
|
if(sameObject.length === 2) {
|
|
|
const index = _.findIndex(chart_category_data.data2, function (item) {
|
|
|
- return _.isEqual(item, sameObject);
|
|
|
+ return _.isEqual(_.sortBy(item, 'cid'), _.sortBy(sameObject, 'cid'));
|
|
|
})
|
|
|
if (index !== -1) {
|
|
|
chart_option5_data.data2[index].value = ZhCalc.add(chart_option5_data.data2[index].value, (t.total_price ? t.total_price : 0));
|
|
@@ -1276,7 +1276,7 @@
|
|
|
const sameObject = _.intersectionWith(t.category, cc3, _.isEqual);
|
|
|
if(sameObject.length === 3) {
|
|
|
const index = _.findIndex(chart_category_data.data3, function (item) {
|
|
|
- return _.isEqual(item, sameObject);
|
|
|
+ return _.isEqual(_.sortBy(item, 'cid'), _.sortBy(sameObject, 'cid'));
|
|
|
})
|
|
|
if (index !== -1) {
|
|
|
chart_option5_data.data3[index].value = ZhCalc.add(chart_option5_data.data3[index].value, (t.total_price ? t.total_price : 0));
|
|
@@ -1295,6 +1295,7 @@
|
|
|
option5.series[2].data = _.filter(chart_option5_data.data3, function (item) {
|
|
|
return item.value !== 0;
|
|
|
});
|
|
|
+ console.log(chart_option5_data, chart_category_data.data2);
|
|
|
myChart5.setOption(option5);
|
|
|
// const selectCategory = {
|
|
|
// cid: category && category[0].value ? category[0].id : ,
|