1

1

dist/static/css/chunk-07e1b9a5.a6f7bb1b.css

@@ -0,0 +1 @@
+[data-v-41ad46f6] .el-date-editor.el-input,[data-v-41ad46f6] .el-select{width:100%!important}

dist/static/css/chunk-0b67e740.31c81cd6.css

@@ -0,0 +1 @@
+.m-container[data-v-64afb78b]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-64afb78b]{display:inline-block}

dist/static/css/chunk-1316b18d.07b0f7d1.css

@@ -0,0 +1 @@
+.micon[data-v-3f5afa29]{position:absolute;top:3px;right:2px}.serverInfo[data-v-3f5afa29]{line-height:30px}.serverInfo span[data-v-3f5afa29]{color:#333;font-weight:700}.infoWrap[data-v-3f5afa29]{margin-top:30px}.infoWrap span[data-v-3f5afa29]{color:red;font-weight:400}.titleWrap[data-v-3f5afa29]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.m-container h2[data-v-3f5afa29]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}

dist/static/css/chunk-1d325650.37ecdfb8.css

@@ -0,0 +1 @@
+.lookTitle[data-v-04785c86]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-04785c86]{display:inline-block}.showShop[data-v-04785c86]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-04785c86]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

dist/static/css/chunk-39c5a912.b700ae2e.css

@@ -0,0 +1 @@
+.bannerImg[data-v-3a6ffbb2],.bannerImg[data-v-4f2179cc],.bannerImg[data-v-7c3c3b84],.bannerImg[data-v-20e38d1c],.bannerImg[data-v-155e9e31],.bannerImg[data-v-689537a4],.bannerImg[data-v-7041759c],.bannerImg[data-v-8821938e]{height:60px}

dist/static/css/chunk-400be2b8.e271c118.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-734e893a]{line-height:44px}.fixedBox[data-v-734e893a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-734e893a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-734e893a]{font-size:18px;cursor:pointer}[data-v-734e893a] .el-divider--horizontal{margin:0!important}.topWrap[data-v-734e893a]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-734e893a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

dist/static/css/chunk-4ec0e2e0.57b10c51.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-8699355a.62edf7cd.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-2c61b453] .el-button+.el-button{margin-left:0}.select[data-v-2c61b453]{font-size:14px}.btnList[data-v-2c61b453]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-2c61b453]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-d152e468] .el-button+.el-button{margin-left:0}.select[data-v-d152e468]{font-size:14px}.btnList[data-v-d152e468]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-d152e468]{margin-right:15px}
+>>>>>>> 03/12permission:dist/static/css/chunk-4ec0e2e0.57b10c51.css

dist/static/css/chunk-67585918.753ee7da.css

@@ -0,0 +1 @@
+.v-charts-component-loading{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9)}.v-charts-mask-status{-webkit-filter:blur(1px);filter:blur(1px)}.v-charts-component-loading .circular{width:42px;height:42px;-webkit-animation:loading-rotate 2s linear infinite;animation:loading-rotate 2s linear infinite}.v-charts-component-loading .path{-webkit-animation:loading-dash 1.5s ease-in-out infinite;animation:loading-dash 1.5s ease-in-out infinite;stroke-dasharray:90,150;stroke-dashoffset:0;stroke-width:2;stroke:#20a0ff;stroke-linecap:round}@-webkit-keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@-webkit-keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}@keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}.v-charts-data-empty{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9);color:#888;font-size:14px}

dist/static/css/chunk-695165be.5021b6fa.css

@@ -0,0 +1 @@
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-2ad51dd4] .description-title{margin:0!important}

dist/static/css/chunk-85a8bb64.a35f1c65.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-f7dff66a],.el-button--primary[data-v-f7dff66a]:active,.el-button--primary[data-v-f7dff66a]:focus,.el-button--primary[data-v-f7dff66a]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-f7dff66a]{margin-top:40px}.el-col[data-v-f7dff66a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-f7dff66a]{width:200px;margin:0 20px}[data-v-f7dff66a] .el-tree-node__content{height:40px!important}.moreRule[data-v-f7dff66a]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-f7dff66a]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-f7dff66a]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-f7dff66a]{display:inline-block}.moreRuleIn .el-form-item[data-v-f7dff66a]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-f7dff66a] .el-form-item__content{margin-left:0!important}.max[data-v-f7dff66a],.min[data-v-f7dff66a]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-8699355a.62edf7cd.css

@@ -1 +1,5 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-2c61b453] .el-button+.el-button{margin-left:0}.select[data-v-2c61b453]{font-size:14px}.btnList[data-v-2c61b453]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-2c61b453]{margin-right:15px}
+<<<<<<< HEAD:dist/static/css/chunk-8699355a.62edf7cd.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-2c61b453] .el-button+.el-button{margin-left:0}.select[data-v-2c61b453]{font-size:14px}.btnList[data-v-2c61b453]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-2c61b453]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-d152e468] .el-button+.el-button{margin-left:0}.select[data-v-d152e468]{font-size:14px}.btnList[data-v-d152e468]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-d152e468]{margin-right:15px}
+>>>>>>> 03/12permission:dist/static/css/chunk-4ec0e2e0.57b10c51.css

dist/static/css/chunk-be2a0e4e.1103b9bd.css

@@ -1 +1,5 @@
-.alert[data-v-a97fca8e] .el-alert__content{width:100%}.alert .title[data-v-a97fca8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.content[data-v-a97fca8e]{padding:0 24px;padding-top:24px}.dialog-footer[data-v-028ec50e]{text-align:right;display:block;padding-bottom:20px;margin-top:20px}[data-v-0bf7cd38] .el-button--primary,[data-v-0bf7cd38] .el-button--primary:active,[data-v-0bf7cd38] .el-button--primary:focus,[data-v-0bf7cd38] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-0bf7cd38] .el-date-editor.el-input,[data-v-0bf7cd38] .el-select{width:100%!important}
+<<<<<<< HEAD:dist/static/css/chunk-be2a0e4e.1103b9bd.css
+.alert[data-v-a97fca8e] .el-alert__content{width:100%}.alert .title[data-v-a97fca8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.content[data-v-a97fca8e]{padding:0 24px;padding-top:24px}.dialog-footer[data-v-028ec50e]{text-align:right;display:block;padding-bottom:20px;margin-top:20px}[data-v-0bf7cd38] .el-button--primary,[data-v-0bf7cd38] .el-button--primary:active,[data-v-0bf7cd38] .el-button--primary:focus,[data-v-0bf7cd38] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-0bf7cd38] .el-date-editor.el-input,[data-v-0bf7cd38] .el-select{width:100%!important}
+=======
+.alert[data-v-a97fca8e] .el-alert__content{width:100%}.alert .title[data-v-a97fca8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.content[data-v-a97fca8e]{padding:0 24px;padding-top:24px}.dialog-footer[data-v-028ec50e]{text-align:right;display:block;padding-bottom:20px;margin-top:20px}[data-v-2e1550ae] .el-button--primary,[data-v-2e1550ae] .el-button--primary:active,[data-v-2e1550ae] .el-button--primary:focus,[data-v-2e1550ae] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2e1550ae] .el-date-editor.el-input,[data-v-2e1550ae] .el-select{width:100%!important}
+>>>>>>> 03/12permission:dist/static/css/chunk-ed08db5c.b26912e5.css

dist/static/css/chunk-ed08db5c.b26912e5.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-be2a0e4e.1103b9bd.css
+.alert[data-v-a97fca8e] .el-alert__content{width:100%}.alert .title[data-v-a97fca8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.content[data-v-a97fca8e]{padding:0 24px;padding-top:24px}.dialog-footer[data-v-028ec50e]{text-align:right;display:block;padding-bottom:20px;margin-top:20px}[data-v-0bf7cd38] .el-button--primary,[data-v-0bf7cd38] .el-button--primary:active,[data-v-0bf7cd38] .el-button--primary:focus,[data-v-0bf7cd38] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-0bf7cd38] .el-date-editor.el-input,[data-v-0bf7cd38] .el-select{width:100%!important}
+=======
+.alert[data-v-a97fca8e] .el-alert__content{width:100%}.alert .title[data-v-a97fca8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.content[data-v-a97fca8e]{padding:0 24px;padding-top:24px}.dialog-footer[data-v-028ec50e]{text-align:right;display:block;padding-bottom:20px;margin-top:20px}[data-v-2e1550ae] .el-button--primary,[data-v-2e1550ae] .el-button--primary:active,[data-v-2e1550ae] .el-button--primary:focus,[data-v-2e1550ae] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2e1550ae] .el-date-editor.el-input,[data-v-2e1550ae] .el-select{width:100%!important}
+>>>>>>> 03/12permission:dist/static/css/chunk-ed08db5c.b26912e5.css

src/views/musicInspection/index.vue

@@ -4,7 +4,11 @@
     <h2>
       <div class="squrt"></div>
       乐团巡查
-      <filter-search :keys="['searchType']" :moreKeys="['organId', 'start', 'end']" @reload="reloadSearch"/>
+      <filter-search
+        :keys="['searchType']"
+        :moreKeys="['organId', 'start', 'end']"
+        @reload="reloadSearch"
+      />
     </h2>
     <div class="m-core">
       <save-form

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -283,17 +283,7 @@ for (const item of classTimeList) {
 }
 
 export default {
-  props: [
-    "form",
-    "type",
-    "surplustime",
-    "prices",
-    "selectPrice",
-    "holidays",
-    "teacherList",
-    "activeType",
-    "cooperationList",
-  ],
+  props: ["form", "type", "surplustime", "prices", "selectPrice", "holidays","teacherList","activeType",'cooperationList','coreid','assistant'],
   data() {
     return {
       classTimeListByType,
@@ -342,7 +332,8 @@ export default {
         this.$message.error("已排课时长使用完毕,请修改预计课时数");
         return;
       }
-      const initVal = {};
+      const initVal = {  coreTeacher: this.coreid,
+        assistant: this.assistant,}
       if (this.selectPrice) {
         initVal.time = this.selectPrice;
       }

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -115,6 +115,8 @@
             :teacherList="teacherList"
             :activeType="activeType"
             :cooperationList="cooperationList"
+            :coreid="coreid"
+            :assistant="assistant"
             :type="key"
             :form="item"
             :prices="prices"
@@ -298,20 +300,20 @@ export default {
       this.courseTypeListByName = courseTypeListByName;
     },
     async formatClasss() {
-      let coreid = "";
-      const assistant = [];
+      this.coreid = "";
+      this.assistant = [];
       if (this.detail) {
         const { classGroupTeacherMapperList } = this.detail;
         for (const item of classGroupTeacherMapperList || []) {
           if (item.teacherRole === "BISHOP") {
-            coreid = String(item.userId);
+            this.coreid = String(item.userId);
           }
           if (item.teacherRole === "TEACHING") {
-            assistant.push(item.userId);
+            this.assistant.push(item.userId);
           }
         }
-        this.$set(this.form, "coreTeacher", String(coreid));
-        this.$set(this.form, "assistant", assistant);
+        this.$set(this.form, "coreTeacher", String(this.coreid));
+        this.$set(this.form, "assistant", this.assistant);
       }
       const studentIds = this.detail
         ? undefined
@@ -351,8 +353,8 @@ export default {
             cycle: [
               {
                 time: this.selectPrices ? this.selectPrices[key] : undefined,
-                coreTeacher: coreid,
-                assistant: assistant,
+                coreTeacher: this.coreid,
+                assistant: this.assistant,
               },
             ],
           };

src/views/teamDetail/components/modals/select-student.vue

@@ -78,8 +78,8 @@
           </el-form-item>
         </el-col>
         <!-- :offset="showName ? 4 : 0" -->
-        <el-col :span="12" >
-          <el-form-item label="声部" style="margin-right: 0;" prop="sound"  :rules="(isOnlyChangeUser||activeType == 'MUSIC_NETWORK')?null:[{ required: true, message: '请选择声部',trigger: 'blur' }]">
+        <el-col :span="10" >
+          <el-form-item :label="isOnlyChangeUser?'声部筛选':'声部'" style="margin-right: 0;" prop="sound"  :rules="(isOnlyChangeUser||activeType == 'MUSIC_NETWORK')?null:[{ required: true, message: '请选择声部',trigger: 'blur' }]">
             <select-all
               v-model="form.sound"
               style="width: 100%"
@@ -218,9 +218,9 @@ export default {
       if (!this.isOnlyChangeUser && this.activeType == 'HIGH_ONLINE' && (this.seleched.length < 3 || this.seleched.length > 5)) {
         return this.$message.error('线上技能班必须为3-5人')
       }
-      // if (this.seleched.length < 1 && !this.isStudentRemove) {
-      //   return this.$message.error('请至少选择一名学生')
-      // }
+      if (this.activeType == 'MUSIC_NETWORK'&&this.seleched.length < 1 && !this.isStudentRemove) {
+        return this.$message.error('请选择一名学生')
+      }
       if (this.activeType == 'MUSIC_NETWORK' && this.seleched.length > 1) {
         return this.$message.error('乐团网管课仅可添加一名学生')
       }

src/views/teamDetail/teamClassList.vue

@@ -348,15 +348,17 @@ export default {
         this.hightOnlineCount != this.compoundList.length
       ) {
         this.$message.error("线上基础技能班仅能和线上基础技能班合并");
-        this.hightOnlineCount = 0;
-        this.hightCount = 0;
-        this.compoundList = [];
+        // this.hightOnlineCount = 0;
+        // this.hightCount = 0;
+        // this.compoundList = [];
+        this.compoundList.splice(this.compoundList.length-1,1)
       }
       if (this.hightCount && this.hightCount != this.compoundList.length) {
         this.$message.error("基础技能班仅能和基础技能班合并");
-        this.hightOnlineCount = 0;
-        this.hightCount = 0;
-        this.compoundList = [];
+          this.compoundList.splice(this.compoundList.length-1,1)
+        // this.hightOnlineCount = 0;
+        // this.hightCount = 0;
+        // this.compoundList = [];
       }
     },
     isAddCom(row) {