Merge branch 'ssotest' of https://git.steerinfo.com/XTEMS/xt-ems-front into ssotest

# Conflicts:
#	package.json

src/views/basicInformation/components/energyType.vue

@@ -605,7 +605,7 @@ export default {
                 params: params
             })
                 .then(function (res) {
-                    console.log(res.data)
+                    //console.log(res.data)
                     if (res.code === '0') {
                         let arr = [];
                         for (let item of res.data.list) {

src/views/energyAnalysis/components/SDProjectAnalysis/SDPPerformanceContrast.vue

@@ -343,7 +343,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'SDPPerformanceContrast',
     components: {
@@ -567,7 +567,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['PLANVALUE', 'APPORTVALUE']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取能介
         getEnergyIdData () {

src/views/energyAnalysis/components/SDProjectAnalysis/SDPTrackingAndTrend.vue

@@ -422,7 +422,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'SDPTrackingAndTrend',
     components: {
@@ -619,7 +619,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportValue', 'productValue', 'singleValue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取能介
         getEnergyIdData () {

src/views/energyAnalysis/components/SDResultsAnalysis/SDTrackingAndTrend.vue

@@ -443,7 +443,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'SDTrackingAndTrend',
     components: {
@@ -658,7 +658,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportValue', 'productValue', 'singleValue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取能介(供需实绩)
         getEnergyIdData () {

src/views/energyAnalysis/components/economicIndicatorsAnalysis/EIAContrastAnalysis.vue

@@ -259,7 +259,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'EIAContrastAnalysis',
     components: {
@@ -393,7 +393,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取指标类型
         getIndexType () {

src/views/energyAnalysis/components/indexManagement/indexData.vue

@@ -305,7 +305,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'indexData',
     components: {
@@ -430,7 +430,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = []; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序(指标)
         getWorkprocIdData () {

src/views/energyAnalysis/components/indexManagement/indexDataMaintain.vue

@@ -622,7 +622,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'indexDataMaintain',
     components: {
@@ -828,7 +828,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = []; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(指标数据数据维护)
         getTimeGranData () {

src/views/energyBalance/components/balanceData.vue

@@ -486,7 +486,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'BalanceData',
     components: {
@@ -641,7 +641,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序(供需实际)
         getWorkprocIdData () {

src/views/energyBalance/components/balanceSheetData.vue

@@ -587,7 +587,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'balanceSheetData',
     components: {
@@ -724,7 +724,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue', 'proportion']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(平衡表数据维护)
         getTimeGranData () {

src/views/energyBalance/components/processAndRawMaterials.vue

@@ -415,7 +415,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'processAndRawMaterials',
     components: {
@@ -538,7 +538,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(工序与原材料数据维护)
         getTimeGranData () {

src/views/energyBalance/components/production.vue

@@ -439,7 +439,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'production',
     components: {
@@ -568,7 +568,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(实绩产量管理)
         getTimeGranData () {

src/views/energyPerformance/components/energyDw/productwData.vue

@@ -348,7 +348,7 @@
 </template>
 
 <script>
-import { formatDate, commonSummaries } from '@/utils/util.js';
+import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 import timegranDate from '~/components/zg/timegranDate.vue'
 import { zCheckNumber1 } from '~/utils/validator.js'
 export default {
@@ -472,7 +472,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'productwvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序(供需实际)
         getWorkprocIdData () {

src/views/energyPerformance/components/energyDw/projectwData.vue

@@ -441,7 +441,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'projectwData',
     components: {
@@ -576,7 +576,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'apportwvalue', 'productvalue', 'productwvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序(供需实际)
         getWorkprocIdData () {

src/views/energyPerformance/components/financeData/financeProjectData.vue

@@ -473,7 +473,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'financeProjectData',
     components: {
@@ -607,7 +607,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportwvalue', 'productvalue', 'productwvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序(供需实际)
         getWorkprocIdData () {

src/views/energyPerformance/components/outElectricity.vue

@@ -553,7 +553,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -749,7 +749,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         getNodeData () {

src/views/energyPerformance/components/supplyAnddemand/ProjectData.vue

@@ -620,7 +620,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'ProjectData',
     components: {
@@ -790,7 +790,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(数据维护)
         getTimeGranData () {

src/views/energyPlan/components/supplyAndDemand/planProduction.vue

@@ -576,7 +576,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
 import store from '@/store/index.js';
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'planProduction',
     components: {
@@ -740,7 +740,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(计划产量维护)
         getTimeGranData () {

src/views/energyPlan/components/supplyAndDemand/planProjectAudit.vue

@@ -322,7 +322,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js';
 import timegranDate from '~/components/zg/timegranDate.vue';
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 import store from '@/store/index.js';
 export default {
     name: 'outElectricity',
@@ -592,7 +592,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['planWeight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         rowClick (row) {
           let that = this,

src/views/energyPlan/components/supplyAndDemand/planProjectBuildingMaterialsFactory.vue

@@ -514,7 +514,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -832,7 +832,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'weight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         // getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectBuildingMaterialsWaterSlag.vue

@@ -432,7 +432,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -732,7 +732,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'weight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         // getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectCBD.vue

@@ -831,7 +831,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -1218,7 +1218,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['planweight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取高线钢种
         getGrades () {

src/views/energyPlan/components/supplyAndDemand/planProjectCoke.vue

@@ -548,7 +548,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -881,7 +881,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/planProjectCoking.vue

@@ -597,7 +597,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -899,7 +899,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'weight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         // getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectData.vue

@@ -457,7 +457,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'planProjectData',
     components: {
@@ -591,7 +591,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(计划项目数据维护)
         getTimeGranData () {

src/views/energyPlan/components/supplyAndDemand/planProjectDataMonth.vue

@@ -634,7 +634,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -938,7 +938,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'weightDay', 'yhj']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectDataYear.vue

@@ -475,7 +475,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -764,7 +764,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'weight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
        // 获取工序列表
         getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectGeneration.vue

@@ -602,7 +602,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -929,7 +929,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/planProjectIronMill.vue

@@ -576,7 +576,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -913,7 +913,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/planProjectLimePowder.vue

@@ -591,7 +591,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -903,7 +903,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/planProjectMachineCoke.vue

@@ -811,7 +811,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -1168,7 +1168,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             // js中有两种不同的数据类型，一个是基本类型，一个是引用类型，其中Object是引用类型
             // 浅拷贝复制的是引用，深拷贝复制的是实体，简单的说，就是如果b复制a，现在修改b，如果a跟着改变，这种就是浅拷贝如果a不变，就是深拷贝
@@ -1267,7 +1267,7 @@ export default {
             }
             });
             return sums;
-           // return commonSummaries(param, prop);
+           // return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         // getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectPowerPlant.vue

@@ -594,7 +594,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -937,7 +937,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'weight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         // getNodeData () {

src/views/energyPlan/components/supplyAndDemand/planProjectPuddling.vue

@@ -557,7 +557,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -903,7 +903,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/planProjectRoundGx.vue

@@ -741,7 +741,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js';
 import timegranDate from '@/components/zg/timegranDate.vue';
 import formulaEditor from '@/components/zg/formulaEditor.vue';
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'balanceSheetData',
     components: {
@@ -1063,7 +1063,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['kxf_weight', 'planweight', 'yxf_weight', 'planWeight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(平衡表数据维护)
         getTimeGranData () {

src/views/energyPlan/components/supplyAndDemand/planProjectRoundLG.vue

@@ -725,7 +725,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js';
 import timegranDate from '@/components/zg/timegranDate.vue';
 import formulaEditor from '@/components/zg/formulaEditor.vue';
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'balanceSheetData',
     components: {
@@ -1055,7 +1055,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['kxf_weight', 'planweight', 'yxf_weight', 'planWeight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(平衡表数据维护)
         getTimeGranData () {

src/views/energyPlan/components/supplyAndDemand/planProjectRoundXG.vue

@@ -772,7 +772,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js';
 import timegranDate from '@/components/zg/timegranDate.vue';
 import formulaEditor from '@/components/zg/formulaEditor.vue';
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'balanceSheetData',
     components: {
@@ -1099,7 +1099,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['kxf_weight', 'planweight', 'yxf_weight', 'planWeight']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(平衡表数据维护)
         getTimeGranData () {

src/views/energyPlan/components/supplyAndDemand/planProjectSinter.vue

@@ -550,7 +550,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -874,7 +874,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total', 'subtotal']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/planProjectSteelRolling.vue

@@ -537,7 +537,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'outElectricity',
     components: {
@@ -861,7 +861,7 @@ export default {
         getSummaries (param) {
             const prop = ['apportvalue', 'realvalue', 'wastage', 'total']; // 合计列绑定的prop
             const {columns, data} = param;
-            const sums = commonSummaries(param, prop);
+            const sums = XtcommonSummaries(param, prop);
             let that = this;
             columns.forEach((column, index) => {
             if (index === 1) {

src/views/energyPlan/components/supplyAndDemand/weightAdjustment.vue

@@ -471,7 +471,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js';
 import timegranDate from '~/components/zg/timegranDate.vue';
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 import store from '@/store/index.js';
 export default {
     name: 'outElectricity',
@@ -789,7 +789,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['planweight', 'planWeightOld', 'tzl']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         rowClick (row) {
             if (row.state === '3') {

src/views/energyScheduling/components/investAndProduce/investAndProduceManage.vue

@@ -320,7 +320,7 @@
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
 import timegranDate from '@/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',
     components: {
@@ -485,7 +485,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['qty']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取能介
         getEnergyIdData () {

src/views/energyScheduling/components/investAndProduce/productMaterialsInOut.vue

@@ -387,7 +387,7 @@
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
 import timegranDate from '@/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',
     components: {
@@ -554,7 +554,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualValue', 'correctValue', 'apportValue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取原材料
         getMaterialIdData () {

src/views/energyScheduling/components/investAndProduce/productMaterialsInput.vue

@@ -377,7 +377,7 @@
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
 import timegranDate from '@/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',
     components: {
@@ -544,7 +544,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualValue', 'correctValue', 'apportValue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取原材料
         getMaterialIdData () {

src/views/energyScheduling/components/measuringLocationData/AbnormalDataMaintenance.vue

@@ -294,7 +294,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '@/components/zg/timegranDate.vue'
-import { formatDate, commonSummaries } from '@/utils/util.js';
+import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 export default {
     name: 'AbnormalDataMaintenance',
     components: {
@@ -472,7 +472,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = []; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取表格中的数据
         getTableData (pageNum) {

src/views/energyScheduling/components/measuringLocationData/manualmeasuringLocationEntry.vue

@@ -667,7 +667,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '@/components/zg/timegranDate.vue'
-import { formatDate, commonSummaries } from '@/utils/util.js';
+import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 export default {
     name: 'manmalmeasuringLocationAdd',
     components: {
@@ -908,7 +908,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(计量点数据录入)
         getTimeGranData () {

src/views/energyScheduling/components/measuringLocationData/measuringLocationEntry.vue

@@ -778,7 +778,7 @@
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
 import timegranDate from '@/components/zg/timegranDate.vue'
-import { formatDate, commonSummaries } from '@/utils/util.js';
+import { formatDate, XtcommonSummaries } from '@/utils/util.js';
 export default {
     name: 'measuringLocationAdd',
     components: {
@@ -1011,7 +1011,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue', 'correctvalue', 'apportvalue', 'sumvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取时间粒度(计量点数据录入)
         getTimeGranData () {

src/views/energyScheduling/components/measuringLocationData/measuringLocationQuery.vue

@@ -178,7 +178,7 @@
 
 <script>
 import measurementPlaceChoose from './components/measurementPlaceChoose.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'measuringLocationQuery',
     components: {
@@ -366,7 +366,7 @@ export default {
                     prop.push(item.code);
                 }
             }
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取表格中的数据
         getTableData () {

src/views/energyScheduling/components/measuringLocationData/measuringLocationQueryTiming.vue

@@ -178,7 +178,7 @@
 
 <script>
 import measurementPlaceChoose from './components/measurementPlaceChoose.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'measuringLocationQuery',
     components: {
@@ -361,7 +361,7 @@ export default {
                     prop.push(item.code);
                 }
             }
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取表格中的数据
         getTableData () {

src/views/energyScheduling/components/meterManage/measuringManualEntry.vue

@@ -372,7 +372,7 @@
 <script>
 import { zCheckNumber1, checkInteger } from '~/utils/validator.js'
 import timegranDate from '@/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries, getCookie} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries, getCookie} from '@/utils/util.js';
 export default {
     name: 'measuringManualEntry',
     components: {
@@ -516,7 +516,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['APPORTVALUE']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取能介
         getEnergyIdData () {

src/views/systemInterface/components/emsMeterData.vue

@@ -363,7 +363,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 import store from '@/store/index.js';
 export default {
     name: 'emsMeterData',
@@ -489,7 +489,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['actualvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         rowClassName ({row, rowIndex}) {
             return row.property === '2' || row.property === '3' ? 'rowDisable' : ''

src/views/systemInterface/components/energyDepletion.vue

@@ -498,7 +498,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'energyDepletion',
     components: {
@@ -668,7 +668,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取工序列表
         getNodeData () {

src/views/systemInterface/components/getCorDas.vue

@@ -246,7 +246,7 @@
 
 <script>
 import timegranDate from '~/components/zg/timegranDate.vue'
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 import store from '@/store/index.js';
 export default {
     name: 'getCorDas',
@@ -359,7 +359,7 @@ export default {
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
             const prop = ['apportvalue']; // 合计列绑定的prop
-            return commonSummaries(param, prop);
+            return XtcommonSummaries(param, prop);
         },
         // 获取能介
         getEnergyIdData () {

src/views/systemInterface/components/usageData.vue

@@ -547,7 +547,7 @@
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
 import store from '@/store/index.js';
-import {formatDate, commonSummaries} from '@/utils/util.js';
+import {formatDate, XtcommonSummaries} from '@/utils/util.js';
 export default {
     name: 'usageData',
     data () {