-
+ {{ item.name }} :
{{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
: item.stateName }}
{{ item.unit
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index 128a924..6e04960 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -33,17 +33,17 @@
const legendData = ref([
{
name: '管网哨兵',
- url: `${publicPath}/image/pipeline/地埋式哨兵-正常.png`,
+ url: `${publicPath}/image/pipeline/underground-normal.png`,
value: '管网哨兵',
},
{
name: '智能警示桩',
- url: `${publicPath}/image/pipeline/警示桩-正常.png`,
+ url: `${publicPath}/image/pipeline/warning-normal.png`,
value: '智能警示桩',
},
// {
// name: '离线',
- // url: `${publicPath}/image/station/场站-离线.png`,
+ // url: `${publicPath}/image/station/station-offline.png`,
// value: '3',
// },
])
@@ -69,7 +69,7 @@
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/pipeline/地埋式哨兵-正常.png`, // 图标地址
+ url: `${publicPath}/image/pipeline/underground-normal.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
@@ -87,7 +87,7 @@
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/pipeline/警示桩-正常.png`, // 图标地址
+ url: `${publicPath}/image/pipeline/warning-normal.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
@@ -99,7 +99,7 @@
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
// {
- // url: `${publicPath}/image/pipeline/场站-离线.png`, // 图标地址
+ // url: `${publicPath}/image/pipeline/station-offline.png`, // 图标地址
// anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
// size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
// zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
@@ -299,6 +299,7 @@
bottom: 10px;
padding: 0 10px;
border-radius: 3px;
+ color: #000;
.legend-item {
margin: 10px 0;
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index dd10204..ed91b03 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -45,7 +45,7 @@
const loadingTable = ref(true)
// 查询条件
const listQuery = ref({
- limit: 20,
+ limit: 5,
offset: 1,
deptId: '', // 管理单位
devCode: '', // 设备编号
@@ -140,7 +140,7 @@
const reset = () => {
mapLoad.value = false
listQuery.value = {
- limit: 20,
+ limit: 5,
offset: 1,
deptId: '', // 管理单位
devCode: '', // 设备编号
@@ -257,9 +257,9 @@
})
}
// 表格高度
-const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15)
window.addEventListener('resize', () => {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15
})
// 监听地图高度
const watchMapHeight = () => {
@@ -271,7 +271,7 @@
// 执行相应的操作,比如更新UI或调用其他函数
console.log(`元素新高度为:${newHeight}`)
if (newHeight < 350) {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10 + (350 - newHeight)
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15 + (350 - newHeight)
}
}
})
@@ -281,10 +281,10 @@
}
watch(() => tableFlag.value, (newVal) => {
if (newVal === 'map') {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15
}
else if (newVal === 'normal') {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 15
}
})
onMounted(() => {
@@ -312,22 +312,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 9291513..f99ece6 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -27,22 +27,22 @@
const legendData = ref([
{
name: '正常',
- url: `${publicPath}/image/station/场站-正常.png`,
+ url: `${publicPath}/image/station/station-normal.png`,
value: '1',
},
{
name: '异常',
- url: `${publicPath}/image/station/场站-异常.png`,
+ url: `${publicPath}/image/station/station-error.png`,
value: '2',
},
{
name: '离线',
- url: `${publicPath}/image/station/场站-离线.png`,
+ url: `${publicPath}/image/station/station-offline.png`,
value: '3',
},
{
name: '未监控',
- url: `${publicPath}/image/station/场站-未部署.png`,
+ url: `${publicPath}/image/station/station-will.png`,
value: '0',
},
])
@@ -62,25 +62,25 @@
const drawMarker = () => {
const style = [
{
- url: `${publicPath}/image/station/场站-正常.png`, // 图标地址
+ url: `${publicPath}/image/station/station-normal.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/station/场站-异常.png`, // 图标地址
+ url: `${publicPath}/image/station/station-error.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/station/场站-离线.png`, // 图标地址
+ url: `${publicPath}/image/station/station-offline.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
},
{
- url: `${publicPath}/image/station/场站-未部署.png`, // 图标地址
+ url: `${publicPath}/image/station/station-will.png`, // 图标地址
anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量,基准点为图标左上角
size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
zIndex: 99, // 每种样式图标的叠加顺序,数字越大越靠前
@@ -228,6 +228,7 @@
bottom: 10px;
padding: 0 10px;
border-radius: 3px;
+ color: #000;
.legend-item {
margin: 10px 0;
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index a16559b..ed8a084 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -45,7 +45,7 @@
const loadingTable = ref(true)
// 查询条件
const listQuery = ref({
- limit: 20,
+ limit: 5,
offset: 1,
tagNumber: '', // 闸井位号
ledgerName: '', // 闸井名称
@@ -102,7 +102,7 @@
const reset = () => {
mapLoad.value = false
listQuery.value = {
- limit: 20,
+ limit: 5,
offset: 1,
tagNumber: '', // 闸井位号
ledgerName: '', // 闸井名称
@@ -178,9 +178,9 @@
})
}
// 表格高度
-const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10)
+const tableHeight = ref(window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15)
window.addEventListener('resize', () => {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15
})
// 监听地图高度
const watchMapHeight = () => {
@@ -192,7 +192,7 @@
// 执行相应的操作,比如更新UI或调用其他函数
console.log(`元素新高度为:${newHeight}`)
if (newHeight < 350) {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10 + (350 - newHeight)
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15 + (350 - newHeight)
}
}
})
@@ -202,13 +202,13 @@
}
watch(() => tableFlag.value, (newVal) => {
if (newVal === 'map') {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 52 - 10
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 350 - 98 - 10 - 52 - 15
setTimeout(() => {
watchMapHeight()
})
}
else if (newVal === 'normal') {
- tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 52 - 10
+ tableHeight.value = window.innerHeight - 60 - 50 - 10 - 98 - 10 - 52 - 15
}
})
onMounted(() => {
@@ -236,30 +236,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 37e7923..68b3861 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -190,6 +190,15 @@
gasRef.value.initDialog(baseInfo.value.id)
}
defineExpose({ initDialog, close })
+
+const goDeviceDetail = (code: string) => {
+ $router.push({
+ path: '/manage/detail',
+ query: {
+ row: JSON.stringify({ devcode: code }),
+ },
+ })
+}
@@ -227,6 +236,7 @@