diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html deleted file mode 100644 index c55a148f5..000000000 --- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • -

    null:

    - -
  • -
  • -

    航班日期:

    - - - - -
  • -
  • -

    飞机号:

    - -
  • -
  • -

    机型:

    - -
  • -
  • -

    起飞机场:

    - -
  • -
  • -

    到达机场:

    - -
  • -
  • -

    所属公司:

    - -
  • -
  • -

    操作人:

    - -
  • -
  • -

    操作时间:

    - - - - -
  • -
  • -

    ip:

    - -
  • -
  • -

    文件大小:

    - -
  • -
  • -

    操作类型

    - -
  • -
  • -

    是否成功:

    - -
  • -
  • -

    失败原因:

    - -
  • -
  • -  搜索 -  重置 -
  • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/csvexport.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/csvexport.html index e10f55151..388fa038a 100644 --- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/csvexport.html +++ b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/csvexport.html @@ -22,16 +22,17 @@
  • 机型:

    - - +
  • -

    操作类型--导入,导出:

    - - + +
  • @@ -75,6 +76,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + sortName: "create_date", + sortOrder: "desc", modalName: "导入导出日志", columns: [{ checkbox: true @@ -113,11 +116,25 @@ }, { field : 'operateType', - title : '操作类型--导入,导出' + title : '操作类型', + formatter: function (value, row, index) { + if (value == 'import') { + return "导入"; + } else { + return "导出"; + } + } }, { field : 'isSucce', - title : '是否成功' + title : '是否成功', + formatter: function (value, row, index) { + if (value == 'true') { + return "成功"; + } else { + return "失败"; + } + } }, { field : 'failType', diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html index 0e4a35ecc..72bf2c84e 100644 --- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html +++ b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html @@ -86,6 +86,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + sortName: "create_date", + sortOrder: "desc", modalName: "航班信息", columns: [{ checkbox: true