Merge remote-tracking branch 'origin/master'

fuintAdmin_zt/src/views/tag/oilTag/index.vue

@@ -1,22 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="厂家名字" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入厂家名字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="二维码id" prop="tagCodeId">
-        <el-input
-          v-model="queryParams.tagCodeId"
-          placeholder="请输入二维码id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="二维码SN号" prop="tagCodeSn">
         <el-input
           v-model="queryParams.tagCodeSn"
@@ -89,7 +73,6 @@
       <el-table-column label="序号" type="index" width="55" align="center" />
 
       <el-table-column label="厂家名字" align="center" prop="companyName" />
-      <el-table-column label="二维码id" align="center" prop="tagCodeId" />
       <el-table-column label="二维码SN号" align="center" prop="tagCodeSn" />
       <el-table-column label="码牌SN号" align="center" prop="snCode" />
       <el-table-column label="是否已绑定油站" align="center" prop="status" >
@@ -128,7 +111,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
 
-          >删除</el-button>
+          >解绑</el-button>
         </template>
       </el-table-column>
     </el-table>

fuintAdmin_zt/src/views/tag/tagCode/index.vue

@@ -61,12 +61,16 @@
     <el-table v-loading="loading" :data="codeList" @selection-change="handleSelectionChange">
       <el-table-column type="index" >
       </el-table-column>
-      <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />
+<!--      <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
       <el-table-column label="二维码SN号" align="center" prop="tagCodeSn" />
       <el-table-column label="图片地址" align="center" prop="imageUrl" >
         <template slot-scope="scope">
-          <img :src="imgUrl + scope.row.imageUrl" alt="">
-          <div>{{scope.row.imageUrl}}</div>
+
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="imgUrl + scope.row.imageUrl"
+            fit="fill"></el-image>
+<!--          <div>{{imgUrl+scope.row.imageUrl}}</div>-->
         </template>
         </el-table-column>
     </el-table>
@@ -122,7 +126,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 5,
         collection: null,
         tagCodeSn: null,
         imageUrl: null,