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 @@
-