diff --git a/package-lock.json b/package-lock.json index 40bae50d..222b3b2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4281,7 +4281,7 @@ "fastclick": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", - "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=", + "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==", "dev": true }, "fastparse": { diff --git a/src/main.js b/src/main.js index 87ad471a..82346e0c 100644 --- a/src/main.js +++ b/src/main.js @@ -3,7 +3,7 @@ import Vue from 'vue' import App from './App' import router from './router' -import FastClick from 'fastclick' +// import FastClick from 'fastclick' Vue.config.productionTip = false // import 'lib-flexible/flexible.js' import 'amfe-flexible/index.js' @@ -183,11 +183,11 @@ Vue.use(VueHtml5Editor,{ }); /*解决手动点击与真正触发click事件会存在300ms的延迟*/ -if ('addEventListener' in document) { - document.addEventListener('DOMContentLoaded', function () { - FastClick.attach(document.body); - }, false); -} +// if ('addEventListener' in document) { +// document.addEventListener('DOMContentLoaded', function () { +// FastClick.attach(document.body); +// }, false); +// } //设置动态登录页 router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index 965b02d9..72494123 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3609,6 +3609,7 @@ export const constantRoutes = [ meta: { title: '现场检查笔录', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/lawEnforcement/record/record'], resolve) }, @@ -3634,8 +3635,9 @@ export const constantRoutes = [ path: '/lawEnforcement/recordDocument', name: 'lawEnforcementRecordDocument', meta: { - title: '文书打印', + title: '全部文书', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/lawEnforcement/record/recordDocument'], resolve) }, diff --git a/src/views/lawEnforcement/basis/basis.vue b/src/views/lawEnforcement/basis/basis.vue index 1e726032..83e6cdbc 100644 --- a/src/views/lawEnforcement/basis/basis.vue +++ b/src/views/lawEnforcement/basis/basis.vue @@ -110,9 +110,10 @@ this.popValue = action.text; this.queryParams.number = action.value; this.list = []; + this.finished = true; + this.loading = true; this.queryParams.pageNum = 1 ; - this.finished = false; - this.loading = false; + this.queryParams.pageSize = '9999'; this.getList(); }, goSearch(){ diff --git a/src/views/lawEnforcement/record/record.vue b/src/views/lawEnforcement/record/record.vue index e5089afd..ca0a66b2 100644 --- a/src/views/lawEnforcement/record/record.vue +++ b/src/views/lawEnforcement/record/record.vue @@ -64,6 +64,22 @@ this.headTitle = '责令改正通知书'; } }, + beforeRouteEnter (to, from, next) { + /* + to:获取你要跳转的路由信息 + from: 获取你从哪个路由来的信息 + next: (放行函数) + // 第一种写法 + next(); // 直接放行 + // 第二种 + next('/url') //放行到指定的路由 + */ + next(vm => { + if (from.path === '/lawEnforcement/index_new'){ + location.reload() + } + }) + }, methods: { getDictionaries(){ let query = { diff --git a/src/views/lawEnforcement/record/recordDocument.vue b/src/views/lawEnforcement/record/recordDocument.vue index 20204489..6f696965 100644 --- a/src/views/lawEnforcement/record/recordDocument.vue +++ b/src/views/lawEnforcement/record/recordDocument.vue @@ -52,6 +52,22 @@ created() { this.getDictionaries() }, + beforeRouteEnter (to, from, next) { + /* + to:获取你要跳转的路由信息 + from: 获取你从哪个路由来的信息 + next: (放行函数) + // 第一种写法 + next(); // 直接放行 + // 第二种 + next('/url') //放行到指定的路由 + */ + next(vm => { + if (from.path === '/lawEnforcement/index_new'){ + location.reload() + } + }) + }, methods: { getDictionaries(){ let query = {