diff --git a/src/views/sevenLargeScreen/laborManagement/data-dialog.vue b/src/views/sevenLargeScreen/laborManagement/data-dialog.vue index 8493ae6..a26c4c0 100644 --- a/src/views/sevenLargeScreen/laborManagement/data-dialog.vue +++ b/src/views/sevenLargeScreen/laborManagement/data-dialog.vue @@ -27,7 +27,7 @@ let dialogTitle = ref("" as any); function openDialog(obj: any) { console.log("type", obj); if(obj.type == 1){ - dialogTitle.value = "人数统计数据"; + dialogTitle.value = obj.tip + '人数统计数据'; } else if(obj.type == 2) { dialogTitle.value = "历史报警数据"; } diff --git a/src/views/sevenLargeScreen/laborManagement/leftTop.vue b/src/views/sevenLargeScreen/laborManagement/leftTop.vue index 4d77b41..60e5b2f 100644 --- a/src/views/sevenLargeScreen/laborManagement/leftTop.vue +++ b/src/views/sevenLargeScreen/laborManagement/leftTop.vue @@ -15,7 +15,7 @@ {{ attendancePerson }} -
+
总人数
{{ toaltPerson }} diff --git a/src/views/sevenLargeScreen/laborManagement/member-count-list.vue b/src/views/sevenLargeScreen/laborManagement/member-count-list.vue index c58d933..4937e25 100644 --- a/src/views/sevenLargeScreen/laborManagement/member-count-list.vue +++ b/src/views/sevenLargeScreen/laborManagement/member-count-list.vue @@ -52,24 +52,38 @@ 查询
-
报警类型
-
报警名称
-
设备名称
-
报警值
-
阈值
-
超标时间
-
超标量
+
序号
+
照片
+
姓名
+
联系电话
+
所属部门
+
进场日期
+
在职状态
+
身份证号
+
人员类型
+
所属企业
-
{{ alarmTypeList[item.type] }}
-
{{ item.alarmTypeName }}
-
{{ item.deviceName }}
-
{{ item.avgData }}
-
{{ item.alarmValue }}
-
{{ item.tempAlarmTime }}
-
{{ item.exceedVal }}
+
{{index + 1}}
+
+ + +
+
{{item.workerName}}
+
{{item.phoneNumber}}
+
{{item.phoneNumber}}
+
{{item.personType == 1?item.teamName:item.personType == 2?item.departmentName:''}}
+
{{item.phoneNumber}}
+
身份证号
+
人员类型
+
所属企业
@@ -86,6 +100,7 @@ import { GlobalStore } from "@/stores"; import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor"; const store = GlobalStore(); const props = defineProps(["tip"]); +const BASEURL = import.meta.env.VITE_API_URL; const onlineWorkList = ref([ { name: "在职", value: 1 }, { name: "离职", value: 2 } @@ -145,7 +160,7 @@ const getMemberCountList = async (tip:any) => { onMounted(async () => { await getCompanyList(); - // await getHistoryAlarmList('search'); + await getMemberCountList('search'); refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => { // console.log("滚动容器", e); const scrollTop = e.target.scrollTop; diff --git a/src/views/sevenLargeScreen/videoManagement/ckplayerComp(webRtc版).vue b/src/views/sevenLargeScreen/videoManagement/ckplayerComp(webRtc版).vue new file mode 100644 index 0000000..54ccd0d --- /dev/null +++ b/src/views/sevenLargeScreen/videoManagement/ckplayerComp(webRtc版).vue @@ -0,0 +1,39 @@ + + + + diff --git a/src/views/sevenLargeScreen/videoManagement/ckplayerComp.vue b/src/views/sevenLargeScreen/videoManagement/ckplayerComp.vue index 54ccd0d..d226800 100644 --- a/src/views/sevenLargeScreen/videoManagement/ckplayerComp.vue +++ b/src/views/sevenLargeScreen/videoManagement/ckplayerComp.vue @@ -1,38 +1,33 @@