Merge branch 'master' into opt_xuexiaojiaofei

.gitignore

@@ -20,3 +20,4 @@ debug.log
 debug.log
 debug.log
 debug.log
+debug.log

debug.log

@@ -5,3 +5,4 @@
 [1214/094206.298:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1216/112417.508:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1218/093715.178:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1223/094343.219:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

dist/static/css/chunk-0174893d.a726912f.css

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

dist/static/css/chunk-4a8ed94e.72c2f93c.css → dist/static/css/chunk-0268ac20.c1ccdaa6.css

@@ -1 +1 @@
-[data-v-ba4d1aec] .dialog-footer{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}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}
+[data-v-68cbd11d] .dialog-footer{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}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}

dist/static/css/chunk-05ffe0fa.a335b8c3.css

@@ -1 +0,0 @@
-.lookTitle[data-v-744b5874]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-744b5874]{display:inline-block}

dist/static/css/chunk-22acce82.780e5ac8.css → dist/static/css/chunk-0903eb14.301aa819.css

@@ -1 +1 @@
-.schoolCell[data-v-6260081a]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-6260081a] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4d0e6264]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4d0e6264] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.schoolCell[data-v-0e3cc291]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-0e3cc291] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4d0e6264]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4d0e6264] .el-textarea.is-disabled .el-textarea__inner{color:#333}

dist/static/css/chunk-0ca85e10.6e6c088e.css

@@ -0,0 +1 @@
+.tableWrap[data-v-37c6bfc0]{overflow:auto}

dist/static/css/chunk-f4a6e8b2.45ad5231.css → dist/static/css/chunk-1d246db6.3933d09e.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-ddf285a0]{font-size:14px}.btnList[data-v-ddf285a0]{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-ddf285a0]{margin-right:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-95a1bb58]{font-size:14px}.btnList[data-v-95a1bb58]{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-95a1bb58]{margin-right:15px}

dist/static/css/chunk-1ee4ba0a.1699de6a.css

@@ -1 +0,0 @@
-.newBand[data-v-0fafcc44]{display:inline-block}[data-v-0fafcc44] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-0fafcc44]{display:inline-block}.lookTitle[data-v-0fafcc44]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

dist/static/css/chunk-225a89ee.b669a384.css

@@ -1 +0,0 @@
-.titleP[data-v-f5ac2752]{line-height:30px}

dist/static/css/chunk-71820c9a.68b68aec.css → dist/static/css/chunk-23a5e1e6.5eb8d0b6.css

@@ -1 +1 @@
-.topWrap[data-v-3060654d]{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}.topWrap div[data-v-3060654d]{margin-right:10px}
+.topWrap[data-v-6b773d67]{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}.topWrap div[data-v-6b773d67]{margin-right:10px}

dist/static/css/chunk-22c39fbe.49f646e3.css → dist/static/css/chunk-2629dde4.0ab908fd.css

@@ -1 +1 @@
-[data-v-edfb85f0] .description-title{margin-bottom:0}.video[data-v-edfb85f0]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-1fe60f94] .el-dialog__body{padding:10px 20px}
+[data-v-edfb85f0] .description-title{margin-bottom:0}.video[data-v-edfb85f0]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-72d3f868] .el-dialog__body{padding:10px 20px}

dist/static/css/chunk-3340d497.bfa203b4.css

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

dist/static/css/chunk-37bf19f8.4e06f5ad.css

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

dist/static/css/chunk-38a32091.e5ff9520.css

@@ -1 +0,0 @@
-.msg[data-v-7f24afe5]{min-width:120px}.label[data-v-7f24afe5]{width:520px}

dist/static/css/chunk-38d0e891.0fc9b2d1.css

@@ -1 +0,0 @@
-.red[data-v-7f4b9f80]{color:red}.visibleForm[data-v-7f4b9f80] .el-input__inner,.visibleForm[data-v-7f4b9f80] .el-textarea__inner{width:225px!important}

dist/static/css/chunk-57232be7.c1126166.css

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

dist/static/css/chunk-6afa9e47.808440cb.css

@@ -0,0 +1 @@
+.titleP[data-v-a1b6878e]{line-height:30px}

dist/static/css/chunk-759ed13c.1b4eb2e4.css

@@ -1 +0,0 @@
-.table[data-v-31e2c24b]{margin-top:20px}.table[data-v-31e2c24b] .el-table__header .has-gutter tr th{background-color:#edeef0;color:#444}

dist/static/css/chunk-770c9774.bc07d112.css

@@ -0,0 +1 @@
+.red[data-v-cb803aca]{color:red}.visibleForm[data-v-cb803aca] .el-input__inner,.visibleForm[data-v-cb803aca] .el-textarea__inner{width:225px!important}[data-v-cb803aca] .el-input-number .el-input__inner{text-align:left}

dist/static/css/chunk-7886e8f2.303856bf.css

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

dist/static/css/chunk-7a30933e.3a162d65.css

@@ -0,0 +1 @@
+.lookTitle[data-v-f200eb2e]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-f200eb2e]{display:inline-block}

dist/static/css/chunk-8600326c.7b16a013.css

@@ -0,0 +1 @@
+.msg[data-v-4c249b6e]{min-width:120px}.label[data-v-4c249b6e]{width:520px}

dist/static/css/chunk-df82aae2.0bff79fc.css

@@ -0,0 +1 @@
+.newBand[data-v-db83f626]{display:inline-block}[data-v-db83f626] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-db83f626]{display:inline-block}.lookTitle[data-v-db83f626]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

dist/static/css/chunk-fb916698.04e7de78.css

@@ -0,0 +1 @@
+.table[data-v-7ba4cfc4]{margin-top:20px}.table[data-v-7ba4cfc4] .el-table__header .has-gutter tr th{background-color:#edeef0;color:#444}