Merge branch 'master' of http://139.159.239.83:9093/mxl/ETL-admin into master

src/views/watch/transform.vue

@@ -133,12 +133,12 @@
         <el-table-column prop="transName" label="转换名称" align="center"/>
         <el-table-column prop="startTime" label="转换执行起始时间" align="center">
           <template slot-scope="scope">
-              {{ scope.row.startTime |  dateformat("YYYY-MM-DD HH:mm:mm") }}
+              {{ scope.row.startTime  }}
             </template>
         </el-table-column>
         <el-table-column prop="stopTime" label="转换执行结束时间" align="center">
           <template slot-scope="scope">
-              {{ scope.row.stopTime |  dateformat("YYYY-MM-DD HH:mm:mm") }}
+              {{ scope.row.stopTime }}
             </template>
         </el-table-column>
         <el-table-column prop="recordStatus" label="转换执行状态" align="center">
@@ -466,7 +466,7 @@ export default {
 
     // 获取异常详情
     seeLogContent(row) {
-      this.getLogContent(row.transId);// 根据作业ID获取执行日志记录内容
+      this.getLogContent(row.id);// 根据作业ID获取执行日志记录内容
       this.logContentdialog = true;
     },
     // 根据作业ID获取执行日志记录内容