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

Compare commits

base: xiaomeng:73ece757391a52f1088485d3c9b17790fa04a6d7
Branches Tags
xiaomeng:main
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:4bef7c1f909eb1a4643e90c50e7d7f5649a3f5fb
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "73ece757391a52f1088485d3c9b17790fa04a6d7" and "4bef7c1f909eb1a4643e90c50e7d7f5649a3f5fb" have entirely different histories.
73ece75739 ... 4bef7c1f90

7 changed files with 56 additions and 77 deletions
Show Stats Expand all files Collapse all files

6
src/assets/css/main.css
View File

@ -627,12 +627,6 @@
width: 120px; width: 120px;
} }
.input-main.input-disabled input {
background: transparent;
border: 2px solid transparent;
padding-left: 0;
}
.input-main.input-main-w260 input { .input-main.input-main-w260 input {
width: 260px; width: 260px;
} }

2
src/assets/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
src/assets/css/main.scss
View File

@ -661,13 +661,6 @@
width: 120px; width: 120px;
} }
} }
&.input-disabled{
input{
background: transparent;
border: 2px solid transparent;
padding-left: 0;
}
}
&.input-main-w260{ &.input-main-w260{
input{ input{
width: 260px; width: 260px;

BIN
src/assets/img/warning.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

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

@ -371,7 +371,6 @@ export function realTimeLine(id, data,pageId) {
} }
export function statusCharts(id, data) { export function statusCharts(id, data) {
var chartDom = document.getElementById(id); var chartDom = document.getElementById(id);
var myChart = echarts.init(chartDom); var myChart = echarts.init(chartDom);
var option; var option;

49
src/views/page/realTime.vue
View File

@ -148,7 +148,6 @@
alt=""> alt="">
<img v-else src="../../assets/img/fan-off.png" alt=""> <span>5#风机</span> <img v-else src="../../assets/img/fan-off.png" alt=""> <span>5#风机</span>
</div> </div>
<div style="display: none;"></div>
</div> </div>
</div> </div>
<div v-else class="status-noTrue"> <div v-else class="status-noTrue">
@ -220,7 +219,6 @@
<img v-else src="../../assets/img/fan-off.png" alt=""> <img v-else src="../../assets/img/fan-off.png" alt="">
<span>8#补光灯</span> <span>8#补光灯</span>
</div> </div>
<div style="display: none;"></div>
</div> </div>
</div> </div>
<div v-else class="status-noTrue"> <div v-else class="status-noTrue">
@ -252,7 +250,7 @@
</div> </div>
<div class="status-true-text" v-if="item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12 <div class="status-true-text" v-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"> || item.type == 13 || item.type == 14 || item.type == 15|| item.type == 16">
<div class="status-true-text-left">{{ getNumberStatus(item) }}</div> <div class="status-true-text-left">{{ getNumberStatus(item) }}</div>
<div class="status-true-text-right" <div class="status-true-text-right"
v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12"> v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12">
@ -260,9 +258,10 @@
</div> </div>
<div class="status-fan status-btn" v-else> <div class="status-fan status-btn" v-else>
<div class="btn" :class="item.index == 1 ? 'blue' : 'off'"> <div class="btn" :class="item.index == 1 ? 'blue' : 'off'">
<img class="light-img" :src="getIcon(item)" alt=""> <img class="light-img" :src="getIcon(item)"
alt="">
<!-- <img v-else src="../../assets/img/fan-off.png" alt=""> --> <!-- <img v-else src="../../assets/img/fan-off.png" alt=""> -->
<span>{{ item.index == 1 ? '开启' : '关闭' }}</span> <span>{{item.index==1?'开启':'关闭'}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -668,7 +667,7 @@ export default {
height: divH, // 播放容器宽高 也可以直接设置成数字 如 1080 单位是px height: divH, // 播放容器宽高 也可以直接设置成数字 如 1080 单位是px
}) })
}, },
getIcon(item) { getIcon(item){
var index = item.index var index = item.index
if (item.type == 3) { if (item.type == 3) {
//加温水泵 //加温水泵
@ -689,7 +688,7 @@ export default {
} else { } else {
return '' return ''
} }
} else if (item.type == 4) { }else if (item.type == 4) {
//地热风机 //地热风机
if (index == 0) { if (index == 0) {
return require('../../assets/img/fan-off.png') return require('../../assets/img/fan-off.png')
@ -698,7 +697,7 @@ export default {
} else { } else {
return '' return ''
} }
} else if (item.type == 9) { }else if (item.type == 9) {
//高压微雾 //高压微雾
if (index == 0) { if (index == 0) {
return require('../../assets/img/fan-off.png') return require('../../assets/img/fan-off.png')
@ -733,7 +732,7 @@ export default {
getNumberStatus(item) { getNumberStatus(item) {
var index = item.index var index = item.index
if (item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12 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) { || item.type == 13 || item.type == 14 || item.type == 15|| item.type == 16) {
//顶卷膜 //顶卷膜
if (index == 0) { if (index == 0) {
return '静止状态' return '静止状态'
@ -945,7 +944,7 @@ export default {
this.api.postFsdata(data1).then(res => { this.api.postFsdata(data1).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
var chartsData = res.data.data var chartsData = res.data.data
realTimeLine('realTime-line', chartsData, data1) realTimeLine('realTime-line', chartsData,data1)
} else { } else {
// this.$message.error(res.data.msg); // this.$message.error(res.data.msg);
} }
@ -1058,7 +1057,7 @@ export default {
this.api.getControlFsdata(data1).then(res => { this.api.getControlFsdata(data1).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
var chartsData = res.data.data var chartsData = res.data.data
realTimeLine('realTime-line', chartsData, data1) realTimeLine('realTime-line', chartsData,data1)
} else { } else {
// this.$message.error(res.data.msg); // this.$message.error(res.data.msg);
} }
@ -1121,7 +1120,7 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
res.data.data.forEach((el, index) => { res.data.data.forEach((el, index) => {
var chartsData = res.data.data var chartsData = res.data.data
realTimeLine('realTime-line', chartsData, equipmentId) realTimeLine('realTime-line', chartsData,equipmentId)
}) })
} }
}) })
@ -1225,19 +1224,19 @@ export default {
} }
this.api.getControlGetState(TargetValue).then(res => { this.api.getControlGetState(TargetValue).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
if (res.data.data["1119"]) { if(res.data.data["1119"]){
this.sunrise = this.insertColonEveryTwoDigits( this.sunrise = this.insertColonEveryTwoDigits(
this.convertToTimeMinutes(res.data.data["1119"]) this.convertToTimeMinutes(res.data.data["1119"])
); );
} else { }else{
this.sunrise = '' this.sunrise =''
} }
if (res.data.data["1120"]) { if(res.data.data["1120"]){
this.sunset = this.insertColonEveryTwoDigits( this.sunset = this.insertColonEveryTwoDigits(
this.convertToTimeMinutes(res.data.data["1120"]) this.convertToTimeMinutes(res.data.data["1120"])
); );
} else { }else{
this.sunset = '' this.sunset =''
} }
const statusList = [] const statusList = []
@ -1250,7 +1249,7 @@ export default {
fandata.type = 1 fandata.type = 1
fandata.name = el.name fandata.name = el.name
fandata.status = [] fandata.status = []
var num = res.data.data['1024'] ? res.data.data['1024'] : 0 var num = res.data.data['1024']?res.data.data['1024']:0
var num1 = this.padString(num.toString(2), 5) var num1 = this.padString(num.toString(2), 5)
var openListNew = [] var openListNew = []
openListNew = num1.split("") openListNew = num1.split("")
@ -1264,7 +1263,7 @@ export default {
fandata.type = 1 fandata.type = 1
fandata.name = el.name fandata.name = el.name
fandata.status = [] fandata.status = []
var num = res.data.data['1079'] ? res.data.data['1079'] : 0 var num = res.data.data['1079']?res.data.data['1079']:0
var num1 = this.padString(num.toString(2), 5) var num1 = this.padString(num.toString(2), 5)
var openListNew = [] var openListNew = []
openListNew = num1.split("") openListNew = num1.split("")
@ -1278,7 +1277,7 @@ export default {
fandata.type = 8 fandata.type = 8
fandata.name = el.name fandata.name = el.name
fandata.status = [] fandata.status = []
var num = res.data.data['1069'] ? res.data.data['1069'] : 0 var num = res.data.data['1069']?res.data.data['1069']:0
var num1 = this.padString(num.toString(2), 8) var num1 = this.padString(num.toString(2), 8)
var openListNew = [] var openListNew = []
openListNew = num1.split("") openListNew = num1.split("")
@ -1340,25 +1339,19 @@ export default {
//通风窗 //通风窗
var statusData = { name: el.name, type: 15, id: el.id, open: res.data.data[(1102 + ((el.id - 26) * 3))], progress: res.data.data[(1104 + ((el.id - 26) * 3))], index: res.data.data[(1103 + ((el.id - 26) * 3))] } var statusData = { name: el.name, type: 15, id: el.id, open: res.data.data[(1102 + ((el.id - 26) * 3))], progress: res.data.data[(1104 + ((el.id - 26) * 3))], index: res.data.data[(1103 + ((el.id - 26) * 3))] }
statusList.push(statusData) statusList.push(statusData)
} else if (el.id == 30 || el.id == 31) { } else if (el.id == 30 || el.id == 31 ) {
//内保温 //内保温
var statusData = { name: el.name, type: 16, id: el.id, open: res.data.data[(1182 + ((el.id - 30) * 3))], progress: res.data.data[(1184 + ((el.id - 30) * 3))], index: res.data.data[(1183 + ((el.id - 30) * 3))] } var statusData = { name: el.name, type: 16, id: el.id, open: res.data.data[(1182 + ((el.id - 30) * 3))], progress: res.data.data[(1184 + ((el.id - 30) * 3))], index: res.data.data[(1183 + ((el.id - 30) * 3))] }
statusList.push(statusData) statusList.push(statusData)
} }
}) })
this.statusList = statusList this.statusList = statusList
this.$forceUpdate(); this.$forceUpdate();
setTimeout(() => { setTimeout(() => {
this.statusList.forEach((el, index) => { this.statusList.forEach((el, index) => {
if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2 || el.type == 15 || el.type == 14 || el.type == 13 || el.type == 12)) { if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2 || el.type == 15 || el.type == 14 || el.type == 13 || el.type == 12)) {
setTimeout(() => {
statusCharts(`statusCharts${index}`, el.progress) statusCharts(`statusCharts${index}`, el.progress)
}, 0);
} }
}) })
}, 10); }, 10);

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

@ -59,7 +59,7 @@
type="text" placeholder="0"> type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
<div class="input-main input-main-w120 input-disabled"> <div class="input-main input-main-w120">
<div>PID计算结果</div> <div>PID计算结果</div>
<input disabled v-model="statusData[1114+Number(indexs)]" <input disabled v-model="statusData[1114+Number(indexs)]"
type="text" placeholder="0"> type="text" placeholder="0">