diff --git a/api/ems/site.js b/api/ems/site.js
index c5f1de4..ab066d4 100644
--- a/api/ems/site.js
+++ b/api/ems/site.js
@@ -83,20 +83,38 @@ export function getSingleBatteryData(data) {
})
}
-//获取单个站点的基本信息
-export function getSingleSiteBaseInfo(data) {
- return request({
- url: `/ems/siteMap/getSingleSiteBaseInfo`, //?siteId=${siteId}`,
- method: 'get',
- data
- })
-}
-
-// 一周冲放曲线
-export function getSevenChargeData(data) {
- return request({
- url: `/ems/siteMap/getSevenChargeData`, //?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
- method: 'get',
+//获取单个站点的基本信息
+export function getSingleSiteBaseInfo(data) {
+ return request({
+ url: `/ems/siteMap/getSingleSiteBaseInfo`, //?siteId=${siteId}`,
+ method: 'get',
+ data
+ })
+}
+
+//单站监控 首页 总累计运行数据
+export function getDzjkHomeView(data) {
+ return request({
+ url: `/ems/siteMonitor/homeView`, //?siteId=${siteId}
+ method: 'get',
+ data
+ })
+}
+
+// 电价报表(收益数据)
+export function getAmmeterRevenueData(params) {
+ return request({
+ url: `/ems/statsReport/getAmmeterRevenueData`,
+ method: 'get',
+ params
+ })
+}
+
+// 一周冲放曲线
+export function getSevenChargeData(data) {
+ return request({
+ url: `/ems/siteMap/getSevenChargeData`, //?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
+ method: 'get',
data
})
}
@@ -117,4 +135,4 @@ export function getSiteAllDeviceCategory(data) {
method: 'get',
data
})
-}
\ No newline at end of file
+}
diff --git a/pages.json b/pages.json
index 6748101..0a1570d 100644
--- a/pages.json
+++ b/pages.json
@@ -9,15 +9,13 @@
"style": {
"navigationBarTitleText": "注册"
}
- }, {
- "path": "pages/index",
- "style": {
- "navigationBarTitleText": "工单列表",
- "navigationStyle": "custom",
- "onReachBottomDistance": 100
- }
- }, {
- "path": "pages/work/index",
+ }, {
+ "path": "pages/index",
+ "style": {
+ "navigationBarTitleText": "首页"
+ }
+ }, {
+ "path": "pages/work/index",
"style": {
"navigationBarTitleText": "工作台"
}
@@ -71,11 +69,19 @@
"style": {
"navigationBarTitleText": "浏览文本"
}
- },
- {
- "path": "pages/ticket/index",
- "style": {
- "navigationBarTitleText": "工单详情"
+ },
+ {
+ "path": "pages/ticket/list",
+ "style": {
+ "navigationBarTitleText": "工单列表",
+ "navigationStyle": "custom",
+ "onReachBottomDistance": 100
+ }
+ },
+ {
+ "path": "pages/ticket/index",
+ "style": {
+ "navigationBarTitleText": "工单详情"
}
},
{
@@ -116,14 +122,19 @@
"selectedColor": "#000000",
"borderStyle": "white",
"backgroundColor": "#ffffff",
- "list": [{
- "pagePath": "pages/index",
- "iconPath": "static/images/tabbar/home.png",
- "selectedIconPath": "static/images/tabbar/home_.png",
- "text": "首页"
- }, {
- "pagePath": "pages/work/index",
- "iconPath": "static/images/tabbar/work.png",
+ "list": [{
+ "pagePath": "pages/index",
+ "iconPath": "static/images/tabbar/home.png",
+ "selectedIconPath": "static/images/tabbar/home_.png",
+ "text": "首页"
+ }, {
+ "pagePath": "pages/ticket/list",
+ "iconPath": "static/images/tabbar/ticket.png",
+ "selectedIconPath": "static/images/tabbar/ticket_.png",
+ "text": "工单"
+ }, {
+ "pagePath": "pages/work/index",
+ "iconPath": "static/images/tabbar/work.png",
"selectedIconPath": "static/images/tabbar/work_.png",
"text": "工作台"
}, {
@@ -138,4 +149,4 @@
"navigationBarTitleText": "EMS",
"navigationBarBackgroundColor": "#FFFFFF"
}
-}
\ No newline at end of file
+}
diff --git a/pages/index.vue b/pages/index.vue
index cb7b268..0c2b475 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,229 +1,403 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无数据
-
-
-
- 工单号:{{item.ticketNo}}
- {{ticketStatusOptions[item.status]}}
-
-
- 工单标题:
- {{item.title}}
-
- 问题描述:
- {{item.content}}
-
- 预期完成时间:
- {{item.expectedCompleteTime || '-'}}
-
- 处理人:
-
- {{item.workName || '-'}}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+ 站点选择
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ format2(runningInfo[item.attr]) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/ticket/index.vue b/pages/ticket/index.vue
index f339d1f..13c4a7b 100644
--- a/pages/ticket/index.vue
+++ b/pages/ticket/index.vue
@@ -96,11 +96,11 @@
title: '提交成功',
duration: 2000
});
- uni.switchTab({
- url: '/pages/index'
- });
- }
- }).finally(() => this.loading = false)
+ uni.switchTab({
+ url: '/pages/ticket/list'
+ });
+ }
+ }).finally(() => this.loading = false)
},
// 获取上传状态
@@ -211,4 +211,4 @@
.submit-button {
font-size: 28rpx;
}
-
\ No newline at end of file
+
diff --git a/pages/ticket/list.vue b/pages/ticket/list.vue
new file mode 100644
index 0000000..7d55206
--- /dev/null
+++ b/pages/ticket/list.vue
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+ 工单号:{{item.ticketNo}}
+ {{ticketStatusOptions[item.status]}}
+
+
+ 工单标题:
+ {{item.title}}
+
+ 问题描述:
+ {{item.content}}
+
+ 预期完成时间:
+ {{item.expectedCompleteTime || '-'}}
+
+ 处理人:
+
+ {{item.workName || '-'}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/images/tabbar/ticket.png b/static/images/tabbar/ticket.png
new file mode 100644
index 0000000..4365e95
Binary files /dev/null and b/static/images/tabbar/ticket.png differ
diff --git a/static/images/tabbar/ticket_.png b/static/images/tabbar/ticket_.png
new file mode 100644
index 0000000..7f81990
Binary files /dev/null and b/static/images/tabbar/ticket_.png differ