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

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

Reviewed-on: #97
portal
xiaomeng 2024-01-22 09:07:05 +00:00
parent 99b9f34880 5705bf9a65
commit ffe8243ec0
9 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -113,7 +113,7 @@
</div>
<div class="flex-view border-none shrink-none padding-none">
<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' ? '有效' : '无效' }}
</div>
</div>
@ -124,7 +124,7 @@
<div class="flex-view border-none shrink-none padding-none">
<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' ? '有效' : '无效' }}
</div>
</div>
@ -257,7 +257,7 @@ export default {
this.actList1 = []
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 = []
openListNew = num1.split("")
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)"
type="text" placeholder="0">
<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">
<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">
<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">
<span>时间段里启动次数</span>
<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)"
type="text" placeholder="0">
<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">
</div>
</div>

2
src/views/page/forceOutput.vue
View File

@ -9,7 +9,7 @@
<div class="flex-view">
<div class="input-btn ">
<div class="btn blue" @click="changeOpen()" :class="inputData[20600] == 1 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet2.png" alt="" />非测试模式
<img src="../../assets/image/irrigateSet2.png" alt="" />{{inputData[20600] == 1 ? '测试模式' : '非测试模式'}}
</div>
</div>
</div>

7
src/views/page/insizeSunshade.vue
View File

@ -129,7 +129,7 @@
<span>分钟收拢内遮阳。</span>
</div>
</div>
<div class="flex-view shrink-none padding-none">
<!-- <div class="flex-view shrink-none padding-none">
<div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen(4)" :class="actList1[4] == '1' ? 'blue' : 'off'">
{{ actList1[4] == '1' ? '有效' : '无效' }}
@ -138,7 +138,7 @@
<div class="input-main-80">
<span>预留条件</span>
</div>
</div>
</div> -->
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
@ -300,8 +300,9 @@ export default {
if (res.data.code == 200) {
this.inputData = res.data.data;
this.startList.forEach((el, index) => {
this.inputData[el + 2] = this.countData10(this.inputData[el + 2])
this.inputData[el + 6] = this.countData10(this.inputData[el + 6])
this.inputData[el + 8] = this.countData10(this.inputData[el + 8])
this.inputData[el + 14] = this.countData10(this.inputData[el + 14])
})
this.getActive1()
}

12
src/views/page/intrinsicParameter.vue
View File

@ -182,6 +182,15 @@
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
<span>&nbsp;&nbsp;&nbsp;CO2补气1-2输出通道：</span>
<input @blur="blurChange(20731, $event)" v-model="inputData[20731]" @input="change(20731, $event)"
type="text" placeholder="0">
<input @blur="blurChange(20732, $event)" v-model="inputData[20732]" @input="change(20732, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
<span>冷暖风机1-2组输出通道：</span>
@ -232,8 +241,7 @@
</div>
<div class="flex-view shrink-none padding-none">
<div class="input-main-80">
<span></span>
<span>补光灯1-8组输出通道：</span>
<span>&nbsp;&nbsp;&nbsp;补光灯1-8组输出通道：</span>
<input @blur="blurChange(20712, $event)" v-model="inputData[20712]" @input="change(20712, $event)"
type="text" placeholder="0">
<input @blur="blurChange(20713, $event)" v-model="inputData[20713]" @input="change(20713, $event)"

4
src/views/page/parameterSet.vue
View File

@ -660,7 +660,7 @@ export default {
{ label: '6#空气温度', value: 8 },
{ label: '7#空气温度', value: 7 },
{ label: '8#空气温度', value: 8 },],
list1: [21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, 21760, 21764, 21768],
list1: [21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, 21760, 21764, 21768,21772,21774],
typeList2: [
{ label: '1#平均空气湿度', value: 1 },
{ label: '2#平均空气湿度', value: 2 },
@ -676,7 +676,7 @@ export default {
typeList3: [
{ label: '目标温度1', value: 1 },
{ label: '目标温度2', value: 2 },],
list3: [21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, 21769],
list3: [21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, 21769,21773,21775],
typeList4: [
{ label: '目标湿度1', value: 1 },
{ label: '目标湿度2', value: 2 },],

10
src/views/page/wetFan.vue
View File

@ -118,7 +118,7 @@
<span>时，跳过通风窗直接启动风机。</span>
</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="btn btn-w80" @click="changeIndexOpen1(2)" :class="actList2[2] == '1' ? 'blue' : 'off'">
{{actList2[2] == '1' ? '有效' : '无效'}}
@ -127,7 +127,7 @@
<div class="input-main-80">
<span>预留条件</span>
</div>
</div>
</div> -->
<div class="flex-view shrink-none padding-none">
<div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen1(3)" :class="actList2[3] == '1' ? 'blue' : 'off'">
@ -630,16 +630,12 @@ export default {
this.inputData[21967]=this.countData(this.inputData[21967])
this.inputData[21968]=this.countData(this.inputData[21968])
this.inputData[21969]=this.countData(this.inputData[21969])
this.inputData[21976]=this.countData(this.inputData[21976])
this.inputData[21977]=this.countData10(this.inputData[21977])
this.inputData[21981]=this.countData(this.inputData[21981])
this.inputData[21982]=this.countData10(this.inputData[21982])
this.inputData[21976]=this.countData(this.inputData[21976])
this.inputData[21977]=this.countData10(this.inputData[21977])
this.inputData[21981]=this.countData(this.inputData[21981])
this.inputData[21982]=this.countData10(this.inputData[21982])
this.getActive1()
this.getActive2()
this.getActive3()