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

src/components/main.vue

@@ -1287,13 +1287,18 @@ export default {
                 // 根据服务器推送的消息做自己的业务处理
                 let data = JSON.parse(event.data);
                 let show = false;
-                for(let item of data.role) {
-                  let roleId = this.roleList.obj[item].id;
-                  if(this.qrRole.includes(roleId)) {
-                    show = true;
-                    break;
-                  }
+                if(this.qrRole.length > 0){
+                    for(let item of data.role) {
+                      let roleId = this.roleList.obj[item].id;
+                      if(this.qrRole.includes(roleId)) {
+                        show = true;
+                        break;
+                      }
+                    }
+                } else{
+                     show = true;
                 }
+                
                 if(show) {
                 this.$notify({
                           title: data.title,

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制(建材厂-水渣) -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">
@@ -88,24 +88,6 @@
                                     @click="but_del_plural()"
                                     :loading="loading"
                                 >删除</el-button>
-                                <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
-                                <el-button
-                                    class="button"
-                                    type="primary"
-                                    size="mini"
-                                    icon="el-icon-view"
-                                    @click="upState()"
-                                    :loading="loading"
-                                    v-if="butPrivilege.CHECK && isCheck"
-                                >审核</el-button>
-                                <el-button
-                                    class="button"
-                                    size="mini"
-                                    icon="el-icon-refresh"
-                                    @click="upState('1')"
-                                    :loading="loading"
-                                    v-if="butPrivilege.UNDOCHECK && isCheck"
-                                >撤销审核</el-button>
                             </el-col>
                             <el-col :span="8">
                                 <div style="float:right; text-align: right;">

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制-机焦厂-副产品 -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">
@@ -217,8 +217,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['焦油']"
-                                        v-if="!isNaN(Number(itemform['焦油']))"
+                                        v-model="itemform['AT3024']"
+                                        v-if="!isNaN(Number(itemform['AT3024']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -230,7 +230,7 @@
                                         <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['焦油']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT3024']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -705,8 +705,8 @@ export default {
                 },
                 workprocid: {
                     obj: {
-                        '焦油': {
-                             id: '焦油',
+                        'AT3024': {
+                             id: 'AT3024',
                            name: '焦油'
                         },
                         'AT3009': {
@@ -718,7 +718,7 @@ export default {
                            name: '硫铵'
                         }},
                     arr: [{
-                             id: '焦油',
+                             id: 'AT3024',
                            name: '焦油'
                         },
                         {
@@ -732,8 +732,8 @@ export default {
                 },
                 line: {
                     obj: {
-                        '焦油': {
-                             id: '焦油',
+                        'AT3024': {
+                             id: 'AT3024',
                            name: '焦油'
                         },
                         'AT3009': {
@@ -745,7 +745,7 @@ export default {
                            name: '硫铵'
                         }},
                     arr: [{
-                           id: '焦油',
+                           id: 'AT3024',
                            name: '焦油'
                         },
                         {
@@ -909,7 +909,7 @@ export default {
                     break;
                     default:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['焦油']) ? 0 : item['焦油']);
+                        weiItem = (isNaN(item['AT3024']) ? 0 : item['AT3024']);
                         lineTotal += Number(weiItem);
                     });
                     break;

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

@@ -11,7 +11,7 @@
                 >
                     <el-row>
                         <el-col :span="6">
-                            <el-form-item label="查找日期">
+                            <el-form-item label="月份">
                                 <zj-timegran-date
                                     v-model="filterForm.data.may"
                                     style="width: 100%;"
@@ -138,31 +138,17 @@
                     >
                         <el-table-column
                             type="selection"
-                            width="40"
+                            width="46"
                             align="center"
                             :selectable='checkboxT'
                             fixed="left"
                             class-name="cnspicuous"
                         ></el-table-column>
-                        <el-table-column
-                            prop="sqno"
-                            label="序号"
-                            fixed="left"
-                            width="50px"
-                            :show-overflow-tooltip="true"
-                        ></el-table-column>
-                        <el-table-column
-                            prop="may"
-                            label="月份"
-                            fixed="left"
-                            width="80px"
-                            :show-overflow-tooltip="true"
-                        ></el-table-column>
                         <el-table-column
                             prop="workprocid"
                             label="工序"
                             fixed="left"
-                            width="70px"
+                            width="90px"
                             :show-overflow-tooltip="true"
                         >
                         <template slot-scope="scope">
@@ -173,23 +159,26 @@
                             prop="productid"
                             label="产品"
                             fixed="left"
-                            width="80px"
+                            width="120px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
+                            prop="rxj"
+                            label="月计划量"
                             fixed="left"
-                            prop="unitid"
-                            label="单位名称"
                             width="100px"
                             :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                              <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                         </template>
-                        </el-table-column>
+                        ></el-table-column>
+                        <el-table-column
+                            prop="may"
+                            label="日期"
+                            fixed="left"
+                            width="120px"
+                            :show-overflow-tooltip="true"
+                        ></el-table-column>
                         <el-table-column
                             prop="weightDay"
-                            label="目标计划量(日)"
+                            label="计划量(日)"
                             width="120px"
                             :show-overflow-tooltip="true"
                         >
@@ -214,15 +203,19 @@
                             </template>
                         </el-table-column>
                         <el-table-column
-                            prop="rxj"
-                            label="日小计"
-                            width="100px"
+                            prop="unitid"
+                            label="计量单位"
+                            width="80px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
+                        >
+                        <template slot-scope="scope">
+                              <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                         </template>
+                        </el-table-column>
                         <el-table-column
                             prop="jxdays"
                             label="检修小时"
-                            width="120px"
+                            width="80px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
@@ -246,6 +239,12 @@
                             </template>
                         </el-table-column>
                         <el-table-column
+                            prop="sqno"
+                            label="序号"
+                            width="60px"
+                            :show-overflow-tooltip="true"
+                        ></el-table-column>
+<!--                        <el-table-column
                             prop="weightMonth"
                             label="目标计划量(月)"
                             width="110px"
@@ -316,38 +315,38 @@
                                 </el-form-item>
                                 <span v-else>{{scope.row.yxf_weight}}</span>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column
                             prop="createman"
                             label="创建人"
-                            width="95px"
+                            width="120px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
                         <el-table-column
                             prop="createtime"
                             label="创建时间"
-                            width="95px"
+                            width="180px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
                          <el-table-column
                             prop="updatetime"
                             label="修改时间"
-                            width="95px"
+                            width="180px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
                         <el-table-column
                             prop="updateman"
                             label="修改人"
-                            width="110px"
+                            width="120px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="400px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
@@ -427,13 +426,13 @@
              </el-col>
              <el-col :span="12">
                   <el-form-item
-                    label="月份"
+                    label="日期"
                     prop="may"
                     >
                     <zj-timegran-date
                     v-model="dialog.editorBox.form.data.may"
                     style="width: 100%;"
-                    :timegranId="'MONTH'"
+                    :timegranId="'DAY'"
                     ></zj-timegran-date>
                 </el-form-item>
             </el-col>
@@ -604,7 +603,7 @@
                     <zj-timegran-date
                     v-model="dialog.editorBox2.form.data.may"
                      style="width: 150%;"
-                    :timegranId="'MONTH'"
+                    :timegranId="'DAY'"
                     :defaultOffset="-1"
                     :rules="dialog.editorBox2.form.may"
                     ></zj-timegran-date>
@@ -938,7 +937,7 @@ export default {
         },
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
-            const prop = ['apportvalue', 'realvalue', 'wastage', 'weightMonth', 'weightDay', 'rxj', 'yhj']; // 合计列绑定的prop
+            const prop = ['apportvalue', 'realvalue', 'wastage', 'weightDay', 'yhj']; // 合计列绑定的prop
             return commonSummaries(param, prop);
         },
         // 获取工序列表

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 发电厂 -->
+<!-- 年度计划编制-发电厂 -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">
@@ -206,8 +206,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2017']"
-                                        v-if="!isNaN(Number(itemform['AT2017']))"
+                                        v-model="itemform['AT4002']"
+                                        v-if="!isNaN(Number(itemform['AT4002']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -219,7 +219,7 @@
                                         <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['AT2017']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT4002']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -236,8 +236,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2016']"
-                                        v-if="!isNaN(Number(itemform['AT2016']))"
+                                        v-model="itemform['AT4001']"
+                                        v-if="!isNaN(Number(itemform['AT4001']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -249,7 +249,7 @@
                                         <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['AT2016']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT4001']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -266,8 +266,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2015']"
-                                        v-if="!isNaN(Number(itemform['AT2015']))"
+                                        v-model="itemform['AT4008']"
+                                        v-if="!isNaN(Number(itemform['AT4008']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -279,7 +279,7 @@
                                         <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['AT2015']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT4008']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -325,8 +325,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2020']"
-                                        v-if="!isNaN(Number(itemform['AT2020']))"
+                                        v-model="itemform['AT4004']"
+                                        v-if="!isNaN(Number(itemform['AT4004']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -337,7 +337,7 @@
                                         <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['AT2020']}}</span>
+                                <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
@@ -353,8 +353,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2021']"
-                                        v-if="!isNaN(Number(itemform['AT2021']))"
+                                        v-model="itemform['3022']"
+                                        v-if="!isNaN(Number(itemform['3022']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -365,7 +365,7 @@
                                         <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['AT2021']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['3022']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -759,40 +759,40 @@ export default {
                 },
                 workprocid: {
                     obj: {
-                        'AT2017': {
-                            id: 'AT2017',
+                        'AT4002': {
+                            id: 'AT4002',
                             name: '煤气机组40MW'
                         },
-                        'AT2016': {
-                            id: 'AT2016',
+                        'AT4001': {
+                            id: 'AT4001',
                             name: '煤气机组25MW'
                         },
-                        'AT2015': {
-                            id: 'AT2015',
+                        'AT4008': {
+                            id: 'AT4008',
                             name: '煤气机组6MW'
                          },
                          'AT2022': {
                              id: 'AT2022',
                              name: '煤气机组3MW'
                          },
-                         'AT2020': {
-                             id: 'AT2020',
+                         'AT4004': {
+                             id: 'AT4004',
                              name: '12MW干熄焦'
                          },
-                        'AT2021': {
-                            id: 'AT2021',
+                        '3022': {
+                            id: '3022',
                             name: 'TRT发电'
                         }},
                     arr: [{
-                            id: 'AT2017',
+                            id: 'AT4002',
                             name: '煤气机组40MW'
                         },
                         {
-                            id: 'AT2016',
+                            id: 'AT4001',
                             name: '煤气机组25MW'
                         },
                         {
-                            id: 'AT2015',
+                            id: 'AT4008',
                             name: '煤气机组6MW'
                         },
                         {
@@ -800,11 +800,11 @@ export default {
                             name: '煤气机组3MW'
                         },
                         {
-                            id: 'AT2020',
+                            id: 'AT4004',
                             name: '12MW干熄焦'
                         },
                         {
-                            id: 'AT2021',
+                            id: '3022',
                             name: 'TRT发电'
                         }]
                 },
@@ -953,15 +953,15 @@ export default {
              lineTotal5 = 0;
             for (let i = 0; i < that.tableData.length; i++) {
                  that.tableData[i].weight.forEach((item, key) => {
-                    weiItem = (isNaN(item['AT2017']) ? 0 : item['AT2017']);
+                    weiItem = (isNaN(item['AT4002']) ? 0 : item['AT4002']);
                     lineTotal += Number(weiItem);
                 });
                 that.tableData[i].weight.forEach((item, key) => {
-                    weiItem = (isNaN(item['AT2016']) ? 0 : item['AT2016']);
+                    weiItem = (isNaN(item['AT4001']) ? 0 : item['AT4001']);
                     lineTotal1 += Number(weiItem);
                 });
                 that.tableData[i].weight.forEach((item, key) => {
-                    weiItem = (isNaN(item['AT2015']) ? 0 : item['AT2015']);
+                    weiItem = (isNaN(item['AT4008']) ? 0 : item['AT4008']);
                     lineTotal2 += Number(weiItem);
                 });
                 that.tableData[i].weight.forEach((item, key) => {
@@ -969,11 +969,11 @@ export default {
                     lineTotal3 += Number(weiItem);
                 });
                 that.tableData[i].weight.forEach((item, key) => {
-                    weiItem = (isNaN(item['AT2021']) ? 0 : item['AT2021']);
+                    weiItem = (isNaN(item['3022']) ? 0 : item['3022']);
                     lineTotal5 += Number(weiItem);
                 });
                 that.tableData[i].weight.forEach((item, key) => {
-                    weiItem = (isNaN(item['AT2020']) ? 0 : item['AT2020']);
+                    weiItem = (isNaN(item['AT4004']) ? 0 : item['AT4004']);
                     lineTotal4 += Number(weiItem);
                 });
             };

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

@@ -1,4 +1,5 @@
 <template>
+    <!-- 年度计划编制-炼钢 -->
     <div class="outElectricity">
         <div class="box">
             <div class="box-top">
@@ -215,8 +216,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT3005']"
-                                        v-if="!isNaN(Number(itemform['AT3005']))"
+                                        v-model="itemform['AT2005']"
+                                        v-if="!isNaN(Number(itemform['AT2005']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -228,7 +229,7 @@
                                         <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['AT3005']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2005']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -245,8 +246,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT3006']"
-                                        v-if="!isNaN(Number(itemform['AT3006']))"
+                                        v-model="itemform['AT2006']"
+                                        v-if="!isNaN(Number(itemform['AT2006']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -258,7 +259,7 @@
                                         <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['AT3006']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2006']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -275,8 +276,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT3007']"
-                                        v-if="!isNaN(Number(itemform['AT3007']))"
+                                        v-model="itemform['AT2007']"
+                                        v-if="!isNaN(Number(itemform['AT2007']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -288,7 +289,7 @@
                                         <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['AT3007']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2007']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -722,16 +723,16 @@ export default {
                 },
                 workprocid: {
                     obj: {
-                        'AT3005': {
-                            id: 'AT3005',
+                        'AT2005': {
+                            id: 'AT2005',
                           name: '供高线一车间'
                          },
-                         'AT3006': {
-                             id: 'AT3006',
+                         'AT2006': {
+                             id: 'AT2006',
                            name: '供高线二车间'
                         },
-                        'AT3007': {
-                             id: 'AT3007',
+                        'AT2007': {
+                             id: 'AT2007',
                            name: '供型钢厂异形坯'
                         },
                         'AT3008': {
@@ -740,15 +741,15 @@ export default {
                         }
                          },
                     arr: [{
-                        id: 'AT3005',
+                        id: 'AT2005',
                         name: '供高线一车间'
                         },
                         {
-                         id: 'AT3006',
+                         id: 'AT2006',
                         name: '供高线二车间'
                        },
                        {
-                           id: 'AT3007',
+                           id: 'AT2007',
                            name: '供型钢厂异形坯'
                        },
                        {
@@ -758,16 +759,16 @@ export default {
                 },
                 line: {
                     obj: {
-                        'AT3005': {
-                            id: 'AT3005',
+                        'AT2005': {
+                            id: 'AT2005',
                           name: '供高线一车间'
                          },
-                         'AT3006': {
-                             id: 'AT3006',
+                         'AT2006': {
+                             id: 'AT2006',
                            name: '供高线二车间'
                         },
-                        'AT3007': {
-                             id: 'AT3007',
+                        'AT2007': {
+                             id: 'AT2007',
                            name: '供型钢厂异形坯'
                         },
                         'AT3008': {
@@ -776,15 +777,15 @@ export default {
                         }
                          },
                     arr: [{
-                        id: 'AT3005',
+                        id: 'AT2005',
                         name: '供高线一车间'
                         },
                         {
-                         id: 'AT3006',
+                         id: 'AT2006',
                         name: '供高线二车间'
                        },
                        {
-                           id: 'AT3007',
+                           id: 'AT2007',
                            name: '供型钢厂异形坯'
                        },
                        {
@@ -940,19 +941,19 @@ export default {
                     break;
                     case index % 7:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT3007']) ? 0 : item['AT3007']);
+                        weiItem = (isNaN(item['AT2007']) ? 0 : item['AT2007']);
                         lineTotal += Number(weiItem);
                     });
                     break;
                     case index % 6:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT3006']) ? 0 : item['AT3006']);
+                        weiItem = (isNaN(item['AT2006']) ? 0 : item['AT2006']);
                         lineTotal += Number(weiItem);
                     });
                     break;
                     default:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT3005']) ? 0 : item['AT3005']);
+                        weiItem = (isNaN(item['AT2005']) ? 0 : item['AT2005']);
                         lineTotal += Number(weiItem);
                     });
                     break;

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制-建材厂-石灰 -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制((机焦-主产品)) -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制-炼铁 -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制-烧结 -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">

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

@@ -1,5 +1,5 @@
 <template>
-<!-- 转供电实绩 -->
+<!-- 年度计划编制-轧钢厂 -->
 <!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">