diff --git a/src/config/getData2.js b/src/config/getData2.js
index acca392..2d3d7fe 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -72,3 +72,41 @@ export const sendMaterialConfirm = (sid, scode, spcode, nid, ncode, npcode) => p
next_region_code: ncode,
next_point_code: npcode
})
+
+/**
+ * 取放桶盖
+ */
+// 1.1查询所有区域信息
+// export const handArea = () => post('api/hand/area', {})
+export const handArea = () => {
+ let res = {
+ code: '1',
+ result: [{
+ region_id: '1',
+ region_code: '1',
+ region_name: 'A001'
+ }]
+ }
+ return res
+}
+// 1.2根据区域查询点位
+// export const handPoint = (reg) => post('api/hand/point', {
+// region: reg
+// })
+export const handPoint = () => {
+ let res = {
+ code: '1',
+ result: [{
+ device_id: '1',
+ device_code: '1',
+ device_name: 'A001-001',
+ status: '2'
+ }]
+ }
+ return res
+}
+// 1.3取放盖确认
+export const handTake = (code, type) => post('api/hand/take', {
+ device_code: code,
+ type: type
+})
diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index f6c63d0..645f2e2 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -20,6 +20,7 @@
搬运任务
任务管理
指令管理
+ 取放桶盖
修改密码
diff --git a/src/pages/proj/TakeBung.vue b/src/pages/proj/TakeBung.vue
new file mode 100644
index 0000000..67629e7
--- /dev/null
+++ b/src/pages/proj/TakeBung.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+
+
站点
+
{{el.device_name}}
+
+
+
+
+
+
+
+
+
站点:{{obj.device_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 3882619..12d6fc5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,6 +13,7 @@ const CarryTask = r => require.ensure([], () => r(require('../pages/proj/CarryTa
const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage')
const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage')
const Password = r => require.ensure([], () => r(require('../pages/proj/Password')), 'Password')
+const TakeBung = r => require.ensure([], () => r(require('../pages/proj/TakeBung')), 'TakeBung')
Vue.use(Router)
@@ -64,6 +65,10 @@ export default new Router({
{
path: '/Password', // 密码
component: Password
+ },
+ {
+ path: '/TakeBung', // 取放桶盖
+ component: TakeBung
}
],
scrollBehavior (to, from, savedPosition) {
diff --git a/src/style/common.styl b/src/style/common.styl
index 15a7218..5f0c876 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -548,4 +548,17 @@ header
.el-radio__input.is-checked+.el-radio__label
color#323232
.el-radio__inner:hover
- border-color: $red
\ No newline at end of file
+ border-color: $red
+
+.icons
+ height .4rem
+ margin-bottom .12rem
+.item_icon
+ _fj()
+ margin-right .1rem
+.color_icon
+ _wh(.2rem,.2rem)
+ border-radius 50%
+ margin-right .1rem
+.font_icon
+ _font(.28rem, .4rem, #000)
\ No newline at end of file