@@ -121,29 +161,30 @@ onMounted(() => {
设备编号:
-
25566333
+
{{ showInfo.code || '-' }}
设备名称:
-
甲烷监测设备
+
{{ showInfo.name || '-' }}
-
警告事件:
-
2023-12-7 12:30
+
警告时间:
+
{{ showInfo.create_time || '-' }}
设备图片:
-
+
![]()
警告原因:
-
甲烷含量超标, 同时浓度也超标了
+
{{ showInfo.alarm_reason || '-' }}
警告数据:
-
甲烷含量>1000ppm 浓度>120
+
{{ showInfo.alarm_value.join(', ') || '-' }}
+
{{ showInfo.alarm_value || '-' }}
@@ -151,10 +192,9 @@ onMounted(() => {
解决方案:
- 确保良好的通风系统：提供良好的通风以排除甲烷气体。这可以包括安装有效的排气扇、通风管道和通风设备，以确保空气流动。
- 检修和维护设备：定期检查和维护可能产生甲烷泄漏的设备，如管道、阀门、连接件等。确保它们的密封性和操作正常，及时修复任何泄漏。
+ {{ showInfo.alarm_resolution || '-' }}
-
1.优化饲养管理 2.粪便处理设施改…
+
@@ -339,6 +379,12 @@ onMounted(() => {
text-align: start;
padding-right: 0.4rem;
box-sizing: border-box;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 3; /* 显示的行数 */
+ line-height: 1.5rem; /* 行高 */
}
.tips {
flex-shrink: 0;
@@ -346,6 +392,10 @@ onMounted(() => {
.list {
padding-bottom: 4rem;
}
+ .img{
+ height: 4.5rem;
+ width: 4.5rem;
+ }
}
}
}
diff --git a/src/view/delivery/components/center.vue b/src/view/delivery/components/center.vue
index 41a96e6..335d689 100644
--- a/src/view/delivery/components/center.vue
+++ b/src/view/delivery/components/center.vue
@@ -14,6 +14,10 @@ import naxi from "@/assets/json/naxi.json";
import luxian_geo from "@/utils/luxian_geo.js";
import xuyong_geo from "@/utils/xuyong_geo.js";
import jiangyang_geo from "@/utils/jiangyang_geo.js";
+import longma_geo from "@/utils/longma_geo.js";
+import gulin_geo from "@/utils/gulin_geo.js";
+import hejiang_geo from "@/utils/hejiang_geo.js";
+import naxi_geo from "@/utils/naxi_geo.js";
import { useAppStore } from "@/store/app.js";
import geoJSON from "@/utils/geo.js";
@@ -499,6 +503,10 @@ const mapInfo = () => {
if (area.name == "泸县") map = luxian_geo;
if (area.name == "江阳区") map = jiangyang_geo;
if (area.name == "叙永县") map = xuyong_geo;
+ if (area.name == "龙马潭区") map = longma_geo;
+ if (area.name == "纳溪区") map = naxi_geo;
+ if (area.name == "合江县") map = hejiang_geo;
+ if (area.name == "古蔺县") map = gulin_geo;
map = JSON.parse(JSON.stringify(map));
if (appStore.address.streetCode) {
let street = appStore.street.find(
diff --git a/src/view/delivery/components/left.vue b/src/view/delivery/components/left.vue
index a3bc196..153fd12 100644
--- a/src/view/delivery/components/left.vue
+++ b/src/view/delivery/components/left.vue
@@ -1,18 +1,31 @@
@@ -232,12 +269,15 @@ onMounted(() => {
-
泸县原生态养殖基地
+
{{ farmInfo.farm_name }}
-
-
泸县原生态养殖基地
+
+
{{ farmInfo.farm_name }}
@@ -301,7 +341,7 @@ onMounted(() => {
flex-direction: column;
justify-content: space-evenly;
align-items: center;
- img {
+ .img {
height: 76%;
width: 96%;
}
diff --git a/src/view/index/components/bottom.vue b/src/view/index/components/bottom.vue
index 50a84f7..3b31f0b 100644
--- a/src/view/index/components/bottom.vue
+++ b/src/view/index/components/bottom.vue
@@ -1,14 +1,18 @@
@@ -100,7 +117,7 @@ onMounted(() => {
-
{{ 6 }}
+
{{ leftInfo.todayAlarmCount }}
今日警告数
@@ -114,7 +131,7 @@ onMounted(() => {
-
{{ 6 }}
+
{{ leftInfo.alarmCount }}
警告总数
@@ -122,7 +139,7 @@ onMounted(() => {
@@ -143,29 +160,30 @@ onMounted(() => {
设备编号:
-
25566333
+
{{ showInfo.code || '-' }}
设备名称:
-
甲烷监测设备
+
{{ showInfo.name || '-' }}
-
警告事件:
-
2023-12-7 12:30
+
警告时间:
+
{{ showInfo.create_time || '-' }}
设备图片:
-
+
![]()
警告原因:
-
甲烷含量超标, 同时浓度也超标了
+
{{ showInfo.alarm_reason || '-' }}
警告数据:
-
甲烷含量>1000ppm 浓度>120
+
{{ showInfo.alarm_value.join(', ') || '-' }}
+
{{ showInfo.alarm_value || '-' }}
@@ -173,10 +191,9 @@ onMounted(() => {
解决方案:
- 确保良好的通风系统：提供良好的通风以排除甲烷气体。这可以包括安装有效的排气扇、通风管道和通风设备，以确保空气流动。
- 检修和维护设备：定期检查和维护可能产生甲烷泄漏的设备，如管道、阀门、连接件等。确保它们的密封性和操作正常，及时修复任何泄漏。
+ {{ showInfo.alarm_resolution || '-' }}
-
1.优化饲养管理 2.粪便处理设施改…
+
@@ -361,6 +378,12 @@ onMounted(() => {
text-align: start;
padding-right: 0.4rem;
box-sizing: border-box;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 3; /* 显示的行数 */
+ line-height: 1.5rem; /* 行高 */
}
.tips {
flex-shrink: 0;
@@ -368,6 +391,10 @@ onMounted(() => {
.list {
padding-bottom: 4rem;
}
+ .img{
+ height: 4.5rem;
+ width: 4.5rem;
+ }
}
}
}
diff --git a/src/view/index/components/center.vue b/src/view/index/components/center.vue
index 3706ef1..6e32cf3 100644
--- a/src/view/index/components/center.vue
+++ b/src/view/index/components/center.vue
@@ -14,7 +14,10 @@ import naxi from "@/assets/json/naxi.json";
import luxian_geo from "@/utils/luxian_geo.js";
import xuyong_geo from "@/utils/xuyong_geo.js";
import jiangyang_geo from "@/utils/jiangyang_geo.js";
-import geoJSON from "@/utils/geo.js";
+import longma_geo from "@/utils/longma_geo.js";
+import gulin_geo from "@/utils/gulin_geo.js";
+import hejiang_geo from "@/utils/hejiang_geo.js";
+import naxi_geo from "@/utils/naxi_geo.js";
import { useAppStore } from "@/store/app.js";
import { sendMsg } from "@/api/sendMsg.js";
@@ -500,9 +503,18 @@ const initMap = () => {
name: params.name
}})
} else {
- router.push({
- path: '/delivery',
+ // router.push({
+ // path: '/delivery',
+ // query: {
+ // name: params.name
+ // }
+ // })
+ let obj = appStore.street.find(item=>item.name==params.name);
+ if(obj) router.push({
+ path: '/indexc',
query: {
+ areaCode: appStore.address.areaCode,
+ streetCode: obj.code,
name: params.name
}
})
@@ -519,6 +531,10 @@ const mapInfo = () => {
if (area.name == "泸县") map = luxian_geo;
if (area.name == "江阳区") map = jiangyang_geo;
if (area.name == "叙永县") map = xuyong_geo;
+ if (area.name == "龙马潭区") map = longma_geo;
+ if (area.name == "纳溪区") map = naxi_geo;
+ if (area.name == "合江县") map = hejiang_geo;
+ if (area.name == "古蔺县") map = gulin_geo;
map = JSON.parse(JSON.stringify(map));
if (appStore.address.streetCode) {
let street = appStore.street.find(
diff --git a/src/view/index/components/left.vue b/src/view/index/components/left.vue
index 61a98dd..3788044 100644
--- a/src/view/index/components/left.vue
+++ b/src/view/index/components/left.vue
@@ -35,6 +35,7 @@ const initBreedTypeCount = ()=>{
streetCode: appStore.address.streetCode
}).then((res)=>{
breedTypeRows.value = res.data.breedTypeRows;
+ if(res.data.animalList.length>6) res.data.animalList = res.data.animalList.slice(0,6);
animalList.value = res.data.animalList;
animalList.value.forEach(item=>{
QRCode.toDataURL('d_' + item.sn, {
@@ -264,7 +265,7 @@ onMounted(() => {
-
占地规模
+
养殖规模
{{ farmInfo.totalScale }}亩
diff --git a/src/view/indexc/components/center2.vue b/src/view/indexc/components/center2.vue
new file mode 100644
index 0000000..73474bb
--- /dev/null
+++ b/src/view/indexc/components/center2.vue
@@ -0,0 +1,629 @@
+
+
+
+
+
+
+
{{ route.query.name }}
+
+
+
diff --git a/src/view/indexc/index.vue b/src/view/indexc/index.vue
new file mode 100644
index 0000000..462873f
--- /dev/null
+++ b/src/view/indexc/index.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
- {{ 6 }}
+ {{ leftInfo.offline }}
