diff --git a/src/router/index.js b/src/router/index.js index ef410e1..d97ccea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,7 @@ import Vue from "vue"; import VueRouter from "vue-router"; - +import MobilePage from "../views/realTimeMonitor/mobile_index.vue"; +import PCPage from "../views/realTimeMonitor/index.vue"; Vue.use(VueRouter); const routes = [ @@ -29,10 +30,7 @@ const routes = [ { path: "/realTimeMonitor", - component: () => - import( - /* webpackChunkName: "icon" */ "../views/realTimeMonitor/index.vue" - ), + component: window.innerWidth < 768 ? MobilePage : PCPage, meta: { title: "实时监控", permission: true, diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 71c0f8b..cc86fd1 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -1397,6 +1397,7 @@ export default { padding: 0px 8px; border-left: 1px solid #dcdfe6; position: relative; + overflow-y: auto; .zzbox { height: 32px; line-height: 32px; diff --git a/src/views/realTimeMonitor/mobile_index.vue b/src/views/realTimeMonitor/mobile_index.vue new file mode 100644 index 0000000..4100cd7 --- /dev/null +++ b/src/views/realTimeMonitor/mobile_index.vue @@ -0,0 +1,1470 @@ + + + diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index 23df418..ea4254d 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -419,6 +419,7 @@ export default { type: "warning", }); } + this.page = 1; this.getPicData(); }, //点击分页