天宁价格分析等需求

.env.development

@@ -3,13 +3,13 @@ ENV = 'development'
 
 # base api
 # 测试线
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+#VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # 白少后台本地
-#VUE_APP_BASE_API = 'http://192.168.1.79:8081/'
+VUE_APP_BASE_API = 'http://192.168.1.59:8081/'
 
 线上
-VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
+#VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/views/basicData/defaultParameter/function/index.vue

@@ -196,6 +196,16 @@
            </el-form-item>
         </el-col>
       </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="TMR最大重量" prop="tmrOrVolume">
+              <el-select v-model="createTemp.tmrOrVolume" :disabled="isRoleEdit==false" filterable placeholder="TMR最大重量" class="filter-item" style="width:100%">
+                <el-option v-for="item in volumeList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 10px;">
       <el-button v-if="isRoleEdit" class="save" :disabled="isokDisable" @click="handleSave">保存</el-button>
@@ -254,6 +264,7 @@ export default {
   data() {
     return {
       weightList:[{ id: '0', name: '手动' }, { id: '1', name: '自动' }],
+      volumeList:[{ id: '0', name: 'TMR' }, { id: '1', name: '容积' }],
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
       planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
@@ -373,7 +384,8 @@ export default {
         yhfeedtemplet:this.createTemp.yhfeedtemplet,
         yhautosecond: this.createTemp.yhautosecond,
         isConcentrate: this.createTemp.isConcentrate,
-        excess:this.createTemp.excess
+        excess:this.createTemp.excess,
+        tmrOrVolume :this.createTemp.tmrOrVolume
       }}
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
         pastureid: this.createTemp.pastureid

src/views/basicData/defaultParameter/index2.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-container">
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="250px" style="margin-top: 40px;margin-bottom:30px;">
       <el-row>
@@ -126,17 +126,17 @@
       <el-button v-if="isRoleEdit" class="success" :disabled="isokDisable" @click="handleSave">保存</el-button>
       <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery">恢复默认</el-button>
     </div>
-  </div>
-
-</template>
-
+  </div>
+
+</template>
+
 <script>
-import { GetDataByName, PostDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
+import { GetDataByName, PostDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
 import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'DefaultParameter',
-  data() {
+import { MessageBox } from 'element-ui'
+export default {
+  name: 'DefaultParameter',
+  data() {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
@@ -151,8 +151,8 @@ export default {
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
       feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
       leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '平均分配' }],
-      requestParams: [
-        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
+      requestParams: [
+        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],
       getdataListParm: {
         name: 'getysoptList',
@@ -171,14 +171,14 @@ export default {
       isokDisable: false,
       requestParam: {}
 
-    }
-  },
+    }
+  },
   created() {
     this.getList()
     this.getButtons()
     this.getDownList()
-  },
-
+  },
+
   methods: {
     getButtons() {
       const Edit = 'DefaultParameter'
@@ -274,9 +274,9 @@ export default {
         })
       })
     }
-  }
-}
+  }
+}
 </script>
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/basicData/feedTable/index.vue

@@ -139,7 +139,7 @@
         >设置</el-button
       >
       <el-button
-        v-if="isRoleEdit"
+        v-if="isRoleEdit  && ispalyXdmy"
         class="success"
         icon="el-icon-plus"
         @click="handleGetSapCode"
@@ -188,6 +188,13 @@
         @click="handleGetUd"
         >获取UD饲料</el-button
       >
+      <el-button
+        v-if="isRoleEdit && ispalyYmy"
+        class="success"
+        icon="el-icon-plus"
+        @click="handleGetYmy"
+        >获取饲料</el-button
+      >
       <el-upload
         style="float: right"
         :headers="headers"
@@ -2006,6 +2013,7 @@ export default {
       dropState: false,
       isOrder: true,
       ispalyUd: true,
+      ispalyXdmy: true,
       myHeight: document.documentElement.clientHeight - 85 - 150,
     };
   },
@@ -2054,6 +2062,8 @@ export default {
   },
   created() {
     this.getIspalyUd();
+    this.getIspalyXdmy();
+    this.getIspalyYmy();
     this.getList();
     this.getDownList();
     this.getButtons();
@@ -3564,6 +3574,66 @@ export default {
         }
       });
     },
+    getIspalyXdmy() {
+      let url = "authdata/GetDataByName";
+      let data = {
+        name: "getSysoptEnable",
+        page: 1,
+        offset: 1,
+        pagecount: 1,
+        returntype: "Map",
+        parammaps: {
+          pastureid: Cookies.get("pastureid"),
+          inforname: "xdmysapupload",
+        },
+      };
+      postJson(url, data).then((response) => {
+        if (response.msg !== "fail") {
+          if (response.data.list[0].inforvalue == 0) {
+            this.ispalyXdmy = false;
+          } else {
+            this.ispalyXdmy = true;
+          }
+        } else {
+          this.$notify({
+            title: "请求失败",
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
+        }
+      });
+    },
+    getIspalyYmy() {
+      let url = "authdata/GetDataByName";
+      let data = {
+        name: "getSysoptEnable",
+        page: 1,
+        offset: 1,
+        pagecount: 1,
+        returntype: "Map",
+        parammaps: {
+          pastureid: Cookies.get("pastureid"),
+          inforname: "ymySync",
+        },
+      };
+      postJson(url, data).then((response) => {
+        if (response.msg !== "fail") {
+          if (response.data.list[0].inforvalue == 0) {
+            this.ispalyYmy = false;
+          } else {
+            this.ispalyYmy = true;
+          }
+        } else {
+          this.$notify({
+            title: "请求失败",
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
+        }
+      });
+    },
     handleGetUd() {
       MessageBox.confirm("是否获取UD饲料?", {
         confirmButtonText: "确认",
@@ -3594,6 +3664,36 @@ export default {
         });
       });
     },
+    handleGetYmy() {
+      MessageBox.confirm("是否获取饲料?", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let url = "authdata/ymy/syncfeed";
+        let data = {
+          pastureId: Cookies.get("pastureid"),
+        };
+        postJson(url, data).then((response) => {
+          if (response.msg !== "fail") {
+            this.$notify({
+              title: "成功",
+              message: "保存成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
+          } else {
+            this.$notify({
+              title: "保存失败",
+              message: response.data,
+              type: "warning",
+              duration: 2000,
+            });
+          }
+        });
+      });
+    },
   },
 };
 </script>
@@ -3661,3 +3761,7 @@ $left: 325px;
   }
 }
 </style>
+
+
+
+

src/views/basicData/groupColumn/index.vue

@@ -40,6 +40,7 @@
       </div>
       <el-button v-if="isRoleEdit && sapUpload.isSap" class="success" icon="el-icon-plus" @click="handleGetSapCode">获取SAP编码</el-button>
       <el-button v-if="isRoleEdit && ispalyUd" class="success" icon="el-icon-plus" @click="handleGetUd">获取UD栏舍</el-button>
+      <el-button v-if="isRoleEdit && ispalyYmy" class="success" icon="el-icon-plus" @click="handleGetYmy">获取栏舍</el-button>
     </div>
     <div class="table">
       <u-table
@@ -265,12 +266,14 @@ export default {
       dropState: false,
       isOrder: true,
       ispalyUd: true,
+      ispalyYmy: true,
       myHeight:document.documentElement.clientHeight - 85- 150
     }
   },
 
   created() {
     this.getIspalyUd()
+    this.getIspalyYmy()
     this.getList()
     this.getDownList()
     this.getButtons()
@@ -763,6 +766,24 @@ export default {
         }
       })
     },
+    getIspalyYmy(){
+      let url = 'authdata/GetDataByName'
+      let data = {
+        "name":"getSysoptEnable","page":1,"offset":1,"pagecount":1,"returntype":"Map",
+        "parammaps":{"pastureid":Cookies.get('pastureid'),"inforname":"ymySync"}
+      }
+      postJson(url,data).then(response => {
+        if (response.msg !== 'fail') {
+          if(response.data.list[0].inforvalue == 0){
+            this.ispalyYmy = false
+          }else{
+            this.ispalyYmy = true
+          }
+        } else {
+          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
+        }
+      })
+    },
     handleGetUd(){
       MessageBox.confirm('是否获取UD栏舍?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
@@ -780,6 +801,24 @@ export default {
           }
         })
       })
+    },
+    handleGetYmy(){
+      MessageBox.confirm('是否获取一牧云栏舍?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+        let url = 'authdata/ymy/syncbar'
+        let data = {
+          pastureId:Cookies.get('pastureid')
+        }
+        postJson(url,data).then(response => {
+          if (response.msg !== 'fail') {
+            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.getList()
+          } else {
+            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          }
+        })
+      })
     }
   }
 }

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -279,6 +279,18 @@
           @click="handleGetUd5"
           >云养牛撒料上传</el-button
         >
+        <el-button
+         v-if="dataSynchronization4.isDataSynchronization && isRoleEdit"
+          class="success"
+          @click="handleGetYmy6"
+          >搅拌上传</el-button
+        >
+        <el-button
+          v-if="dataSynchronization4.isDataSynchronization && isRoleEdit"
+          class="success"
+          @click="handleGetYmy7"
+          >撒料上传</el-button
+        >
         <!--  v-if="isRoleEdit && ispalyUdYyn" -->
       </div>
       <!-- 日执行计划 -->
@@ -312,7 +324,7 @@
           />
           <el-table-column label="计划id" min-width="90px" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.id }}</span>
+              <span>{{ scope.row.downloadedplanId }}/{{scope.row.id }}</span>
             </template>
           </el-table-column>
 
@@ -2065,6 +2077,20 @@
             @click="udData5()"
             >确认</el-button
           >
+          <el-button
+            class="save"
+            v-else-if="sapUpload.dialogStatus == 'udload6'"
+            :disabled="isokDisable"
+            @click="udData6()"
+            >确认</el-button
+          >
+          <el-button
+            class="save"
+            v-else-if="sapUpload.dialogStatus == 'udload7'"
+            :disabled="isokDisable"
+            @click="udData7()"
+            >确认</el-button
+          >
         </div>
       </div>
     </el-dialog>
@@ -2354,6 +2380,22 @@ export default {
         },
         isDataSynchronization: false,
       },
+      dataSynchronization4: {
+        dialogFormVisible: false,
+        dialogStatus: "",
+        getdataListParm: {
+          name: "getSysoptEnable",
+          page: 1,
+          offset: 1,
+          pagecount: 1,
+          returntype: "Map",
+          parammaps: {
+            pastureid: Cookies.get("pastureid"),
+            inforname: "ymySync",
+          },
+        },
+        isDataSynchronization: false,
+      },
       textMap: {
         newGeneration: "新生成",
         historyRecord: "历史记录",
@@ -2366,6 +2408,8 @@ export default {
         udload3: "撒料上传",
         udload4: "云养牛搅拌数据上传",
         udload5: "云养牛撒料上传",
+        udload6: "搅拌数据上传",
+        udload7: "撒料上传"
       },
       isokDisable: false,
       requestParam: {},
@@ -2454,6 +2498,7 @@ export default {
     this.getDataSynchronization();
     this.getDataSynchronization2();
     this.getDataSynchronization3();
+    this.getDataSynchronization4();
     this.getButtons();
     this.getList();
     this.getDownList();
@@ -2497,6 +2542,28 @@ export default {
         this.checkDateDifference(value[0], value[1]);
       }
     },
+    udData7() {
+      if (this.dateRange.length >= 2) {
+        this.sendRequests(
+          this.dateRange[0],
+          this.dateRange[1],
+          "/authdata/ymy/materialissuepush"
+        );
+      } else {
+        this.$message.warning("请选择日期时间");
+      }
+    },
+    udData6() {
+      if (this.dateRange.length >= 2) {
+        this.sendRequests(
+          this.dateRange[0],
+          this.dateRange[1],
+          "/authdata/ymy/utirpush"
+        );
+      } else {
+        this.$message.warning("请选择日期时间");
+      }
+    },
     udData5() {
       if (this.dateRange.length >= 2) {
         this.sendRequests(
@@ -2629,6 +2696,19 @@ export default {
       );
     },
 
+    getDataSynchronization4() {
+      GetDataByName(this.dataSynchronization4.getdataListParm).then(
+        (response) => {
+          // console.log(response.data.list[0])
+          if (response.data.list[0].inforvalue == 0) {
+            this.dataSynchronization4.isDataSynchronization = false;
+          } else {
+            this.dataSynchronization4.isDataSynchronization = true;
+          }
+        }
+      );
+    },
+
     form_updata() {
       var send_data = {
         name: "syncSCJH",
@@ -4939,6 +5019,16 @@ export default {
       this.sapUpload.dialogFormVisible = true;
     },
 
+    handleGetYmy6() {
+      this.sapUpload.dialogStatus = "udload6";
+      this.sapUpload.dialogFormVisible = true;
+    },
+
+    handleGetYmy7() {
+      this.sapUpload.dialogStatus = "udload7";
+      this.sapUpload.dialogFormVisible = true;
+    },
+
     udData1() {
       this.$refs["sapUpload"].validate((valid) => {
         if (valid) {

src/views/formulationPlan/recipeTemplate/index.vue

@@ -132,13 +132,23 @@
             @click="handleCreate"
             >新增</el-button
           >
+
+          <el-button
+            v-if="isRoleEdit"
+            class="success"
+            icon="el-icon-copy-document"
+            @click="handleCopy"
+            >配方复制</el-button
+          >
+
           <el-button
-            v-if="isRoleEdit && ispalyUd"
+            v-if="isRoleEdit && ispalyYmy"
             class="success"
             icon="el-icon-plus"
-            @click="handleGetUd"
+            @click="handleGetYmy"
             >配方上传</el-button
           >
+
           <el-upload
             style="float: right; margin-right: 15px"
             :headers="headers"
@@ -191,7 +201,7 @@
             @row-click="tableRowClick"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column type="selection"  @selection-change="handleSelectionChange" align="center" width="50" />
             <el-table-column
               label="序号"
               align="center"
@@ -2419,7 +2429,7 @@ export default {
           },
         },
       },
-
+      isCopy: false,
       isOrder: true,
       detail: {
         dialogFormVisible: false,
@@ -2524,6 +2534,7 @@ export default {
       },
       isEnlarge: true,
       ispalyUd: true,
+      ispalyYmy: true,
       // enlargeHeight: document.documentElement.clientHeight - 85 - 165 + 50,
       enlargeHeight: document.documentElement.clientHeight - 85 - 165 + 50,
       getTcodeParm: {
@@ -2595,6 +2606,7 @@ export default {
   },
   created() {
     this.getIspalyUd();
+    this.getIspalyYmy();
     this.getList();
     this.getButtons();
     this.getDownList();
@@ -6099,6 +6111,40 @@ export default {
         }
       });
     },
+    getIspalyYmy() {
+      let url = "authdata/GetDataByName";
+      let data = {
+        name: "getSysoptEnable",
+        page: 1,
+        offset: 1,
+        pagecount: 1,
+        returntype: "Map",
+        parammaps: {
+          pastureid: Cookies.get("pastureid"),
+          inforname: "ymySync",
+        },
+      };
+      postJson(url, data).then((response) => {
+        if (response.msg !== "fail") {
+          if (response.data.list[0].inforvalue == 0) {
+            this.ispalyYmy = false;
+          } else {
+            this.ispalyYmy = true;
+          }
+        } else {
+          this.$notify({
+            title: "请求失败",
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
+        }
+      });
+    },
+    handleSelectionChange(selection){
+      console.log("当前勾选的数据：", selection);
+      this.selectList = selection;
+    },
     handleGetUd() {
       MessageBox.confirm("是否上传配方?", {
         confirmButtonText: "确认",
@@ -6129,6 +6175,36 @@ export default {
         });
       });
     },
+    handleGetYmy() {
+      MessageBox.confirm("是否上传配方?", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let url = "authdata/ymy/feedtemplet";
+        let data = {
+          pastureId: Cookies.get("pastureid"),
+        };
+        postJson(url, data).then((response) => {
+          if (response.msg !== "fail") {
+            this.$notify({
+              title: "成功",
+              message: "保存成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
+          } else {
+            this.$notify({
+              title: "保存失败",
+              message: response.data,
+              type: "warning",
+              duration: 2000,
+            });
+          }
+        });
+      });
+    },
   },
 };
 </script>

src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -398,6 +398,7 @@ export default {
       }
     },
     handleExport(item) {
+      console.log("vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv")
       if (item == 'tab1') {
         console.log('库存统计导出')
       } else if (item == 'tab2') {
@@ -445,7 +446,7 @@ export default {
               // 进行所有表头的单元格合并
               // const merges = ['A1:A1', 'B1:E1','F1:J1' ];
               const merges = ['A1:A1']
-
+              console.log(data)
               excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
             })
         }
@@ -456,23 +457,27 @@ export default {
         var exportData = []
         var exportTitle1 = [] // 一级标题
         var exportTitle2 = [] // 二级标题
+
         for (let i = 0; i < this.tab3.table.tableConfig.length; i++) {
           exportTitle1.push(this.tab3.table.tableConfig[i].label)
           for (let j = 0; j < this.tab3.table.tableConfig[i].children.length; j++) {
             exportTitle2.push(this.tab3.table.tableConfig[i].children[j].label)
           }
         }
-        console.log('一级标题exportTitle1', exportTitle1)
-        console.log('二级标题exportTitle2', exportTitle2)
+        // console.log('一级标题exportTitle1', exportTitle1)
+        // console.log('二级标题exportTitle2', exportTitle2)
         var headerArr = []// 处理一级标题
         for (let i = 0; i < exportTitle1.length; i++) {
+          console.log(exportTitle1[i],"xxxxxxxxxxxxxxx")
           if (i > 0) {
-            headerArr.push(exportTitle1[i], '')
+            console.log(exportTitle1[i],"ddddddddddd")
+            headerArr.push(exportTitle1[i], '', '')
           } else {
             headerArr.push(exportTitle1[i])
           }
         }
-        console.log('一级表头处理后', headerArr)
+
+        console.log('一级表头处理后111', headerArr)
         var valueArr = [] // 对应字段
         for (let i = 0; i < exportTitle2.length; i++) {
           if (i == 0) {
@@ -481,7 +486,7 @@ export default {
             valueArr.push('a' + [i - 1])
           }
         }
-        console.log('对应字段valueArr', valueArr)
+        // console.log('对应字段valueArr', valueArr)
         if (headerArr.length > 0) {
             import('@/vendor/Export3Excel').then((excel) => {
               const multiHeader = [
@@ -495,7 +500,7 @@ export default {
               // 进行所有表头的单元格合并
               // const merges = ['A1:A1', 'B1:E1','F1:J1' ];
               const merges = ['A1:A1']
-
+              // console.log(data)
               excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '价格分析', merges })
             })
         }

src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -149,7 +149,7 @@
           <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="TMR设备编号" />
 
           <el-select v-model="tab3.table.getdataListParm.parammaps.typea" clearable placeholder="列表显示" class="filter-item" style="width: 120px;">
-            <el-option v-for="item in displayList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in displayList1" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
 
           <el-button class="successBorder" @click="form_search('third')">查询</el-button>
@@ -243,6 +243,7 @@ export default {
       },
       fileComment: [{ 'label': '商务文件评分', 'children': [{ 'label': '1' }, { 'label': '2' }, { 'label': '管理员' }] }],
       displayList:[{id:'1',name:'理论'},{id:'2',name:'实际'}],//列表显示
+      displayList1:[{id:'1',name:'理论'},{id:'2',name:'实际'},{id:'3',name:'理论重量'},{id:'4',name:'实际重量'}],
       isSplitsmallmaterialsList:[{id:'0',name:'拆分'},{id:'1',name:'不拆分'}],
       activeName: 'first',
       tab: {
@@ -1074,11 +1075,21 @@ export default {
         console.log('一级标题exportTitle1', exportTitle1)
         console.log('二级标题exportTitle2', exportTitle2)
         var headerArr = []// 处理一级标题
-        for (let i = 0; i < exportTitle1.length; i++) {
-          if (i > 0) {
-            headerArr.push(exportTitle1[i], '')
-          } else {
-            headerArr.push(exportTitle1[i])
+        if (this.tab3.table.getdataListParm.typea !== '') {
+          for (let i = 0; i < exportTitle1.length; i++) {
+            if (i > 0) {
+              headerArr.push(exportTitle1[i])
+            } else {
+              headerArr.push(exportTitle1[i])
+            }
+          }
+        }else {
+          for (let i = 0; i < exportTitle1.length; i++) {
+            if (i > 0) {
+              headerArr.push(exportTitle1[i], '','','')
+            } else {
+              headerArr.push(exportTitle1[i])
+            }
           }
         }
         console.log('一级表头处理后', headerArr)