From 0df1527329f7b028e2a59905154fc73d29767bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=99=8E?= Date: Sun, 8 Mar 2020 11:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=99=8E=EF=BC=9A=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=8C=E6=97=B6=E9=97=B4=E5=80=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arj21/csvmanager/imexportLog.html | 216 ------------------ .../arj21/csvmanager/log/csvexport.html | 31 ++- .../arj21/csvmanager/qarDataExport.html | 2 + 3 files changed, 26 insertions(+), 223 deletions(-) delete mode 100644 infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html 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