Merge branch 'master' of http://223.75.76.159:9090/xiao547607/smart-community-server-portal

src/views/base/alarmConfig-detail.vue

@@ -76,10 +76,14 @@
                 }"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="考勤类型" prop="subordinate">
+        <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>
+        <el-form-item label="要求测温" prop="needMeasureTemperature">
+          <el-radio v-model="formModel.needMeasureTemperature" :label="true">是</el-radio>
+          <el-radio v-model="formModel.needMeasureTemperature" :label="false">否</el-radio>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">

src/views/base/alarmConfig-list.vue

@@ -84,6 +84,11 @@
           <span v-html="row.classifier==2 ? '下班时间': ''"></span>
         </template>
       </el-table-column>
+      <el-table-column prop="needMeasureTemperature" label="是否要求测温" width="120">
+        <template slot-scope="{row}">
+          <span v-html="row.needMeasureTemperature ? '是': '否'"></span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="480">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>