1.考勤分为内勤及外勤打卡。

2.手表增加测温、血氧频率设置。

src/views/base/alarmConfig-detail.vue

@@ -85,7 +85,11 @@
                 }"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="考勤类型" prop="classifier">
+        <el-form-item label="考勤类型" prop="attendanceType">
+          <el-radio v-model="formModel.attendanceType" :label="1">内勤</el-radio>
+          <el-radio v-model="formModel.attendanceType" :label="2">外勤</el-radio>
+        </el-form-item>
+        <el-form-item label="考勤类别" prop="classifier">
           <el-radio v-model="formModel.classifier" :label="1">上班时间</el-radio>
           <el-radio v-model="formModel.classifier" :label="2">下班时间</el-radio>
         </el-form-item>

src/views/base/alarmConfig-list.vue

@@ -79,6 +79,12 @@
       <el-table-column prop="startTime" label="开始时间" width="120"></el-table-column>
       <el-table-column prop="attendanceTime" label="考勤时间" width="120"></el-table-column>
       <el-table-column prop="endTime" label="结束时间" width="120"></el-table-column>
+      <el-table-column prop="attendanceType" label="考勤类型" width="120">
+        <template slot-scope="{row}">
+          <span v-html="row.attendanceType==1 ? '内勤': ''"></span>
+          <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>

src/views/base/watchInfo-detail.vue

@@ -103,6 +103,15 @@
             <template slot="append">秒</template>
           </el-input>
         </el-form-item>
+        <el-form-item label="测温间隔时间" prop="frequency">
+          <el-input
+            v-model="formModel.frequency"
+            placeholder="请输入测温间隔时间"
+            style="width: 300px"
+          >
+          <template slot="append">秒</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="服务号码" prop="num1">
           <el-input
             v-model="formModel.num1"

src/views/base/watchInfo-list.vue

@@ -90,53 +90,29 @@
           <span v-else>不在线</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        prop="sos1"
-        sort-by="sos1"
-        label="紧急联系人1号码"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
       <el-table-column
-        prop="sos2"
-        sort-by="sos2"
-        label="紧急联系人2号码"
-        sortable="custom"
+        prop="stepSwitch"
+        label="计步器开关"
         width="180"
       ></el-table-column>
       <el-table-column
-        prop="sos3"
-        sort-by="sos3"
-        label="紧急联系人3号码"
-        sortable="custom"
+        prop="frequency"
+        label="测温间隔时间"
         width="180"
-      ></el-table-column> -->
+      ></el-table-column>
       <el-table-column
-        prop="stepSwitch"
-        sort-by="step_switch"
-        label="计步器开关"
-        sortable="custom"
+        prop="bpi"
+        label="血压间隔时间"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="locationTimeInterval"
-        sort-by="location_time_interval"
         label="定位间隔时间"
-        sortable="custom"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="heartRateTimeInterval"
-        sort-by="heart_rate_time_interval"
         label="心率间隔时间"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="bpi"
-        sort-by="bpi"
-        label="血压间隔时间"
-        sortable="custom"
         width="180"
       ></el-table-column>
       <el-table-column

src/views/business/workAttendance-list.vue

@@ -377,6 +377,12 @@ export default {
 
       content.push(" ");
 
+      if (item.sources == "1") {
+        content.push("内勤");
+      } else {
+        content.push("外勤");
+      }
+
       if (item.classifier == 1) {
         content.push("上班");
       } else {