diff --git a/locale/en.json b/locale/en.json
index 32d3254..054a9c5 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -61,5 +61,6 @@
"warning": "Warning",
"toast.command-reissue": "Do you need to issue it?",
"charging-task": "Charging task",
- "toast.charging-task": "Do you need to charge it?"
+ "toast.charging-task": "Do you need to charge it?",
+ "cancel-charging-task": "Cancel charging task"
}
\ No newline at end of file
diff --git a/locale/ko.json b/locale/ko.json
index abff09e..60b4704 100644
--- a/locale/ko.json
+++ b/locale/ko.json
@@ -61,5 +61,6 @@
"warning": "힌트",
"toast.command-reissue": "발송해야 하나요?",
"charging-task": "충전 작업",
- "toast.charging-task": "충전이 필요하십니까?"
+ "toast.charging-task": "충전이 필요하십니까?",
+ "cancel-charging-task": "충전 작업 취소"
}
\ No newline at end of file
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 9eca34d..15b73f6 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -61,6 +61,7 @@
"warning": "提示",
"toast.command-reissue": "是否需要下发?",
"charging-task": "充电任务",
- "toast.charging-task": "是否需要充电?"
+ "toast.charging-task": "是否需要充电?",
+ "cancel-charging-task": "取消充电任务"
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 031de30..52ae4c5 100644
--- a/pages.json
+++ b/pages.json
@@ -50,6 +50,14 @@
}
}
+ ,{
+ "path" : "pages/manage/cancel-charge-task",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 1ea513f..5746435 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -34,7 +34,8 @@
menuList: [
{id: 1, title: this.$t('title.call'), icon: 'RF01', path: '/pages/manage/call-manage'},
{id: 2, title: this.$t('title.command'), icon: 'RF02', path: '/pages/manage/inst-manage'},
- {id: 3, title: this.$t('title.task'), icon: 'RF03', path: '/pages/manage/task-manage'}
+ {id: 3, title: this.$t('title.task'), icon: 'RF03', path: '/pages/manage/task-manage'},
+ {id: 4, title: this.$t('cancel-charging-task'), icon: 'RF05', path: '/pages/manage/cancel-charge-task'}
// {id: 4, title: this.$t('title.release-confirm'), icon: 'RF04', path: '/pages/manage/release-confirm'}
],
show: false,
diff --git a/pages/manage/cancel-charge-task.vue b/pages/manage/cancel-charge-task.vue
new file mode 100644
index 0000000..7d40f5d
--- /dev/null
+++ b/pages/manage/cancel-charge-task.vue
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/image/che.png b/static/image/che.png
new file mode 100644
index 0000000..d73781d
Binary files /dev/null and b/static/image/che.png differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
new file mode 100644
index 0000000..4a8c05b
Binary files /dev/null and b/static/image/menu/RF05.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 0735089..3e7c1d8 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -101,4 +101,11 @@ export const updateTask = (code,type) => request({
export const taskCharge = () => request({
url:'api/hand/taskCharge',
data: {}
+})
+/**
+ * 取消充电任务
+ */
+export const cancleTaskCharge = () => request({
+ url:'api/hand/cancleTaskCharge',
+ data: {}
})
\ No newline at end of file