Commit 12e033d7 authored by van.chen's avatar van.chen

加载

parent 42f232a9
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.stepClass { .stepClass {
display: inline-block; display: inline-block;
width: calc(100% - 209px); width: calc(100% - 220px);
margin-left: 60px; margin-left: 60px;
margin-right: 5px; margin-right: 5px;
} }
......
...@@ -70,7 +70,6 @@ export class EastPage implements OnInit { ...@@ -70,7 +70,6 @@ export class EastPage implements OnInit {
op: a.value ? 0 : 1, op: a.value ? 0 : 1,
ts: parseInt((new Date().getTime() / 1000).toString(), 10) ts: parseInt((new Date().getTime() / 1000).toString(), 10)
}; };
this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlSwitch([req, (data) => { this.api.control.controlSwitch([req, (data) => {
if (data && data.code === 1) { if (data && data.code === 1) {
this.getData(1); this.getData(1);
...@@ -79,7 +78,6 @@ export class EastPage implements OnInit { ...@@ -79,7 +78,6 @@ export class EastPage implements OnInit {
this.api.presentMsgToast(data.message); this.api.presentMsgToast(data.message);
} }
a.loading = false; a.loading = false;
this.load.offLoad();
}]); }]);
} }
...@@ -98,7 +96,6 @@ export class EastPage implements OnInit { ...@@ -98,7 +96,6 @@ export class EastPage implements OnInit {
startTime: parseInt((new Date().getTime() / 1000).toString(), 10), startTime: parseInt((new Date().getTime() / 1000).toString(), 10),
ts: parseInt((new Date().getTime() / 1000).toString(), 10) ts: parseInt((new Date().getTime() / 1000).toString(), 10)
}; };
this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlSwitch([req, (data) => { this.api.control.controlSwitch([req, (data) => {
if (data && data.code === 1) { if (data && data.code === 1) {
this.getData(1); this.getData(1);
...@@ -107,7 +104,6 @@ export class EastPage implements OnInit { ...@@ -107,7 +104,6 @@ export class EastPage implements OnInit {
this.api.presentMsgToast(data.message); this.api.presentMsgToast(data.message);
} }
this.cancel(); this.cancel();
this.load.offLoad();
}]); }]);
} }
......
...@@ -60,7 +60,6 @@ export class OtherPage implements OnInit { ...@@ -60,7 +60,6 @@ export class OtherPage implements OnInit {
op: a.value ? 0 : 1, op: a.value ? 0 : 1,
ts: parseInt((new Date().getTime() / 1000).toString(), 10) ts: parseInt((new Date().getTime() / 1000).toString(), 10)
}; };
this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlSwitch([req, (data) => { this.api.control.controlSwitch([req, (data) => {
if (data && data.code === 1) { if (data && data.code === 1) {
this.getData(1); this.getData(1);
...@@ -69,7 +68,6 @@ export class OtherPage implements OnInit { ...@@ -69,7 +68,6 @@ export class OtherPage implements OnInit {
this.api.presentMsgToast(data.message); this.api.presentMsgToast(data.message);
} }
a.loading = false; a.loading = false;
this.load.offLoad();
}]); }]);
} }
...@@ -105,7 +103,6 @@ export class OtherPage implements OnInit { ...@@ -105,7 +103,6 @@ export class OtherPage implements OnInit {
op: a.v ? 0 : 1, op: a.v ? 0 : 1,
type: a.t type: a.t
}; };
this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlBatchSwitch([req, (data) => { this.api.control.controlBatchSwitch([req, (data) => {
if (data.code === 1) { if (data.code === 1) {
this.getData(1); this.getData(1);
...@@ -114,7 +111,6 @@ export class OtherPage implements OnInit { ...@@ -114,7 +111,6 @@ export class OtherPage implements OnInit {
this.api.presentMsgToast(data.message); this.api.presentMsgToast(data.message);
} }
a.d = false; a.d = false;
this.load.offLoad();
}]); }]);
} }
......
export const environment = { export const environment = {
production: true, production: true,
// url: 'http://pasture.witium.com/api', // 对外访问测试网地址 url: 'http://pasture.witium.com/api', // 对外访问测试网地址
url: 'http://172.16.1.13:8096', // 测试 // url: 'http://172.16.1.13:8096', // 测试
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment