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

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

@@ -370,6 +370,34 @@
                                 <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT4004']}}</span>
                             </template>
                         </el-table-column>
+                        <el-table-column
+                            prop="weight"
+                            label="25MW干熄焦"
+                            width="80px"
+                            :show-overflow-tooltip="true"
+                        ><template slot-scope="scope">
+                                <el-form-item
+                                    v-if="!isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    :prop="scope.row.seq + '.weight'"
+                                >
+                                    <el-input clearable
+                                        v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
+                                        style="width: 100%;"
+                                        v-model="itemform['AT4009']"
+                                        v-if="!isNaN(Number(itemform['AT4009']))"
+                                        refcous="true"
+                                        :rules="tableFormRules.weight"
+                                        oninput="this.value = this.value.replace(/[^\d.]/g,'');"
+                                        @keydown.native="keyDown" :id="scope.$index + scope.column.id"
+                                        :key="key"
+                                    ></el-input>
+                                    <template slot="error" slot-scope="scope">
+                                        <p class="error" :title="scope.error">{{ scope.error }}</p>
+                                    </template>
+                                </el-form-item>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT4009']}}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column
                             prop="weight"
                             label="TRT发电"
@@ -813,6 +841,10 @@ export default {
                              id: 'AT4004',
                              name: '15MW干熄焦'
                          },
+                         'AT4009': {
+                             id: 'AT4009',
+                             name: '25MW干熄焦'
+                         },
                         'AT3022': {
                             id: 'AT3022',
                             name: 'TRT发电'
@@ -841,6 +873,10 @@ export default {
                             id: 'AT4004',
                             name: '15MW干熄焦'
                         },
+                        {
+                            id: 'AT4009',
+                            name: '25MW干熄焦'
+                        },
                         {
                             id: 'AT3022',
                             name: 'TRT发电'
@@ -980,6 +1016,7 @@ export default {
             let lineTotal3 = 0;
             let lineTotal4 = 0;
             let lineTotal5 = 0;
+            let lineTotal6 = 0;
             let weiItem = 0;
             switch (column.property) {
             case 'weight':
@@ -989,6 +1026,7 @@ export default {
              lineTotal3 = 0;
              lineTotal4 = 0;
              lineTotal5 = 0;
+             lineTotal6 = 0;
             for (let i = 0; i < that.tableData.length; i++) {
                  that.tableData[i].weight.forEach((item, key) => {
                     weiItem = (isNaN(item['AT4002']) ? 0 : item['AT4002']);
@@ -1014,12 +1052,16 @@ export default {
                     weiItem = (isNaN(item['AT4004']) ? 0 : item['AT4004']);
                     lineTotal4 += Number(weiItem);
                 });
+                that.tableData[i].weight.forEach((item, key) => {
+                    weiItem = (isNaN(item['AT4009']) ? 0 : item['AT4009']);
+                    lineTotal6 += Number(weiItem);
+                });
                 that.tableData[i].weight.forEach((item, key) => {
                     weiItem = (isNaN(item['AT4003']) ? 0 : item['AT4003']);
                     lineTotal3 += Number(weiItem);
                 });
             };
-            sums[index] = (index % 8 === 0) ? lineTotal5 : (
+            sums[index] = (index % 9 === 0) ? lineTotal5 : ((index % 8 === 0) ? lineTotal6 :
             (index % 7 === 0) ? lineTotal4 : (index % 6 === 0) ? lineTotal3 : (index % 5 === 0) ? lineTotal1 : lineTotal);
             break;
             default: