Skip to content

H
hp-smart
Commit 64f8b736 by zhangzhen
Options

界面展示优化

parent f83f8b3c
Showing with 13 additions and 12 deletions
src/main/webapp/HP/BI/HPBI004.jsp
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
placeholder="选择日期" placeholder="选择日期"
@change="handledataPicker" @change="handledataPicker"
value-format="yyyyMMdd" value-format="yyyyMMdd"
:picker-options='pickerOptions'
style="width: 11vw" style="width: 11vw"
> >
</el-date-picker> </el-date-picker>
...@@ -202,9 +203,9 @@ ...@@ -202,9 +203,9 @@
<div class="device-echarts-background"> <div class="device-echarts-background">
<manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts> <manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts>
</div> </div>
<div class="device-echarts-background"> <%-- <div class="device-echarts-background">--%>
<manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts> <%-- <manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts>--%>
</div> <%-- </div>--%>
</div> </div>
<div class="left-device device" style="margin-left: 2vw;"> <div class="left-device device" style="margin-left: 2vw;">
<div v-for="(item,index) in querySbNoList" <div v-for="(item,index) in querySbNoList"
...@@ -214,9 +215,9 @@ ...@@ -214,9 +215,9 @@
<div class="device-echarts-background"> <div class="device-echarts-background">
<manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts> <manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts>
</div> </div>
<div class="device-echarts-background"> <%-- <div class="device-echarts-background">--%>
<manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts> <%-- <manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts>--%>
</div> <%-- </div>--%>
</div> </div>
</div> </div>
</el-main> </el-main>
...@@ -257,7 +258,12 @@ ...@@ -257,7 +258,12 @@
currentTime:dayjs().format("YYYY-MM-DD HH:mm:ss"), currentTime:dayjs().format("YYYY-MM-DD HH:mm:ss"),
lineOption1:'', lineOption1:'',
lineOption2:'', lineOption2:'',
timer: '' timer: '',
pickerOptions:{
disabledDate(time) {
return time.getTime() > Date.now();
}
}
}; };
}, },
mounted() { mounted() {
...@@ -324,11 +330,6 @@ ...@@ -324,11 +330,6 @@
_this.queryBySbStatusList = res.extAttr.result; _this.queryBySbStatusList = res.extAttr.result;
} }
_this.queryBySbStatusList.push({ _this.queryBySbStatusList.push({
deviceName:'切割机',
status:'3',
deviceModel:'MZ-1250',
})
_this.queryBySbStatusList.push({
deviceName:'焊接机', deviceName:'焊接机',
status:'3', status:'3',
deviceModel:'H8760', deviceModel:'H8760',
......
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