Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "workbench.colorCustomizations": {
-        "activityBar.background": "#2E0B8A",
-        "titleBar.activeBackground": "#4110C2",
-        "titleBar.activeForeground": "#FDFCFF"
-    }
-}

src/business/platform/form/formrender/dynamic-form/mixins/StatisOrRecordTable.vue

@@ -26,7 +26,7 @@
 <script>
   import $dialog from '@/utils/dialog'
   import store from '@/store'
-  import templateStatis from '@/views/statistics/index.vue'
+  import templateStatis from '@/views/statistics/indexold.vue'
   import { mapState, mapGetters, mapActions } from 'vuex'
   export default {
     components:{

src/views/statistics/indexold.vue

@@ -371,7 +371,7 @@
     },
     created() {
       //时间
-      this.currentTime()
+      // this.currentTime()
       if(screenfull.isEnabled && !screenfull.isFullscreen){
       this.allView()