Merge remote-tracking branch 'origin/master'

src/views/thrsys/SysUdimsDownloadData.vue

@@ -6,7 +6,7 @@
             <el-form :inline="true" :model="query" class="query-form" size="mini">
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.id" placeholder="记录ID"></el-input>
+                        <el-input v-model="filterQuery.taskId" placeholder="任务ID"></el-input>
                     </el-form-item>
 
                     <el-form-item class="query-form-item">
@@ -17,15 +17,6 @@
                             <el-option label="异常" value="2"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-date-picker
-                            v-model="syncTime"
-                            type="datetime"
-                            format="yyyy-MM-dd HH:mm:ss"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="请选择下载时间">
-                        </el-date-picker>
-                    </el-form-item>
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@@ -42,8 +33,8 @@
             >
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column
-                    label="记录ID"
+                    label="任务ID"
-                    prop="id"
+                    prop="taskId"
                     width="140"
                     show-overflow-tooltip
                 ></el-table-column>
@@ -93,6 +84,13 @@
 
                 <el-table-column label="操作" fixed="right" width="160">
                     <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="detailDialog(scope.row.id)"
+                        >详情
+                        </el-button
+                        >
                         <el-button
                             type="text"
                             size="small"
@@ -111,6 +109,16 @@
             ></el-pagination>
         </el-card>
 
+        <el-dialog
+            title="同步信息"
+            width="25%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="syncVisible"
+        >
+            <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -122,7 +130,7 @@ export default {
         data() {
             return {
                 filterQuery: {
-                id: null,
+                    taskId: null,
                     status: "1",
                     page: 1,
                     limit: 10,
@@ -172,6 +180,8 @@ export default {
                 templateDlUrl: null,
                 checked: false,
                 syncTime: null,
+                syncInfo: null,
+                syncVisible: false
             };
         },
 
@@ -181,7 +191,7 @@ export default {
                     path: "",
                 });
                 this.filterQuery = {
-                id: null,
+                    taskId: null,
                     status: "1",
                     page: 1,
                     limit: 20,
@@ -229,13 +239,11 @@ export default {
                 if (val) {
                     this.getList();
                 }
-        }
+            },
-        ,
             handleCurrentChange(val) {
                 this.filterQuery.page = val;
                 this.getList();
-        }
+            },
-        ,
 
             deleteDialog(rowId) {
                 this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
@@ -263,8 +271,7 @@ export default {
                     })
                     .catch(() => {
                     });
-        }
+            },
-        ,
             handleChange(response, files, fileList) {
                 console.log(response);
                 if (response.code != 20000) {
@@ -275,8 +282,7 @@ export default {
                     this.$message.success(response.data);
                     this.getList();
                 }
-        }
+            },
-        ,
             statusFilterType(status) {
                 const statusMap = {
                     0: "warning",
@@ -284,8 +290,15 @@ export default {
                     2: "danger",
                 };
                 return statusMap[status];
+            },
+            detailDialog(id) {
+                this.syncVisible = true;
+                this.list.forEach(item => {
+                    if (id === item.id) {
+                        this.syncInfo = item.remark;
+                    }
+                })
             }
-        ,
         },
 
         mounted() {