master
fanluyan 2 years ago
parent 1b82ef8e5a
commit 25ff9ab7f3

@ -155,12 +155,14 @@
</div> </div>
<div class="graphBox" v-if="echartsShow"> <div class="graphBox" v-if="echartsShow">
<div <div
class="codeBox" class="codeBox1"
v-for="(item, index) in codeList" v-for="(item, index) in codeList"
:key="index" :key="index"
> >
<h3>相位(标识): ({{ item }})</h3> <h3>相位(标识): ({{ item }})</h3>
<div :id="'lineEchart' + index" class="lineChartBox"></div> <div class="codeBox">
<div :id="'lineEchart' + index" class="lineChartBox"></div>
</div>
</div> </div>
<div class="noDatabox" v-if="codeList.length == 0"> <div class="noDatabox" v-if="codeList.length == 0">
<img src="../../assets/img/nopic1.jpg" /> <img src="../../assets/img/nopic1.jpg" />
@ -303,8 +305,8 @@ export default {
id: this.id, id: this.id,
bt: sTime, bt: sTime,
et: eTime, et: eTime,
p: this.page, p: 1,
ps: 1000, ps: 1000000,
}) })
.then((res) => { .then((res) => {
console.log(res); console.log(res);
@ -339,7 +341,7 @@ export default {
"最小风偏角时拉力", "最小风偏角时拉力",
]; ];
timeXData = this.chartsData.map((item) => timeXData = this.chartsData.map((item) =>
this.$moment(item.updateTime * 1000).format("HH:mm:ss") this.$moment(item.updateTime * 1000).format("YYYY-MM-DD HH:mm:ss")
); );
timeXData = [...new Set(timeXData)]; timeXData = [...new Set(timeXData)];
console.log(timeXData); console.log(timeXData);
@ -417,13 +419,13 @@ export default {
show: true, show: true,
realtime: true, realtime: true,
start: 0, start: 0,
end: 85, end: 100,
}, },
{ {
type: "inside", type: "inside",
realtime: true, realtime: true,
start: 0, start: 0,
end: 85, end: 100,
}, },
], ],
xAxis: [ xAxis: [
@ -564,23 +566,23 @@ export default {
}, },
onSubmit() { onSubmit() {
console.log(this.formdata.starttime, this.formdata.endtime); console.log(this.formdata.starttime, this.formdata.endtime);
if ( // if (
new Date(this.formdata.starttime).getDate() === // new Date(this.formdata.starttime).getDate() ===
new Date(this.formdata.endtime).getDate() // new Date(this.formdata.endtime).getDate()
) { // ) {
this.getIcingData(this.paramsData); // this.getIcingData(this.paramsData);
console.log("开始时间和结束时间为同一天"); // console.log("");
} else { // } else {
this.$message({ // this.$message({
duration: 1500, // duration: 1500,
showClose: true, // showClose: true,
message: "请选择同一天", // message: "",
type: "warning", // type: "warning",
}); // });
return; // return;
console.log("开始时间和结束时间不是同一天"); // console.log("");
} // }
// this.getIcingData(this.paramsData); this.getIcingData(this.paramsData);
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
@ -640,9 +642,9 @@ export default {
margin: 0 auto; margin: 0 auto;
height: calc(100% - 54px); height: calc(100% - 54px);
overflow: auto; overflow: auto;
.codeBox { .codeBox1 {
width: 100%; width: 100%;
height: 400px; height: 500px;
h3 { h3 {
font-size: 14px; font-size: 14px;
color: #333; color: #333;
@ -651,6 +653,10 @@ export default {
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
} }
.codeBox {
width: 100%;
height: 450px;
}
.lineChartBox { .lineChartBox {
width: 100%; width: 100%;
height: 372px; height: 372px;

Loading…
Cancel
Save