diff --git a/.env.development b/.env.development index f584a24..d3e8059 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -# VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 @@ -13,7 +13,7 @@ VITE_APP_ENV = 'development' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +# VITE_APP_BASE_API = 'http://192.168.110.149:8899' #曾涛 # VITE_APP_BASE_API = 'http://192.168.110.171:8899' diff --git a/src/views/ProjectScreen/components/centerPage.vue b/src/views/ProjectScreen/components/centerPage.vue index 50ab572..28a266a 100644 --- a/src/views/ProjectScreen/components/centerPage.vue +++ b/src/views/ProjectScreen/components/centerPage.vue @@ -16,8 +16,8 @@
安全巡检 -
{{ item.createTime.slice(5) }}
-
{{ item.label }}
+
{{ item.createTime.slice(5, 16) }}
+
{{ item.label || '未佩戴安全帽' }}
@@ -89,6 +89,7 @@ const getInspectionList = async () => { const res = await getScreenSafetyInspection(props.projectId) const { code, data } = res if (code === 200) { + console.log(violation_level_type.value) data.map(item => { item.label = violation_level_type.value.find((i) => i.value === item.violationType)?.label }) @@ -146,6 +147,7 @@ const loadBaseMap = (viewer) => { // 添加图层到视图 const layer = viewer.imageryLayers.addImageryProvider(imageryProvider); } + onMounted(() => { getInspectionList() createEarth() @@ -153,7 +155,6 @@ onMounted(() => { swiperItemWidth.value = swiperContent.value.children[0].clientWidth + 20 } }) - diff --git a/src/views/ProjectScreen/components/optionList.ts b/src/views/ProjectScreen/components/optionList.ts index bcdf958..41f9e48 100644 --- a/src/views/ProjectScreen/components/optionList.ts +++ b/src/views/ProjectScreen/components/optionList.ts @@ -27,7 +27,7 @@ export let pieOption = { legend: { show: true, type: 'plain', - bottom: 20, + bottom: 0, itemWidth: 12, itemHeight: 12, textStyle: { @@ -38,7 +38,7 @@ export let pieOption = { type: 'pie', data: [], radius: [50, 80], - center: ['50%', '45%'], + center: ['50%', '50%'], itemStyle: { borderColor: '#fff', borderWidth: 1 @@ -73,7 +73,7 @@ export let barOption = { itemHeight: 12, // 调整文字与图标间距 data: ['计划流转面积', '已流转面积'], - top: 0, + top: 10, right: 20, textStyle: { color: '#fff', diff --git a/src/views/ProjectScreen/components/rightPage.vue b/src/views/ProjectScreen/components/rightPage.vue index 0d08c08..8f425f9 100644 --- a/src/views/ProjectScreen/components/rightPage.vue +++ b/src/views/ProjectScreen/components/rightPage.vue @@ -4,12 +4,13 @@ <div class="content" v-html="generalize"></div> </div> - <div class="endPage"> + <div class="midPage"> <Title title="形象进度" /> - <div class="chart_container"> - <div ref="pieChartRef" class="echart" /> - <div ref="lineChartRef" class="echart" /> - </div> + <div ref="pieChartRef" class="echart" /> + </div> + <div class="endPage"> + <Title title="土地流转情况" /> + <div ref="lineChartRef" class="echart" /> </div> </div> </template> @@ -79,12 +80,6 @@ const initLineChart = () => { lineChart.setOption(barOption); } -// 响应窗口大小变化 -const handleResize = () => { - if (pieChart) pieChart.resize(); - if (lineChart) lineChart.resize(); -}; - /** * 获取项目土地统计数据 */ @@ -124,6 +119,12 @@ const getScreenGeneralizeData = async () => { } } +// 响应窗口大小变化 +const handleResize = () => { + if (pieChart) pieChart.resize(); + if (lineChart) lineChart.resize(); +}; + // 组件挂载时初始化图表 onMounted(() => { getScreenLandData() @@ -137,7 +138,6 @@ onMounted(() => { // 组件卸载时清理 onUnmounted(() => { - window.removeEventListener('resize', handleResize); if (pieChart) { pieChart.dispose(); pieChart = null; @@ -156,6 +156,7 @@ onUnmounted(() => { height: 100%; .topPage, + .midPage, .endPage { display: flex; flex-direction: column; @@ -166,20 +167,13 @@ onUnmounted(() => { box-sizing: border-box; } - .endPage { + .endPage, + .midPage { flex: 1; margin-top: 23px; - .chart_container { - display: flex; - flex-direction: column; - gap: 5px; - width: 100%; - height: 100%; - } - .echart { - height: 48%; + height: 100%; width: 100%; } }