Merge branch '07/06musicArchives' into test

src/views/main/cloudDate/activeUserNum.vue

@@ -86,7 +86,6 @@ export default {
           obj[str] = this.data[str];
         }
       });
-      console.log(this.data, obj);
       /**
        *  {
         HOMEWORK_CREATE_RATE:this.data["HOMEWORK_CREATE_RATE"] || {},

src/views/main/cloudDate/modals/headers.vue

@@ -14,10 +14,10 @@
           filterable
           clearable
           placeholder="请选择分部"
-          @change='changeOrgan'
+          @change="changeOrgan"
         >
           <el-option
-            v-for="(item, index) in selects.branchs"
+            v-for="(item, index) in special?specialList:selects.branchs"
             :key="index"
             :label="item.name"
             :value="item.id"
@@ -30,27 +30,32 @@
 </template>
 <script>
 export default {
-  props: ["title", "hidenOrgan"],
+  props: ["title", "hidenOrgan",'special'],
   data() {
     return {
       organId: "",
+      specialList: [],
     };
   },
   async mounted() {
     await this.$store.dispatch("setBranchs");
+    const arr = [36,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56]
+    this.specialList = this.selects.branchs.filter((item) => {
+      return arr.indexOf(item.id) == -1;
+    });
   },
-  methods:{
-    changeOrgan(val){
+  methods: {
+    changeOrgan(val) {
       this.organId = val;
-      this.$emit('changeOrgan',val)
-    }
-  }
+      this.$emit("changeOrgan", val);
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-.el-divider--horizontal{
-  margin-top:0!important
+.el-divider--horizontal {
+  margin-top: 0 !important;
 }
 .titleWrap {
   display: flex;

src/views/main/cloudDate/organDate.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <headers title="分部数据" @changeOrgan="changeOrgan" />
+      <headers title="分部数据" @changeOrgan="changeOrgan" :special='true'/>
       <el-button
         type="primary"
         v-permission="'export/organStudentOverView'"