Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -177,7 +177,7 @@ export default {
       console.log("this.logoName.DNAME", this.logoName.DNAME);
       if ((this.logoName.DNAME = "map610700")) {
         this.mapjson = "hanzhong";
-         require(`@/common/map/${this.mapjson}.js`);
+      require(`@/common/map/${this.mapjson}.js`);
       }
     },
     // 开启定时器

@@ -152,7 +152,7 @@ export default {
                         this.getUserList(scope.row);
                       }}
                     >
-                      人员
+                      配置
                     </el-button>
                     </span>
                     </el-tooltip>