diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue new file mode 100644 index 0000000..7fc4658 --- /dev/null +++ b/src/components/Engineering/HistoricalFault.vue @@ -0,0 +1,251 @@ + + + + 平台: + + + + 站点: + + + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue new file mode 100644 index 0000000..7fc4658 --- /dev/null +++ b/src/components/Engineering/HistoricalFault.vue @@ -0,0 +1,251 @@ + + + + 平台: + + + + 站点: + + + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue new file mode 100644 index 0000000..51f1492 --- /dev/null +++ b/src/components/Engineering/Nowfault.vue @@ -0,0 +1,122 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue new file mode 100644 index 0000000..7fc4658 --- /dev/null +++ b/src/components/Engineering/HistoricalFault.vue @@ -0,0 +1,251 @@ + + + + 平台: + + + + 站点: + + + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue new file mode 100644 index 0000000..51f1492 --- /dev/null +++ b/src/components/Engineering/Nowfault.vue @@ -0,0 +1,122 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/NFCloudPlatform/RealTime.vue b/src/components/NFCloudPlatform/RealTime.vue index 481b3b7..8958f31 100644 --- a/src/components/NFCloudPlatform/RealTime.vue +++ b/src/components/NFCloudPlatform/RealTime.vue @@ -50,7 +50,7 @@ name: "RealTime", data: function() { return { - power: localStorage.getItem("userName"), + // power: localStorage.getItem("userName"), username: "", list: [], total: 0, @@ -95,7 +95,7 @@ let params = { pageSize: this.pageSize, pageNo: this.currentPage, - condition: this.username, + condition: this.username, type: this.TypeNo }; this.$http.post(url, params).then(res => { diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue new file mode 100644 index 0000000..7fc4658 --- /dev/null +++ b/src/components/Engineering/HistoricalFault.vue @@ -0,0 +1,251 @@ + + + + 平台: + + + + 站点: + + + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue new file mode 100644 index 0000000..51f1492 --- /dev/null +++ b/src/components/Engineering/Nowfault.vue @@ -0,0 +1,122 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/NFCloudPlatform/RealTime.vue b/src/components/NFCloudPlatform/RealTime.vue index 481b3b7..8958f31 100644 --- a/src/components/NFCloudPlatform/RealTime.vue +++ b/src/components/NFCloudPlatform/RealTime.vue @@ -50,7 +50,7 @@ name: "RealTime", data: function() { return { - power: localStorage.getItem("userName"), + // power: localStorage.getItem("userName"), username: "", list: [], total: 0, @@ -95,7 +95,7 @@ let params = { pageSize: this.pageSize, pageNo: this.currentPage, - condition: this.username, + condition: this.username, type: this.TypeNo }; this.$http.post(url, params).then(res => { diff --git a/src/components/index.vue b/src/components/index.vue index a3a0a0e..d8b1be8 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -82,7 +82,7 @@ 消息查询 消息统计 - + 数据分析 @@ -90,7 +90,7 @@ 数据总览 统计报表 - + 工业物联网云平台 @@ -98,6 +98,14 @@ 视频监控 实时监控 + + + + 工程作业 + + 站点实时故障数据 + 站点历史故障数据 + @@ -281,7 +289,7 @@ #IndexMessage, #IndexQuanpin, #IndexLetout { - float: right; + float: right; margin: 12px; } /* 顶部 B */ diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue new file mode 100644 index 0000000..7fc4658 --- /dev/null +++ b/src/components/Engineering/HistoricalFault.vue @@ -0,0 +1,251 @@ + + + + 平台: + + + + 站点: + + + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue new file mode 100644 index 0000000..51f1492 --- /dev/null +++ b/src/components/Engineering/Nowfault.vue @@ -0,0 +1,122 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/NFCloudPlatform/RealTime.vue b/src/components/NFCloudPlatform/RealTime.vue index 481b3b7..8958f31 100644 --- a/src/components/NFCloudPlatform/RealTime.vue +++ b/src/components/NFCloudPlatform/RealTime.vue @@ -50,7 +50,7 @@ name: "RealTime", data: function() { return { - power: localStorage.getItem("userName"), + // power: localStorage.getItem("userName"), username: "", list: [], total: 0, @@ -95,7 +95,7 @@ let params = { pageSize: this.pageSize, pageNo: this.currentPage, - condition: this.username, + condition: this.username, type: this.TypeNo }; this.$http.post(url, params).then(res => { diff --git a/src/components/index.vue b/src/components/index.vue index a3a0a0e..d8b1be8 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -82,7 +82,7 @@ 消息查询 消息统计 - + 数据分析 @@ -90,7 +90,7 @@ 数据总览 统计报表 - + 工业物联网云平台 @@ -98,6 +98,14 @@ 视频监控 实时监控 + + + + 工程作业 + + 站点实时故障数据 + 站点历史故障数据 + @@ -281,7 +289,7 @@ #IndexMessage, #IndexQuanpin, #IndexLetout { - float: right; + float: right; margin: 12px; } /* 顶部 B */ diff --git a/src/router/index.js b/src/router/index.js index 9e7f937..7772755 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,6 +33,10 @@ // import Attic from '@/components/NFCloudPlatform/Attic' //视频监控-顶楼泵站 import RealTime from '@/components/NFCloudPlatform/RealTime' //实时监控 +// 工程作业 +import Nowfault from '@/components/Engineering/Nowfault' //查询实时故障数据 +import HistoricalFault from '@/components/Engineering/HistoricalFault' //查询历史故障数据 + Vue.use(Router) @@ -105,6 +109,14 @@ path: '/NFCloudPlatform/RealTime',// 工业物联网云平台--实时监控 name: 'RealTime', component: RealTime + },{ + path: '/Engineering/Nowfault',// 查询实时故障数据 + name: 'Nowfault', + component: Nowfault + },{ + path: '/Engineering/HistoricalFault',// 查询历史故障数据 + name: 'HistoricalFault', + component: HistoricalFault },] },{ path: '/login', diff --git a/src/components/Engineering/HistoricalFault.vue b/src/components/Engineering/HistoricalFault.vue new file mode 100644 index 0000000..7fc4658 --- /dev/null +++ b/src/components/Engineering/HistoricalFault.vue @@ -0,0 +1,251 @@ + + + + 平台: + + + + 站点: + + + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue new file mode 100644 index 0000000..51f1492 --- /dev/null +++ b/src/components/Engineering/Nowfault.vue @@ -0,0 +1,122 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/NFCloudPlatform/RealTime.vue b/src/components/NFCloudPlatform/RealTime.vue index 481b3b7..8958f31 100644 --- a/src/components/NFCloudPlatform/RealTime.vue +++ b/src/components/NFCloudPlatform/RealTime.vue @@ -50,7 +50,7 @@ name: "RealTime", data: function() { return { - power: localStorage.getItem("userName"), + // power: localStorage.getItem("userName"), username: "", list: [], total: 0, @@ -95,7 +95,7 @@ let params = { pageSize: this.pageSize, pageNo: this.currentPage, - condition: this.username, + condition: this.username, type: this.TypeNo }; this.$http.post(url, params).then(res => { diff --git a/src/components/index.vue b/src/components/index.vue index a3a0a0e..d8b1be8 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -82,7 +82,7 @@ 消息查询 消息统计 - + 数据分析 @@ -90,7 +90,7 @@ 数据总览 统计报表 - + 工业物联网云平台 @@ -98,6 +98,14 @@ 视频监控 实时监控 + + + + 工程作业 + + 站点实时故障数据 + 站点历史故障数据 + @@ -281,7 +289,7 @@ #IndexMessage, #IndexQuanpin, #IndexLetout { - float: right; + float: right; margin: 12px; } /* 顶部 B */ diff --git a/src/router/index.js b/src/router/index.js index 9e7f937..7772755 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,6 +33,10 @@ // import Attic from '@/components/NFCloudPlatform/Attic' //视频监控-顶楼泵站 import RealTime from '@/components/NFCloudPlatform/RealTime' //实时监控 +// 工程作业 +import Nowfault from '@/components/Engineering/Nowfault' //查询实时故障数据 +import HistoricalFault from '@/components/Engineering/HistoricalFault' //查询历史故障数据 + Vue.use(Router) @@ -105,6 +109,14 @@ path: '/NFCloudPlatform/RealTime',// 工业物联网云平台--实时监控 name: 'RealTime', component: RealTime + },{ + path: '/Engineering/Nowfault',// 查询实时故障数据 + name: 'Nowfault', + component: Nowfault + },{ + path: '/Engineering/HistoricalFault',// 查询历史故障数据 + name: 'HistoricalFault', + component: HistoricalFault },] },{ path: '/login', diff --git a/src/util/CHGTwo.js b/src/util/CHGTwo.js index 245b58d..e93811d 100644 --- a/src/util/CHGTwo.js +++ b/src/util/CHGTwo.js @@ -18,6 +18,13 @@ 'engineeringWorkcloseMachine':'/engineeringWork/closeMachine ',//工业物联网云平台- 关设备 'engineeringWorkopenValve':'/engineeringWork/openValve',//工业物联网云平台-开阀门 'engineeringWorkcloseValve':'/engineeringWork/closeValve',//工业物联网云平台-关阀门 + + 'faultInfoGetTempInfo':'/faultInfo/getTempInfo',//工程作业-查询实时故障数据 + 'faultInfoGetHisInfo':'/faultInfo/getHisInfo',//工程作业-查询历史故障数据 + 'StationBaseControllerGetPlatFormSiteTree':'/StationBaseController/getPlatFormSiteTree',//工程作业-平台站点二级树 + + + }; for (let item in nozzle) {