Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/layouts/header/HeaderSite.vue

@@ -134,7 +134,7 @@ export default {
           const { siteTree } = data;
           this.sitelist = siteTree;
           let arr = [];
-          const treeFn = function (e) {
+          const treeFn = function(e) {
             e.forEach((element) => {
               arr.push(element);
               if (element.children && element.children.length > 0) {

base-manager-ui/admin/src/pages/basicset/hall/hallwindow/modal/WindowToHall.vue

@@ -35,8 +35,9 @@
     </a-modal>
   </div>
 </template>
-    
-    <script>
+
+<script>
+import local from "@/utils/local";
 import {
   // saveWindowHall,
   batchSaveWindowHall,
@@ -60,6 +61,7 @@ export default {
   data() {
     return {
       selectInfo: undefined,
+      siteId: local.getLocal("siteId"), // 站点id
       form: {
         windowId: "", // 窗口id
         windowName: "", // 窗口名称
@@ -115,6 +117,7 @@ export default {
               windowName: v.name, // 窗口名称
               hallId: this.form.hallId, // 大厅id
               hallName: this.form.hallName, // 大厅名称
+              siteId: this.siteId,
             };
           });
           let res = await batchSaveWindowHall(arr);
@@ -135,6 +138,5 @@ export default {
   },
 };
 </script>
-    
-<style lang="less" scoped>
-</style>
+
+<style lang="less" scoped></style>
\ No newline at end of file