Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/userSelector/index.vue

@@ -37,7 +37,7 @@
           >
             <!-- 搜索 -->
             <template slot="searchs">
-              <el-form-item  prop="ruleId" label="用户账号">
+              <el-form-item  prop="username" label="用户账号">
                 <el-input v-model="search.username" clearable></el-input>
               </el-form-item>
               <el-form-item prop="name" label="用户姓名">
@@ -156,7 +156,8 @@ export default {
       this.refresh()   
     },
     resetQuery() {
-      this.resetForm("search");
+      this.search=this.emptySearch();
+      // this.resetForm("search");
       // this.queryParams.orgId = undefined;
       // this.$refs.tree.setCurrentKey(null);
       this.refresh();

src/views/check/task/dialog.scanrecord.vue

@@ -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"