Merge branch 'master' of D:\workspace\ztqt with conflicts.

lyfO_o

2022-04-07 cb2e79e8374725da81b19c518405f1b91c86e601

 src/views/dashboard/index.vue

@@ -7,7 +7,7 @@

<script>
import { mapGetters } from 'vuex'
import menuIndex from '../mapManage/map/index'
import menuIndex from '../doublePreventAction/riskLevelManage/analyseUnit/index'

export default {
  name: 'Dashboard',