Merge branch 'nov23' into online

dist/static/css/chunk-046659e7.fe3af2d9.css

@@ -1 +1,5 @@
-.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-4296d911]{font-size:14px}.btnList[data-v-4296d911]{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-4296d911]{margin-right:15px}
+<<<<<<< HEAD:dist/static/css/chunk-046659e7.fe3af2d9.css
+.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-4296d911]{font-size:14px}.btnList[data-v-4296d911]{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-4296d911]{margin-right:15px}
+=======
+.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-a0c50254]{font-size:14px}.btnList[data-v-a0c50254]{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-a0c50254]{margin-right:15px}
+>>>>>>> nov23:dist/static/css/chunk-39875c59.2e558394.css

dist/static/css/chunk-084ade5c.c5c86cfd.css

@@ -0,0 +1 @@
+.newBand[data-v-4ab6d262]{display:inline-block;margin-right:10px}.right-code .title[data-v-4ab6d262]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-4ab6d262] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-4ab6d262] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-0cb0fd3d.9b16d441.css

@@ -0,0 +1 @@
+[data-v-1ab84b11] .el-button--primary,[data-v-1ab84b11] .el-button--primary:active,[data-v-1ab84b11] .el-button--primary:focus,[data-v-1ab84b11] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-1ab84b11] .el-dialog__body{padding:0 20px}[data-v-1ab84b11] .el-date-editor.el-input,[data-v-1ab84b11] .el-select{width:100%!important}

dist/static/css/chunk-0ee82209.a74b259d.css

@@ -0,0 +1 @@
+[data-v-3d9d5acc] .el-popover .el-form{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d9d5acc] .el-popover .el-form-item__content{margin-left:0!important}.music-title[data-v-3d9d5acc]{font-size:14px;color:#444}.music-title .el-col[data-v-3d9d5acc]{background-color:#edeef0;padding-left:36px}.music-title[data-v-3d9d5acc] .el-button{float:right;margin-top:10px;margin-right:16px}.el-row[data-v-3d9d5acc]{margin-bottom:12px}.el-row .el-col[data-v-3d9d5acc]{line-height:48px}.el-row .el-col-18[data-v-3d9d5acc]{width:calc(75% - 20px);margin-left:20px}.el-row .one_name[data-v-3d9d5acc]{padding-left:10px}.el-row .tow_col[data-v-3d9d5acc]{padding-left:20px}.el-row .tow_col .el-button--primary[data-v-3d9d5acc],.el-row .tow_col .el-button--primary[data-v-3d9d5acc]:active,.el-row .tow_col .el-button--primary[data-v-3d9d5acc]:focus,.el-row .tow_col .el-button--primary[data-v-3d9d5acc]:hover{background:#fff;border-color:#979797;color:#777}.el-row .tow_input[data-v-3d9d5acc]{width:100px;margin-right:12px}.el-button--primary[data-v-3d9d5acc],.el-button--primary[data-v-3d9d5acc]:active,.el-button--primary[data-v-3d9d5acc]:focus,.el-button--primary[data-v-3d9d5acc]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-3d9d5acc] .el-date-editor.el-input{width:100%!important}.el-select[data-v-3d9d5acc]{width:98%!important}.el-tag+.el-tag[data-v-3d9d5acc]{margin-left:10px}.button-new-tag[data-v-3d9d5acc]{margin-left:10px;height:32px;line-height:30px;padding-top:0;padding-bottom:0}.input-new-tag[data-v-3d9d5acc]{width:90px;vertical-align:bottom}.el-tag--dark.el-tag--info[data-v-3d9d5acc]{background-color:#f0f2f5;border-color:#f0f2f5;color:#5a5e66}.el-tag--dark.el-tag--info[data-v-3d9d5acc] .el-tag__close{background-color:#c0c4cc}

dist/static/css/chunk-0f644909.fbd194ff.css

@@ -0,0 +1 @@
+.studenTable[data-v-edfcf184]{height:300px;overflow:auto}.infoMsg[data-v-edfcf184]{margin:30px 0;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;text-align:center}.infoMsg .title[data-v-edfcf184]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-edfcf184]{font-size:20px}.infoMsg .left[data-v-edfcf184]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-edfcf184],.infoMsg .right[data-v-edfcf184]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-edfcf184]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-edfcf184]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-edfcf184]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-edfcf184]{width:300px}.wrap[data-v-edfcf184]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-edfcf184]{margin-right:20px}

dist/static/css/chunk-13c5f6b8.757db4bc.css

@@ -0,0 +1 @@
+[data-v-3d7298d6] .demo-table-expand .el-form-item{margin-right:0;margin-bottom:0;width:50%}[data-v-3d7298d6] .demo-table-expand label{color:#99a9bf}

dist/static/css/chunk-14275101.b0de7ad5.css

@@ -0,0 +1 @@
+[data-v-05c0c116] .el-button--primary,[data-v-05c0c116] .el-button--primary:active,[data-v-05c0c116] .el-button--primary:focus,[data-v-05c0c116] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-05c0c116] .el-date-editor.el-input{width:100%!important}[data-v-05c0c116] .el-select{width:98%!important}

dist/static/css/chunk-1510eeb8.cca87cb9.css

@@ -0,0 +1 @@
+[data-v-65befa4a] .el-button--primary,[data-v-65befa4a] .el-button--primary:active,[data-v-65befa4a] .el-button--primary:focus,[data-v-65befa4a] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-65befa4a] .el-date-editor.el-input{width:100%!important}[data-v-65befa4a] .el-select{width:98%!important}

dist/static/css/chunk-2b48c012.fea96aa2.css

@@ -0,0 +1 @@
+.description-title[data-v-2186a818]{margin-bottom:20px;color:rgba(0,0,0,.85);font-weight:700;font-size:16px;line-height:1.5}.description-view[data-v-2186a818]{width:100%;border:1px solid #e8e8e8}.description-view .description-table[data-v-2186a818]{width:100%;border-collapse:collapse;table-layout:fixed}.description-view .description-tr[data-v-2186a818]{border-bottom:1px solid #e8e8e8;width:100%}.description-view .description-tr[data-v-2186a818]:last-child{border-bottom:none}.description-view .description-label[data-v-2186a818]{border-right:1px solid #e8e8e8;background-color:#fafafa;color:rgba(0,0,0,.85);font-weight:400;font-size:14px;line-height:22px;padding:12px 16px;white-space:nowrap;display:table-cell}.description-view .description-label[data-v-2186a818]:after{content:"";margin:0 8px 0 2px;position:relative;top:-.5px}.description-view .description-content[data-v-2186a818]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;border-right:1px solid #e8e8e8;font-size:14px;line-height:1.5;padding:12px 16px;color:rgba(0,0,0,.65);display:table-cell}.description-tr .description-content[data-v-2186a818]:last-child{border-right:none}[data-v-cacf320a] .description-title{margin-bottom:0}.video[data-v-cacf320a]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-7fcf3a1f] .el-dialog__body{padding:10px 20px}

dist/static/css/chunk-39628782.01ffa568.css

@@ -0,0 +1 @@
+.el-button+.el-button[data-v-719dfe07]{margin-left:0}

dist/static/css/chunk-39875c59.2e558394.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-046659e7.fe3af2d9.css
+.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-4296d911]{font-size:14px}.btnList[data-v-4296d911]{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-4296d911]{margin-right:15px}
+=======
+.process[data-v-cd5d302a]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-a0c50254]{font-size:14px}.btnList[data-v-a0c50254]{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-a0c50254]{margin-right:15px}
+>>>>>>> nov23:dist/static/css/chunk-39875c59.2e558394.css

dist/static/css/chunk-415bb04d.f6ac4485.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-a5c7d23e],.el-button--primary[data-v-a5c7d23e]:active,.el-button--primary[data-v-a5c7d23e]:focus,.el-button--primary[data-v-a5c7d23e]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-a5c7d23e] .el-date-editor.el-input,[data-v-a5c7d23e] .el-select{width:100%!important}

dist/static/css/chunk-426aa8ce.4b280271.css

@@ -0,0 +1 @@
+[data-v-66e7c1a2] .el-button--primary,[data-v-66e7c1a2] .el-button--primary:active,[data-v-66e7c1a2] .el-button--primary:focus,[data-v-66e7c1a2] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-66e7c1a2] .el-dialog__body{padding:0 20px}[data-v-66e7c1a2] .el-date-editor.el-input,[data-v-66e7c1a2] .el-select{width:100%!important}

dist/static/css/chunk-6177db6e.ca6cecc5.css

@@ -0,0 +1 @@
+.titlewrap[data-v-11f74cb2]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-11f74cb2],.wrap[data-v-11f74cb2]{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}.wrap div[data-v-11f74cb2]{margin-right:20px}.countWrap[data-v-11f74cb2] .el-date-editor.el-input,.countWrap[data-v-11f74cb2] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-6dfda159.d2105b9b.css

@@ -0,0 +1 @@
+.floor[data-v-709ad215]{padding-right:20px;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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-709ad215]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-709ad215],.floor .remove[data-v-709ad215]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-709ad215]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-709ad215]{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}.studentMask .left[data-v-709ad215]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-709ad215]{margin-bottom:20px}.studentMask .left h4[data-v-709ad215]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-709ad215]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-709ad215]{padding-left:10px;line-height:25px}.studentMask .right[data-v-709ad215]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-709ad215]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-709ad215] .el-date-editor.el-input,.resetClassForm[data-v-709ad215] .el-date-editor.el-input__inner{width:180px!important}[data-v-709ad215] .el-date-editor.el-input,[data-v-709ad215] .el-date-editor.el-input__inner{width:100px!important}.higheSelect[data-v-709ad215] .el-input__inner{height:40px!important}

dist/static/css/chunk-a5aecc40.49031e90.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-768ca9e7],.el-button--primary[data-v-768ca9e7]:active,.el-button--primary[data-v-768ca9e7]:focus,.el-button--primary[data-v-768ca9e7]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-select[data-v-768ca9e7],[data-v-768ca9e7] .el-date-editor.el-input{width:100%!important}

dist/static/css/chunk-abd3c3a4.0ff0b683.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-194b2ba5],.el-button--primary[data-v-194b2ba5]:active,.el-button--primary[data-v-194b2ba5]:focus,.el-button--primary[data-v-194b2ba5]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-194b2ba5]{margin-top:40px}.el-col[data-v-194b2ba5]{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-194b2ba5]{width:200px;margin:0 20px}[data-v-194b2ba5] .el-tree-node__content{height:40px!important}[data-v-194b2ba5] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-194b2ba5]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-194b2ba5]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-194b2ba5]{width:120px;height:120px;display:block}

dist/static/css/chunk-c741473a.a7b540c5.css

@@ -0,0 +1 @@
+.tableWrap[data-v-5bd092d6]{height:300px;overflow:auto}

dist/static/css/chunk-commons.64bd9f1a.css

@@ -0,0 +1 @@
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.content-tooltip[data-v-3fa367a3]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}