Skip to content

W
web-project
Commit 7721f82c authored by hubaoshan's avatar hubaoshan
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9dd157c6 2d1856c2
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 30 deletions
src/api/AIStation/RecyclePump.js
View file @ 7721f82c
......@@ -31,5 +31,5 @@ export const exportRecyclePumpAlarmData = (item) => {
// return httpTwo.get(`/busFireExtinguisher/test3`,'','',{responseType:'blob'})
// }
export const getAudio = (item) => {
return httpTwo.get(`/busFireExtinguisher/test3?audioUrl=${item}`,'','',{responseType:'blob'})
return httpTwo.get(`/busFireExtinguisher/test4?audioUrl=${item}`,'','',{responseType:'blob'})
}
src/api/AIStation/token.js
View file @ 7721f82c
import httpTwo from '../httpTwo'
import qs from "qs";
import { encrypt } from '../../utils/jsencrypt.js'
import { encrypt,encryptTwo } from '../../utils/jsencrypt.js'
// 获取随机uuid
export const getAuthUUID = params => {
......@@ -17,8 +17,14 @@ export const createToken = params => {
const sign = qs.stringify({
sign: encrypt(params)
})
const headers = {'Content-Type': 'application/x-www-form-urlencoded'}
return httpTwo.post(`/auth/createToken`, sign,headers).then(res => res).catch(function (error) {
console.log('params',params)
const data = {
userId: encryptTwo(params.userId),
username: encryptTwo(params.username),
uuid: encryptTwo(params.uuid),
}
// const headers = {'Content-Type': 'application/x-www-form-urlencoded'}
return httpTwo.post(`/auth/createToken`, data).then(res => res).catch(function (error) {
console.log(error);
})
}
......
src/components/screenDisplay.vue
View file @ 7721f82c
......@@ -320,9 +320,10 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<div v-show="mapLevel === 2">
<div class="secondLeftLayer">
<div class="secondLeftLayer_one">
<div style="display: flex;justify-content: space-between;width: 100%">
<div class="secondLeftLayer_title"><p>热源趋势曲线</p></div>
<div style="display: flex;align-items: center;padding-right: 2%">
<div style="width: 100%">
<!-- <div class="secondLeftLayer_title"><p>热源趋势曲线</p></div>-->
<div class="titleStyleTwo"><p>热源趋势曲线</p></div>
<div style="display: flex;align-items: center;justify-content: end; padding-right: 2%">
<ul v-for="(item,index) in heatSourceBtnList" :key="index">
<li
:class="[item.value === heatType ? 'activeBtn' : 'normalBtn']"
......@@ -336,11 +337,13 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<div class="secondLeftLayer1" id="secondLeftLayer1"></div>
</div>
<div class="secondLeftLayer_two">
<div class="secondLeftLayer_title"><p>一次侧补水量曲线</p></div>
<!-- <div class="secondLeftLayer_title"><p>一次侧补水量曲线</p></div>-->
<div class="titleStyleTwo"><p>一次侧补水量曲线</p></div>
<div class="secondLeftLayer2" id="secondLeftLayer2"></div>
</div>
<div class="secondLeftLayer_three">
<div class="secondLeftLayer_title"><p>二次侧机组补水量排名</p></div>
<!-- <div class="secondLeftLayer_title"><p>二次侧机组补水量排名</p></div>-->
<div class="titleStyleTwo"><p>二次侧机组补水量排名</p></div>
<div class="table-container">
<div class="table-row" v-for="(item,index) in waterRankList" :key="index">
<div :title="item.transferName" class="table-cell label">{{item.transferName}}</div>
......@@ -351,30 +354,32 @@ import AMapLoader from "@amap/amap-jsapi-loader";
</div>
<div class="secondRightLayer">
<div class="secondLeftLayer_four">
<div class="secondLeftLayer_title"><p>当日实时能耗数据</p></div>
<!-- <div class="secondLeftLayer_title"><p>当日实时能耗数据</p></div>-->
<div class="titleStyleTwo"><p>当日实时能耗数据</p></div>
<div class="secondLeftLayer_fourContent">
<div class="fourRow">
<div class="fourRow_label">热耗</div>
<div class="fourRow_value">{{dayEnergyForm.heat || '0'}} w/m²</div>
<div class="fourRow_value">{{formatDecimal(dayEnergyForm.heat) || '0'}} w/m²</div>
</div>
<div class="fourRow">
<div class="fourRow_label">度日热耗</div>
<div class="fourRow_value">{{dayEnergyForm.dayheat || '0'}} w/(m².°c)</div>
<div class="fourRow_value">{{formatDecimal(dayEnergyForm.dayheat) || '0'}} w/(m².°c)</div>
</div>
<div class="fourRow">
<div class="fourRow_label">水耗</div>
<div class="fourRow_value">{{dayEnergyForm.water || '0'}} kg/m²·天</div>
<div class="fourRow_value">{{formatDecimal(dayEnergyForm.water) || '0'}} kg/m²</div>
</div>
<div class="fourRow">
<div class="fourRow_label">电耗</div>
<div class="fourRow_value">{{dayEnergyForm.elec || '0'}} kWh/m²·天</div>
<div class="fourRow_value">{{formatDecimal(dayEnergyForm.elec) || '0'}} kWh/m²</div>
</div>
</div>
</div>
<div class="secondLeftLayer_fifth">
<div style="display: flex;justify-content: space-between;padding: 10px">
<div class="secondLeftLayer_title"><p>机组排名</p></div>
<div style="display: flex;align-items: center">
<div >
<!-- <div class="secondLeftLayer_title"><p>机组排名</p></div>-->
<div class="titleStyleTwo"><p>机组排名</p></div>
<div style="display: flex;align-items: center;justify-content: end">
<ul v-for="(item,index) in rankTypeBtnList" :key="index">
<li
:class="[item.value === RankType ? 'activeBtn' : 'normalBtn']"
......@@ -394,7 +399,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<div :title="item.transferName" class="table-cellTwo label">
{{item.transferName}}
</div>
<div class="table-cellTwo value">{{item.record}}</div>
<div class="table-cellTwo value">{{ parseFloat(item.record).toFixed(1) }}</div>
</div>
</div>
......@@ -402,7 +407,8 @@ import AMapLoader from "@amap/amap-jsapi-loader";
</div>
<div class="bottomLayerTwo">
<div class="title_row">
<div class="secondLeftLayer_title"><p>报警信息轮播</p></div>
<!-- <div class="secondLeftLayer_title"><p>报警信息轮播</p></div>-->
<div class="titleStyleTwo"><p>报警信息轮播</p></div>
<div class="moreInfo" @click="handleShowMore('1')">更多》</div>
</div>
<vue3ScrollSeamless class="scroll-wrap border text-color" :classOptions="classOptions" :dataList="alarmDataList">
......@@ -417,47 +423,47 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<div v-show="mapLevel === 3">
<div class="thirdLeftLayer">
<div class="thirdLeftLayer_one">
<div class="secondLeftLayer_title"><p>换热站监控</p></div>
<div class="titleStyleTwo"><p>换热站监控</p></div>
</div>
<div class="thirdLeftLayer_one">
<div class="secondLeftLayer_title"><p>电气柜监视</p></div>
<div class="titleStyleTwo"><p>电气柜监视</p></div>
</div>
<div class="thirdLeftLayer_one">
<div class="secondLeftLayer_title"><p>循环泵听诊</p></div>
<div class="titleStyleTwo"><p>循环泵听诊</p></div>
</div>
</div>
<div class="thirdRightLayer">
<div class="thirdLeftLayer_one">
<div class="secondLeftLayer_title"><p>当日实时能耗数据</p></div>
<div class="titleStyleTwo"><p>当日实时能耗数据</p></div>
<div class="secondLeftLayer_fourContent">
<div class="fourRow">
<div class="fourRow_label">热耗</div>
<div class="fourRow_value">{{thirdDayEnergyForm.heat || '0'}} w/m²</div>
<div class="fourRow_value">{{formatDecimal(thirdDayEnergyForm.heat) || '0'}} w/m²</div>
</div>
<div class="fourRow">
<div class="fourRow_label">度日热耗</div>
<div class="fourRow_value">{{thirdDayEnergyForm.dayheat || '0'}} w/(m².°c)</div>
<div class="fourRow_value">{{formatDecimal(thirdDayEnergyForm.dayheat) || '0'}} w/(m².°c)</div>
</div>
<div class="fourRow">
<div class="fourRow_label">水耗</div>
<div class="fourRow_value">{{thirdDayEnergyForm.water || '0'}} kg/m²·天</div>
<div class="fourRow_value">{{formatDecimal(thirdDayEnergyForm.water) || '0'}} kg/m²</div>
</div>
<div class="fourRow">
<div class="fourRow_label">电耗</div>
<div class="fourRow_value">{{thirdDayEnergyForm.elec || '0'}} kWh/m²·天</div>
<div class="fourRow_value">{{formatDecimal(thirdDayEnergyForm.elec) || '0'}} kWh/m²</div>
</div>
</div>
</div>
<div class="thirdLeftLayer_one">
<div class="secondLeftLayer_title"><p>管道光纤测漏温度曲线</p></div>
<div class="titleStyleTwo"><p>管道光纤测漏温度曲线</p></div>
</div>
<div class="thirdLeftLayer_one">
<div class="secondLeftLayer_title"><p>灭火器仪表监视</p></div>
<div class="titleStyleTwo"><p>灭火器仪表监视</p></div>
</div>
</div>
<div class="bottomLayerTwo">
<div class="title_row">
<div class="secondLeftLayer_title"><p>报警信息轮播</p></div>
<div class="titleStyleTwo"><p>报警信息轮播</p></div>
<div class="moreInfo" @click="handleShowMore('2')">更多》</div>
</div>
<vue3ScrollSeamless class="scroll-wrap border text-color" :classOptions="classOptions" :dataList="alarmDataTwoList">
......@@ -637,6 +643,7 @@ export default defineComponent({
fullscreenLoading: false,
};
},
created() {
let timeOff = true;
// 创建定时任务
......@@ -664,6 +671,20 @@ export default defineComponent({
};
},
methods: {
formatDecimal(value) {
// 将输入值转换为数字
const num = parseFloat(value);
if (!isNaN(num)) {
// 检查是否有小数部分
const parts = num.toString().split('.');
if (parts.length > 1) {
// 如果有小数部分，保留最多六位小数
return `${parts[0]}.${parts[1].slice(0, 6)}`; // 仅保留前六位小数
}
return parts[0]; // 没有小数部分，返回整数部分
}
return ''; // 返回空字符串以保证无效输入时的表现
},
handleToDetail() {
this.$router.push("/Alarm")
},
......@@ -2426,6 +2447,17 @@ export default defineComponent({
letter-spacing: 3px;
font-size: 120%;
}
.gis_content .titleStyleTwo {
width: 95%;
height: 35px;
background: url("/imgs/Gis/title_bg.png") top left no-repeat;
}
.gis_content .titleStyleTwo p {
padding: 0.5% 0 0 2%;
color: #19f7ff;
letter-spacing: 3px;
font-size: 120%;
}
.gis_content .ulList li {
display: flex;
width: 90%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment