diff --git a/.env.development b/.env.development
index 5fc66da..254c09f 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
ENV = 'development'
# base api
-#VUE_APP_DOMIAN=http://192.168.60.99:9003/
-VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+VUE_APP_DOMIAN=http://192.168.60.99:9003/
+#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
VUE_APP_BASE_API = ''
VUE_APP_UPLOAD=http://hdcontract.ali251.langye.net/api/admin/upload-file
#VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 66e9c30..3ed0339 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -557,9 +557,12 @@
>
@@ -1343,6 +1346,37 @@ export default {
.catch((error) => {});
},
methods: {
+ //合计
+ summary(param) {
+ this.$nextTick(() => {
+ this.$refs['xyTable'].$children[0].doLayout()
+ })
+ const {
+ columns,
+ data
+ } = param
+ const sums = []
+ columns.map((column, index) => {
+ if (index === 1) {
+ sums[index] = '总计'
+ return
+ }
+ if (column.property === 'year_total') {
+ sums[index] = 0
+ return
+ }
+ if (column.property === 'plan_price') {
+ sums[index] = this.tableTotal.planPriceTotal
+ return
+ }
+ if (column.property === 'money') {
+ sums[index] = this.tableTotal.moneyTotal
+ return
+ }
+ })
+
+ return sums
+ },
nopayCellStyle({ row }) {
let per = ((row.fund_log_total / row.money || 0) * 100)?.toFixed(2) || 0;
let endDay = this.$moment(new Date()).diff(