Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

src/api/model/hrm.js

@@ -89,4 +89,15 @@ export default {
 			}
 		}
 	},
+	clock_record: {
+		list: {
+			name: "打卡记录",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/hrm/clock_record/`,
+					data
+				);
+			}
+		},
+	}
 }

src/config/route.js

@@ -612,6 +612,16 @@ const routes = [
         "component": "hrm/certificate"
       }
       ,
+      {
+        "name": "clockRecord",
+        "path": "/hrm/clock_record",
+        "meta": {
+          "title": "打卡记录",
+          "icon": "el-icon-check",
+          "perms": ["clock_record"]
+        },
+        "component": "hrm/clock_record"
+      },
       {
         "name": "certificate",
         "path": "/hrm/certificate",

src/views/am/monitor.vue

@@ -139,7 +139,6 @@ export default {
     return {
       apiObj: this.$API.am.video.list,
 	  apiParams: {
-		"channelTypeList": ["1"]
 	  },
 	  pageStr: "pageNum",
 	  pageSizeStr: "pageSize",

src/views/ecm/event_handlefrom.vue

@@ -23,8 +23,8 @@
     </el-descriptions-item>
     <el-descriptions-item label="图片" column=3>
       <div style="display:flex;">
-        <sc-upload v-model="form.global_img" title="全景照" :disabled="true" style="margin-right:8px"></sc-upload>
+        <sc-upload v-model="form.global_img" title="全景照" :disabled="true" style="margin-right:8px;width:auto"></sc-upload>
-        <sc-upload v-model="form.face_img" title="人脸照" :disabled="true"></sc-upload>
+        <sc-upload v-model="form.face_img" title="人脸照" :disabled="true" style="width:auto"></sc-upload>
       </div>
     </el-descriptions-item>
   </el-descriptions>

src/views/hrm/clock_record.vue

@@ -0,0 +1,75 @@
+<template>
+  <el-container>
+    <el-header>
+      <div class="right-panel">
+        <div class="right-panel-search">
+          <el-input
+            v-model="query.search"
+            placeholder="员工姓名/编号"
+            clearable
+         
+          ></el-input>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+          
+          ></el-button>
+        </div>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        row-key="id"
+       
+        stripe
+       
+      >
+        <el-table-column label="人员" prop="employee">
+            <template #default="scope">
+                <span v-if="scope.row.employee">{{scope.row.employee_.name}}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="打卡类型" prop="number">
+            <template #default="scope">{{type_[scope.row.type]}}
+            </template>
+        </el-table-column>
+        <el-table-column label="触发形式" prop="type">
+            <template #default="scope">{{trigger_[scope.row.trigger]}}
+            </template>
+        </el-table-column>
+        <el-table-column label="打卡时间" prop="create_time"></el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+</template>
+    <script>
+export default {
+  name: "clock_record",
+  components: {},
+  data() {
+    return {
+      apiObj: this.$API.hrm.clock_record.list,
+      query: {},
+      selection: [],
+      type_:{
+        10: "上班打卡",
+        20: "下班打卡"
+      },
+      trigger_:{
+        "door": "门禁",
+        "location": "定位"
+      }
+    };
+  },
+   mounted() {
+  },
+  methods: {
+    handleQuery(){
+      this.$refs.table.queryData(this.query)
+    },
+    
+  },
+};
+</script>

src/views/hrm/employee.vue

@@ -42,18 +42,15 @@
         <el-table-column label="人员类型" prop="type">
           <template #default="scope">
             <span>{{ userTypeOptions[scope.row.type] }}</span>
+            <span v-if="scope.row.type=='employee' && scope.row.is_atwork" style="color:green;font-weight:bold">
+              在岗
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="姓名" prop="name"></el-table-column>
         <el-table-column label="证件照" prop="photo">
           <template #default="scope">
-            <sc-upload
+            <el-avatar :size="50" :src="scope.row.photo" shape="square"/>
-              v-if="scope.row.photo"
-              v-model="scope.row.photo"
-              :disabled="true"
-              width="70"
-              height="80"
-            ></sc-upload>
           </template>
         </el-table-column>
         <el-table-column

src/views/rpm/remployee.vue

@@ -38,7 +38,7 @@
         <el-table-column label="身份证号" prop="id_number" ></el-table-column>
         <el-table-column label="证件照" prop="photo" >
           <template #default="scope">
-            <sc-upload v-model="scope.row.photo" :disabled="true" width="70" height="80"></sc-upload>
+            <el-avatar :size="50" :src="scope.row.photo" shape="square"/>
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="left" width="170">