diff --git a/src/api/modules/labor.ts b/src/api/modules/labor.ts
index b2b3d44..d0080ba 100644
--- a/src/api/modules/labor.ts
+++ b/src/api/modules/labor.ts
@@ -29,6 +29,10 @@ export const getCompanyDataList = (params: {}) => {
export const getPersonTypeAndEduStatisticsApi = (params: {}) => {
return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: true } });
};
+//查询人员人数-新
+export const getWorkerByNatureApi = (params: {}) => {
+ return http.post(BASEURL + `/xmgl/workerInfo/getWorkerByNature`, params, { headers: { noLoading: true } });
+};
//查询今日作业人员趋势
export const getQueryTodayAttendanceTrendApi = (params: {}) => {
return http.get(BASEURL + `/xmgl/workerAttendance/queryTodayAttendanceTrend`, params, { headers: { noLoading: true } });
diff --git a/src/api/modules/smartSafeHat.ts b/src/api/modules/smartSafeHat.ts
index 470feed..e49a7c0 100644
--- a/src/api/modules/smartSafeHat.ts
+++ b/src/api/modules/smartSafeHat.ts
@@ -92,3 +92,15 @@ export const addSafeHatPositionFence = (params: {}) => {
export const getSafeyHatSessionApi = (params: {}) => {
return http.post(BASEURL + `/xmgl/projectApi/getSafeyHatSession`, params);
};
+
+// 查询历史记录
+export const getTaskMessageRecordApi = (params: {}) => {
+ return http.post(BASEURL + `/xmgl/task/messageRecord`, params, {
+ headers: { noLoading: true }
+ });
+};
+
+// 文字转语音并发送
+export const getTaskTextToAudioApi = (params: {}) => {
+ return http.post(BASEURL + `/xmgl/task/textToAudio`, params);
+};
diff --git a/src/assets/images/broadcast.png b/src/assets/images/broadcast.png
new file mode 100644
index 0000000..f1c76fd
Binary files /dev/null and b/src/assets/images/broadcast.png differ
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue
index acad0e9..aaeb4fd 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue
@@ -20,11 +20,21 @@
+
+
+
+
{{ item.name }}
+
+ {{ item.num }}
+
+
+
+
@@ -68,7 +78,7 @@ import Card from "@/components/card.vue";
import { GlobalStore } from "@/stores";
import { COMPANY } from "@/config/config";
import { ref, onMounted, watch } from "vue";
-import { getPersonTypeAndEduStatisticsApi } from "@/api/modules/labor";
+import { getPersonTypeAndEduStatisticsApi, getWorkerByNatureApi } from "@/api/modules/labor";
const store = GlobalStore();
// ts
type Props = {
@@ -84,6 +94,8 @@ const statisticsCount = ref({
presencecount: {}
} as any);
+const personalList = ref([]);
+
watch(
() => props.statisticsCount,
newVal => {
@@ -99,15 +111,21 @@ const attendancePerson = ref(0)
const toaltPerson = ref(0)
//获取人员数据
const getPersonList = async () => {
- const res = await getPersonTypeAndEduStatisticsApi({
+ // const res = await getPersonTypeAndEduStatisticsApi({
+ // projectSn: store.sn
+ // });
+ // if (res.result) {
+ // console.log("+++++++++++++++++++++++++++++++++")
+ // console.log(res)
+ // presencePerson.value = res.result.personType.presencePerson;
+ // attendancePerson.value = res.result.personType.attendancePerson;
+ // toaltPerson.value = res.result.personType.toaltPerson;
+ // }
+ const res = await getWorkerByNatureApi({
projectSn: store.sn
});
if (res.result) {
- console.log("+++++++++++++++++++++++++++++++++")
- console.log(res)
- presencePerson.value = res.result.personType.presencePerson;
- attendancePerson.value = res.result.personType.attendancePerson;
- toaltPerson.value = res.result.personType.toaltPerson;
+ personalList.value = res.result || [];
}
};
onMounted( async () => {
@@ -175,15 +193,22 @@ onMounted( async () => {
height: 100%;
width: 70%;
position: relative;
+ display: flex;
.penName {
background: rgba(39, 88, 192, 0.6);
- margin: 5% 5%;
+ margin: 6% 5%;
+ width: 90%;
+ position: absolute;
+ z-index: 0;
}
.penN {
height: 10px;
background: url("@/assets/images/comprehensiveManage/project8.png") no-repeat;
background-size: 100% 100%;
- margin: 13% 5%;
+ margin: 0 5%;
+ margin-top: 24%;
+ width: 90%;
+ position: absolute;
}
.numData1 {
left: 5%;
@@ -198,15 +223,18 @@ onMounted( async () => {
top: -10%;
}
.numData {
- position: absolute;
+ // position: absolute;
height: 60%;
- width: 30%;
+ // width: 30%;
+ flex: 1;
display: flex;
flex-direction: column;
align-items: center;
.text {
- margin-top: 18%;
+ margin-top: 15%;
+ color: #fff;
font-size: 16px;
+ z-index: 1;
}
.num {
font-size: 20px;
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 4df18c3..3490c60 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -60,16 +60,25 @@
label: 'name'
}"
show-checkbox
- check-on-click-node
default-expand-all
node-key="devSn"
ref="tree"
>
+
{{ node.label }}
+
+
@@ -93,7 +102,7 @@
人员名称
-
+
-
+
+
+ {{ date }}
+
+ 上个月
+ 今天
+
+ 下个月
+
+
+
@@ -427,10 +446,55 @@
+
+
+
+
+
+
+
+
+
+
{{ item.send_user_name }}
+
{{ dateFormat(item.ctime) }}
+
+
+
+
{{ item.length == 0 ? 1 : item.length }}"
+
+
+
+
+
+

+
+
+
+
+ 发送
+
+
+