diff --git a/src/views/home/Home.vue b/src/views/home/Home.vue index 64acca0..37d0633 100755 --- a/src/views/home/Home.vue +++ b/src/views/home/Home.vue @@ -88,7 +88,8 @@ onMounted(async () => { addDIS1.value = _disList.reduce((previousValue: any, currentValue: { budget: any }) => { const sum = parseFloat(currentValue.budget) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_disList[0].budget == _disList[1].budget && addDIS1.value > 0) { addDIS1.value -= _disList[0].budget @@ -96,7 +97,8 @@ onMounted(async () => { } addDSZ1.value = _dszList.reduce((previousValue: any, currentValue: { budget: any }) => { const sum = parseFloat(currentValue.budget) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_dszList[0].budget == _dszList[1].budget && addDSZ1.value > 0) { addDSZ1.value -= _dszList[0].budget @@ -104,7 +106,8 @@ onMounted(async () => { } addDISH1.value = _dishList.reduce((previousValue: any, currentValue: { budget: any }) => { const sum = parseFloat(currentValue.budget) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_dishList[0].budget == _dishList[1].budget && addDISH1.value > 0) { addDISH1.value -= _dishList[0].budget @@ -112,7 +115,8 @@ onMounted(async () => { } addDIS2.value = _disList.reduce((previousValue: any, currentValue: { monthOne: any }) => { const sum = parseFloat(currentValue.monthOne) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_disList[0].monthOne == _disList[1].monthOne && addDIS2.value > 0) { addDIS2.value -= _disList[0].monthOne @@ -120,7 +124,8 @@ onMounted(async () => { } addDSZ2.value = _dszList.reduce((previousValue: any, currentValue: { monthOne: any }) => { const sum = parseFloat(currentValue.monthOne) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_dszList[0].monthOne == _dszList[1].monthOne && addDSZ2.value > 0) { addDSZ2.value -= _dszList[0].monthOne @@ -128,7 +133,8 @@ onMounted(async () => { } addDISH2.value = _dishList.reduce((previousValue: any, currentValue: { monthOne: any }) => { const sum = parseFloat(currentValue.monthOne) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_dishList[0].monthOne == _dishList[1].monthOne && addDISH2.value > 0) { addDISH2.value -= _dishList[0].monthOne @@ -136,7 +142,8 @@ onMounted(async () => { } addDIS3.value = _disList.reduce((previousValue: any, currentValue: { monthTwo: any }) => { const sum = parseFloat(currentValue.monthTwo) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_disList[0].monthTwo == _disList[1].monthTwo && addDIS3.value > 0) { addDIS3.value -= _disList[0].monthTwo @@ -144,7 +151,8 @@ onMounted(async () => { } addDSZ3.value = _dszList.reduce((previousValue: any, currentValue: { monthTwo: any }) => { const sum = parseFloat(currentValue.monthTwo) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_dszList[0].monthTwo == _dszList[1].monthTwo && addDSZ3.value > 0) { addDSZ3.value -= _dszList[0].monthTwo @@ -152,7 +160,8 @@ onMounted(async () => { } addDISH3.value = _dishList.reduce((previousValue: any, currentValue: { monthTwo: any }) => { const sum = parseFloat(currentValue.monthTwo) + parseFloat(previousValue) - return sum > 0 ? sum.toFixed(2) : 0 + // return sum > 0 ? sum.toFixed(2) : 0 + return sum }, 0) if (_dishList[0].monthTwo == _dishList[1].monthTwo && addDISH3.value > 0) { addDISH3.value -= _dishList[0].monthTwo diff --git a/src/views/home/news/news.vue b/src/views/home/news/news.vue index 060ff43..05cce99 100755 --- a/src/views/home/news/news.vue +++ b/src/views/home/news/news.vue @@ -19,7 +19,7 @@ const flg = ref() let keywords = ref() const pageInfo = reactive({ currentPage: 1, - pageSize: 10, + pageSize: 15, total: 0 }) // App_Article 外部情报模块,App_Market 市况汇率,App_data_platform 数据平台, App_BCP BCP模块, App_CSR 碳中和模块,App_Quality 品质模块,App_Lab Lab模块,App_Database DatabBase模块