From 752548d42dbdd963ee70a42dc004bdabc441b271 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 5 Aug 2021 23:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/breadcrumb/breadcrumb.html          |  2 +-
 .../assetImportLog/assetImportLog.html        | 11 +++-
 .../property/assetImportLog/assetImportLog.js |  6 ++
 .../assetImportLogDetail.html                 | 46 ++++++++++++++
 .../assetImportLogDetail.js                   | 63 +++++++++++++++++++
 5 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 public/pages/property/assetImportLogDetail/assetImportLogDetail.html
 create mode 100644 public/pages/property/assetImportLogDetail/assetImportLogDetail.js

diff --git a/public/components/frame/breadcrumb/breadcrumb.html b/public/components/frame/breadcrumb/breadcrumb.html
index 43cc2c904..988c11a56 100755
--- a/public/components/frame/breadcrumb/breadcrumb.html
+++ b/public/components/frame/breadcrumb/breadcrumb.html
@@ -1,4 +1,4 @@
-<div id="breadcrumb" class="border-bottom white-bg page-heading">
+<div id="breadcrumb" class="border-bottom white-bg page-heading" v-if="breadCrumbs.length > 0">
     <div class="row">
         <div class="col-lg-12" style="margin-left: 5px;">
             <h2>{{breadCrumbs.length > 0 ? breadCrumbs[breadCrumbs.length-1].pageName : ''}}</h2>
diff --git a/public/pages/property/assetImportLog/assetImportLog.html b/public/pages/property/assetImportLog/assetImportLog.html
index 912619cb4..8170deffe 100644
--- a/public/pages/property/assetImportLog/assetImportLog.html
+++ b/public/pages/property/assetImportLog/assetImportLog.html
@@ -4,6 +4,11 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>批量导入日志</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
+                            返回
+                        </button>
+                    </div>
                 </div>
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny"
@@ -22,15 +27,15 @@
                         <tbody>
                         <tr v-for="log in assetImportLogInfo.logs">
                             <td class="text-center">{{log.logId}}</td>
-                            <td class="text-center">{{log.logType == '1001'?'资产':'缴费历史'}}</td>
+                            <td class="text-center">{{log.logTypeName}}</td>
                             <td class="text-center">{{log.successCount}}</td>
                             <td class="text-center">{{log.errorCount}}</td>
                             <td class="text-center">{{log.remark}}</td>
                             <td class="text-center">{{log.createTime}}</td>
                             <td class="text-center">
-                                <div class="btn-group" v-if="log.errorCount > 0">
+                                <div class="btn-group" >
                                     <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditCarBlackWhiteModel(log)">失败详情
+                                            v-on:click="_openDetail(log)">详情
                                     </button>
                                 </div>
                             </td>
diff --git a/public/pages/property/assetImportLog/assetImportLog.js b/public/pages/property/assetImportLog/assetImportLog.js
index c22b2a497..c214a8516 100644
--- a/public/pages/property/assetImportLog/assetImportLog.js
+++ b/public/pages/property/assetImportLog/assetImportLog.js
@@ -52,6 +52,12 @@
                         console.log('请求失败处理');
                     }
                 );
+            },
+            _goBack:function(){
+                vc.goBack();
+            },
+            _openDetail:function(_log){
+                vc.jumpToPage('/admin.html#/pages/property/assetImportLogDetail?logId='+_log.logId);
             }
         }
     });
diff --git a/public/pages/property/assetImportLogDetail/assetImportLogDetail.html b/public/pages/property/assetImportLogDetail/assetImportLogDetail.html
new file mode 100644
index 000000000..9e2abb038
--- /dev/null
+++ b/public/pages/property/assetImportLogDetail/assetImportLogDetail.html
@@ -0,0 +1,46 @@
+<div class="animated fadeInRight ecommerce">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>详情</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
+                            返回
+                        </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <table class="footable table table-stripped toggle-arrow-tiny"
+                           data-page-size="15">
+                        <thead>
+                        <tr>
+                            <th class="text-center">名称</th>
+                            <th class="text-center">状态</th>
+                            <th class="text-center">错误描述</th>
+                            <th class="text-center">导入时间</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="log in assetImportLogDetailInfo.logs">
+                            <td class="text-center">{{log.objName}}</td>
+                            <td class="text-center">{{log.state}}</td>
+                            <td class="text-center">{{log.message}}</td>
+                            <td class="text-center">{{log.createTime}}</td>
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/public/pages/property/assetImportLogDetail/assetImportLogDetail.js b/public/pages/property/assetImportLogDetail/assetImportLogDetail.js
new file mode 100644
index 000000000..8274fa6f6
--- /dev/null
+++ b/public/pages/property/assetImportLogDetail/assetImportLogDetail.js
@@ -0,0 +1,63 @@
+/**
+    入驻小区
+**/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            assetImportLogDetailInfo: {
+                logs: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                logId: '',
+            }
+        },
+        _initMethod: function () {
+            $that.assetImportLogDetailInfo.logId = vc.getParam('logId');
+            vc.component._listAssetImportLogDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent: function () {
+
+            vc.on('assetImportLogDetail', 'listAssetImportLogDetail', function (_param) {
+                vc.component._listAssetImportLogDetails(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listAssetImportLogDetails(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods: {
+            _listAssetImportLogDetails: function (_page, _rows) {
+                var param = {
+                    params: {
+                        page: _page,
+                        row: _rows,
+                        logId: $that.assetImportLogDetailInfo.logId,
+                        communityId: vc.getCurrentCommunity().communityId
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/assetImportLogDetail/queryAssetImportLogDetail',
+                    param,
+                    function (json, res) {
+                        var _assetImportLogDetailInfo = JSON.parse(json);
+                        vc.component.assetImportLogDetailInfo.total = _assetImportLogDetailInfo.total;
+                        vc.component.assetImportLogDetailInfo.records = _assetImportLogDetailInfo.records;
+                        vc.component.assetImportLogDetailInfo.logs = _assetImportLogDetailInfo.data;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.assetImportLogDetailInfo.records,
+                            dataCount: vc.component.assetImportLogDetailInfo.total,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _goBack: function () {
+                vc.goBack();
+            },
+        }
+    });
+})(window.vc);