Compare commits

..

No commits in common. "64b4c3c737dc56af629bf5449076bacd5b624948" and "d6202a91db8b953a1b6a7debbbb5defa22965939" have entirely different histories.

9 changed files with 517 additions and 745 deletions

14
package-lock.json generated
View File

@ -13,7 +13,6 @@
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"less": "^4.2.0", "less": "^4.2.0",
"less-loader": "^11.1.3", "less-loader": "^11.1.3",
"moment": "^2.29.4",
"postcss-pxtorem": "^6.0.0", "postcss-pxtorem": "^6.0.0",
"prismjs": "^1.29.0", "prismjs": "^1.29.0",
"sass-loader": "^13.3.2", "sass-loader": "^13.3.2",
@ -7627,14 +7626,6 @@
"integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==", "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
"dev": true "dev": true
}, },
"node_modules/moment": {
"version": "2.29.4",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
"engines": {
"node": "*"
}
},
"node_modules/mrmime": { "node_modules/mrmime": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
@ -17250,11 +17241,6 @@
"integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==", "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
"dev": true "dev": true
}, },
"moment": {
"version": "2.29.4",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
},
"mrmime": { "mrmime": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",

View File

@ -13,7 +13,6 @@
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"less": "^4.2.0", "less": "^4.2.0",
"less-loader": "^11.1.3", "less-loader": "^11.1.3",
"moment": "^2.29.4",
"postcss-pxtorem": "^6.0.0", "postcss-pxtorem": "^6.0.0",
"prismjs": "^1.29.0", "prismjs": "^1.29.0",
"sass-loader": "^13.3.2", "sass-loader": "^13.3.2",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,7 @@
<template> <template>
<div> <div>
<!-- <el-button @click="dialogVisible = true">网关维护</el-button> --> <el-button @click="dialogVisible = true">网关维护</el-button>
<el-dialog <el-dialog title="网关维护" :visible.sync="dialogVisible">
title="网关维护"
:visible.sync="dialogVisible"
:append-to-body="true"
>
<div class="title"> <div class="title">
<div class="left"> <div class="left">
<el-button @click="flag = true">新增参数</el-button> <el-button @click="flag = true">新增参数</el-button>
@ -176,7 +172,7 @@
export default { export default {
data() { data() {
return { return {
dialogVisible: true, dialogVisible: false,
labelPosition: "left", labelPosition: "left",
flag: false, flag: false,
tableData: [ tableData: [
@ -229,7 +225,6 @@ export default {
}, },
}; };
}, },
created() {},
methods: { methods: {
handleSelectionChange() {}, handleSelectionChange() {},
cellStyle({ row, column }) { cellStyle({ row, column }) {

View File

@ -4,15 +4,6 @@ import ElementUI from "element-ui";
import router from "./router"; import router from "./router";
import "element-ui/lib/theme-chalk/index.css"; import "element-ui/lib/theme-chalk/index.css";
Vue.config.productionTip = false; Vue.config.productionTip = false;
import moment from "moment";
//定义一个全局过滤器实现日期格式化
Vue.filter("datefmt", function (input, fmtstring) {
//当input为时间戳时需转为Number类型
// 使用momentjs这个日期格式化类库实现日期的格式化功能
return moment(input).format(fmtstring);
});
Vue.prototype.$moment = moment;
Vue.use(ElementUI); Vue.use(ElementUI);
new Vue({ new Vue({
router, router,

View File

@ -158,11 +158,6 @@ export let mainshaftChart = {
}; };
//负载电流监控 //负载电流监控
export let loadChartChart = { export let loadChartChart = {
tooltip: {
//悬浮框
show: true, // 是否显示
trigger: "item", //
},
xAxis: { xAxis: {
type: "category", type: "category",
data: ["08:00", "10:00", "12:00", "14:00", "16:00", "18:00"], data: ["08:00", "10:00", "12:00", "14:00", "16:00", "18:00"],
@ -231,11 +226,6 @@ export let loadChartChart = {
}; };
//额定电流监控 //额定电流监控
export let ratedChart = { export let ratedChart = {
tooltip: {
//悬浮框
show: true, // 是否显示
trigger: "item", //
},
xAxis: { xAxis: {
type: "category", type: "category",
data: ["08:00", "10:00", "12:00", "14:00", "16:00", "18:00"], data: ["08:00", "10:00", "12:00", "14:00", "16:00", "18:00"],
@ -383,11 +373,6 @@ export let CuttingSpeedChart = {
}; };
//急停状态监控 //急停状态监控
export let stopChart = { export let stopChart = {
tooltip: {
//悬浮框
show: true, // 是否显示
trigger: "item", //
},
xAxis: { xAxis: {
type: "category", type: "category",
data: [ data: [

View File

@ -1,16 +1,6 @@
<template> <template>
<div class="container"> <div class="container">
<div class="btns"> <div class="title">5G工厂机电智核数字孪生平台</div>
<div class="btnOne">提交</div>
<div class="btnTwo">网关配置</div>
<div class="btnThree">网关维护</div>
<div class="btnFour">网关监控</div>
</div>
<div class="title">
<img src="../assets/image/工业互联网驾驶舱文字_03.png" alt="" />
<span class="date">{{ data }}</span>
<span class="time">{{ time }}</span>
</div>
<div class="bottom"> <div class="bottom">
<div class="topBox"> <div class="topBox">
<div> <div>
@ -97,13 +87,9 @@ export default {
ratedChartOption: {}, ratedChartOption: {},
CuttingSpeedChartOption: {}, CuttingSpeedChartOption: {},
stopChartOption: {}, stopChartOption: {},
data: "",
time: "",
timer: null,
}; };
}, },
created() { created() {
this.time = this.$moment().format("HH:mm:ss");
this.productChartOption = productChart; this.productChartOption = productChart;
this.mainshaftChartOption = mainshaftChart; this.mainshaftChartOption = mainshaftChart;
this.loadChartChartOption = loadChartChart; this.loadChartChartOption = loadChartChart;
@ -112,24 +98,19 @@ export default {
this.stopChartOption = stopChart; this.stopChartOption = stopChart;
}, },
methods: { methods: {
//
fontSize(res) {
const clientWidth =
window.innerWidth ||
document.documentElement.clientWidth ||
document.body.clientWidth;
if (!clientWidth) return;
let fontSize = clientWidth / 1920;
return res * fontSize;
},
//
getLoadEcharts(dom, option) { getLoadEcharts(dom, option) {
var myChart = echarts.init(document.getElementById(dom), null, { var myChart = echarts.init(document.getElementById(dom), null, {
devicePixelRatio: 10, // 2 devicePixelRatio: 10, // 2
}); });
option.xAxis.axisLabel.textStyle.fontSize = this.fontSize(10); // if (option) {
option.yAxis.axisLabel.textStyle.fontSize = this.fontSize(10); // console.log(option.xAxis.axisLabel.textStyle);
// option.xAxis.axisLabel.textStyle.fontSize =
// this.$fontSize.fontSize(0.1);
// option.yAxis.axisLabel.textStyle.fontSize =
// this.$fontSize.fontSize(0.1);
// }
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () { window.addEventListener("resize", function () {
myChart.resize(); myChart.resize();
}); });
@ -142,15 +123,6 @@ export default {
this.getLoadEcharts("ratedChart", this.ratedChartOption); this.getLoadEcharts("ratedChart", this.ratedChartOption);
this.getLoadEcharts("one", this.CuttingSpeedChartOption); this.getLoadEcharts("one", this.CuttingSpeedChartOption);
this.getLoadEcharts("two", this.stopChartOption); this.getLoadEcharts("two", this.stopChartOption);
//
this.timer = setInterval(() => {
this.time = this.$moment().format("HH:mm:ss");
this.data = this.$moment().format("YYYY.MM.DD");
}, 100);
},
beforeDestory() {
//
clearInterval(this.timer);
}, },
beforeDestoryed() { beforeDestoryed() {
// , // ,
@ -166,45 +138,13 @@ export default {
.container { .container {
font-family: "SourceHanSansSC-regular"; font-family: "SourceHanSansSC-regular";
position: relative;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: #fff; background-color: #fff;
background-image: url("../assets/image/图片 2 Copy@1x.png"); // background-image: url("../assets/image/ 2 Copy@1x.png");
background-size: cover; /* 图像大小适应容器 */ background-size: cover; /* 图像大小适应容器 */
background-repeat: no-repeat; /* 防止图像平铺 */ background-repeat: no-repeat; /* 防止图像平铺 */
background-position: center; /* 图像在容器中居中 */ background-position: center; /* 图像在容器中居中 */
.btns {
div {
width: 146px;
height: 39px;
position: absolute;
background-image: url("../assets/image/未选中-文字背景_06.png");
background-size: cover; /* 图像大小适应容器 */
background-repeat: no-repeat; /* 防止图像平铺 */
background-position: center; /* 图像在容器中居中 */
color: #fff;
font-size: 20px;
text-align: center;
line-height: 39px;
right: 10px;
font-family: "Microsoft Yahei";
}
.btnOne {
top: 80px;
}
.btnTwo {
top: 129px;
}
.btnThree {
top: 178px;
}
.btnFour {
top: 227px;
color: #6b92fd;
background-image: url("../assets/image/选中-文字背景_07.png");
}
}
.title { .title {
height: 11%; height: 11%;
display: flex; display: flex;
@ -213,29 +153,11 @@ export default {
font-size: 48px; font-size: 48px;
color: #fff; color: #fff;
font-family: "SourceHanSansSC-regular"; font-family: "SourceHanSansSC-regular";
background-image: url("../assets/image/head.png"); // background-image: url("../assets/image/2@1x.png");
// background-image: url("../assets/image/_03.png");
background-size: cover; /* 图像大小适应容器 */ background-size: cover; /* 图像大小适应容器 */
background-repeat: no-repeat; /* 防止图像平铺 */ background-repeat: no-repeat; /* 防止图像平铺 */
background-position: center; /* 图像在容器中居中 */ background-position: center; /* 图像在容器中居中 */
img {
width: 20vw;
margin-top: -15px;
}
.date {
position: absolute;
font-size: 15px;
font-family: "myFont";
left: 10px;
top: 10px;
color: #5e7dd5;
}
.time {
position: absolute;
font-size: 24px;
font-family: "myFont";
left: 10px;
top: 20px;
}
} }
.bottom { .bottom {
height: calc(100vh - 11%); height: calc(100vh - 11%);

View File

@ -1,13 +1,3 @@
<template> <template>
<div><GatewayMaintenance /></div> <div>网络优化-网关维护</div>
</template> </template>
<script>
import GatewayMaintenance from "../components/GatewayMaintenance.vue";
export default {
name: "ntmaintenance",
data() {},
components: {
GatewayMaintenance,
},
};
</script>