diff --git a/src/config/getData.js b/src/config/getData.js
index adba311..c17fca0 100644
--- a/src/config/getData.js
+++ b/src/config/getData.js
@@ -18,16 +18,12 @@ export const instOperation = (uuid, type) => post('api/andxy2/hand/inst', {
inst_uuid: uuid,
type: type
})
-
-// 任务管理
-// 1.1 查询未完成指令
-export const queryTask = (keyword, scode, ncode) => post('api/andxy2/hand/tasks', {
- keyword: keyword,
- start_devicecode: scode,
- next_devicecode: ncode
-})
-// 1.2 指令操作
-export const taskOperation = (uuid, type) => post('api/andxy2/hand/taskoperation', {
- inst_uuid: uuid,
- 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
})
diff --git a/src/pages/proj/HomePage.vue b/src/pages/proj/HomePage.vue
index 5fa3c91..a059801 100644
--- a/src/pages/proj/HomePage.vue
+++ b/src/pages/proj/HomePage.vue
@@ -17,6 +17,7 @@
diff --git a/src/pages/proj/SignalSend.vue b/src/pages/proj/SignalSend.vue
new file mode 100644
index 0000000..8193c2c
--- /dev/null
+++ b/src/pages/proj/SignalSend.vue
@@ -0,0 +1,152 @@
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index c6f3ed5..eb40c94 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@ 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')
Vue.use(Router)
@@ -26,6 +27,10 @@ export default new Router({
{
path: '/zlmanage',
component: ZlManage
+ },
+ {
+ path: '/SignalSend',
+ component: SignalSend
}
]
})
diff --git a/src/style/layout.styl b/src/style/layout.styl
index a457abd..2dfbf14 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -192,8 +192,9 @@ header
display flex
justify-content space-between
.filter-label
+ font-size 0.12rem
color #464646
- width .6rem
+ width 1.2rem
line-height .3rem
height .3rem
text-align justify
@@ -275,7 +276,7 @@ header
display inline-block
// width calc(100% - .8rem)
width 100%
- height .3rem
+ height .4rem
line-height .3rem
font-size .13rem
color #606266
@@ -507,7 +508,7 @@ header
cursor: not-allowed
.iliblock
flex 1
- margin-left .2rem
+ margin-left .05rem
position relative
.filter-scan
display: block