Commit 97bb68d3 authored by zhanglw's avatar zhanglw

爆破 列表字段新增 xyz

parent 34962187
...@@ -67,17 +67,21 @@ ...@@ -67,17 +67,21 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="pointName" label="监测点位"> <el-table-column align="center" prop="pointName" label="监测点位">
</el-table-column> </el-table-column>
<el-table-column <el-table-column align="center" prop="monValueX" label="震动速度-X(cm/s)"></el-table-column>
<el-table-column align="center" prop="monValueY" label="震动速度-Y(cm/s)"></el-table-column>
<el-table-column align="center" prop="monValueZ" label="震动速度-Z(cm/s)"></el-table-column>
<el-table-column align="center" prop="monValue" label="合成速度(cm/s)"></el-table-column>
<!-- <el-table-column
align="center" align="center"
prop="monValue" prop="monValue"
label="震动幅度(cm/s)" label="震动幅度(cm/s)"
> >
</el-table-column> </el-table-column> -->
<el-table-column <!-- <el-table-column
align="center" align="center"
prop="monFrequency" prop="monFrequency"
label="震动主频(Hz)" label="震动主频(Hz)"
> > -->
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -144,8 +148,8 @@ export default { ...@@ -144,8 +148,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 99999, pageSize: 99999,
startTime: "2022-01-17", startTime: "2023-09-28",
endTime: "2023-03-17", endTime: "2023-11-28",
}, },
dataVal: "", dataVal: "",
appPicApi: "", appPicApi: "",
...@@ -158,7 +162,7 @@ export default { ...@@ -158,7 +162,7 @@ export default {
created() {}, created() {},
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.getchart();
let getTime = getSevenTime(7); let getTime = getSevenTime(7);
this.queryParams.startTime = getTime[0]; this.queryParams.startTime = getTime[0];
this.queryParams.endTime = getTime[getTime.length - 1]; this.queryParams.endTime = getTime[getTime.length - 1];
...@@ -166,6 +170,7 @@ export default { ...@@ -166,6 +170,7 @@ export default {
imageList({ monType: 9 }).then((res) => { imageList({ monType: 9 }).then((res) => {
this.picUrl = res.rows[0].image; this.picUrl = res.rows[0].image;
}); });
this.getchart();
}); });
}, },
methods: { methods: {
...@@ -260,7 +265,8 @@ export default { ...@@ -260,7 +265,8 @@ export default {
} }
} }
.watch-right { .watch-right {
width: 55%; // width: 55%;
width: 80%;
padding: 10px; padding: 10px;
float: left; float: left;
.lcl-title { .lcl-title {
......
...@@ -34,11 +34,13 @@ module.exports = { ...@@ -34,11 +34,13 @@ module.exports = {
port: port, port: port,
open: true, open: true,
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.3.180:8002`, // target: `http://192.168.3.180:8002`,
// target: `http://192.168.3.37:9090`, // target: `http://192.168.3.37:9090`,
target: `http://60.212.188.152:12000`,//服务器 target: `http://60.212.188.152:12000`,//服务器
// target: `http://192.168.3.188:9090`,//广建服务器-好用
// target: `http://192.168.3.188:9090`,//毕广建服务器
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
......
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