添加排序,谱图展示

newCac1.0
fanluyan 3 months ago
parent 257ad35bbf
commit b91a8297fb

@ -36,18 +36,18 @@
<span>{{ scope.row.id }}</span> <span>{{ scope.row.id }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="源路径" prop="path"> <!-- <el-table-column label="源路径" prop="path">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.remotePath }}</span> <span>{{ scope.row.remotePath }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column label="path" prop="path"> <!-- <el-table-column label="path" prop="path">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.path }}</span> <span>{{ scope.row.path }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="filename" prop="filename"> <el-table-column label="文件名" prop="filename">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -58,11 +58,17 @@
<!-- <span>{{ scope.row.filename }}</span> --> <!-- <span>{{ scope.row.filename }}</span> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采集时间" prop="dtime">
<template slot-scope="scope">
<span>{{ scope.row.dtime }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime"> <el-table-column label="创建时间" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200" class-name="editClass"> <el-table-column label="操作" width="200" class-name="editClass">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link

@ -0,0 +1,342 @@
<template>
<div class="ptrecordBoxdown">
<div class="page-body">
<div class="zsbTableBox">
<el-table
:data="recordData"
style="width: 100%"
height="calc(100% - 0px)"
v-loading="recordLoading"
>
<el-table-column label="采集时间" prop="dtime">
<template slot-scope="scope">
<span>{{ scope.row.dtime }}</span>
</template>
</el-table-column>
<el-table-column label="文件名" prop="filename">
<template slot-scope="scope">
<el-button
type="text"
@click="downFile(scope.row)"
class="buttonText"
>{{ scope.row.filename }}</el-button
>
<!-- <span>{{ scope.row.filename }}</span> -->
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="200" class-name="editClass">
<template slot-scope="scope">
<el-link
type="primary"
@click="handleLookClick(scope.row)"
size="small"
icon="el-icon-document"
>查看图谱</el-link
>
</template>
</el-table-column>
</el-table>
<div class="pageNation">
<el-pagination
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
:current-page="page"
:page-size="pageSize"
:page-sizes="[20, 40, 100]"
layout="sizes, prev, pager, next, jumper,total"
:total="total"
>
</el-pagination>
</div>
</div>
</div>
<el-dialog
title="图谱"
:visible.sync="tpdialogVisible"
width="860px"
class="tpboxChartsData"
append-to-body="true"
@close="closeCharts"
v-if="tpdialogVisible"
>
<span v-if="tpRow.config">{{ tpRow.config.sensor.name }}</span>
<span v-else>{{ tpRow.configId }}</span>
<div id="tpEchartBox"></div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeCharts"></el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { ieddlDownloadAllApi, ieddlServerApi } from "@/utils/api/index";
// import addzsbDialog from "./components/addzsbDialog";
export default {
name: "record",
components: {},
props: ["currentNodeData"],
data() {
return {
recordData: [],
recordLoading: false,
page: 1, //
pageSize: 20, //
total: 0, //
tpdialogVisible: false,
tpRow: "", //
tpModleData: "", //
myChart: "",
xData4: [], //
lineData4: [], //
yMax4: "", //y
channelCrests4: [], //
dataPointer4: [], //
};
},
created() {},
mounted() {},
watch: {},
methods: {
getdownAll(row, formRow) {
console.log("我是选中的节点", row);
console.log("我是选中的节点", formRow);
let params = {
startTime: formRow.starttime,
endTime: formRow.endtime,
devId: row,
pageNum: this.page,
pageSize: this.pageSize,
};
ieddlDownloadAllApi(params)
.then((res) => {
console.log(res);
this.recordData = res.data.content;
this.total = res.data.totalElements;
})
.catch((err) => {
console.log(err); //
});
},
handleLookClick(row) {
console.log(row);
// model
if (row.model) {
// model
// model
this.tpdialogVisible = true;
this.tpRow = row;
this.tpModleData = row.model;
this.lineData4 = this.tpModleData.channels[0].data; //
this.yMax4 = this.tpModleData.yMax; //y
this.channelCrests4 = this.tpModleData.channels[0].crests;
var timeSpan = 1; //
for (var i = 0; i < this.tpModleData.k * timeSpan; i = i + timeSpan) {
this.xData4.push(i);
}
console.log(this.lineData4);
for (var i = 0; i < this.channelCrests4.length; i++) {
this.dataPointer4.push({
name: this.channelCrests4[i].name,
label: this.channelCrests4[i].j + "",
xAxis: this.channelCrests4[i].time,
yAxis: this.lineData4[this.channelCrests4[i].time],
});
}
console.log(this.dataPointer4);
//
this.$nextTick(() => {
this.getEchart4();
});
} else {
// model
this.$message({
showClose: true,
message: "暂无图谱数据",
type: "warning",
});
}
},
getEchart4() {
this.$nextTick(() => {
let that = this;
that.myChart = this.$echarts.init(
document.getElementById("tpEchartBox")
);
let option = {
// title: {
// text: "4",
// left: "left",
// },
tooltip: {
trigger: "axis",
axisPointer: {
animation: false,
},
},
dataZoom: [
{
type: "inside",
start: 0,
end: 100,
},
{
start: 0,
end: 100,
},
],
xAxis: {
type: "category",
data: this.xData4, // x
boundaryGap: false,
axisLabel: {
//interval: 0, //
showMaxLabel: true, //
},
// showMaxLabel: true,
name: "单位:s", //
},
yAxis: {
type: "value",
scale: true,
show: true, // y
name: "单位:mV", //
nameTextStyle: {
//
color: "#000", //
fontSize: 10, //
padding: [0, 28, 4, 0], //
},
},
series: [
{
data: this.lineData4,
type: "line",
smooth: true,
symbol: "none",
sampling: "lttb",
itemStyle: {
color: "rgb(255, 70, 131)",
},
markPoint: {
data: this.dataPointer4,
symbol: "pin",
symbolSize: 18,
itemStyle: {
normal: {
label: {
show: true,
position: "top",
distance: 0,
formatter: function (params) {
console.log(params);
return params.data.label + ":" + params.name;
},
},
},
},
},
},
],
};
that.myChart.setOption(option);
window.addEventListener("resize", () => {
that.myChart.resize();
});
});
},
closeCharts() {
this.tpdialogVisible = false;
this.xData4 = []; //
this.lineData4 = []; //
this.yMax4 = ""; //y
this.channelCrests4 = []; //
this.dataPointer4 = []; //
},
//
downFile(row) {
// a
const a = document.createElement("a");
// ahrefURL
a.href = row.path;
console.log(a.href);
//
a.download = row.filename; //
//
document.body.appendChild(a);
a.click();
// a
document.body.removeChild(a);
},
//
handleCurrentChange(val) {
this.page = val;
this.recordData = [];
this.getdownAll();
},
//
handleSizeChange(val) {
this.pageSize = val;
this.recordData = [];
this.getdownAll();
},
},
};
</script>
<style lang="less">
.ptrecordBoxdown {
width: 100%;
height: calc(100% - 48px);
.page-body {
width: calc(100% - 24px);
height: calc(calc(100% - 24px));
padding: 12px;
background: #eee;
.title {
display: flex;
align-items: center;
span {
color: #000;
font-size: 14px;
}
}
.zsbTableBox {
margin-top: 8px;
height: calc(100% - 48px);
box-shadow: 1px 0 10px 1px rgba(0, 0, 0, 0.3);
.pageNation {
margin-top: 6px;
display: flex;
justify-content: flex-end;
}
.buttonText {
cursor: pointer;
white-space: pre-wrap;
&:hover {
text-decoration: underline;
}
}
}
}
}
.tpboxChartsData {
.el-dialog__body {
height: 400px;
#tpEchartBox {
height: 380px;
width: 820px;
}
}
}
</style>

@ -205,6 +205,12 @@
<el-empty v-else description="暂无图表数据"></el-empty> <el-empty v-else description="暂无图表数据"></el-empty>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="谱图文件" name="ptFileTab">
<div class="dataTabHead">
<h3>{{ crrrentName }}</h3>
</div>
<ptFile ref="ptflieRef"></ptFile>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
@ -215,11 +221,13 @@
import { getTreeApi, getDetailApi, getexportApi } from "@/utils/api/index"; import { getTreeApi, getDetailApi, getexportApi } from "@/utils/api/index";
import lineChart from "./components/line"; import lineChart from "./components/line";
import deviceExportDialog from "./components/deviceExportDialog"; import deviceExportDialog from "./components/deviceExportDialog";
import ptFile from "./components/ptFile";
export default { export default {
name: "dataReport", name: "dataReport",
components: { components: {
lineChart, lineChart,
deviceExportDialog, deviceExportDialog,
ptFile,
}, },
data() { data() {
return { return {
@ -583,6 +591,8 @@ export default {
this.formdata.starttime, this.formdata.starttime,
this.formdata.endtime this.formdata.endtime
); );
} else if (this.tabName == "ptFileTab") {
this.$refs.ptflieRef.getdownAll(this.currentId, this.formdata);
} }
}, },
// //
@ -665,13 +675,15 @@ export default {
this.formdata.starttime, this.formdata.starttime,
this.formdata.endtime this.formdata.endtime
); );
} else { } else if (this.tabName === "dataTab") {
this.getDetailTable( this.getDetailTable(
this.currentId, this.currentId,
this.formdata.dayValue, this.formdata.dayValue,
this.formdata.starttime, this.formdata.starttime,
this.formdata.endtime this.formdata.endtime
); );
} else if (this.tabName === "ptFileTab") {
this.$refs.ptflieRef.getdownAll(this.currentId, this.formdata);
} }
}, },
// //

@ -40,6 +40,13 @@
<el-form-item label="传感器代码:" prop="sensorCode"> <el-form-item label="传感器代码:" prop="sensorCode">
<el-input v-model="formInfo.sensorCode"></el-input> <el-input v-model="formInfo.sensorCode"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排序号:" prop="orderNum">
<el-input
v-model="formInfo.orderNum"
type="number"
oninput="value=value.replace(/[^0-9999999.-]/g,'')"
></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="hide"> </el-button> <el-button @click="hide"> </el-button>
@ -66,6 +73,7 @@ export default {
typeId: "", typeId: "",
devId: "", devId: "",
sensorCode: "", sensorCode: "",
orderNum: "",
}, },
rules: { rules: {
name: [{ required: true, message: "请输入名称", trigger: "blur" }], name: [{ required: true, message: "请输入名称", trigger: "blur" }],
@ -107,6 +115,13 @@ export default {
}); });
this.hide(); this.hide();
this.$parent.getjcsbAllList(); // this.$parent.getjcsbAllList(); //
} else {
this.$message({
duration: 1500,
showClose: true,
message: res.errorMsg,
type: "error",
});
} }
}) })
.catch((err) => {}); .catch((err) => {});
@ -124,6 +139,13 @@ export default {
}); });
this.hide(); this.hide();
this.$parent.getjcsbAllList(); // this.$parent.getjcsbAllList(); //
} else {
this.$message({
duration: 1500,
showClose: true,
message: res.errorMsg,
type: "error",
});
} }
}) })
.catch((err) => {}); .catch((err) => {});

@ -26,7 +26,8 @@
<el-table-column prop="name" label="名称"> </el-table-column> <el-table-column prop="name" label="名称"> </el-table-column>
<el-table-column prop="modevtname" label="类型"> </el-table-column> <el-table-column prop="modevtname" label="类型"> </el-table-column>
<el-table-column prop="zsbname" label="主设备"> </el-table-column> --> <el-table-column prop="zsbname" label="主设备"> </el-table-column> -->
<el-table-column prop="id" label="ID" width="50"> </el-table-column> <el-table-column prop="orderNum" label="排序号" width="60">
</el-table-column>
<el-table-column prop="zsbName" label="主设备名称"> </el-table-column> <el-table-column prop="zsbName" label="主设备名称"> </el-table-column>
<el-table-column prop="devId" label="devId"> </el-table-column> <el-table-column prop="devId" label="devId"> </el-table-column>
<el-table-column prop="name" label="名称"> </el-table-column> <el-table-column prop="name" label="名称"> </el-table-column>

@ -43,6 +43,13 @@
<el-form-item label="equipmentId" prop="equipmentId"> <el-form-item label="equipmentId" prop="equipmentId">
<el-input v-model="formInfo.equipmentId"></el-input> <el-input v-model="formInfo.equipmentId"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排序号:" prop="orderNum">
<el-input
v-model="formInfo.orderNum"
type="number"
oninput="value=value.replace(/[^0-9999999.-]/g,'')"
></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="hide"> </el-button> <el-button @click="hide"> </el-button>
@ -70,6 +77,7 @@ export default {
devId: "", devId: "",
sensorCode: "", sensorCode: "",
equipmentId: "", equipmentId: "",
orderNum: "",
}, },
rules: { rules: {
name: [{ required: true, message: "请输入名称", trigger: "blur" }], name: [{ required: true, message: "请输入名称", trigger: "blur" }],
@ -111,6 +119,13 @@ export default {
}); });
this.hide(); this.hide();
this.$parent.getmonitoringAllList(); // this.$parent.getmonitoringAllList(); //
} else {
this.$message({
duration: 1500,
showClose: true,
message: res.errorMsg,
type: "error",
});
} }
}) })
.catch((err) => {}); .catch((err) => {});
@ -128,6 +143,13 @@ export default {
}); });
this.hide(); this.hide();
this.$parent.getmonitoringAllList(); // this.$parent.getmonitoringAllList(); //
} else {
this.$message({
duration: 1500,
showClose: true,
message: res.errorMsg,
type: "error",
});
} }
}) })
.catch((err) => {}); .catch((err) => {});

@ -79,7 +79,8 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<!-- <el-table-column prop="id" label="ID" width="50"> </el-table-column> --> <el-table-column prop="orderNum" label="排序号" width="60">
</el-table-column>
<el-table-column prop="zsbName" label="主设备名称"> </el-table-column> <el-table-column prop="zsbName" label="主设备名称"> </el-table-column>
<el-table-column prop="devId" label="devId"> </el-table-column> <el-table-column prop="devId" label="devId"> </el-table-column>
<el-table-column prop="name" label="名称"> </el-table-column> <el-table-column prop="name" label="名称"> </el-table-column>

Loading…
Cancel
Save