src/views/base/personDeviceLog-list.vue

@@ -56,6 +56,9 @@
         <el-form-item label="设备别称" prop="aliasName">
           <el-input type="text" size="mini" v-model="queryModel.aliasName"></el-input>
         </el-form-item>
+        <el-form-item label="匹配状态" prop="matchMsg">
+          <el-input type="text" size="mini" v-model="queryModel.matchMsg"></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -154,7 +157,8 @@ export default {
         position: "",
         temperatureBegin: "",
         temperatureEnd: "",
-        temperatureRanges: ""
+        temperatureRanges: "",
+        matchMsg:""
       },
       loading: false,
       tableData: [],
@@ -199,6 +203,7 @@ export default {
       formData.append("aliasName", self.queryModel.aliasName);
       formData.append("companyId", self.queryModel.companyId);
       formData.append("position", self.queryModel.position);
+      formData.append("matchMsg", self.queryModel.matchMsg);
 
       // formData.append(
       //   "temperatureRanges",
@@ -301,7 +306,7 @@ export default {
       lastDate.setDate(0);
       //获取上个月最后一天=本月最后一天
       var lastDay = lastDate.getDate();
-      var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 00:00:00";
+      var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 23:59:59";
 
       self.queryModel.timeRanges = [startTime, endTime];
     }

src/views/base/personInfo-list.vue

@@ -41,13 +41,13 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="所属企业" prop="companyId">
+        <el-form-item label="企业" prop="companyId">
           <el-select
             v-model="queryModel.companyId"
             size="mini"
             filterable
             placeholder="请选择"
-            style="width:300px"
+            style="width:220px"
           >
             <el-option
               v-for="company in companyResult"
@@ -232,7 +232,7 @@
                 >上传数据</el-link>-
               </span>
               <span v-if="!row.faceBound">
-                <el-link type="primary" :underline="false" @click="uploadData(row)">上传数据</el-link>-
+                <el-link type="primary" :underline="false" @click="uploadData(row)">数据同步</el-link>-
               </span>
               <el-link type="primary" :underline="false" @click="showBound(row)">已绑定设备</el-link>
             </el-col>