diff --git a/packDetail/pages/operations/add.vue b/packDetail/pages/operations/add.vue
index a4e9a81..d3150bc 100644
--- a/packDetail/pages/operations/add.vue
+++ b/packDetail/pages/operations/add.vue
@@ -15,16 +15,17 @@
+
+
+ 站点位置:
+
+
+
- 维护内容:
+ 监测情况:
-
@@ -32,14 +33,22 @@
- 维护人:
+ 负责人:
-
-
+
+
+
+
+ 联系方式:
+
+
+ {{phoneError}}
@@ -84,16 +93,17 @@
isDel: 0,
itemId: "",
maintainData1: "",
- maintainData2: "",
maintainNote: "",
maintainPerson: "",
+ maintainData2:"",
+ maintainData3: "",
maintainTime: "",
reVision: 0,
stationCode: "",
stationName: "",
tenantId: "",
updatedBy: "",
- updatedTime: ""
+ updatedTime: "",
},
index:'',
date:'',
@@ -102,7 +112,8 @@
tag:'',
hobby: [],
checkbox1: [],
- reload:'true'
+ reload:'true',
+ phoneError: '', // 添加错误提示信息
}
},
onLoad() {
@@ -120,15 +131,14 @@
for(var i=0;i
\ No newline at end of file
diff --git a/packDetail/pages/operations/edit.vue b/packDetail/pages/operations/edit.vue
index 78385b0..59c73e1 100644
--- a/packDetail/pages/operations/edit.vue
+++ b/packDetail/pages/operations/edit.vue
@@ -15,9 +15,15 @@
+
+
+ 站点位置:
+
+
+
- 维护内容:
+ 检测情况:
@@ -29,13 +35,8 @@
- 维护人:
+ 负责人:
-
@@ -82,6 +83,7 @@
itemId: "",
maintainData1: "",
maintainData2: "",
+ maintainData3:"",
maintainNote: "",
maintainPerson: "",
maintainTime: "",
@@ -91,7 +93,7 @@
stationName: "",
tenantId: "",
updatedBy: "",
- updatedTime: ""
+ updatedTime: "",
},
index:'',
date:'',
@@ -119,10 +121,10 @@
for(var i=0;i
+
+ 站点位置:
+ {{item.maintainData3}}
+
- 维护内容:
+ 监测情况:
{{item.maintainData1}}
- 维护人员:
+ 负责人员:
{{item.maintainPerson}}
+
+ 联系方式:
+ {{item.maintainData2}}
+
维护时间:
{{item.maintainTime}}
diff --git a/packDetail/pages/sjdyj/index.vue b/packDetail/pages/sjdyj/index.vue
index eed19c7..2ea8f12 100644
--- a/packDetail/pages/sjdyj/index.vue
+++ b/packDetail/pages/sjdyj/index.vue
@@ -168,7 +168,7 @@
dictLabel:'监测站告警'
},
{
- dictLabel:'杀虫灯告警'
+ dictLabel:'异常趋势图'
}
],
isActive:0,
diff --git a/pages.json b/pages.json
index cb7a699..7f0993f 100644
--- a/pages.json
+++ b/pages.json
@@ -109,7 +109,7 @@
{
"path": "pages/Site/index",
"style": {
- "navigationBarTitleText": "监测站点",
+ "navigationBarTitleText": "站点管理",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@@ -117,7 +117,7 @@
{
"path": "pages/Site/detail",
"style": {
- "navigationBarTitleText": "监测站点",
+ "navigationBarTitleText": "站点管理",
"navigationStyle": "custom",
"navigationBarBackgroundColor":"#0F6EFF"
}
@@ -125,7 +125,7 @@
{
"path": "pages/Site/sjdetail",
"style": {
- "navigationBarTitleText": "监测站点",
+ "navigationBarTitleText": "站点管理",
"navigationStyle": "custom",
"navigationBarBackgroundColor":"#0F6EFF"
}
@@ -188,7 +188,7 @@
{
"path": "pages/analysis/index",
"style": {
- "navigationBarTitleText": "数据分析",
+ "navigationBarTitleText": "统计分析",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
@@ -204,7 +204,7 @@
{
"path": "pages/sjdyj/index",
"style": {
- "navigationBarTitleText": "设备告警",
+ "navigationBarTitleText": "预警信息",
"navigationStyle": "default",
"navigationBarBackgroundColor":"#0F6EFF"
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e01565d..f13737e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,1632 +1,1605 @@
-
-
-
-
-
-
-
-
- {{ city }}
-
-
-
-
- {{ weather }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
- {{ cutMoneyFiter(bjnumber) }}
-
-
-
-
-
-
-
-
-
-
-
- 累计
- {{ cutMoneyFiter(numbers) }}
- 条
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.stationName }}
-
-
- {{ item.times[1] }}
-
-
-
-
-
- {{ item.name }}
-
-
-
-
- {{ item.value }}{{ item.unit }}
-
-
-
-
- {{ item.times[0] }}
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ item.times[0] }}
+
+
+
+
+
+
+
+
+
+
+ .liebiao {
+ height: 713rpx;
+ }
+
\ No newline at end of file