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

Reviewed-on: #227
This commit is contained in:
xiaomeng 2025-03-08 08:48:01 +00:00
commit 432eaef71a
8 changed files with 58 additions and 56 deletions

View File

@ -16,10 +16,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2)" :class="inputData[startList[indexs - 1]] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3)" :class="inputData[startList[indexs - 1]] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />收拢
</div>
<div class="btn" @click="changeOpen(4)" :class="inputData[startList[indexs - 1]] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止

View File

@ -16,10 +16,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2)" :class="inputData[startList[indexs - 1]] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3)" :class="inputData[startList[indexs - 1]] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />收拢
</div>
<div class="btn" @click="changeOpen(4)" :class="inputData[startList[indexs - 1]] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止

View File

@ -16,10 +16,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2)" :class="inputData[startList[indexs - 1]] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3)" :class="inputData[startList[indexs - 1]] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />收拢
</div>
<div class="btn" @click="changeOpen(4)" :class="inputData[startList[indexs - 1]] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止

View File

@ -492,10 +492,10 @@
<span>1#内遮阳全程运行时间</span>
<input @blur="blurChange(20683, $event)" v-model="inputData[20683]" @input="change(20683, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20684, $event)" v-model="inputData[20684]" @input="change(20684, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20685, $event)" v-model="inputData[20685]" @input="change(20685, $event)"
type="text" placeholder="0">
</div>
@ -506,10 +506,10 @@
<span>2#内遮阳全程运行时间</span>
<input @blur="blurChange(20686, $event)" v-model="inputData[20686]" @input="change(20686, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20687, $event)" v-model="inputData[20687]" @input="change(20687, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20688, $event)" v-model="inputData[20688]" @input="change(20688, $event)"
type="text" placeholder="0">
</div>
@ -519,10 +519,10 @@
<span>1#外遮阳全程运行时间</span>
<input @blur="blurChange(20689, $event)" v-model="inputData[20689]" @input="change(20689, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20690, $event)" v-model="inputData[20690]" @input="change(20690, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20691, $event)" v-model="inputData[20691]" @input="change(20691, $event)"
type="text" placeholder="0">
</div>
@ -533,10 +533,10 @@
<span>2#外遮阳全程运行时间</span>
<input @blur="blurChange(20692, $event)" v-model="inputData[20692]" @input="change(20692, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20693, $event)" v-model="inputData[20693]" @input="change(20693, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20694, $event)" v-model="inputData[20694]" @input="change(20694, $event)"
type="text" placeholder="0">
</div>
@ -546,10 +546,10 @@
<span>1#内保温全程运行时间</span>
<input @blur="blurChange(20695, $event)" v-model="inputData[20695]" @input="change(20695, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20696, $event)" v-model="inputData[20696]" @input="change(20696, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20697, $event)" v-model="inputData[20697]" @input="change(20697, $event)"
type="text" placeholder="0">
</div>
@ -559,10 +559,10 @@
<span>2#内保温全程运行时间</span>
<input @blur="blurChange(20698, $event)" v-model="inputData[20698]" @input="change(20698, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20699, $event)" v-model="inputData[20699]" @input="change(20699, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20700, $event)" v-model="inputData[20700]" @input="change(20700, $event)"
type="text" placeholder="0">
</div>
@ -598,10 +598,10 @@
<span>立面保温1全程运行时间</span>
<input @blur="blurChange(20741, $event)" v-model="inputData[20741]" @input="change(20741, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20742, $event)" v-model="inputData[20742]" @input="change(20742, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20743, $event)" v-model="inputData[20743]" @input="change(20743, $event)"
type="text" placeholder="0">
</div>
@ -611,10 +611,10 @@
<span>立面保温2全程运行时间</span>
<input @blur="blurChange(20744, $event)" v-model="inputData[20744]" @input="change(20744, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20745, $event)" v-model="inputData[20745]" @input="change(20745, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20746, $event)" v-model="inputData[20746]" @input="change(20746, $event)"
type="text" placeholder="0">
</div>
@ -624,10 +624,10 @@
<span>立面保温3全程运行时间</span>
<input @blur="blurChange(20747, $event)" v-model="inputData[20747]" @input="change(20747, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20748, $event)" v-model="inputData[20748]" @input="change(20748, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20749, $event)" v-model="inputData[20749]" @input="change(20749, $event)"
type="text" placeholder="0">
</div>
@ -637,10 +637,10 @@
<span>立面保温4全程运行时间</span>
<input @blur="blurChange(20750, $event)" v-model="inputData[20750]" @input="change(20750, $event)"
type="text" placeholder="0">
<span>开输出通道</span>
<span>开输出通道</span>
<input @blur="blurChange(20751, $event)" v-model="inputData[20751]" @input="change(20751, $event)"
type="text" placeholder="0">
<span>关闭输出通道</span>
<span>收拢输出通道</span>
<input @blur="blurChange(20752, $event)" v-model="inputData[20752]" @input="change(20752, $event)"
type="text" placeholder="0">
</div>

View File

@ -16,10 +16,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2)" :class="inputData[startList[indexs-1]] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3)" :class="inputData[startList[indexs-1]] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />收拢
</div>
<div class="btn" @click="changeOpen(4)" :class="inputData[startList[indexs-1]] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止

View File

@ -958,8 +958,7 @@ export default {
},
getNumberStatus(item) {
var index = item.index
if (item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12
|| item.type == 13 || item.type == 14 || item.type == 15 || item.type == 16) {
if (item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12) {
//
if (index == 0) {
return '静止状态'
@ -971,26 +970,29 @@ export default {
return ''
}
}
// else if (item.type == 7) {
// //
// if (index == 0) {
// return ''
// } else if (index == 1) {
// return ''
// } else {
// return ''
// }
// } else {
// //
// if (index == 0) {
// return ''
// } else if (index == 1) {
// return ''
// } else {
// return ''
// }
// }
if(item.type == 16|| item.type == 13 || item.type == 14){
if (index == 0) {
return '静止状态'
} else if (index == 1) {
return '正向展开中'
} else if (index == 2) {
return '反向收拢中'
} else {
return ''
}
}
if(item.type == 15){
if (index == 0) {
return '静止状态'
} else if (index == 1) {
return '正向开窗'
} else if (index == 2) {
return '反向关窗'
} else {
return ''
}
}
},
createVideo() {

View File

@ -16,10 +16,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2)" :class="inputData[startList[indexs-1]] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3)" :class="inputData[startList[indexs-1]] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />关窗
</div>
<div class="btn" @click="changeOpen(4)" :class="inputData[startList[indexs-1]] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止

View File

@ -297,10 +297,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2,21974)" :class="inputData[21974] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3,21974)" :class="inputData[21974] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />关窗
</div>
<div class="btn" @click="changeOpen(4,21974)" :class="inputData[21974] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止
@ -347,10 +347,10 @@
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
<div class="btn" @click="changeOpen(2,21979)" :class="inputData[21979] == 2 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet3.png" alt="" />手动打
<img src="../../assets/image/irrigateSet3.png" alt="" />
</div>
<div class="btn" @click="changeOpen(3,21979)" :class="inputData[21979] == 3 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
<img src="../../assets/image/irrigateSet1.png" alt="" />关窗
</div>
<div class="btn" @click="changeOpen(4,21979)" :class="inputData[21979] == 4 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet1.png" alt="" />停止