Skip to content

B
bianpoSys
Commit b88a0933 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

bianpo rev-from-lcl

parent 01baadf3
Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 269 deletions
.env.development
View file @ b88a0933
# 页面标题 # 页面标题
VUE_APP_TITLE = 建平盛德日新矿业有限公司边坡结构稳定性监测系统 VUE_APP_TITLE = 边坡结构稳定性监测系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 建平盛德日新矿业有限公司边坡结构稳定性监测系统/开发环境 # 边坡结构稳定性监测系统/开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
#VUE_APP_BASE_API = '/prod-api' #VUE_APP_BASE_API = '/prod-api'
......
.env.production
View file @ b88a0933
# 页面标题 # 页面标题
VUE_APP_TITLE = 建平盛德日新矿业有限公司边坡结构稳定性监测系统 VUE_APP_TITLE = 边坡结构稳定性监测系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
......
.env.staging
View file @ b88a0933
# 页面标题 # 页面标题
VUE_APP_TITLE = 建平盛德日新矿业有限公司边坡结构稳定性监测系统 VUE_APP_TITLE = 边坡结构稳定性监测系统
NODE_ENV = production NODE_ENV = production
......
README.en.md
View file @ b88a0933
# 建平盛德日新矿业有限公司边坡结构稳定性监测系统 # 边坡结构稳定性监测系统
#### Description #### Description
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} {**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
......
package.json
View file @ b88a0933
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
"connect": "3.6.6", "connect": "3.6.6",
"eslint": "7.15.0", "eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0", "eslint-plugin-vue": "7.2.0",
"html-webpack-plugin": "^5.5.3",
"lint-staged": "10.5.3", "lint-staged": "10.5.3",
"runjs": "4.4.2", "runjs": "4.4.2",
"sass": "1.32.13", "sass": "1.32.13",
......
src/api/lclApi/lclapi.js
View file @ b88a0933
...@@ -687,4 +687,12 @@ export function alarmRelieve(data) { ...@@ -687,4 +687,12 @@ export function alarmRelieve(data) {
method: 'put', method: 'put',
data data
}) })
}
// : 爆破震动
export function blastingImage(params) {
return request({
url: '/slope/blasting/image',
method: 'get',
params
})
} }
\ No newline at end of file
src/components/lclEcharts/charts.js
View file @ b88a0933
...@@ -19,26 +19,26 @@ echarts.use([ ...@@ -19,26 +19,26 @@ echarts.use([
* } * }
*/ */
export function lineCharts(params) { export function lineCharts(params) {
console.log(params,'singleLine') console.log(params, 'singleLine')
let {chartId,chartData,color,unit}=params let { chartId, chartData, color, unit } = params
// let alarm // let alarm
// if(params.alarm) { // if(params.alarm) {
// alarm=params.alarm // alarm=params.alarm
// }else{ // }else{
// alarm={equipname: '黄山水库降雪量', equipno: 'hs1901', fourlevelalarm: 7, onelevelalarm: 10, threelevelalarm: 8, twolevelalarm: 9,unit:"cm"} // alarm={equipname: '黄山水库降雪量', equipno: 'hs1901', fourlevelalarm: 7, onelevelalarm: 10, threelevelalarm: 8, twolevelalarm: 9,unit:"cm"}
// } // }
let xAxisData = chartData.map(v => v.createTime); let xAxisData = chartData.map(v => v.createTime);
let yAxisData = chartData.map(v => v.disValue); let yAxisData = chartData.map(v => v.disValue);
let myChart = echarts.init(document.getElementById(chartId)); let myChart = echarts.init(document.getElementById(chartId));
let option = { let option = {
backgroundColor: "#f8f8f8", backgroundColor: "#f8f8f8",
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
formatter: function(arg) { formatter: function (arg) {
return arg[0].name + '<br>' + arg[0].data+unit return arg[0].name + '<br>' + arg[0].data + unit
// +alarm.unit // +alarm.unit
} }
}, },
...@@ -58,7 +58,7 @@ export function lineCharts(params) { ...@@ -58,7 +58,7 @@ export function lineCharts(params) {
lineStyle: { lineStyle: {
color: params.axisLabel, color: params.axisLabel,
}, },
onZero:false onZero: false
}, },
axisLabel: { axisLabel: {
show: true, show: true,
...@@ -179,7 +179,7 @@ export function lineCharts(params) { ...@@ -179,7 +179,7 @@ export function lineCharts(params) {
// markLine: { // markLine: {
// silent: false , // silent: false ,
// data: [ // data: [
// { // {
// yAxis: alarm.fourlevelalarm, // yAxis: alarm.fourlevelalarm,
// name: alarm.fourlevelalarm+alarm.unit, // name: alarm.fourlevelalarm+alarm.unit,
...@@ -269,125 +269,125 @@ export function lineCharts(params) { ...@@ -269,125 +269,125 @@ export function lineCharts(params) {
*/ */
export function nLineCharts(params) { export function nLineCharts(params) {
console.log(params) console.log(params)
let {chartId,chartData,alarm}=params let { chartId, chartData, alarm } = params
let color=params.color let color = params.color
let legendItem = ['X偏移量','Y偏移量','Z偏移量']; let legendItem = ['X偏移量', 'Y偏移量', 'Z偏移量'];
let xAxisData = chartData.map(v => v.name); let xAxisData = chartData.map(v => v.name);
let yAxisData1 = chartData.map(v => v.value1); let yAxisData1 = chartData.map(v => v.value1);
let yAxisData2 = chartData.map(v => v.value2); let yAxisData2 = chartData.map(v => v.value2);
let yAxisData3 = chartData.map(v => v.value3); let yAxisData3 = chartData.map(v => v.value3);
let myChart = echarts.init(document.getElementById(chartId)); let myChart = echarts.init(document.getElementById(chartId));
let markLineData={ let markLineData = {
silent: false , silent: false,
data: [ data: [
{ {
yAxis: alarm.fourlevelalarm, yAxis: alarm.fourlevelalarm,
name: alarm.fourlevelalarm+alarm.unit, name: alarm.fourlevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'blue', color: 'blue',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'blue', color: 'blue',
}, },
}, },
{ {
yAxis: alarm.threelevelalarm, yAxis: alarm.threelevelalarm,
name: alarm.threelevelalarm+alarm.unit, name: alarm.threelevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'yellow', color: 'yellow',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'yellow', color: 'yellow',
}, },
}, },
{ {
yAxis: alarm.twolevelalarm, yAxis: alarm.twolevelalarm,
name: alarm.twolevelalarm+alarm.unit, name: alarm.twolevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'orange', color: 'orange',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'orange', color: 'orange',
}, },
}, },
{ {
yAxis: alarm.onelevelalarm, yAxis: alarm.onelevelalarm,
name: alarm.onelevelalarm+alarm.unit, name: alarm.onelevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'red', color: 'red',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'red', color: 'red',
}, },
}, },
{ {
yAxis: -alarm.fourlevelalarm, yAxis: -alarm.fourlevelalarm,
name: '-'+alarm.fourlevelalarm+alarm.unit, name: '-' + alarm.fourlevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'blue', color: 'blue',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'blue', color: 'blue',
}, },
}, },
{ {
yAxis: -alarm.threelevelalarm, yAxis: -alarm.threelevelalarm,
name: '-'+alarm.threelevelalarm+alarm.unit, name: '-' + alarm.threelevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'yellow', color: 'yellow',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'yellow', color: 'yellow',
}, },
}, },
{ {
yAxis: -alarm.twolevelalarm, yAxis: -alarm.twolevelalarm,
name: '-'+alarm.twolevelalarm+alarm.unit, name: '-' + alarm.twolevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'orange', color: 'orange',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'orange', color: 'orange',
}, },
}, },
{ {
yAxis: -alarm.onelevelalarm, yAxis: -alarm.onelevelalarm,
name: '-'+alarm.onelevelalarm+alarm.unit, name: '-' + alarm.onelevelalarm + alarm.unit,
lineStyle: { lineStyle: {
color: 'red', color: 'red',
}, },
label: { label: {
show: true, show: true,
position: ['80%', '0'], position: ['80%', '0'],
color: 'red', color: 'red',
}, },
}, },
] ]
} }
const hexToRgba = (hex, opacity) => { const hexToRgba = (hex, opacity) => {
let rgbaColor = ""; let rgbaColor = "";
let reg = /^#[\da-f]{6}$/i; let reg = /^#[\da-f]{6}$/i;
if (reg.test(hex)) { if (reg.test(hex)) {
rgbaColor = `rgba(${parseInt("0x" + hex.slice(1, 3))},${parseInt( rgbaColor = `rgba(${parseInt("0x" + hex.slice(1, 3))},${parseInt(
"0x" + hex.slice(3, 5) "0x" + hex.slice(3, 5)
)},${parseInt("0x" + hex.slice(5, 7))},${opacity})`; )},${parseInt("0x" + hex.slice(5, 7))},${opacity})`;
} }
return rgbaColor; return rgbaColor;
} }
let option = { let option = {
// backgroundColor: "#C7D8EE", // backgroundColor: "#C7D8EE",
...@@ -406,7 +406,7 @@ export function nLineCharts(params) { ...@@ -406,7 +406,7 @@ export function nLineCharts(params) {
z: 22, z: 22,
}, },
legend: { legend: {
show:false, show: false,
center: true, center: true,
top: 10, top: 10,
data: legendItem, data: legendItem,
...@@ -423,7 +423,7 @@ export function nLineCharts(params) { ...@@ -423,7 +423,7 @@ export function nLineCharts(params) {
lineStyle: { lineStyle: {
color: params.axisLabel, color: params.axisLabel,
}, },
onZero:false onZero: false
}, },
axisLabel: { axisLabel: {
show: true, show: true,
...@@ -437,7 +437,7 @@ export function nLineCharts(params) { ...@@ -437,7 +437,7 @@ export function nLineCharts(params) {
// }, // },
}, },
}, },
], ],
yAxis: [ yAxis: [
{ {
...@@ -461,37 +461,37 @@ export function nLineCharts(params) { ...@@ -461,37 +461,37 @@ export function nLineCharts(params) {
}, },
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: params.axisLabel color: params.axisLabel
} }
}, },
axisTick: { axisTick: {
show: false show: false
}, },
min:Math.max.apply( min: Math.max.apply(
null, null,
chartData.map((p) => { chartData.map((p) => {
if(p.value>-alarm.onelevelalarm){ if (p.value > -alarm.onelevelalarm) {
return -Math.ceil(alarm.onelevelalarm) return -Math.ceil(alarm.onelevelalarm)
}else{ } else {
return Math.ceil(p.value) return Math.ceil(p.value)
} }
}) })
) * 1.1, ) * 1.1,
max: max:
Math.max.apply( Math.max.apply(
null, null,
chartData.map((p) => { chartData.map((p) => {
if(p.value>alarm.onelevelalarm){ if (p.value > alarm.onelevelalarm) {
return Math.ceil(p.value) return Math.ceil(p.value)
}else{ } else {
return Math.ceil(alarm.onelevelalarm) return Math.ceil(alarm.onelevelalarm)
} }
}) })
) * 1.1, ) * 1.1,
} }
], ],
series: [ series: [
{ {
...@@ -508,11 +508,11 @@ export function nLineCharts(params) { ...@@ -508,11 +508,11 @@ export function nLineCharts(params) {
itemStyle: { itemStyle: {
// 设置symbol的颜色 // 设置symbol的颜色
normal: { normal: {
color:color[0], color: color[0],
}, },
borderWidth: 2, borderWidth: 2,
}, },
markLine:markLineData markLine: markLineData
}, },
{ {
data: yAxisData2, data: yAxisData2,
...@@ -528,11 +528,11 @@ export function nLineCharts(params) { ...@@ -528,11 +528,11 @@ export function nLineCharts(params) {
itemStyle: { itemStyle: {
// 设置symbol的颜色 // 设置symbol的颜色
normal: { normal: {
color:color[1], color: color[1],
}, },
borderWidth: 2, borderWidth: 2,
}, },
markLine:markLineData markLine: markLineData
}, },
{ {
data: yAxisData3, data: yAxisData3,
...@@ -548,11 +548,11 @@ export function nLineCharts(params) { ...@@ -548,11 +548,11 @@ export function nLineCharts(params) {
itemStyle: { itemStyle: {
// 设置symbol的颜色 // 设置symbol的颜色
normal: { normal: {
color:color[2], color: color[2],
}, },
borderWidth: 2, borderWidth: 2,
}, },
markLine:markLineData markLine: markLineData
}, },
], ],
}; };
...@@ -560,7 +560,7 @@ export function nLineCharts(params) { ...@@ -560,7 +560,7 @@ export function nLineCharts(params) {
setTimeout(() => { setTimeout(() => {
myChart.resize(); myChart.resize();
}, 600); }, 600);
} }
...@@ -594,59 +594,59 @@ export function nLineCharts(params) { ...@@ -594,59 +594,59 @@ export function nLineCharts(params) {
* showlegend: true, * showlegend: true,
* } * }
*/ */
export function ChartsForLine(params={}) { export function ChartsForLine(params = {}) {
var {chartId,color,chartType,axisLabel,itemColor,unit,bgc,grid,showlegend,legendItem,xAxisData,yData,}=params var { chartId, color, chartType, axisLabel, itemColor, unit, bgc, grid, showlegend, legendItem, xAxisData, yData, } = params
var alarm,xDataShow=true; var alarm, xDataShow = true;
if(params.alarm){ if (params.alarm) {
alarm=params.alarm alarm = params.alarm
} }
if(params.xDataShow==="1"){ if (params.xDataShow === "1") {
xDataShow=false xDataShow = false
} }
var yAxisData=[] var yAxisData = []
for(let i=0;i<yData.length;i++){ for (let i = 0; i < yData.length; i++) {
yAxisData.push({ yAxisData.push({
data: yData[i], data: yData[i],
name: legendItem[i], name: legendItem[i],
type: chartType, type: chartType,
smooth: true, //是否平滑 smooth: true, //是否平滑
showSymbol: true, showSymbol: true,
symbolSize: 1, symbolSize: 1,
zlevel: 3, zlevel: 3,
lineStyle: { lineStyle: {
color: color[i],
},
itemStyle: {
// 设置symbol的颜色
normal: {
color: color[i], color: color[i],
}, },
itemStyle: { borderWidth: 2,
// 设置symbol的颜色 },
normal: {
color:color[i], })
},
borderWidth: 2,
},
})
} }
let myChart = echarts.init(document.getElementById(chartId)); let myChart = echarts.init(document.getElementById(chartId));
let option = { let option = {
backgroundColor: bgc||"rgba(225,225,225,0)", backgroundColor: bgc || "rgba(225,225,225,0)",
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
formatter: function(params) { formatter: function (params) {
let str = params[0].axisValue + "<br />"; let str = params[0].axisValue + "<br />";
params.forEach((item) => { params.forEach((item) => {
str += str +=
'<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:'+item.color+'"></span>' + item.seriesName + " : " + item.data+unit + "<br />"; '<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:' + item.color + '"></span>' + item.seriesName + " : " + item.data + unit + "<br />";
}); });
return str; return str;
} }
}, },
grid: grid, grid: grid,
legend: { legend: {
show:showlegend, show: showlegend,
center: true, center: true,
top: 10, top: 10,
data: legendItem, data: legendItem,
...@@ -657,19 +657,19 @@ export function ChartsForLine(params={}) { ...@@ -657,19 +657,19 @@ export function ChartsForLine(params={}) {
xAxis: [ xAxis: [
{ {
type: "category", type: "category",
gridIndex: 0, gridIndex: 0,
data: xAxisData, data: xAxisData,
axisLine: { axisLine: {
show: xDataShow, show: xDataShow,
lineStyle: { lineStyle: {
color:axisLabel, color: axisLabel,
}, },
onZero:false onZero: false
}, },
axisLabel: { axisLabel: {
show: xDataShow, show: xDataShow,
color:axisLabel, color: axisLabel,
fontSize: 10, fontSize: 10,
// interval:0, // interval:0,
// formatter: (value) => { // formatter: (value) => {
...@@ -683,13 +683,13 @@ export function ChartsForLine(params={}) { ...@@ -683,13 +683,13 @@ export function ChartsForLine(params={}) {
} }
}, },
], ],
yAxis:[ yAxis: [
{ {
type: "value", type: "value",
// name: 'mm', // name: 'mm',
axisLabel: { axisLabel: {
show: true, show: true,
}, },
nameTextStyle: { nameTextStyle: {
fontSize: 10, fontSize: 10,
...@@ -706,19 +706,20 @@ export function ChartsForLine(params={}) { ...@@ -706,19 +706,20 @@ export function ChartsForLine(params={}) {
}, },
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: params.axisLabel color: params.axisLabel
} }
}, },
axisTick: { axisTick: {
show: false show: false
}, },
} }
], ],
series:yAxisData series: yAxisData
} }
myChart.clear();
myChart.setOption(option); myChart.setOption(option);
setTimeout(() => { setTimeout(() => {
// myChart.clear(); // myChart.clear();
......
src/layout/components/Navbar.vue
View file @ b88a0933
...@@ -162,14 +162,6 @@ export default { ...@@ -162,14 +162,6 @@ export default {
.catch(() => {}); .catch(() => {});
}, },
toBigscreen() { toBigscreen() {
console.log(
this.$router.resolve({
path: "/user",
}),
process,
"this.$router.resolve"
);
// this.$router.push({ path: "/bigscreen" }); // this.$router.push({ path: "/bigscreen" });
// clearInterval(this.curTimer) // clearInterval(this.curTimer)
var link = this.$router.resolve({ var link = this.$router.resolve({
......
src/layout/components/Sidebar/Logo.vue
View file @ b88a0933
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
> >
<transition name="sidebarLogoFade" class="logo-header"> <transition name="sidebarLogoFade" class="logo-header">
<router-link class="sidebar-logo-link logo-header" to="/"> <router-link class="sidebar-logo-link logo-header" to="/">
<img :src="logo" class="sidebar-logo" /> <!-- <img :src="logo" class="sidebar-logo" /> -->
<h1 <h1
class="sidebar-title" class="sidebar-title"
:style="{ :style="{
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
}, },
data() { data() {
return { return {
title: "建平盛德日新矿业有限公司边坡结构稳定性监测系统", title: "边坡结构稳定性监测系统",
logo: logoImg, logo: logoImg,
}; };
}, },
......
src/store/getters.js
View file @ b88a0933
...@@ -15,6 +15,8 @@ const getters = { ...@@ -15,6 +15,8 @@ const getters = {
topbarRouters: state => state.permission.topbarRouters, topbarRouters: state => state.permission.topbarRouters,
defaultRoutes: state => state.permission.defaultRoutes, defaultRoutes: state => state.permission.defaultRoutes,
sidebarRouters: state => state.permission.sidebarRouters, sidebarRouters: state => state.permission.sidebarRouters,
appPicApi: res => 'http://192.168.3.37:40251', appPicApi: res => 'http://60.212.188.152:12100',
// exportModel: res => 'http://60.212.188.152:12100',
// appPicApi: res => 'http://192.168.3.37:40251',
} }
export default getters export default getters
src/views/baopo/baopoDataWatch/index.vue
View file @ b88a0933
...@@ -57,31 +57,28 @@ ...@@ -57,31 +57,28 @@
height: '20px', height: '20px',
}" }"
:row-style="{ height: '20px' }" :row-style="{ height: '20px' }"
@row-click="rowClick"
> >
<el-table-column <el-table-column
align="center" align="center"
prop="createTime" prop="createTime"
label="监测时间" label="爆破时间"
/> />
<el-table-column align="center" prop="monNumber" label="监测编号"> <el-table-column align="center" prop="monNumber" label="监测编号">
</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 align="center" prop="monValueX" label="震动速度-X(cm/s)"></el-table-column> <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>
...@@ -103,10 +100,11 @@ ...@@ -103,10 +100,11 @@
// import { defineComponent } from "@vue/composition-api"; // import { defineComponent } from "@vue/composition-api";
import ChartsForLine from "@/components/lclEcharts/ChartsForLine"; import ChartsForLine from "@/components/lclEcharts/ChartsForLine";
import { getSevenTime } from "@/components/lclEcharts/time"; import { getSevenTime } from "@/components/lclEcharts/time";
import { blastinghistory, imageList } from "@/api/lclApi/lclapi"; import { blastinghistory, imageList, blastingImage } from "@/api/lclApi/lclapi";
export default { export default {
data() { data() {
return { return {
rowId: 1,
baopoTableData: [ baopoTableData: [
{ {
createTime: "2023-03-11 19:06:20", createTime: "2023-03-11 19:06:20",
...@@ -123,6 +121,7 @@ export default { ...@@ -123,6 +121,7 @@ export default {
], ],
AllChartData: { AllChartData: {
name: "1#爆破振动传感器", name: "1#爆破振动传感器",
xDataShow: "1",
chartId: `baopo`, chartId: `baopo`,
color: ["#f7af0b", "#05f57a", "#f40852"], color: ["#f7af0b", "#05f57a", "#f40852"],
chartType: "line", chartType: "line",
...@@ -139,7 +138,7 @@ export default { ...@@ -139,7 +138,7 @@ export default {
}, },
showlegend: false, showlegend: false,
legendItem: ["1#爆破振动传感器"], legendItem: ["1#爆破振动传感器"],
xAxisData: ["q", "p"], xAxisData: null,
yData: [], yData: [],
}, },
allYDataForEchart: [], allYDataForEchart: [],
...@@ -148,8 +147,8 @@ export default { ...@@ -148,8 +147,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 99999, pageSize: 99999,
startTime: "2023-09-28", startTime: "2022-01-17",
endTime: "2023-11-28", endTime: "2023-03-17",
}, },
dataVal: "", dataVal: "",
appPicApi: "", appPicApi: "",
...@@ -162,7 +161,7 @@ export default { ...@@ -162,7 +161,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];
...@@ -170,24 +169,29 @@ export default { ...@@ -170,24 +169,29 @@ 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: {
rowClick(row) {
let that = this;
let id = row.id || that.rowId;
blastingImage({ id, pageNum: 1, pageSize: 999 }).then((res) => {
that.AllChartData.yData = [res.rows.map((item) => item.blastingValue)];
});
},
getchart() { getchart() {
let that = this; let that = this;
blastinghistory(this.queryParams) blastinghistory(this.queryParams)
.then((res) => { .then((res) => {
if (res && res.code === 200 && res.rows) { if (res && res.code === 200 && res.rows) {
that.baopoTableData = res.rows; that.baopoTableData = res.rows;
that.AllChartData.xAxisData = res.rows.map( that.rowId = that.baopoTableData[0].id;
(item) => item.createTime
);
that.AllChartData.yData = [res.rows.map((item) => item.monValue)];
console.log(that.AllChartData);
} }
}) })
.then(() => {}); .then(() => {
this.rowClick({ id: that.baopoTableData[0].id });
});
}, },
gettime() { gettime() {
var date = new Date(); var date = new Date();
...@@ -265,8 +269,7 @@ export default { ...@@ -265,8 +269,7 @@ export default {
} }
} }
.watch-right { .watch-right {
// width: 55%; width: 55%;
width: 80%;
padding: 10px; padding: 10px;
float: left; float: left;
.lcl-title { .lcl-title {
......
src/views/bigScreen/index.vue
View file @ b88a0933
...@@ -433,7 +433,7 @@ Highcharts3D(Highcharts); ...@@ -433,7 +433,7 @@ Highcharts3D(Highcharts);
export default { export default {
data() { data() {
return { return {
screenTitle: "建平盛德日新矿业有限公司边坡结构稳定性监测系统", screenTitle: "边坡结构稳定性监测系统",
nowDate: "2023-01-01", nowDate: "2023-01-01",
nowTime: "23:59:59", nowTime: "23:59:59",
jxlEquipno: 19, jxlEquipno: 19,
...@@ -800,7 +800,7 @@ export default { ...@@ -800,7 +800,7 @@ export default {
a: "getcode", a: "getcode",
id: 48, id: 48,
icon: 1, icon: 1,
py: "jianping"// "weihai", // 建平 py: "weihai",
}).then((res) => { }).then((res) => {
var body = document.createElement("div"); var body = document.createElement("div");
var weather = this.$el.querySelector("#weather1"); var weather = this.$el.querySelector("#weather1");
...@@ -1982,11 +1982,13 @@ window.onload = function () { ...@@ -1982,11 +1982,13 @@ window.onload = function () {
.mid-top { .mid-top {
flex: 0.12; flex: 0.12;
border: none; border: none;
width: 100%;
} }
.mid-fir { .mid-fir {
flex: 2.94; flex: 2.94;
margin-top: 0; margin-top: 0;
width: 100%;
.nothing { .nothing {
height: 0.32rem; height: 0.32rem;
width: 100%; width: 100%;
...@@ -2011,6 +2013,7 @@ window.onload = function () { ...@@ -2011,6 +2013,7 @@ window.onload = function () {
justify-content: space-between; justify-content: space-between;
align-items: stretch; align-items: stretch;
border: none; border: none;
width: 100%;
.section-content { .section-content {
border: 1px solid #0085c0; border: 1px solid #0085c0;
.card-content { .card-content {
......
src/views/bmwy/bmwyAlarm/index.vue
View file @ b88a0933
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
align="center" align="center"
prop="alarmMonNumber" prop="alarmMonNumber"
/> />
<el-table-column label="x(mm)" align="center" prop="alarmValueA" /> <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
<el-table-column label="y(mm)" align="center" prop="alarmValueB" /> <el-table-column label="监测值-b" align="center" prop="alarmValueB" />
<el-table-column label="z(mm)" align="center" prop="alarmValueC" /> <el-table-column label="监测值-c" align="center" prop="alarmValueC" />
<el-table-column <el-table-column
label="报警时间" label="报警时间"
align="center" align="center"
......
src/views/index.vue
View file @ b88a0933
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<div class="home-right"> <div class="home-right">
<div class="home-right-top"> <div class="home-right-top">
<p class="title">边坡介绍</p> <p class="title">边坡介绍</p>
<p class="cont">边坡名称：威海晶合边坡结构系统</p> <!-- <p class="cont">边坡名称：威海晶合边坡结构系统</p> -->
<p class="cont">边坡名称：边坡结构系统</p>
<p class="cont">边坡工程安全等级：高级</p> <p class="cont">边坡工程安全等级：高级</p>
<p class="cont">边坡危害等级：低级</p> <p class="cont">边坡危害等级：低级</p>
<p class="cont">边皮设计稳定系数：高</p> <p class="cont">边皮设计稳定系数：高</p>
......
src/views/jyl/index.vue
View file @ b88a0933
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
}, },
], ],
alarmData: [], alarmData: [],
city_weather: "jianping", // 建平县 city_weather: "qingdao",
weatherList: [ weatherList: [
{ {
day: "今天", day: "今天",
......
src/views/login.vue
View file @ b88a0933
<template> <template>
<div class="login" :style="'background-image:url(' + Background + ');'"> <div class="login" :style="'background-image:url(' + Background + ');'">
<div class="headder"> <div class="headder">
<h2>建平盛德日新矿业有限公司边坡结构稳定性监测系统</h2> <h2>边坡结构稳定性监测系统</h2>
<!-- <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> --> <!-- <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> -->
</div> </div>
<div class="logo-place"> <div class="logo-place">
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
</div> </div>
<!-- 底部 --> <!-- 底部 -->
<div class="el-login-footer"> <!-- <div class="el-login-footer">
<span style="color: #eee; margin-top: 10px" <span style="color: #eee; margin-top: 10px"
>技术支持：威海晶合数字矿山技术有限公司</span >技术支持：威海晶合数字矿山技术有限公司</span
> >
</div> </div> -->
</div> </div>
</template> </template>
......
src/views/nbwy/nbwyAlarm/index.vue
View file @ b88a0933
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
/> />
<el-table-column label="监测值-a" align="center" prop="alarmValueA" /> <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
<el-table-column label="监测值-b" align="center" prop="alarmValueB" /> <el-table-column label="监测值-b" align="center" prop="alarmValueB" />
<el-table-column label="位移值(mm)" align="center" prop="alarmValueC" /> <el-table-column label="监测值-c" align="center" prop="alarmValueC" />
<el-table-column <el-table-column
label="报警时间" label="报警时间"
align="center" align="center"
......
src/views/register.vue
View file @ b88a0933
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:rules="registerRules" :rules="registerRules"
class="register-form" class="register-form"
> >
<h3 class="title">建平盛德日新矿业有限公司边坡结构稳定性监测系统</h3> <h3 class="title">边坡结构稳定性监测系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="registerForm.username" v-model="registerForm.username"
......
src/views/rgxj/calibration/index.vue
View file @ b88a0933
<template> <template>
<div class="name"> <div class="name">
<el-card class="mt10 box-card"> <el-card class="mt10 box-card" v-if="checkRole(['admin', 'addreporter'])">
<div class="lcl-title">设备校准</div> <div class="lcl-title">设备校准</div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
>新增</el-button >新增</el-button
...@@ -168,7 +168,9 @@ ...@@ -168,7 +168,9 @@
type="primary" type="primary"
size="medium" size="medium"
@click="checkDia" @click="checkDia"
v-if="checkStatus && form.status == 0" v-if="
checkStatus && form.status == 0 && checkRole(['admin', 'checker'])
"
>审核</el-button >审核</el-button
> >
<el-form label-width="80px" style="overflow: hidden"> <el-form label-width="80px" style="overflow: hidden">
...@@ -240,7 +242,7 @@ ...@@ -240,7 +242,7 @@
<el-button <el-button
type="primary" type="primary"
@click="submitForm" @click="submitForm"
v-if="form.status == 0" v-if="form.status == 0 && checkRole(['admin', 'addreporter'])"
>提 交</el-button >提 交</el-button
> >
</div> </div>
...@@ -260,6 +262,7 @@ import { ...@@ -260,6 +262,7 @@ import {
calibrationDel, calibrationDel,
} from "@/api/lclApi/lclapi"; } from "@/api/lclApi/lclapi";
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { checkPermi, checkRole } from "@/utils/permission";
export default { export default {
name: "name", name: "name",
components: {}, components: {},
...@@ -317,6 +320,8 @@ export default { ...@@ -317,6 +320,8 @@ export default {
}); });
}, },
methods: { methods: {
checkPermi,
checkRole,
formreset() { formreset() {
this.form = { this.form = {
id: null, id: null,
......
src/views/rgxj/record/index.vue
View file @ b88a0933
<template> <template>
<div class="name"> <div class="name">
<el-card class="mt10 box-card"> <el-card class="mt10 box-card" v-if="checkRole(['admin', 'addreporter'])">
<div class="lcl-title">巡检记录</div> <div class="lcl-title">巡检记录</div>
<el-button type="primary" icon="el-icon-plus" @click="addRecord" <el-button type="primary" icon="el-icon-plus" @click="addRecord"
>新增</el-button >新增</el-button
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<el-form <el-form
:model="reportForm" :model="reportForm"
ref="reportForm" ref="reportForm"
label-width="6.25rem" label-width="100px"
class="demo-dynamic" class="demo-dynamic"
> >
<el-form-item label="负责人" prop="insUser"> <el-form-item label="负责人" prop="insUser">
......
src/views/rgxj/watch/index.vue
View file @ b88a0933
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<div class="name"> <div class="name">
<el-card class="mt10 box-card"> <el-card class="mt10 box-card">
<div class="lcl-title">人工观测</div> <div class="lcl-title">人工观测</div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" <el-button
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-if="checkRole(['admin', 'addreporter'])"
>新增</el-button >新增</el-button
> >
<div class="mt10" id=" radar-table"> <div class="mt10" id=" radar-table">
...@@ -41,7 +45,8 @@ ...@@ -41,7 +45,8 @@
<el-table-column <el-table-column
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="历史数据" label="操作"
v-if="checkRole(['admin', 'addreporter'])"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -175,6 +180,7 @@ import { ...@@ -175,6 +180,7 @@ import {
delObservation, delObservation,
} from "@/api/lclApi/lclapi"; } from "@/api/lclApi/lclapi";
import ChartsForLine from "@/components/lclEcharts/ChartsForLine"; import ChartsForLine from "@/components/lclEcharts/ChartsForLine";
import { checkPermi, checkRole } from "@/utils/permission";
import * as echarts from "echarts"; import * as echarts from "echarts";
export default { export default {
name: "name", name: "name",
...@@ -246,6 +252,8 @@ export default { ...@@ -246,6 +252,8 @@ export default {
}); });
}, },
methods: { methods: {
checkPermi,
checkRole,
formRest() { formRest() {
this.form = { this.form = {
id: null, id: null,
......
src/views/system/checkPlan/index.vue
View file @ b88a0933
...@@ -371,12 +371,11 @@ export default { ...@@ -371,12 +371,11 @@ export default {
exportExcl() { exportExcl() {
exportModel().then((res) => { exportModel().then((res) => {
console.log(`192.168.3.37:8035/excel/${res.msg}`);
this.$modal this.$modal
.confirm("是否确认导出？") .confirm("是否确认导出？")
.then(function () { .then(function () {
return window.open( return window.open(
`http://192.168.3.37:8035/excel/${res.msg}`, `${this.$store.getters.appPicApi}/excel/${res.msg}`,
"_blank" "_blank"
); );
}) })
......
src/views/yujing/yujingAlarm/index.vue
View file @ b88a0933
...@@ -46,10 +46,9 @@ ...@@ -46,10 +46,9 @@
align="center" align="center"
prop="alarmMonNumber" prop="alarmMonNumber"
/> />
<!-- <el-table-column label="监测值-a" align="center" prop="alarmValueA" /> <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
<el-table-column label="监测值-b" align="center" prop="alarmValueB" /> <el-table-column label="监测值-b" align="center" prop="alarmValueB" />
<el-table-column label="监测值-c" align="center" prop="alarmValueC" /> --> <el-table-column label="监测值-c" align="center" prop="alarmValueC" />
<el-table-column label="报警数据" align="center" prop="alarmValue" />
<el-table-column <el-table-column
label="报警时间" label="报警时间"
align="center" align="center"
...@@ -144,10 +143,8 @@ ...@@ -144,10 +143,8 @@
// import { defineComponent } from "@vue/composition-api"; // import { defineComponent } from "@vue/composition-api";
import { dataAlarm } from "@/api/lclApi/lclapi"; import { dataAlarm } from "@/api/lclApi/lclapi";
export default { export default {
dicts:["slope_alarm_level"],
data() { data() {
return { return {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
src/views/zhjgyl/Alarm/index.vue
View file @ b88a0933
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
align="center" align="center"
prop="alarmMonNumber" prop="alarmMonNumber"
/> />
<el-table-column align="center" prop="monValue" label="监测值（KN）"> <el-table-column align="center" prop="monValue" label="监测值（mm）">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="报警时间" label="报警时间"
......
src/views/zhjgyl/Chart/index.vue
View file @ b88a0933
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</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 align="center" prop="monValue" label="监测值（KN）"> <el-table-column align="center" prop="monValue" label="监测值（mm）">
</el-table-column> </el-table-column>
<el-table-column align="center" prop="monAlarmLevel" label="预警状态"> <el-table-column align="center" prop="monAlarmLevel" label="预警状态">
</el-table-column> </el-table-column>
......
src/views/zhjgyl/DataWatch/index.vue
View file @ b88a0933
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="monValue" prop="monValue"
label="监测值（KN）" label="监测值（mm）"
> >
</el-table-column> </el-table-column>
......
vue.config.js
View file @ b88a0933
...@@ -7,8 +7,8 @@ function resolve(dir) { ...@@ -7,8 +7,8 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
// const name = process.env.VUE_APP_TITLE || '建平盛德日新矿业有限公司边坡结构稳定性监测系统' // 网页标题 // const name = process.env.VUE_APP_TITLE || '边坡结构稳定性监测系统' // 网页标题
const name = '建平盛德日新矿业有限公司边坡结构稳定性监测系统' // 网页标题 建平盛德日新矿业有限公司边坡结构稳定性监测系统 const name = '边坡结构稳定性监测系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 12100 // 端口 const port = process.env.port || process.env.npm_config_port || 12100 // 端口
...@@ -34,13 +34,11 @@ module.exports = { ...@@ -34,13 +34,11 @@ 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