Merge pull request 'pc-master' (#126) from pc-master into portal

Reviewed-on: #126
portal
xiaomeng 2024-03-05 10:04:38 +00:00
commit 8bbf31f2b0
4 changed files with 24 additions and 3 deletions

View File

@ -171,7 +171,7 @@ export default {
if (!this.routerList.some(item => item.router === "electromagneticControl")) { if (!this.routerList.some(item => item.router === "electromagneticControl")) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: el.nickName, name: '电磁阀',
list: [], list: [],
router: "electromagneticControl" router: "electromagneticControl"
}); });

View File

@ -100,6 +100,23 @@ export default {
}, 0); }, 0);
}, },
yesterdayTime() {
//
var today = new Date();
//
var yesterday = new Date(today);
yesterday.setDate(today.getDate() - 1);
// 00:00
yesterday.setHours(0, 0, 0, 0);
var start = yesterday.toISOString();
// 23:59
yesterday.setHours(23, 59, 59, 999);
var end = yesterday.toISOString();
this.dateRange = [start, end]
},
getData() { getData() {
var store = this.$store.state var store = this.$store.state
var index = store.equipmentIndex; var index = store.equipmentIndex;

View File

@ -290,6 +290,7 @@
<span>开度基础值</span> <span>开度基础值</span>
<input @blur="blurChange(20892, $event)" v-model="inputData[20892]" @input="change(20892, $event)" <input @blur="blurChange(20892, $event)" v-model="inputData[20892]" @input="change(20892, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span>
</div> </div>
</div> </div>
<div class="flex-view border-none shrink-none padding-none"> <div class="flex-view border-none shrink-none padding-none">
@ -321,6 +322,7 @@
<span>开度基础值</span> <span>开度基础值</span>
<input @blur="blurChange(20893, $event)" v-model="inputData[20893]" @input="change(20893, $event)" <input @blur="blurChange(20893, $event)" v-model="inputData[20893]" @input="change(20893, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span>
</div> </div>
</div> </div>
<div class="flex-view border-none shrink-none padding-none"> <div class="flex-view border-none shrink-none padding-none">
@ -352,6 +354,7 @@
<span>开度基础值</span> <span>开度基础值</span>
<input @blur="blurChange(20894, $event)" v-model="inputData[20894]" @input="change(20894, $event)" <input @blur="blurChange(20894, $event)" v-model="inputData[20894]" @input="change(20894, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span>
</div> </div>
</div> </div>
<div class="flex-view shrink-none padding-none"> <div class="flex-view shrink-none padding-none">
@ -383,6 +386,7 @@
<span>开度基础值</span> <span>开度基础值</span>
<input @blur="blurChange(20895, $event)" v-model="inputData[20895]" @input="change(20895, $event)" <input @blur="blurChange(20895, $event)" v-model="inputData[20895]" @input="change(20895, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span>
</div> </div>
</div> </div>
<div class="flex-view shrink-none padding-none"> <div class="flex-view shrink-none padding-none">

View File

@ -34,13 +34,13 @@
<div>温度控制精度</div> <div>温度控制精度</div>
<input @blur="blurChange10(startList[indexs-1]+3, $event)" v-model="inputData[startList[indexs-1]+3]" @input="changeCount10(startList[indexs-1]+3, $event)" <input @blur="blurChange10(startList[indexs-1]+3, $event)" v-model="inputData[startList[indexs-1]+3]" @input="changeCount10(startList[indexs-1]+3, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
<div class="input-main input-main-w120"> <div class="input-main input-main-w120">
<div>计算周期</div> <div>计算周期</div>
<input @blur="blurChange(startList[indexs-1]+5, $event)" v-model="inputData[startList[indexs-1]+5]" @input="change(startList[indexs-1]+5, $event)" <input @blur="blurChange(startList[indexs-1]+5, $event)" v-model="inputData[startList[indexs-1]+5]" @input="change(startList[indexs-1]+5, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span> <span>分钟</span>
</div> </div>
</div> </div>
<div class="flex-view border-none padding-none"> <div class="flex-view border-none padding-none">