Merge branch 'develop'

Former-commit-id: 49d89f5c96d9b2f916f3ca6690f043fe719f60f7 [formerly 1e9aba53827131c159f0ecf987a216b536a78116] [formerly 49d89f5c96d9b2f916f3ca6690f043fe719f60f7 [formerly 1e9aba53827131c159f0ecf987a216b536a78116] [formerly 49d89f5c96d9b2f916f3ca6690f043fe719f60f7 [formerly 1e9aba53827131c159f0ecf987a216b536a78116] [formerly 1e9aba53827131c159f0ecf987a216b536a78116 [formerly 4cd5dee5e3e1bc89e9fbab409201279b8e08cedf [formerly 08bd4638526c87fb6f9bbad58f9e2a67aa9d718c]]]]]
Former-commit-id: 9a26d683ecd433779ffeb2cc28c0b154104649bb
Former-commit-id: 088e423d0251d9a39848890cdfcec81156fc232c
Former-commit-id: d709b796f41d96d69aca76809a7510126bf1a7b6 [formerly 5de26439ee1d4b006a46af6af7d01b7044263693]
Former-commit-id: 899e22cd73866929fc822e09a6f6bf5e98ed5148
Former-commit-id: c84d8cb85a07f5071c12fbffeab3bd1d101e8c0b
Former-commit-id: 08ba61f77053d8d72fc81b31009b39bd88e60af2
Former-commit-id: b0b17b8c949963182e252637bc7c2b272c2333f7
Former-commit-id: 8944acb052012bc8bc316f6958562d1975466e3b

src/views/system/log/index.vue

@@ -5,15 +5,55 @@
       size="mini"
       style="width: 100%"
       stripe>
+      <!-- 时间 -->
       <el-table-column
         prop="time"
         label="Time"
         width="140">
       </el-table-column>
+      <!-- 信息 -->
       <el-table-column
         prop="message"
         label="Message">
       </el-table-column>
+      <!-- 触发页面 -->
+      <el-table-column
+        label="Url"
+        align="center"
+        min-width="200">
+        <template slot-scope="scope">
+          {{get(scope.row, 'meta.url')}}
+        </template>
+      </el-table-column>
+      <!-- 触发组件 -->
+      <el-table-column
+        label="Tag"
+        align="center"
+        min-width="120">
+        <template slot-scope="scope">
+          <el-tag
+            v-if="get(scope.row, 'meta.instance.$vnode.componentOptions.tag')"
+            type="info"
+            size="mini">
+            &#60;{{get(scope.row, 'meta.instance.$vnode.componentOptions.tag')}}&gt;
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- 查看详情 -->
+      <el-table-column
+        fixed="right"
+        align="center"
+        label="More"
+        width="100">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleShowMore(scope.row)">
+            <d2-icon name="eye"/>
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <template slot="footer">
       <el-button
@@ -34,7 +74,6 @@ import { get } from 'lodash'
 export default {
   data () {
     return {
-      get,
       uploading: false
     }
   },
@@ -44,9 +83,20 @@ export default {
     ])
   },
   methods: {
-    handleLogConsole (log) {
+    get,
+    handleShowMore (log) {
       // 打印一条日志的所有信息到控制台
-      console.log(log)
+      this.$notify({
+        type: 'info',
+        title: '日志详情',
+        message: '完整的日志内容已经打印到控制台'
+      })
+      this.$log.capsule('D2Admin', 'handleShowMore', 'primary')
+      console.group(log.message)
+      console.log('time: ', log.time)
+      console.log('type: ', log.type)
+      console.log(log.meta)
+      console.groupEnd()
     },
     // 日志上传
     handleUpload () {