diff --git a/src/config/getData.js b/src/config/getData.js
index 55ce123..645517c 100644
--- a/src/config/getData.js
+++ b/src/config/getData.js
@@ -19,11 +19,19 @@ export const instOperation = (uuid, type) => post('api/andxy2/hand/inst', {
type: type
})
// 信号下发
-// 1.3下发设备信号
-export const putPoint = (val1, val2, val3, val4, val5) => post('api/hand/putPoint', {
- outer_diameter: val1,
- length: val2,
- color: val3,
- jackup_num: val4,
- strap_number: val5
+// // 1.3下发设备信号
+// export const putPoint = (val1, val2, val3, val4, val5) => post('api/hand/putPoint', {
+// outer_diameter: val1,
+// length: val2,
+// color: val3,
+// jackup_num: val4,
+// strap_number: val5
+// })
+
+// 1.3信号查询(定时)
+export const queryDeviceInfo = () => post('api/hand/queryDeviceInfo', {})
+// 1.3下发设备信号(按照查询的字段,每次1个信号)
+export const putPoint = (type, value) => post('api/hand/putPoint', {
+ type: type,
+ value: value
})
diff --git a/src/pages/proj/HomePage.vue b/src/pages/proj/HomePage.vue
index ab6e474..cd8263c 100644
--- a/src/pages/proj/HomePage.vue
+++ b/src/pages/proj/HomePage.vue
@@ -19,7 +19,8 @@
分拣管理
工单管理
- 信号下发
+
+ 运行操作
diff --git a/src/pages/proj/RunOperate.vue b/src/pages/proj/RunOperate.vue
new file mode 100644
index 0000000..e28ec45
--- /dev/null
+++ b/src/pages/proj/RunOperate.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 837bef3..0aeded4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,9 +3,9 @@ import Router from 'vue-router'
const Login = r => require.ensure([], () => r(require('@page/Login')), 'Login')
-// const ZlManage = r => require.ensure([], () => r(require('@page/proj/ZlManage')), 'ZlManage')
const HomePage = r => require.ensure([], () => r(require('@page/proj/HomePage')), 'HomePage')
const SignalSend = r => require.ensure([], () => r(require('@page/proj/SignalSend')), 'SignalSend')
+const RunOperate = r => require.ensure([], () => r(require('@page/proj/RunOperate')), 'RunOperate')
const SortingManage = r => require.ensure([], () => r(require('@page/proj/SortingManage')), 'SortingManage')
const OrderManage = r => require.ensure([], () => r(require('@page/proj/OrderManage')), 'OrderManage')
Vue.use(Router)
@@ -14,7 +14,7 @@ export default new Router({
routes: [
{
path: '/',
- redirect: '/login'
+ redirect: '/RunOperate'
},
{
path: '/login',
@@ -25,14 +25,14 @@ export default new Router({
path: '/home',
component: HomePage
},
- // {
- // path: '/zlmanage',
- // component: ZlManage
- // },
{
path: '/SignalSend',
component: SignalSend
},
+ {
+ path: '/RunOperate',
+ component: RunOperate
+ },
{
path: '/SortingManage',
component: SortingManage
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 7fadfb2..14ecbab 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -770,4 +770,17 @@ header
margin-bottom .1rem
button:disabled
background-color #e1e1e1
- color #444
\ No newline at end of file
+ color #444
+// same input
+.showbox
+ display inline-block
+ // width calc(100% - .8rem)
+ width 100%
+ height .4rem
+ line-height .3rem
+ font-size .13rem
+ color #606266
+ text-indent .16rem
+ background-color #fff
+ border 1px solid #D1D1D1
+ border-radius 4px
\ No newline at end of file