xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #97

Merged
xiaomeng merged 6 commits from pc-master into portal 2024-01-22 09:07:06 +00:00
Conversation 0 Commits 6 Files Changed 9 +17 -13
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9250006bee - Show all commits

3
src/assets/js/charts.js
View File

@ -1,4 +1,5 @@
import * as echarts from "echarts"; import * as echarts from "echarts";
import { h } from "vue";
export function realTimeLine(id, data) { export function realTimeLine(id, data) {
var chartDom = document.getElementById(id); var chartDom = document.getElementById(id);
@ -236,9 +237,11 @@ export function realTimeLine(id, data) {
top:10, top:10,
itemGap: 10, itemGap: 10,
width:'90%', width:'90%',
height:20,
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,
color: "#fff", color: "#fff",
lineHeight: 30,
}, },
pageTextStyle: { pageTextStyle: {
color: '#fff', // 设置翻页文字颜色 color: '#fff', // 设置翻页文字颜色

13
src/views/page/LED.vue
View File

@ -54,24 +54,24 @@
</div> </div>
<div class="flex-view padding-none border-none shrink-none"> <div class="flex-view padding-none border-none shrink-none">
<div class="input-btn"> <div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen2(0)" :class="actList3[0] == '1' ? 'blue' : 'off'"> <div class="btn btn-w80" @click="changeIndexOpen2(2)" :class="actList3[2] == '1' ? 'blue' : 'off'">
{{actList3[0] == '1' ? '有效' : '无效'}} {{actList3[2] == '1' ? '有效' : '无效'}}
</div> </div>
</div> </div>
<div class="input-main-80"> <div class="input-main-80">
<span>高温报警时，禁止启动补光灯</span> <span>高温报警时，禁止启动补光灯</span>
</div> </div>
<div class="input-btn"> <div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen2(1)" :class="actList3[1] == '1' ? 'blue' : 'off'"> <div class="btn btn-w80" @click="changeIndexOpen2(1)" :class="actList3[0] == '1' ? 'blue' : 'off'">
{{actList3[1] == '1' ? '有效' : '无效'}} {{actList3[0] == '1' ? '有效' : '无效'}}
</div> </div>
</div> </div>
<div class="input-main-80"> <div class="input-main-80">
<span>使用1#日标温度</span> <span>使用1#日标温度</span>
</div> </div>
<div class="input-btn"> <div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen2(2)" :class="actList3[2] == '1' ? 'blue' : 'off'"> <div class="btn btn-w80" @click="changeIndexOpen2(2)" :class="actList3[1] == '1' ? 'blue' : 'off'">
{{actList3[2] == '1' ? '有效' : '无效'}} {{actList3[1] == '1' ? '有效' : '无效'}}
</div> </div>
</div> </div>
<div class="input-main-80"> <div class="input-main-80">
@ -347,6 +347,7 @@ export default {
this.getActive1() this.getActive1()
this.getActive2() this.getActive2()
this.getActive3() this.getActive3()
this.inputData[21403] =this.countData10(this.inputData[21403]);
} }
}) })
}, },

6
src/views/page/circulationCan.vue
View File

@ -113,7 +113,7 @@
</div> </div>
<div class="flex-view border-none shrink-none padding-none"> <div class="flex-view border-none shrink-none padding-none">
<div class="input-btn"> <div class="input-btn">
<div class="btn off btn-w80" @click="changeIndexOpen(3)" :class="actList1[3] == '1' ? 'blue' : 'off'"> <div class="btn btn-w80" @click="changeIndexOpen(3)" :class="actList1[3] == '1' ? 'blue' : 'off'">
{{ actList1[3] == '1' ? '有效' : '无效' }} {{ actList1[3] == '1' ? '有效' : '无效' }}
</div> </div>
</div> </div>
@ -124,7 +124,7 @@
<div class="flex-view border-none shrink-none padding-none"> <div class="flex-view border-none shrink-none padding-none">
<div class="input-btn"> <div class="input-btn">
<div class="btn off btn-w80" @click="changeIndexOpen(2)" :class="actList1[2] == '1' ? 'blue' : 'off'"> <div class="btn btn-w80" @click="changeIndexOpen(2)" :class="actList1[2] == '1' ? 'blue' : 'off'">
{{ actList1[2] == '1' ? '有效' : '无效' }} {{ actList1[2] == '1' ? '有效' : '无效' }}
</div> </div>
</div> </div>
@ -257,7 +257,7 @@ export default {
this.actList1 = [] this.actList1 = []
var num = this.inputData[this.startList[this.indexs - 1] + 1] var num = this.inputData[this.startList[this.indexs - 1] + 1]
var num1 = this.padString(num.toString(2), 2) var num1 = this.padString(num.toString(2), 4)
var openListNew = [] var openListNew = []
openListNew = num1.split("") openListNew = num1.split("")
this.actList1 = openListNew.reverse(); this.actList1 = openListNew.reverse();

8
src/views/page/electromagneticControl.vue
View File

@ -86,13 +86,13 @@
<input @blur="blurChange(startList[indexs - 1]+6, $event)" v-model="inputData[startList[indexs - 1]+6]" @input="change(startList[indexs - 1]+6, $event)" <input @blur="blurChange(startList[indexs - 1]+6, $event)" v-model="inputData[startList[indexs - 1]+6]" @input="change(startList[indexs - 1]+6, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>:</span> <span>:</span>
<input @blur="blurChange(startList[indexs - 1]+7, $event)" v-model="inputData[startList[indexs - 1]+5]" @input="change(startList[indexs - 1]+5, $event)" <input @blur="blurChange(startList[indexs - 1]+7, $event)" v-model="inputData[startList[indexs - 1]+7]" @input="change(startList[indexs - 1]+7, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>-</span> <span>-</span>
<input @blur="blurChange(startList[indexs - 1]+8, $event)" v-model="inputData[startList[indexs - 1]+5]" @input="change(startList[indexs - 1]+5, $event)" <input @blur="blurChange(startList[indexs - 1]+8, $event)" v-model="inputData[startList[indexs - 1]+8]" @input="change(startList[indexs - 1]+8, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>:</span> <span>:</span>
<input @blur="blurChange(startList[indexs - 1]+9, $event)" v-model="inputData[startList[indexs - 1]+5]" @input="change(startList[indexs - 1]+5, $event)" <input @blur="blurChange(startList[indexs - 1]+9, $event)" v-model="inputData[startList[indexs - 1]+9]" @input="change(startList[indexs - 1]+9, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>时间段里启动次数</span> <span>时间段里启动次数</span>
<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)"
@ -135,7 +135,7 @@
<input @blur="blurChange(startList[indexs - 1]+17, $event)" v-model="inputData[startList[indexs - 1]+17]" @input="change(startList[indexs - 1]+17, $event)" <input @blur="blurChange(startList[indexs - 1]+17, $event)" v-model="inputData[startList[indexs - 1]+17]" @input="change(startList[indexs - 1]+17, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>:</span> <span>:</span>
<input @blur="blurChange(startList[indexs - 1+18], $event)" v-model="inputData[startList[indexs - 1]+18]" @input="change(startList[indexs - 1]+18, $event)" <input @blur="blurChange(startList[indexs - 1]+18, $event)" v-model="inputData[startList[indexs - 1]+18]" @input="change(startList[indexs - 1]+18, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
</div> </div>
</div> </div>