|
|
@@ -3,8 +3,7 @@
|
|
|
<DialogCom
|
|
|
title="扫描记录"
|
|
|
:visible.sync="isShow"
|
|
|
- width="800px"
|
|
|
- :destroy-on-close="true"
|
|
|
+ width="850px"
|
|
|
>
|
|
|
<el-table :data="tableData" border>
|
|
|
<el-table-column
|
|
|
@@ -12,6 +11,7 @@
|
|
|
align="center"
|
|
|
:show-overflow-tooltip="true"
|
|
|
prop="areaName"
|
|
|
+ min-width="100px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -19,9 +19,17 @@
|
|
|
align="center"
|
|
|
:show-overflow-tooltip="true"
|
|
|
prop="collectionAreaName"
|
|
|
+ min-width="120px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+ <el-table-column
|
|
|
+ label="NFC标签名称"
|
|
|
+ align="center"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ prop="nfcName"
|
|
|
+ min-width="120px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
label="扫描时间"
|
|
|
align="center"
|
|
|
@@ -33,13 +41,13 @@
|
|
|
<el-table-column
|
|
|
label="扫描方式"
|
|
|
align="center"
|
|
|
- width="80px"
|
|
|
+ width="100px"
|
|
|
:show-overflow-tooltip="true"
|
|
|
prop="scanMethod"
|
|
|
>
|
|
|
<template slot-scope="r">
|
|
|
- <span v-if="r.row.scanMethod === 0">扫描</span>
|
|
|
- <span v-else>拍照</span>
|
|
|
+ <span v-if="r.row.scanMethod === 0">感应</span>
|
|
|
+ <span v-else>图片</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -47,9 +55,10 @@
|
|
|
align="center"
|
|
|
:show-overflow-tooltip="true"
|
|
|
prop="img"
|
|
|
+ min-width="150px"
|
|
|
>
|
|
|
<template slot-scope="r">
|
|
|
- <label v-if="r.row.scanMethod == 0">-</label>
|
|
|
+ <label v-if="r.row.scanMethod == 0">{{r.row.nfcCode}}}</label>
|
|
|
<el-image
|
|
|
v-else
|
|
|
style="width: 50px; height: 50px"
|