设备开门时间调整。

src/views/base/alarmConfig-list.vue

@@ -117,6 +117,12 @@
         show-overflow-tooltip
         width="150"
       ></el-table-column>
+      <el-table-column prop="classifier" label="考勤分类" width="120">
+        <template slot-scope="{ row }">
+          <span v-html="row.classifier == 1 ? '上班时间' : ''"></span>
+          <span v-html="row.classifier == 2 ? '下班时间' : ''"></span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="startTime"
         label="开始时间"
@@ -138,12 +144,6 @@
           <span v-html="row.attendanceType == 2 ? '外勤' : ''"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="classifier" label="考勤分类" width="120">
-        <template slot-scope="{ row }">
-          <span v-html="row.classifier == 1 ? '上班时间' : ''"></span>
-          <span v-html="row.classifier == 2 ? '下班时间' : ''"></span>
-        </template>
-      </el-table-column>
       <el-table-column
         prop="needMeasureTemperature"
         label="是否需要提醒"

src/views/base/deviceInfo-detail.vue

@@ -325,22 +325,27 @@ export default {
 
             self.loading = true;
 
-            if (self.formModel.companyId == null) {
-              self.formModel.companyId = "";
-            }
+            // if (self.formModel.companyId == null) {
+            //   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(self.formModel.remoteOpenRangeTime!=null&&self.formModel.remoteOpenRangeTime!=""){
+            //   var remoteOpenRangeTime = self.formModel.remoteOpenRangeTime.toString();
+            //   self.formModel.remoteOpenRangeTime = remoteOpenRangeTime;
+            // }
+            // else{
+            //   self.formModel.remoteOpenRangeTime = "";
+            // }
+            var requestModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if(self.formModel.remoteOpenRangeTime!=null){
+              requestModel.remoteOpenRangeTime = self.formModel.remoteOpenRangeTime.join(",");
             }
 
             if (id == null || id.length == 0) {
-              return deviceInfoApi.add(self.formModel);
+              return deviceInfoApi.add(requestModel);
             } else {
-              return deviceInfoApi.update(self.formModel);
+              return deviceInfoApi.update(requestModel);
             }
           })().then(function(response) {
             self.loading = false;
@@ -407,10 +412,18 @@ export default {
           self.formModel = jsonData.data;
 
           var rangeTime = [];
-          rangeTime.push(self.formModel.remoteOpenStartTime);
-          rangeTime.push(self.formModel.remoteOpenEndTime);
 
-          self.formModel.remoteOpenRangeTime = rangeTime;
+          if(self.formModel.remoteOpenStartTime!=null){
+            rangeTime.push(self.formModel.remoteOpenStartTime);
+          }
+          
+          if(self.formModel.remoteOpenEndTime!=null){
+            rangeTime.push(self.formModel.remoteOpenEndTime);
+          }
+
+          if(rangeTime.length>0){
+            self.formModel.remoteOpenRangeTime = rangeTime;
+          }
 
           if (self.businessKey.length == 0){
             self.formModel.columnColor="1";