Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/views/base/deviceInfo-detail.vue

@@ -129,6 +129,23 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开门时间" prop="remoteOpenRangeTime">
+                <el-time-picker
+                    is-range
+                    v-model="formModel.remoteOpenRangeTime"
+                    arrow-control
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围"
+                    format='HH:mm'
+                    value-format="HH:mm">
+                </el-time-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
         </el-row>
           <!-- <el-col :span="12">
@@ -174,7 +191,9 @@ export default {
   props: ["businessKey", "title", "companyResult"],
   data() {
     return {
-      formModel: {},
+      formModel: {
+        remoteOpenRangeTime: [],
+      },
       ruleValidate: {
         aliasName: [
           { required: true, message: "设备别名不能为空", trigger: "blur" }
@@ -310,6 +329,14 @@ export default {
               self.formModel.companyId = "";
             }
 
+            if(self.formModel.remoteOpenRangeTime!=null&&self.formModel.remoteOpenRangeTime!=""){
+              var remoteOpenRangeTime = self.formModel.remoteOpenRangeTime.toString();
+              self.formModel.remoteOpenRangeTime = remoteOpenRangeTime;
+            }
+            else{
+              self.formModel.remoteOpenRangeTime = "";
+            }
+
             if (id == null || id.length == 0) {
               return deviceInfoApi.add(self.formModel);
             } else {
@@ -379,6 +406,12 @@ export default {
         if (jsonData.result) {
           self.formModel = jsonData.data;
 
+          var rangeTime = [];
+          rangeTime.push(self.formModel.remoteOpenStartTime);
+          rangeTime.push(self.formModel.remoteOpenEndTime);
+
+          self.formModel.remoteOpenRangeTime = rangeTime;
+
           if (self.businessKey.length == 0){
             self.formModel.columnColor="1";
             // self.formModel.columnHeight="";

src/views/base/deviceInfo-list.vue

@@ -158,6 +158,8 @@
       <el-table-column prop="manufacturerN" label="设备厂家"></el-table-column>
       <el-table-column prop="heartbeatUpdateTime" sort-by="a.heartbeat_update_time"
         sortable="custom" label="心跳更新时间" width="160"></el-table-column>
+        <el-table-column prop="remoteOpenStartTime" label="远程开门开始时间"></el-table-column>
+        <el-table-column prop="remoteOpenEndTime" label="远程开门结束时间"></el-table-column>
       <el-table-column label="照片库" width="120">
         <template slot-scope="{row}">
           <el-link