Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -222,6 +222,15 @@ export default {
             }
           }
        })
+       //表头字体重新设置
+      table_book.Sheets.Sheet1['A1'].s.font={
+                name:"宋体",
+                sz:16,
+                bold:true
+      }
+      //画一个简报
+       this.drawExcel(table_book.Sheets.Sheet1);
+       //处理合并行样式
        this.addRangeBorder(table_book.Sheets.Sheet1['!merges'],table_book.Sheets.Sheet1);
        console.log("sheet:",table_book.Sheets.Sheet1);
         //导出
@@ -239,6 +248,59 @@ export default {
         }
         return table_write;
     },
+    drawExcel(sheet){
+      //画一个进口矿水联运情况简报
+      let style={
+                font:{
+                name:"宋体",
+                sz:10
+                },
+                alignment: {//对齐方式
+                  horizontal: 'center',//水平居中
+                  vertical: 'center',//竖直居中
+                  wrapText: true,//自动换行
+                },
+                border: { // 设置边框
+                    top: { style: 'thin' },
+                    bottom: { style: 'thin' },
+                    left: { style: 'thin' },
+                    right: { style: 'thin' }
+                }
+              };
+      Object.keys(sheet).forEach((key) => {
+          if (key.indexOf('!') < 0 && sheet[key].v=='万州港发货信息') {
+             let row = this.getRow(key);
+             console.log("万州港发货信息：",row);
+            //第一行表头
+            sheet['I'+row]={
+              t:'s',
+              v:'进口矿水联运情况简报',
+              s:style
+            };
+            for(let i=row+1; i<this.loadTable.length+row+3;i++){
+                sheet['I'+i]={
+                  t:'s',
+                  v:'',
+                  s:style
+                };
+            }
+            //表格合并
+            for(let i=row-1; i<this.loadTable.length+row+2;i++){
+                sheet['!merges'].push({
+                s:{
+                  r:i,
+                  c:8,
+                },
+                e:{
+                  r:i,
+                  c:15,
+                }
+              });
+            }
+           return;
+          }
+       });
+    },
     exportFilter(sheet){
       //导出过滤方法
       let keys=[];
@@ -247,7 +309,7 @@ export default {
              let row = this.getRow(key);
              console.log("万州港发货信息：",row);
              for(let i=row; i<this.loadTable.length+row+3;i++){
-                keys.push('J'+i);
+                keys.push('F'+i);
              }
           }else if(key.indexOf('!') < 0 && sheet[key].v=='控制线等闸船舶动态'){
             let row = this.getRow(key);

src/views/statisticalReport/components/tableItem.vue

@@ -2,7 +2,8 @@
   <div>
     <table v-show="false">
       <tr>
-        <td colspan="22">达州钢铁每日船舶动态明细表</td>
+        <td colspan="18">达州钢铁每日船舶动态明细表</td>
+        <td colspan="4">{{deadline}}</td> 
       </tr>
     </table>
 
@@ -142,12 +143,7 @@
               </el-table-column>
               <el-table-column width="200px" label="备注"> </el-table-column>
             </el-table-column>
-            <el-table-column label="进口矿水联运情况简报">
-              <el-table-column> </el-table-column>
-              <el-table-column> </el-table-column>
-              <el-table-column> </el-table-column>
-              <el-table-column> </el-table-column>
-            </el-table-column>
+            
           </el-table>
         </div>
         <el-divider></el-divider>
@@ -336,7 +332,8 @@ export default {
       runStockStringArr: [],
       spanArr: [],
       loadTable: [],
-      controlLinesTable: []
+      controlLinesTable: [],
+      deadline:null
     }
   },
   mounted() {
@@ -345,8 +342,19 @@ export default {
     this.getRunStockList()
     this.searchLoadData()
     this.getControlLines()
+    this.initialDate()
   },
   methods: {
+    initialDate(){
+      let now=new Date();
+      this.deadline=now.getFullYear()+'年'+(now.getMonth()+1)+'月'+now.getDate()+'日';
+      if(now.getHours()>=8&&now.getHours()<18){
+        this.deadline+='（数据截止于8:00）';
+      }else{
+        this.deadline+='（数据截止于18:00）';
+      }
+      console.log("deadline：",this.deadline);
+    },
     getStockString() {
       let that = this
       this.axios