Compare commits

..

No commits in common. "98b519c09459ef1b50f1e654e5ecd2d9f397533c" and "a5a5c069fac80a002149e92223e4b37b27f0abca" have entirely different histories.

30 changed files with 14 additions and 296 deletions

View File

@ -43,7 +43,6 @@ export default {
routerNow: "skylight", routerNow: "skylight",
routerIndex: 1, routerIndex: 1,
purview: [], // purview: [], //
loading:null,
}; };
}, },
watch: { watch: {
@ -54,19 +53,12 @@ export default {
var store = this.$store.state; var store = this.$store.state;
var item = store.equipmentList[store.equipmentIndex - 1] var item = store.equipmentList[store.equipmentIndex - 1]
if(item.deviceName == 10 || item.deviceName == 30){ if(item.deviceName == 10 || item.deviceName == 30){
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit(); this.dataInit();
} }
}, },
}, },
mounted() { mounted() {
this.gerRouter(); this.gerRouter();
this.dataInit(); this.dataInit();
}, },
methods: { methods: {
@ -89,7 +81,6 @@ export default {
var store = this.$store.state; var store = this.$store.state;
var data = store.equipmentList[store.equipmentIndex - 1].deviceId; var data = store.equipmentList[store.equipmentIndex - 1].deviceId;
this.api.getcontrol_cpermission(data).then((res) => { this.api.getcontrol_cpermission(data).then((res) => {
this.routerList = []; this.routerList = [];
this.purview = res.data.data; this.purview = res.data.data;
this.purview.forEach((el, index) => { this.purview.forEach((el, index) => {
@ -260,19 +251,12 @@ export default {
this.routerNow != "/rollByRoll" && this.routerNow != "/rollByRoll" &&
this.routerNow != "/snowRemoval" this.routerNow != "/snowRemoval"
) { ) {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// //
var store = this.$store.state; var store = this.$store.state;
var data = { var data = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.readControl_fiveControl(data).then((res) => { this.api.readControl_fiveControl(data).then((res) => {
this.loading.close()
store.ControlData = res.data.data store.ControlData = res.data.data
//waterPump //waterPump
store.ControlData['21521'] = this.countData(store.ControlData['21521']) store.ControlData['21521'] = this.countData(store.ControlData['21521'])

View File

@ -295,7 +295,6 @@ export default {
actList2: [], actList2: [],
actList3: [], actList3: [],
startList:[21408,21413,21418,21423], startList:[21408,21413,21418,21423],
loading:null,
} }
}, },
watch: { watch: {
@ -310,12 +309,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -570,7 +563,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.readfilllight(data).then(res => { this.api.readfilllight(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.getActive1() this.getActive1()

View File

@ -133,18 +133,10 @@ export default {
}, },
data() { data() {
return { return {
inputData: [], inputData: []
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -161,7 +153,6 @@ export default {
regNum: 16, regNum: 16,
}; };
this.api.postReg(data).then((res) => { this.api.postReg(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
} else { } else {

View File

@ -316,17 +316,10 @@ export default {
{ label: '13#湿度传感器', value: 14 }, { label: '13#湿度传感器', value: 14 },
{ label: '14#湿度传感器', value: 15 }, { label: '14#湿度传感器', value: 15 },
{ label: '15#湿度传感器', value: 16 },], { label: '15#湿度传感器', value: 16 },],
loading:null,
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -494,7 +487,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.targetValue(data).then(res => { this.api.targetValue(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputData = JSON.parse(JSON.stringify(res.data.data));
this.inputDataNew = JSON.parse(JSON.stringify(res.data.data)) this.inputDataNew = JSON.parse(JSON.stringify(res.data.data))

View File

@ -143,7 +143,6 @@ export default {
startList: [21450, 21470],// startList: [21450, 21470],//
indexs: 1, indexs: 1,
actList1: [], actList1: [],
loading:null,
} }
}, },
watch: { watch: {
@ -158,12 +157,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -285,7 +278,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.readcirculationfan(data).then(res => { this.api.readcirculationfan(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.startList.forEach((el, index) => { this.startList.forEach((el, index) => {

View File

@ -82,7 +82,6 @@ export default {
startList: [21800, 21808],// startList: [21800, 21808],//
indexs: 1, indexs: 1,
actList1: [], actList1: [],
loading:null,
} }
}, },
watch: { watch: {
@ -97,12 +96,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -224,7 +217,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.highpressuremist(data).then(res => { this.api.highpressuremist(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.startList.forEach((el, index) => { this.startList.forEach((el, index) => {

View File

@ -177,21 +177,13 @@ export default {
actList1: [],// actList1: [],//
inputData: [], inputData: [],
typeList: [{ label: '间隔模式启动', value: 1, }, typeList: [{ label: '间隔模式启动', value: 1, },
{ label: '土壤湿度传感器启动', value: 2, },], { label: '土壤湿度传感器启动', value: 2, },]
loading:null,
} }
}, },
watch: { watch: {
$route(newVal, oldVal) { $route(newVal, oldVal) {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -200,12 +192,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -301,7 +287,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api['solenoidValve' + this.indexs](data).then(res => { this.api['solenoidValve' + this.indexs](data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.sensorType = '' this.sensorType = ''

View File

@ -74,7 +74,6 @@ export default {
data() { data() {
return { return {
inputData: [], inputData: [],
loading:null,
} }
}, },
mounted() { mounted() {
@ -158,18 +157,11 @@ export default {
this.change(code, sendData) this.change(code, sendData)
}, },
dataInit() { dataInit() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
var store = this.$store.state var store = this.$store.state
var data = { var data = {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.readalarmSetting(data).then(res => { this.api.readalarmSetting(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;

View File

@ -143,7 +143,6 @@ export default {
// //
openIndex: 0, openIndex: 0,
actList1:[], actList1:[],
loading:null,
} }
}, },
watch: { watch: {
@ -159,12 +158,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -292,7 +285,6 @@ export default {
}; };
this.api.getReadControlliShuiControl(data).then((res) => { this.api.getReadControlliShuiControl(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.openIndex = this.inputData[21600] this.openIndex = this.inputData[21600]

View File

@ -34,17 +34,10 @@
index: -1, index: -1,
value: 0, value: 0,
}, },
pageList:[[],[],[],[]], pageList:[[],[],[],[]]
loading:null,
} }
}, },
mounted(){ mounted(){
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
}, },
methods:{ methods:{
@ -78,7 +71,6 @@
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.forceChannelOutput(data).then((res) => { this.api.forceChannelOutput(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.pageList.forEach((el, index) => { this.pageList.forEach((el, index) => {

View File

@ -221,7 +221,6 @@ export default {
inputData: [], inputData: [],
dataSel: '', dataSel: '',
store: this.$store.state, store: this.$store.state,
loading:null,
} }
}, },
watch: { watch: {
@ -230,12 +229,6 @@ export default {
var store = this.$store.state var store = this.$store.state
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.titleName = store.equipmentName['fertilization' + store.nameList[this.indexs - 1]] this.titleName = store.equipmentName['fertilization' + store.nameList[this.indexs - 1]]
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -246,12 +239,6 @@ export default {
var store = this.$store.state var store = this.$store.state
this.indexs = this.$route.query.id ? Number(this.$route.query.id) : 1; this.indexs = this.$route.query.id ? Number(this.$route.query.id) : 1;
this.titleName = store.equipmentName['fertilization' + store.nameList[this.indexs - 1]] this.titleName = store.equipmentName['fertilization' + store.nameList[this.indexs - 1]]
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -330,7 +317,6 @@ export default {
regNum: 29, regNum: 29,
}; };
this.api.postReg(data).then((res) => { this.api.postReg(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.inputData[store.formulaNum[this.indexs - 1]] = this.countData1(this.inputData[store.formulaNum[this.indexs - 1]]) this.inputData[store.formulaNum[this.indexs - 1]] = this.countData1(this.inputData[store.formulaNum[this.indexs - 1]])

View File

@ -162,7 +162,6 @@ export default {
startList: [21840, 21858],// startList: [21840, 21858],//
indexs: 1, indexs: 1,
actList1: [], actList1: [],
loading:null,
} }
}, },
watch: { watch: {
@ -177,12 +176,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -304,7 +297,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.innercurtain(data).then(res => { this.api.innercurtain(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.startList.forEach((el, index) => { this.startList.forEach((el, index) => {

View File

@ -109,7 +109,6 @@ export default {
startList: [22000, 22012],// startList: [22000, 22012],//
indexs: 1, indexs: 1,
actList1: [], actList1: [],
loading:null,
} }
}, },
watch: { watch: {
@ -125,12 +124,6 @@ export default {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
setTimeout(() => { setTimeout(() => {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
that.dataInit(); that.dataInit();
}, 0); }, 0);
//input //input
@ -251,7 +244,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.interiorthermalinsulation(data).then(res => { this.api.interiorthermalinsulation(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.startList.forEach((el, index) => { this.startList.forEach((el, index) => {

View File

@ -564,16 +564,9 @@ export default {
{ label: '制冷模式', value: 2 },], { label: '制冷模式', value: 2 },],
inputData:[], inputData:[],
inputDataNew:[], inputDataNew:[],
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -660,7 +653,6 @@ modelConfirm(){
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.intrinsicParameter(data).then(res => { this.api.intrinsicParameter(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData =JSON.parse(JSON.stringify(res.data.data)); this.inputData =JSON.parse(JSON.stringify(res.data.data));
this.inputDataNew=JSON.parse(JSON.stringify(res.data.data)) this.inputDataNew=JSON.parse(JSON.stringify(res.data.data))

View File

@ -441,16 +441,16 @@
<div class="input-main-80"> <div class="input-main-80">
<span>有效时间</span> <span>有效时间</span>
<input @blur="blurChange(10 + (indexs - 1) + '67', $event)" v-model="inputData[10 + (indexs - 1) + '67']" <input @blur="blurChange(10 + (indexs - 1) + '67', $event)" v-model="inputData[10 + (indexs - 1) + '67']"
@input="change(10 + (indexs - 1) + '67', $event)" type="number" placeholder="0" min="0" max="23" /> @input="change(10 + (indexs - 1) + '67', $event)" type="number" placeholder="0" />
<span>:</span> <span>:</span>
<input @blur="blurChange(10 + (indexs - 1) + '68', $event)" v-model="inputData[10 + (indexs - 1) + '68']" <input @blur="blurChange(10 + (indexs - 1) + '68', $event)" v-model="inputData[10 + (indexs - 1) + '68']"
@input="change(10 + (indexs - 1) + '68', $event)" type="number" placeholder="0" min="0" max="59" /> @input="change(10 + (indexs - 1) + '68', $event)" type="number" placeholder="0" />
<span>--</span> <span>--</span>
<input @blur="blurChange(10 + (indexs - 1) + '69', $event)" v-model="inputData[10 + (indexs - 1) + '69']" <input @blur="blurChange(10 + (indexs - 1) + '69', $event)" v-model="inputData[10 + (indexs - 1) + '69']"
@input="change(10 + (indexs - 1) + '69', $event)" type="number" placeholder="0" min="0" max="23" /> @input="change(10 + (indexs - 1) + '69', $event)" type="number" placeholder="0" />
<span>:</span> <span>:</span>
<input @blur="blurChange(10 + (indexs - 1) + '70', $event)" v-model="inputData[10 + (indexs - 1) + '70']" <input @blur="blurChange(10 + (indexs - 1) + '70', $event)" v-model="inputData[10 + (indexs - 1) + '70']"
@input="change(10 + (indexs - 1) + '70', $event)" type="number" placeholder="0" min="0" max="59" /> @input="change(10 + (indexs - 1) + '70', $event)" type="number" placeholder="0" />
</div> </div>
</div> </div>
<div class="model-return"> <div class="model-return">
@ -483,18 +483,11 @@ export default {
indexs: 2, indexs: 2,
data53: "", data53: "",
inputData: {}, inputData: {},
loading:null,
}; };
}, },
watch: { watch: {
'$store.state.equipmentIndex': function (newValue, oldValue) { '$store.state.equipmentIndex': function (newValue, oldValue) {
const that = this; const that = this;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -502,12 +495,6 @@ export default {
$route(newVal, oldVal) { $route(newVal, oldVal) {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -516,12 +503,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -694,7 +675,6 @@ export default {
regNum: 71, regNum: 71,
}; };
this.api.postReg(data).then((res) => { this.api.postReg(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.getType(); this.getType();

View File

@ -132,7 +132,6 @@ export default {
startList: [21900,21915],// startList: [21900,21915],//
indexs: 1, indexs: 1,
actList1: [], actList1: [],
loading:null,
} }
}, },
watch: { watch: {
@ -147,12 +146,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -274,7 +267,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.externalsunshade(data).then(res => { this.api.externalsunshade(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.startList.forEach((el, index) => { this.startList.forEach((el, index) => {

View File

@ -683,16 +683,9 @@ export default {
list4: [21735, 21739, 21751, 21755, 21759, 21763, 21767, 21771], list4: [21735, 21739, 21751, 21755, 21759, 21763, 21767, 21771],
inputData: [], inputData: [],
inputDataNew: [], inputDataNew: [],
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -744,7 +737,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.manufacturerparameter(data).then(res => { this.api.manufacturerparameter(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputData = JSON.parse(JSON.stringify(res.data.data));
this.inputDataNew = JSON.parse(JSON.stringify(res.data.data)) this.inputDataNew = JSON.parse(JSON.stringify(res.data.data))

View File

@ -133,8 +133,7 @@ export default {
openList2: [],// openList2: [],//
openList3: [],// openList3: [],//
openTypeList: [],// openTypeList: [],//
typeList: this.$store.state.typeList, typeList: this.$store.state.typeList
loading:null,
} }
}, },
watch: { watch: {
@ -143,12 +142,6 @@ export default {
}, },
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -410,7 +403,6 @@ return num
}; };
this.api.getReadControlSensorChannel(data).then((res) => { this.api.getReadControlSensorChannel(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputData = JSON.parse(JSON.stringify(res.data.data));
this.inputDataNew = res.data.data; this.inputDataNew = res.data.data;

View File

@ -102,8 +102,7 @@ export default {
inputDataNew:[], inputDataNew:[],
sensorType:'',// sensorType:'',//
openList: [],// openList: [],//
typeList:this.$store.state.typeList, typeList:this.$store.state.typeList
loading:null,
} }
}, },
watch:{ watch:{
@ -113,12 +112,6 @@ export default {
}, },
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -290,7 +283,6 @@ return num
regNum: 31,//pattern regNum: 31,//pattern
}; };
this.api.postReg(data).then((res) => { this.api.postReg(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputData = JSON.parse(JSON.stringify(res.data.data));
this.inputDataNew = res.data.data; this.inputDataNew = res.data.data;

View File

@ -172,7 +172,6 @@ export default {
openIndex: 0, openIndex: 0,
openTrue: [], openTrue: [],
loading:null,
} }
}, },
watch: { watch: {
@ -184,12 +183,6 @@ export default {
}, 0); }, 0);
}, },
'$route.query.change'(newVal, oldVal) { '$route.query.change'(newVal, oldVal) {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit(); this.dataInit();
}, },
}, },
@ -197,12 +190,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -338,7 +325,6 @@ export default {
}; };
this.api.getReadControlliShuiControl(data).then((res) => { this.api.getReadControlliShuiControl(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.getNowData() this.getNowData()

View File

@ -203,7 +203,6 @@ export default {
startList: [21250, 21273, 21296, 21319],// startList: [21250, 21273, 21296, 21319],//
indexs: 1, indexs: 1,
actList1: [], actList1: [],
loading:null,
} }
}, },
watch: { watch: {
@ -218,12 +217,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -346,8 +339,6 @@ export default {
}; };
var equipmentId = store.equipmentList[store.equipmentIndex - 1].deviceId var equipmentId = store.equipmentList[store.equipmentIndex - 1].deviceId
this.api.readskylight(data).then(res => { this.api.readskylight(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.startList.forEach((el, index) => { this.startList.forEach((el, index) => {

View File

@ -49,17 +49,10 @@ export default {
'水温', '水温',
], ],
rightList: ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'], rightList: ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'],
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
}, },
methods: { methods: {
@ -86,7 +79,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.getReadControlSensorInputSynthesis(data).then((res) => { this.api.getReadControlSensorInputSynthesis(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.leftList.forEach((el, index) => { this.leftList.forEach((el, index) => {

View File

@ -94,17 +94,10 @@ export default {
}, },
data() { data() {
return { return {
inputData: [], inputData: []
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -137,7 +130,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.getControlGetState(data).then((res) => { this.api.getControlGetState(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.inputData['1051'] = this.fliter2(this.inputData['1051'].toString(16)) this.inputData['1051'] = this.fliter2(this.inputData['1051'].toString(16))

View File

@ -78,18 +78,10 @@ export default {
}, },
data() { data() {
return { return {
inputData: [], inputData: []
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -124,8 +116,7 @@ export default {
regNum: 72, regNum: 72,
}; };
this.api.postState(data).then((res) => { this.api.postState(data).then((res) => {
console.log(res, 11);
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.inputData['55']= this.fliter2(this.inputData['55'].toString(16)) this.inputData['55']= this.fliter2(this.inputData['55'].toString(16))

View File

@ -103,18 +103,11 @@
data(){ data(){
return { return {
inputData:[], inputData:[],
loading:null,
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -199,7 +192,6 @@
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.targetValue(data).then(res => { this.api.targetValue(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;

View File

@ -200,19 +200,12 @@
export default { export default {
data(){ data(){
return { return {
inputData:[], inputData:[]
loading:null,
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -297,7 +290,6 @@
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.targetValue(data).then(res => { this.api.targetValue(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.inputData[20034] =this.countData10(this.inputData[20034]); this.inputData[20034] =this.countData10(this.inputData[20034]);

View File

@ -202,17 +202,10 @@ export default {
return { return {
timer: null, timer: null,
inputData: [], inputData: [],
loading:null,
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -297,7 +290,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.targetValue(data).then(res => { this.api.targetValue(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.inputData[20002] =this.countData(this.inputData[20002]); this.inputData[20002] =this.countData(this.inputData[20002]);

View File

@ -189,17 +189,10 @@ export default {
'通道传感器47', '通道传感器47',
'通道传感器48',], '通道传感器48',],
inputData: [], inputData: [],
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -293,7 +286,6 @@ export default {
}; };
this.api.getControldataUpload(data).then((res) => { this.api.getControldataUpload(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;

View File

@ -83,17 +83,10 @@ export default {
'5#通道传感器数据', '5#通道传感器数据',
'6#通道传感器数据'], '6#通道传感器数据'],
inputData: [], inputData: [],
loading:null,
} }
}, },
mounted() { mounted() {
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.dataInit() this.dataInit()
//input //input
let inputList = document.querySelectorAll('input'); let inputList = document.querySelectorAll('input');
@ -144,7 +137,6 @@ export default {
regNum: 3, regNum: 3,
}; };
this.api.postReg(data).then((res) => { this.api.postReg(data).then((res) => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;

View File

@ -380,7 +380,6 @@ export default {
actList4: [], actList4: [],
actList5: [], actList5: [],
indexs: 1, indexs: 1,
loading:null,
} }
}, },
watch: { watch: {
@ -392,12 +391,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1; this.indexs = this.$route.query.id ? this.$route.query.id : 1;
this.loading = this.$loading({
lock: true,
text: '加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
}, 0); }, 0);
@ -633,7 +626,6 @@ export default {
deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
}; };
this.api.fanwetcurtain(data).then(res => { this.api.fanwetcurtain(data).then(res => {
this.loading.close()
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.inputData[21958]=this.countData(this.inputData[21958]) this.inputData[21958]=this.countData(this.inputData[21958])