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

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

Reviewed-on: #96
portal
xiaomeng 2024-01-22 07:02:53 +00:00
parent a375f26b88 b11a94f59a
commit 99b9f34880
3 changed files with 110 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,12 +482,30 @@
type="text" placeholder="0"> type="text" placeholder="0">
</div> </div>
</div> </div>
<el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :append-to-body="true" :visible.sync="warnModel"
width="700px">
<div class="vrcode-model-title vrcode-model-title-282">请输入密码</div>
<div class="warning-model" style="padding: 0 30px;">
<div class="flex-view border-none">
<div class="input-main">
<div>密码:</div>
<input type="text" v-model="modelPassword">
</div>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="modelClose">取 消</el-button>
<el-button type="success" @click="modelConfirm">确 认</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
warnModel: true,
modelPassword:'',
sensorType: '', sensorType: '',
typeList1: [{ label: '平均1#土壤湿度', value: 0 }, typeList1: [{ label: '平均1#土壤湿度', value: 0 },
{ label: '1#土壤湿度', value: 1 }, { label: '1#土壤湿度', value: 1 },
@ -525,6 +543,16 @@ export default {
} }
}, },
methods: { methods: {
modelClose(){
this.$router.go(-1); // 返回前一页
},
modelConfirm(){
if(this.modelPassword=='230509'){
this.warnModel=false
}else{
this.$message('密码错误');
}
},
//失去焦点 计算公式 x/10 //失去焦点 计算公式 x/10
blurChange10(code, el) { blurChange10(code, el) {
var store = this.$store.state var store = this.$store.state

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

@ -556,7 +556,7 @@
</div> </div>
</div> </div>
<div class="flex-view shrink-none border-none"> <div class="flex-view shrink-none">
<div class="input-sel input-sel-w180"> <div class="input-sel input-sel-w180">
<span>轴流风机: 目标温度选择</span> <span>轴流风机: 目标温度选择</span>
<el-dropdown @command="handleCommand3($event, 21741)"> <el-dropdown @command="handleCommand3($event, 21741)">
@ -584,22 +584,62 @@
</el-dropdown> </el-dropdown>
</div> </div>
</div> </div>
<el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :append-to-body="true" :visible.sync="warnModel" <div class="flex-view shrink-none border-none">
width="700px"> <div class="input-sel input-sel-w180">
<div class="vrcode-model-title vrcode-model-title-282">请输入密码</div> <span>内保温1:目标温度选择</span>
<div class="warning-model" style="padding: 0 30px;"> <el-dropdown @command="handleCommand3($event, 21773)">
<div class="flex-view border-none"> <div class="el-dropdown-link">
<div class="input-main"> <input v-model="inputDataNew[21773]" type="text" class="input-input" placeholder="无">
<div>密码:</div> <div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
<input type="text" v-model="modelPassword"> </div>
<el-dropdown-menu class="input-menu-180" slot="dropdown">
<el-dropdown-item v-for="item, index in typeList3" :key="index" :command="item.value">{{
item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-sel input-sel-w180">
<span>温度选择</span>
<el-dropdown @command="handleCommand1($event, 21772)">
<div class="el-dropdown-link">
<input v-model="inputDataNew[21772]" type="text" class="input-input" placeholder="无">
<div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
</div>
<el-dropdown-menu class="input-menu-180" slot="dropdown">
<el-dropdown-item v-for="item, index in typeList1" :key="index" :command="item.value">{{
item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div> </div>
</div> </div>
<div class="flex-view shrink-none">
<div class="input-sel input-sel-w180">
<span>内保温2:目标温度选择</span>
<el-dropdown @command="handleCommand3($event, 21775)">
<div class="el-dropdown-link">
<input v-model="inputDataNew[21775]" type="text" class="input-input" placeholder="无">
<div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
</div>
<el-dropdown-menu class="input-menu-180" slot="dropdown">
<el-dropdown-item v-for="item, index in typeList3" :key="index" :command="item.value">{{
item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-sel input-sel-w180">
<span>温度选择</span>
<el-dropdown @command="handleCommand1($event, 21774)">
<div class="el-dropdown-link">
<input v-model="inputDataNew[21774]" type="text" class="input-input" placeholder="无">
<div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
</div>
<el-dropdown-menu class="input-menu-180" slot="dropdown">
<el-dropdown-item v-for="item, index in typeList1" :key="index" :command="item.value">{{
item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div> </div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="modelClose">取 消</el-button>
<el-button type="success" @click="modelConfirm">确 认</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -607,8 +647,7 @@
export default { export default {
data() { data() {
return { return {
warnModel: true,
modelPassword:'',
sensorType: '', sensorType: '',
typeList1: [ typeList1: [
{ label: '1#平均空气温度', value: 1 }, { label: '1#平均空气温度', value: 1 },
@ -655,16 +694,7 @@ export default {
} }
}, },
methods: { methods: {
modelClose(){
this.$router.go(-1); // 返回前一页
},
modelConfirm(){
if(this.modelPassword=='230509'){
this.warnModel=false
}else{
this.$message('密码错误');
}
},
getData1(data) { getData1(data) {
var name = '' var name = ''
this.typeList1.forEach((el, index) => { this.typeList1.forEach((el, index) => {

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

@ -1,7 +1,8 @@
<template> <template>
<div class="formula realTime"> <div class="formula realTime">
<!-- 生态气象站 --> <!-- 生态气象站 -->
<div class="page-content new-data" v-if="deviceName == 30" :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''"> <div class="page-content new-data" v-if="deviceName == 30"
:class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
<div class="table-title"> <div class="table-title">
<img src="../../assets/image/real-time.png" alt="" /> <img src="../../assets/image/real-time.png" alt="" />
@ -12,7 +13,7 @@
}}</span> --> }}</span> -->
{{ list[0].updateTime ? list[0].updateTime : '' }} {{ list[0].updateTime ? list[0].updateTime : '' }}
</div> </div>
<div class="flex-list realTime-bottom" :class="deviceName==30?'weather':''"> <div class="flex-list realTime-bottom" :class="deviceName == 30 ? 'weather' : ''">
<div class="left-view-new"> <div class="left-view-new">
<div class="list-view" v-for="item, index in list " :key="index"> <div class="list-view" v-for="item, index in list " :key="index">
<img :src="item.img" alt=""> <img :src="item.img" alt="">
@ -502,7 +503,7 @@ export default {
this.deviceName = store.equipmentList[this.indexs - 1].deviceName this.deviceName = store.equipmentList[this.indexs - 1].deviceName
this.deviceState = store.equipmentList[this.indexs - 1].deviceState this.deviceState = store.equipmentList[this.indexs - 1].deviceState
// this.getTime() // this.getTime()
console.log(store.equipmentList[this.indexs - 1].deviceName,this.indexs - 1,77); console.log(store.equipmentList[this.indexs - 1].deviceName, this.indexs - 1, 77);
setTimeout(() => { setTimeout(() => {
that.dataInit(); that.dataInit();
that.timer && clearInterval(that.timer) that.timer && clearInterval(that.timer)
@ -855,24 +856,25 @@ export default {
// name = '2#平均' + el.environmentDataId // name = '2#平均' + el.environmentDataId
// } // }
// } else { // } else {
// if (el.targetValue == 1) {
// name = el.equipmentNumber + '#目标' + el.environmentDataId
// } else {
// name = el.equipmentNumber + '#' + el.environmentDataId // name = el.equipmentNumber + '#' + el.environmentDataId
// } // }
if (el.equipmentNumber == 0) { // }
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) { if (el.targetValue == 1) {
name = el.equipmentNumber + '#目标' + el.environmentDataId name = '目标' + el.environmentDataId
} else {
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
} }
this.list.push({ this.list.push({
...el, ...el,
name: name, name: name,
@ -942,17 +944,13 @@ export default {
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
} }
// } // }
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) { if (el.targetValue == 1) {
name = el.equipmentNumber + '#目标' + el.environmentDataId name = '目标' + el.environmentDataId
} else {
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
@ -1038,14 +1036,14 @@ export default {
} else if (this.deviceName == 30) { } else if (this.deviceName == 30) {
this.api.getControlRtDatastation(formData).then(res => { this.api.getControlRtDatastation(formData).then(res => {
this.controlList = [] this.controlList = []
this.list=[] this.list = []
if (res.data.code == 200) { if (res.data.code == 200) {
res.data.data.forEach((el, index) => { res.data.data.forEach((el, index) => {
list.forEach((el1, index1) => { list.forEach((el1, index1) => {
if (el.formula == el1.value) { if (el.formula == el1.value) {
// console.log(el1); // console.log(el1);
var num = 0 var num = 0
var name='' var name = ''
if (el.equipmentStart == 0) { if (el.equipmentStart == 0) {
num = '故障' num = '故障'
} else { } else {