diff --git a/.env.development b/.env.development index 3ab25ff..35105fa 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,8 @@ NODE_ENV = 'development' # VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 VITE_API_URL = 'http://jxj.zhgdyun.com:61212' #杰哥远程 +VITE_API_URL = 'http://192.168.34.221:9111' +# VITE_API_URL = 'http://192.168.34.155:19111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' diff --git a/src/api/modules/agjtCommandApi.ts b/src/api/modules/agjtCommandApi.ts index e73ede1..3d278f0 100644 --- a/src/api/modules/agjtCommandApi.ts +++ b/src/api/modules/agjtCommandApi.ts @@ -86,4 +86,4 @@ export const getStatsDirectorateBigScreenApi = (params: {}) => { // centerTop评分数据接口 export const getStatScoreApi = (params: {}) => { return http.get(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/getStatScore`, params, { headers: { noLoading: true } }); -}; \ No newline at end of file +}; diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 0643d91..5ec62e1 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -11,7 +11,7 @@
-
人员履职情况分析
+
人员履职情况分析
@@ -72,7 +73,7 @@ import { getPersonTypeAndEduStatisticsApi } from "@/api/modules/labor"; import type { TabsPaneContext, ElMessageBox } from "element-plus"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); -const emits = defineEmits(["openDialog"]) +const emits = defineEmits(["openDialog"]); const activeName = ref("first"); const activeIndex = ref("0" as any); const dateRange = ref([]); @@ -96,6 +97,10 @@ let dataList2 = ref([ value: 0, show: true, name: "未教育人员", + // 设置文本颜色 + // textStyle: { + // color: '#038cf5' + // }, itemStyle: { normal: { color: "#038cf5", @@ -107,6 +112,10 @@ let dataList2 = ref([ value: 0, show: true, name: "完成人员", + // 设置文本颜色 + // textStyle: { + // color: '#01d6f4' + // } itemStyle: { normal: { color: "#01d6f4", @@ -127,85 +136,94 @@ let dataList2 = ref([ } ]); // 打开弹窗 -const openDialogData = (obj:any) => { - emits("openDialog",obj) +const openDialogData = (obj: any) => { + emits("openDialog", obj); +}; +const dateChange = () => { + if (activeIndex.value == "0") { + getMemberJobStatusFn(); + } else if (activeIndex.value == "1") { + getInspectManStatusFn(); + } else if (activeIndex.value == "2") { + getEnterpriseStatusFn(); + } } //获取人员数据 const getPersonList = async () => { - const res:any = await getPersonTypeAndEduStatisticsApi({ + const res: any = await getPersonTypeAndEduStatisticsApi({ projectSn: store.sn }); if (res.result) { - dataList2.value[1].value = res.result.personType.toaltPerson.totalPerson - dataList2.value[2].value = res.result.personType.toaltPerson.totalPerson - console.log('安全教育智能分析666',res) + dataList2.value[1].value = res.result.personType.toaltPerson.totalPerson; + dataList2.value[2].value = res.result.personType.toaltPerson.totalPerson; + console.log("安全教育智能分析666", res); } }; // 获取人员履职情况分析数据--整改人 const getMemberJobStatusFn = async () => { - let requestData:any = { + let requestData: any = { projectSn: store.sn, pageSize: 5, pageNo: 1 - } - if(dateRange.value.length > 0){ + }; + if (dateRange.value.length > 0) { requestData.inspectTime_begin = dateRange.value[0]; requestData.inspectTime_end = dateRange.value[1]; } - const res:any = await getMemberJobStatusApi(requestData); - console.log('人员履职情况res--整改人',res) - if(res.result){ + const res: any = await getMemberJobStatusApi(requestData); + console.log("人员履职情况res--整改人", res); + if (res.result) { tabList.value = res.result.records; } else { tabList.value = []; } -} +}; // 获取人员履职情况分析数据--检查人 const getInspectManStatusFn = async () => { - let requestData:any = { + let requestData: any = { projectSn: store.sn, pageSize: 5, pageNo: 1 - } - if(dateRange.value.length > 0){ + }; + if (dateRange.value.length > 0) { requestData.inspectTime_begin = dateRange.value[0]; requestData.inspectTime_end = dateRange.value[1]; } - const res:any = await getInspectManStatusApi(requestData); - console.log('人员履职情况res--检查人',res) - if(res.result){ + const res: any = await getInspectManStatusApi(requestData); + console.log("人员履职情况res--检查人", res); + if (res.result) { tabList.value = res.result.records; } else { tabList.value = []; } -} +}; // 获取人员履职情况分析数据--按分包单位分析 const getEnterpriseStatusFn = async () => { - let requestData:any = { + let requestData: any = { projectSn: store.sn, pageSize: 5, pageNo: 1 - } - if(dateRange.value.length > 0){ + }; + if (dateRange.value.length > 0) { requestData.inspectTime_begin = dateRange.value[0]; requestData.inspectTime_end = dateRange.value[1]; } - const res:any = await getEnterpriseStatusApi(requestData); - console.log('人员履职情况res--按分包单位分析',res) - if(res.result){ + const res: any = await getEnterpriseStatusApi(requestData); + console.log("人员履职情况res--按分包单位分析", res); + if (res.result) { tabList.value = res.result.records; } else { tabList.value = []; } -} +}; const handleClick = (tab: TabsPaneContext, event: Event) => { activeIndex.value = tab.index; - console.log(tab) - if(tab.index == '0'){ + console.log(tab); + if (tab.index == "0") { getMemberJobStatusFn(); - } else if(tab.index == '1'){ + } else if (tab.index == "1") { getInspectManStatusFn(); - } else if(tab.index == '2'){ + } else if (tab.index == "2") { getEnterpriseStatusFn(); } console.log("activeIndex", activeIndex.value); @@ -258,10 +276,10 @@ function drawEchart2() { textStyle: { color: "#fff", fontSize: 26, - fontWeight: "normal", + fontWeight: "normal" // align: "center", // width: "200px", - fontFamily: "sadigitalNumber" + // fontFamily: "sadigitalNumber" }, subtextStyle: { color: "#ccc", @@ -283,7 +301,7 @@ function drawEchart2() { itemHeight: 7, // 设置高度 symbolKeepAspect: false, textStyle: { - color: "#000", + // color: "#000", rich: { name: { verticalAlign: "right", @@ -291,10 +309,26 @@ function drawEchart2() { fontSize: 14, color: "#FFFFFF" }, - value: { + value1: { align: "left", fontSize: 14, - color: "#FFFFFF" + color: "#FBDC00", + fontFamily: "Source Han Sans CN, Source Han Sans CN", + fontWeight: "bold" + }, + value2: { + align: "left", + fontSize: 14, + color: "#0DAF27", + fontFamily: "Source Han Sans CN, Source Han Sans CN", + fontWeight: "bold" + }, + value3: { + align: "left", + fontSize: 14, + color: "#047EFF", + fontFamily: "Source Han Sans CN, Source Han Sans CN", + fontWeight: "bold" } } }, @@ -304,12 +338,20 @@ function drawEchart2() { } }), formatter: function (data) { + console.log(data, 666777); if (dataList2.value && dataList2.value.length) { for (var i = 0; i < dataList2.value.length; i++) { if (data === dataList2.value[i].name) { var value = dataList2.value[i].value; var percentage = value + "%"; - return "{name| " + data + "} {gap| }" + "{value|" + value + " " + "}"; + console.log(value, 888); + if (data == "未教育人员") { + return "{name| " + data + "} {gap| }" + "{value1|" + value + " " + "}"; + } else if (data == "完成人员") { + return "{name| " + data + "} {gap| }" + "{value2|" + value + " " + "}"; + } else if (data == "现场人员") { + return "{name| " + data + "} {gap| }" + "{value3|" + value + " " + "}"; + } } } } @@ -501,7 +543,7 @@ onMounted(async () => { width: 50%; font-size: 20px; font-weight: bold; - background-image: linear-gradient(to bottom left, #c8E3FF, #007AFF); + background-image: linear-gradient(to bottom left, #c8e3ff, #007aff); -webkit-background-clip: text; background-clip: text; color: transparent; @@ -536,7 +578,7 @@ onMounted(async () => { width: 50%; font-size: 20px; font-weight: bold; - background-image: linear-gradient(to bottom left, #c8E3FF, #007AFF); + background-image: linear-gradient(to bottom left, #c8e3ff, #007aff); -webkit-background-clip: text; background-clip: text; color: transparent; diff --git a/src/views/commandScreen/dialogCompnnents/ai-alarm.vue b/src/views/commandScreen/dialogCompnnents/ai-alarm.vue index 69cb597..54c40cd 100644 --- a/src/views/commandScreen/dialogCompnnents/ai-alarm.vue +++ b/src/views/commandScreen/dialogCompnnents/ai-alarm.vue @@ -70,6 +70,9 @@ :src="BASEURL + '/image/' + item.imageUrl" :preview-src-list="[BASEURL + '/image/' + item.imageUrl]" > +
@@ -122,6 +125,7 @@ import { GlobalStore } from "@/stores"; import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor"; import type { TabsPaneContext } from 'element-plus' import { getAlarmTypeOption } from "@/api/modules/aIEarlyWarn"; +import noDataImage from "@/assets/images/vehicleManagement/car.png"; import { getAlarmRecordApi, getAlarmTypeCountApi } from "@/api/modules/agjtCommandApi"; const store = GlobalStore(); const props = defineProps(["tip"]); @@ -482,6 +486,10 @@ onMounted(async () => { height: 100%; } } + .el-no-img{ + width: 30px; + height: 30px; + } } div { width: 17%; diff --git a/src/views/commandScreen/dialogCompnnents/member-count-list.vue b/src/views/commandScreen/dialogCompnnents/member-count-list.vue index 3256161..edded0b 100644 --- a/src/views/commandScreen/dialogCompnnents/member-count-list.vue +++ b/src/views/commandScreen/dialogCompnnents/member-count-list.vue @@ -20,7 +20,11 @@
{{index + 1}}
{{item.engineeringName}}
-
{{item.progressDescribe}}
+
+ + {{item.progressDescribe}} + +
+
@@ -86,7 +93,11 @@
{{index + 1}}
{{item.engineeringName}}
-
{{item.acceptanceDesc}}
+
+ + {{item.acceptanceDesc}} + +
{{item.acceptanceResult == 1?'合格':'不合格'}}
+
@@ -126,6 +140,9 @@ :src="BASEURL + '/image/' + item.imageUrl" :preview-src-list="[BASEURL + '/image/' + item.imageUrl]" > +
@@ -147,6 +164,7 @@ import { ref, onMounted } from "vue"; import { GlobalStore } from "@/stores"; import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor"; import type { TabsPaneContext } from 'element-plus' +import noDataImage from "@/assets/images/vehicleManagement/car.png"; import { getProgressRecordApi, getInspectionRecordApi, getEngineeringRecordApi, getSideStationApi } from "@/api/modules/agjtCommandApi"; const store = GlobalStore(); const props = defineProps(["tip"]); @@ -316,6 +334,10 @@ onMounted(async () => { height: 100%; } } + .el-no-img{ + width: 30px; + height: 30px; + } } div { width: 17%; @@ -371,6 +393,10 @@ onMounted(async () => { height: 100%; } } + .el-no-img{ + width: 30px; + height: 30px; + } } div { width: 17%; @@ -426,6 +452,10 @@ onMounted(async () => { height: 100%; } } + .el-no-img{ + width: 30px; + height: 30px; + } } div { width: 20%; @@ -471,6 +501,10 @@ onMounted(async () => { font-size: 12px; margin-bottom: 5px; .list-img { + .el-img { + width: 50px; + height: 25px; + } .el-img { width: 30px; height: 30px; @@ -481,6 +515,10 @@ onMounted(async () => { height: 100%; } } + .el-no-img{ + width: 30px; + height: 30px; + } } div { width: 20%; diff --git a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue index d3e055f..f1b0f97 100644 --- a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue +++ b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue @@ -2,14 +2,14 @@
- 综合得分：78 + 综合得分：{{ countData.total || 0 }}
月度安全综合评分表
- 工程名称：123测试工程 - 表格日期：2024-05-10 + 工程名称：{{projectData.projectName || ""}} + 表格日期：{{currentDate}}
@@ -29,7 +29,7 @@
- {{ index3 + 1 }} + {{ index3 }}
{{item.name}}
@@ -37,11 +37,17 @@
-
- {{ key2 }} +
+ 25% + 15% + 15% + 25%
-
- {{ key2 }} +
+ {{ countData.hiddenDangerScore || 0 }} + {{ countData.dangerEngScore || 0 }} + {{ countData.riskscore || 0 }} + 25
@@ -55,16 +61,16 @@ 告警数量月度环比对比
- 123 + 100%
- 123 + {{ countData.aiScore || 0 }}
综合得分
- 89 + {{ countData.total || 0 }}
@@ -89,33 +95,54 @@