diff --git a/.env.development b/.env.development index 3f8c10e..c8da159 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -VITE_API_URL = 'http://192.168.34.221:9111' +# VITE_API_URL = 'http://192.168.34.221:9111' # 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' @@ -13,7 +13,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" # 演示平台 -VITE_API_URL = 'http://jxj.zhgdyun.com:9809' +# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 # VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) @@ -21,7 +21,7 @@ VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -# VITE_API_URL = 'http://47.93.215.234:9809' +VITE_API_URL = 'http://47.93.215.234:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/.env.production b/.env.production index de78426..d830490 100644 --- a/.env.production +++ b/.env.production @@ -12,7 +12,7 @@ NODE_ENV = "production" # VITE_API_URL = "http://183.249.224.118:9003" # 百色 新项目通用地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' @@ -21,7 +21,7 @@ VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -# VITE_API_URL = 'http://47.93.215.234:9809' +VITE_API_URL = 'http://47.93.215.234:9809' # 苏立信 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index ff557f0..160cb41 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -41,18 +41,18 @@ import { GlobalStore } from "@/stores"; const store = GlobalStore(); let listData = ref([ - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控胜多负少v现场v在时代广场彼此相伴',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '硬件警报',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设sdasdasdasdasdasdasdasczxczxcz之间的衔接进行全面检查，以防止',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在sdasdasdasdasdasdasdasczxczxcz作前，应对吊装设备进行安全把控',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '硬件警报',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设sdasdasdasdasdasdasdasczxczxcz之间的衔接进行全面检查，以防止',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在sdasdasdasdasdasdasdasczxczxcz作前，应对吊装设备进行安全把控',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '硬件警报',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设sdasdasdasdasdasdasdasczxczxcz之间的衔接进行全面检查，以防止',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在sdasdasdasdasdasdasdasczxczxcz作前，应对吊装设备进行安全把控',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '硬件警报',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设sdasdasdasdasdasdasdasczxczxcz之间的衔接进行全面检查，以防止',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在sdasdasdasdasdasdasdasczxczxcz作前，应对吊装设备进行安全把控',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '硬件警报',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设sdasdasdasdasdasdasdasczxczxcz之间的衔接进行全面检查，以防止',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在sdasdasdasdasdasdasdasczxczxcz作前，应对吊装设备进行安全把控',startTime: '2024-04-01',endTime:"2024-04-20"}, - {header: '硬件警报',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设sdasdasdasdasdasdasdasczxczxcz之间的衔接进行全面检查，以防止',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: 'AI报警',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: 'AI报警',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: 'AI报警',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: 'AI报警',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: 'AI报警',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...',startTime: '2024-04-01',endTime:"2024-04-20"}, + {header: 'AI报警',type: 3,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设之间的衔接进行全面检查，以防止...',startTime: '2024-04-01',endTime:"2024-04-20"}, ]) onMounted( async () => { diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 907ba03..2d5da7a 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -45,16 +45,13 @@ import { selectQualityStatisticsApi } from "@/api/modules/projectOverview"; let listData = ref([ {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, + {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, ]) diff --git a/src/views/commandScreen/commandCenter/leftTop.vue b/src/views/commandScreen/commandCenter/leftTop.vue index d719ffc..3e9156d 100644 --- a/src/views/commandScreen/commandCenter/leftTop.vue +++ b/src/views/commandScreen/commandCenter/leftTop.vue @@ -1,11 +1,17 @@ @@ -46,71 +80,49 @@ import { GlobalStore } from "@/stores"; import { ref, onMounted, watch } from "vue"; import { getStageOption } from "@/api/modules/projectOverview"; -import type { TabsPaneContext } from 'element-plus' +import type { TabsPaneContext, ElMessageBox } from "element-plus"; -const activeName = ref('first') -const activeIndex = ref('1' as any) -let dateRange = ref([] as any) +const dialogVisible = ref(false); + +const activeName = ref("first"); +const activeIndex = ref("1" as any); +let dateRange = ref([] as any); const handleClick = (tab: TabsPaneContext, event: Event) => { -// console.log(tab, event) -// console.log('tab',tab.index) -// console.log('activeName',activeName.value) -// if(activeName.value === 'first') console.log('1') -// if(activeName.value === 'second') console.log('2') -// if(activeName.value === 'third') console.log('3') - activeIndex.value = tab.index - console.log('activeIndex',activeIndex.value) -} + activeIndex.value = tab.index; + console.log("activeIndex", activeIndex.value); +}; const tabList = [ - { sortLine: '1', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '2', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '3', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '4', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, - { sortLine: '5', name: 'Tom', count: '1', rate: '100%', immediateRate: '100%'}, -] -onMounted( async () => { - -}) -// watch( -// () => props.projectData, -// newVal => { -// // console.log(newVal, "newVal"); -// if (newVal) { -// // props.xData = newVal; -// projectData.value = newVal; -// projectLocal.value = -// projectData.value.provinceName + -// projectData.value.cityName + -// projectData.value.areaName + -// projectData.value.projectAddress; -// } -// } -// ); + { sortLine: "1", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "2", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "3", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "4", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" }, + { sortLine: "5", name: "Tom", count: "1", rate: "100%", immediateRate: "100%" } +]; +onMounted(async () => {}); diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 99750fe..320beb9 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -60,8 +60,6 @@ import Card from "@/components/card.vue"; import { onMounted, ref } from "vue"; import { GlobalStore } from "@/stores"; -// import rightTop from "@/views/commandScreen/commandCenter/rightTop.vue"; -// import rightCenter from "@/views/commandScreen/commandCenter/rightCenter.vue"; const store = GlobalStore(); import { getProjectInspectRecordCountApi } from "@/api/modules/projectOverview"; import { selectQualityStatisticsApi } from "@/api/modules/projectOverview"; @@ -77,24 +75,19 @@ let overdueMajorDangerCount = ref(20 as any); let overdueMajorDangerRate = ref(50 as any); let listData = ref([ - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, - {header: '重大风险',type: 1,content: '正处于吊装施工重大风险作业阶段，请注意在操作前，应对吊装设备进行安全把控'}, - {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止'}, + {header: '隐患分类',type: 1,content: '经过智能分析统计，近一个月脚手架类安全隐患最多达...'}, + {header: '重大隐患',type: 1,content: '组织专业人员对隐患进行彻底排查和评估，明确隐患的性质、范围和...'}, + {header: '隐患责任区域',type: 1,content: '经过智能分析统计，近一个月区域-1安全隐患多达4对设备进行...'}, + {header: '隐患分包单位',type: 1,content: '经过智能分析统计，近一月木工班组-管理一组隐患期对设备进行...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, + {header: '特种作业人员教育',type: 2,content: '1#塔吊报警频次较上周增长60%，塔吊间各个设备之间的衔接进行全面检查，以防止...'}, ]) let dataList = ref([ @@ -372,7 +365,7 @@ function drawEchart() { echartsTest.value.resize(); }) } -//获取安全管理 + const getSafeInfo = async () => { const res: any = await getProjectInspectRecordCountApi({ projectSn: store.sn }); // console.log("获取安全管理", res); @@ -629,7 +622,7 @@ function drawEchart2() { // echartsTest.resize(); // }) } -//获取质量管理 + const qualityInfo = async () => { const res: any = await selectQualityStatisticsApi({ projectSn: store.sn }); dataList2.value[0].value = res.result.total.rectificationNum; @@ -638,18 +631,9 @@ const qualityInfo = async () => { drawEchart2(); }; -//将方法暴露给父组件 -defineExpose({ - getSafeInfo -}) onMounted(async () => { await getSafeInfo(); await qualityInfo(); - // window.onresize = function(){ - // if(echartsTest.value){ - // echartsTest.value.resize(); - // } - // } }); diff --git a/src/views/commandScreen/indexCommand.vue b/src/views/commandScreen/indexCommand.vue index 33b3d8c..9bde7c3 100644 --- a/src/views/commandScreen/indexCommand.vue +++ b/src/views/commandScreen/indexCommand.vue @@ -50,7 +50,7 @@ import { useRouter } from "vue-router"; import { GlobalStore } from "@/stores"; import { jumpLargeUserInfoApi } from "@/api/modules/login"; import { COMPANY } from "@/config/config"; -import { AGJTCommandMenu } from "@/config/staticMenu"; +const BASEURL = import.meta.env.VITE_API_URL; const store = GlobalStore(); let nowTime = ref("2023-04-16 09:22:12" as any); let showUserBox = ref(false as any); @@ -589,6 +589,9 @@ function jumpBgd() { if (COMPANY === "as") { window.location.replace("http://182.90.224.237:15551/#/projectIndex"); // 鞍山项目 } + if(COMPANY === "agjtCommand"){ + window.location.replace("http://47.93.215.234:9809" + "/#/login?token=" + store.token); + } }