Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

package.json

@@ -63,6 +63,7 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-seamless-scroll": "^1.1.23",
     "vue-video-player": "5.0",
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.0"

src/router/index.js

@@ -1410,13 +1410,13 @@ export const constantRoutes = [
     component: Layout,
     redirect: 'index',
     children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        redirect: '/user/profile',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
+       {
+              path: 'index',
+              component: () => import('@/views/threeViolations/homePage/index'),
+              name: 'Index',
+              // redirect: '/user/profile',
+              meta: { title: '首页', icon: 'dashboard', affix: true }
+            }
     ]
   },
   {

src/views/equipment/sbbymx/byjl.vue

 <template>
-    <DefaultDialog :app='app'>
+    <DefaultDialog :app='app'  @close='close'>
 
      <div class="min_full" slot='form' style="height: 550px;border: 0px;">
 
@@ -91,6 +91,9 @@ import {
 		}
 	},
 	methods: {
+    close(){
+      this.app.$refs['TablePager'].pageQuery()
+    },
     xzry(){
       if (this.app.selectOne || this.app.clickOne) {
           this.DialogTitle='选择保养项目'

src/views/equipment/sbbymx/byxm.vue

 <template>
-    <DefaultDialog :app='app'>
+    <DefaultDialog :app='app' @close='close' >
 
      <div class="min_full" slot='form' style="height: 550px;border: 0px;">
 
@@ -99,6 +99,9 @@
 		}
 	},
 	methods: {
+    close(){
+      console.log('close')
+    },
     xzry(){
       if (this.app.selectOne || this.app.clickOne) {
           this.DialogTitle='选择保养项目'

src/views/equipment/sbbymx/ckxmEdit.vue

 <template>
-    <DefaultDialog :app='app'>
+    <DefaultDialog @close='close' :app='app'>
 
       <el-form slot="form" ref="form" :model="form" label-width="120px" :rules="rules">
           <el-row :gutter="20">
@@ -99,6 +99,9 @@ props:['app'],
 			init() {
 
 			},
+      close(){
+        console.log('close')
+      },
       save(){
         let params={
           details:[{id:'',records:[]}],