hanzhengzheng/screenFront
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整军团产品详情页 交付状态显示

Browse Source
This commit is contained in:
hzz 2023-05-25 17:14:46 +08:00
parent 8352d3042b
commit a39227e043
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/InPlantProducts/child/component/toptip.vue
View File

@ -115,7 +115,8 @@ const setData = (value: any) => {
} }
if (value.status == '已完成') { if (value.status == '已完成') {
dateColor.value = 2 dateColor.value = 2
data.countdown = value.status calctime(data.date)
// data.countdown = value.status
} }
if (value.status == '已交付') { if (value.status == '已交付') {
dateColor.value = 2 dateColor.value = 2
@ -152,7 +153,7 @@ const calctime = (value: any) => {
// data.countdown = store.DeviceInfo.status // data.countdown = store.DeviceInfo.status
time = setInterval(function () { time = setInterval(function () {
if (data.status == '安装中' || value.status == '调试中') { if (data.status == '安装中' || data.status == '调试中'|| data.status == '已完成') {
data.countdown = "距交付剩余：" + clacendTime(endtime, new Date().getTime()) data.countdown = "距交付剩余：" + clacendTime(endtime, new Date().getTime())
} else { } else {
data.countdown = clacendTime(endtime, new Date().getTime()) data.countdown = clacendTime(endtime, new Date().getTime())

9
src/views/energyConsume/content/left.vue
View File

@ -12,12 +12,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div style="display: flex"> <div style="display: flex">
<chart <chart :title="gasOption.title" :option="gasOption.option" ref="ratio" @click="clickPowerChart"></chart>
:title="gasOption.title"
:option="gasOption.option"
ref="ratio"
@click="clickPowerChart"
></chart>
<!-- <power <!-- <power
ref="yields" ref="yields"
@ -165,7 +160,7 @@ const powerBox = (width: any, height: any) => {
let a = calcWH(height, width, 5, 2, 0); let a = calcWH(height, width, 5, 2, 0);
//修改高度 //修改高度
power1.value.setchartWH(a.oWidth + 90, a.oHeight * 3 - 30); power1.value.setchartWH(a.oWidth + 90, a.oHeight * 3 - 30);
yields.value.setchartWH(a.oWidth+120, a.oHeight*2 - 30); yields.value.setchartWH(a.oWidth + 120, a.oHeight * 2 - 20);
ratio.value.setchartWH(a.oWidth - 120, a.oHeight * 5); ratio.value.setchartWH(a.oWidth - 120, a.oHeight * 5);
}; };
const clickPowerChart = () => { const clickPowerChart = () => {