diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue new file mode 100644 index 0000000..cb51cf0 --- /dev/null +++ b/src/components/Engineering/MyHomework_Now.vue @@ -0,0 +1,157 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + 无图片 + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue new file mode 100644 index 0000000..cb51cf0 --- /dev/null +++ b/src/components/Engineering/MyHomework_Now.vue @@ -0,0 +1,157 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + 无图片 + + + + + + + + + + + + + + diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue index 51f1492..8eb6c29 100644 --- a/src/components/Engineering/Nowfault.vue +++ b/src/components/Engineering/Nowfault.vue @@ -34,7 +34,7 @@ - + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue new file mode 100644 index 0000000..cb51cf0 --- /dev/null +++ b/src/components/Engineering/MyHomework_Now.vue @@ -0,0 +1,157 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + 无图片 + + + + + + + + + + + + + + diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue index 51f1492..8eb6c29 100644 --- a/src/components/Engineering/Nowfault.vue +++ b/src/components/Engineering/Nowfault.vue @@ -34,7 +34,7 @@ - + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue new file mode 100644 index 0000000..cb51cf0 --- /dev/null +++ b/src/components/Engineering/MyHomework_Now.vue @@ -0,0 +1,157 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + 无图片 + + + + + + + + + + + + + + diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue index 51f1492..8eb6c29 100644 --- a/src/components/Engineering/Nowfault.vue +++ b/src/components/Engineering/Nowfault.vue @@ -34,7 +34,7 @@ - + + + \ No newline at end of file diff --git a/src/components/index.vue b/src/components/index.vue index d8b1be8..249e547 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -1,6 +1,6 @@ - + - + 报警配置 推送规则 报警日志 + 巡检配置 @@ -105,6 +106,7 @@ 站点实时故障数据 站点历史故障数据 + 我的作业 @@ -239,6 +241,7 @@ -ms-user-select: none; /*IE10+*/ -khtml-user-select: none; /*早期的浏览器*/ user-select: none; + /* overflow: auto; */ } #ContentView { width: 100%; @@ -330,7 +333,6 @@ } .el-container { width: 100%; - height: 100%; } diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue new file mode 100644 index 0000000..cb51cf0 --- /dev/null +++ b/src/components/Engineering/MyHomework_Now.vue @@ -0,0 +1,157 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + 无图片 + + + + + + + + + + + + + + diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue index 51f1492..8eb6c29 100644 --- a/src/components/Engineering/Nowfault.vue +++ b/src/components/Engineering/Nowfault.vue @@ -34,7 +34,7 @@ - + + + \ No newline at end of file diff --git a/src/components/index.vue b/src/components/index.vue index d8b1be8..249e547 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -1,6 +1,6 @@ - + - + 报警配置 推送规则 报警日志 + 巡检配置 @@ -105,6 +106,7 @@ 站点实时故障数据 站点历史故障数据 + 我的作业 @@ -239,6 +241,7 @@ -ms-user-select: none; /*IE10+*/ -khtml-user-select: none; /*早期的浏览器*/ user-select: none; + /* overflow: auto; */ } #ContentView { width: 100%; @@ -330,7 +333,6 @@ } .el-container { width: 100%; - height: 100%; } diff --git a/src/router/index.js b/src/router/index.js index 7772755..751b201 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -21,6 +21,7 @@ import AlarmConfiguration from '@/components/configure/AlarmConfiguration' //报警配置 import PushRules from '@/components/configure/PushRules' //推送规则 import AlarmLog from '@/components/configure/AlarmLog' //推送规则 +import PatrolConfiguration from '@/components/configure/PatrolConfiguration' //巡检配置 // 消息管理 import MessageQuery from '@/components/MessageManagement/MessageQuery' //消息查询 import MessageStatistics from '@/components/MessageManagement/MessageStatistics' //消息统计 @@ -36,6 +37,7 @@ // 工程作业 import Nowfault from '@/components/Engineering/Nowfault' //查询实时故障数据 import HistoricalFault from '@/components/Engineering/HistoricalFault' //查询历史故障数据 +import MyHomework from '@/components/Engineering/MyHomework' //我的作业 @@ -76,6 +78,10 @@ name: 'AlarmLog', component: AlarmLog },{ + path: '/configure/PatrolConfiguration',// 配置中心--巡检配置 + name: 'PatrolConfiguration', + component: PatrolConfiguration + },{ path: '/MessageManagement/MessageQuery',// 消息管理--消息查询 name: 'MessageQuery', component: MessageQuery @@ -117,6 +123,10 @@ path: '/Engineering/HistoricalFault',// 查询历史故障数据 name: 'HistoricalFault', component: HistoricalFault + },{ + path: '/Engineering/MyHomework',// 查询历史故障数据 + name: 'MyHomework', + component: MyHomework },] },{ path: '/login', diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue new file mode 100644 index 0000000..63b3c62 --- /dev/null +++ b/src/components/Engineering/MyHomework.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue new file mode 100644 index 0000000..d7125be --- /dev/null +++ b/src/components/Engineering/MyHomework_History.vue @@ -0,0 +1,175 @@ + + + + 站点查询: + + 时间选择: + + 搜索 + + + + + + + + + + + + + + + + + + diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue new file mode 100644 index 0000000..cb51cf0 --- /dev/null +++ b/src/components/Engineering/MyHomework_Now.vue @@ -0,0 +1,157 @@ + + + + 站点查询: + + 搜索 + + + + + + + + + + + + + + 无图片 + + + + + + + + + + + + + + diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue index 51f1492..8eb6c29 100644 --- a/src/components/Engineering/Nowfault.vue +++ b/src/components/Engineering/Nowfault.vue @@ -34,7 +34,7 @@ - + + + \ No newline at end of file diff --git a/src/components/index.vue b/src/components/index.vue index d8b1be8..249e547 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -1,6 +1,6 @@ - + - + 报警配置 推送规则 报警日志 + 巡检配置 @@ -105,6 +106,7 @@ 站点实时故障数据 站点历史故障数据 + 我的作业 @@ -239,6 +241,7 @@ -ms-user-select: none; /*IE10+*/ -khtml-user-select: none; /*早期的浏览器*/ user-select: none; + /* overflow: auto; */ } #ContentView { width: 100%; @@ -330,7 +333,6 @@ } .el-container { width: 100%; - height: 100%; } diff --git a/src/router/index.js b/src/router/index.js index 7772755..751b201 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -21,6 +21,7 @@ import AlarmConfiguration from '@/components/configure/AlarmConfiguration' //报警配置 import PushRules from '@/components/configure/PushRules' //推送规则 import AlarmLog from '@/components/configure/AlarmLog' //推送规则 +import PatrolConfiguration from '@/components/configure/PatrolConfiguration' //巡检配置 // 消息管理 import MessageQuery from '@/components/MessageManagement/MessageQuery' //消息查询 import MessageStatistics from '@/components/MessageManagement/MessageStatistics' //消息统计 @@ -36,6 +37,7 @@ // 工程作业 import Nowfault from '@/components/Engineering/Nowfault' //查询实时故障数据 import HistoricalFault from '@/components/Engineering/HistoricalFault' //查询历史故障数据 +import MyHomework from '@/components/Engineering/MyHomework' //我的作业 @@ -76,6 +78,10 @@ name: 'AlarmLog', component: AlarmLog },{ + path: '/configure/PatrolConfiguration',// 配置中心--巡检配置 + name: 'PatrolConfiguration', + component: PatrolConfiguration + },{ path: '/MessageManagement/MessageQuery',// 消息管理--消息查询 name: 'MessageQuery', component: MessageQuery @@ -117,6 +123,10 @@ path: '/Engineering/HistoricalFault',// 查询历史故障数据 name: 'HistoricalFault', component: HistoricalFault + },{ + path: '/Engineering/MyHomework',// 查询历史故障数据 + name: 'MyHomework', + component: MyHomework },] },{ path: '/login', diff --git a/src/util/CHGTwo.js b/src/util/CHGTwo.js index e93811d..20efeb7 100644 --- a/src/util/CHGTwo.js +++ b/src/util/CHGTwo.js @@ -22,6 +22,8 @@ 'faultInfoGetTempInfo':'/faultInfo/getTempInfo',//工程作业-查询实时故障数据 'faultInfoGetHisInfo':'/faultInfo/getHisInfo',//工程作业-查询历史故障数据 'StationBaseControllerGetPlatFormSiteTree':'/StationBaseController/getPlatFormSiteTree',//工程作业-平台站点二级树 + 'taskInfoGetTempInfo':'/taskInfo/getTempInfo',//工程作业-实时作业 + 'taskInfoGetHisInfo':'/taskInfo/getHisInfo',//工程作业-历史作业