Merge branch 'online' into wxl

dist/static/css/chunk-3b1e6541.b2ad25c6.css → dist/static/css/chunk-09cf9c50.e669ff54.css

@@ -1 +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}.el-button--primary[data-v-55148d58],.el-button--primary[data-v-55148d58]:active,.el-button--primary[data-v-55148d58]:focus,.el-button--primary[data-v-55148d58]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-date-editor.el-input[data-v-55148d58]{width:100%!important}.el-select[data-v-55148d58]{width:98%!important}
+.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}.el-button--primary[data-v-2fde72b0],.el-button--primary[data-v-2fde72b0]:active,.el-button--primary[data-v-2fde72b0]:focus,.el-button--primary[data-v-2fde72b0]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2fde72b0] .el-select{width:100%!important}.el-vue-search-box-container[data-v-2fde72b0]{position:absolute!important;left:10px;margin-top:10px;z-index:99999!important}

dist/static/css/chunk-332fe79d.c0b99214.css → dist/static/css/chunk-108798d0.65850ef4.css

@@ -1 +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}.el-button--primary[data-v-62bb3fab],.el-button--primary[data-v-62bb3fab]:active,.el-button--primary[data-v-62bb3fab]:focus,.el-button--primary[data-v-62bb3fab]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-date-editor.el-input[data-v-62bb3fab]{width:100%!important}.el-select[data-v-62bb3fab]{width:98%!important}
+.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}.el-button--primary[data-v-146723c5],.el-button--primary[data-v-146723c5]:active,.el-button--primary[data-v-146723c5]:focus,.el-button--primary[data-v-146723c5]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-146723c5] .el-date-editor.el-input{width:100%!important}.el-select[data-v-146723c5]{width:98%!important}

dist/static/css/chunk-1888cd3e.194ca43d.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}[data-v-50d59552] .el-button--primary,[data-v-50d59552] .el-button--primary:active,[data-v-50d59552] .el-button--primary:focus,[data-v-50d59552] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-50d59552] .el-date-editor.el-input{width:100%!important}[data-v-50d59552] .el-select{width:98%!important}

dist/static/css/chunk-1f86139a.9d221139.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-5cf4b211],.el-button--primary[data-v-5cf4b211]:active,.el-button--primary[data-v-5cf4b211]:focus,.el-button--primary[data-v-5cf4b211]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-5cf4b211]{margin-top:40px}.el-col[data-v-5cf4b211]{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-5cf4b211]{width:200px;margin:0 20px}[data-v-5cf4b211] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-2dd74c68.61d8b673.css

@@ -0,0 +1 @@
+.vip-base[data-v-c2b0d912]{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}.vip-base[data-v-c2b0d912] .el-date-editor.el-input,.vip-base[data-v-c2b0d912] .el-date-editor.el-input__inner,.vip-base[data-v-c2b0d912] .el-input,.vip-base[data-v-c2b0d912] .el-select{width:180px!important}.vip-base .left[data-v-c2b0d912]{width:400px}.vip-base .tableWrap[data-v-c2b0d912]{margin-top:40px}.vip-base .tableWrap h4[data-v-c2b0d912]{font-size:16px;font-weight:400;margin-bottom:20px}.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}

dist/static/css/chunk-325005db.8d62dc6e.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}[data-v-025afb0e] .el-button--primary,[data-v-025afb0e] .el-button--primary:active,[data-v-025afb0e] .el-button--primary:focus,[data-v-025afb0e] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-025afb0e] .el-date-editor.el-input{width:100%!important}[data-v-025afb0e] .el-select{width:98%!important}

dist/static/css/chunk-3d843c38.34f6eaa0.css

@@ -1 +0,0 @@
-.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}.el-button--primary[data-v-76242656],.el-button--primary[data-v-76242656]:active,.el-button--primary[data-v-76242656]:focus,.el-button--primary[data-v-76242656]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-76242656] .el-select{width:100%!important}.el-vue-search-box-container[data-v-76242656]{position:absolute!important;left:10px;margin-top:10px;z-index:99999!important}

dist/static/css/chunk-3e11965c.309df446.css

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

dist/static/css/chunk-45556115.60610fe3.css

@@ -1 +0,0 @@
-.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}.vip-base[data-v-0a82855f]{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}.vip-base .el-date-editor.el-input[data-v-0a82855f],.vip-base .el-date-editor.el-input__inner[data-v-0a82855f],.vip-base .el-input[data-v-0a82855f],.vip-base .el-select[data-v-0a82855f]{width:180px!important}.vip-base .left[data-v-0a82855f]{width:400px}.vip-base .tableWrap[data-v-0a82855f]{margin-top:40px}.vip-base .tableWrap h4[data-v-0a82855f]{font-size:16px;font-weight:400;margin-bottom:20px}

dist/static/css/chunk-47b22918.402a95d8.css

@@ -1 +0,0 @@
-.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}.el-button--primary,.el-button--primary:active,.el-button--primary:focus,.el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}.el-dialog__body{padding:0 20px}.el-date-editor.el-input,.el-select{width:100%!important}

dist/static/css/chunk-0a2a81f0.f784ffa6.css → dist/static/css/chunk-48a24f32.f0ecd021.css

@@ -1 +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}.el-button--primary[data-v-ed649ef2],.el-button--primary[data-v-ed649ef2]:active,.el-button--primary[data-v-ed649ef2]:focus,.el-button--primary[data-v-ed649ef2]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-date-editor.el-input[data-v-ed649ef2]{width:100%!important}.el-select[data-v-ed649ef2]{width:98%!important}
+.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}.el-button--primary[data-v-28d1bacf],.el-button--primary[data-v-28d1bacf]:active,.el-button--primary[data-v-28d1bacf]:focus,.el-button--primary[data-v-28d1bacf]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-28d1bacf] .el-date-editor.el-input{width:100%!important}[data-v-28d1bacf] .el-select{width:98%!important}

dist/static/css/chunk-49305f3a.2183c980.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-61fcc3d1],.el-button--primary[data-v-61fcc3d1]:active,.el-button--primary[data-v-61fcc3d1]:focus,.el-button--primary[data-v-61fcc3d1]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-61fcc3d1]{margin-top:40px}.el-col[data-v-61fcc3d1]{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-61fcc3d1]{width:200px;margin:0 20px}[data-v-61fcc3d1] .el-tree-node__content{height:40px!important}.moreRule[data-v-61fcc3d1]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-61fcc3d1]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-61fcc3d1]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-61fcc3d1]{display:inline-block}.moreRuleIn .el-form-item[data-v-61fcc3d1]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-61fcc3d1] .el-form-item__content{margin-left:0!important}.max[data-v-61fcc3d1],.min[data-v-61fcc3d1]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-8e266704.fc6f6e78.css → dist/static/css/chunk-5404c12a.e7508788.css

@@ -1 +1 @@
-.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-79863546]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-79863546]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-34aa67b1]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-34aa67b1]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-56765a29.62f79240.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}[data-v-2f174f12] .el-button--primary,[data-v-2f174f12] .el-button--primary:active,[data-v-2f174f12] .el-button--primary:focus,[data-v-2f174f12] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2f174f12] .el-date-editor.el-input{width:100%!important}[data-v-2f174f12] .el-select{width:98%!important}

dist/static/css/chunk-5bc328ac.6af3cb9e.css

@@ -1 +0,0 @@
-.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}.el-button--primary[data-v-434c42b2],.el-button--primary[data-v-434c42b2]:active,.el-button--primary[data-v-434c42b2]:focus,.el-button--primary[data-v-434c42b2]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-date-editor.el-input[data-v-434c42b2]{width:100%!important}.el-select[data-v-434c42b2]{width:98%!important}

dist/static/css/chunk-d92f5054.5e398bfe.css → dist/static/css/chunk-6781ed10.51633b85.css

@@ -1 +1 @@
-.el-button--primary[data-v-412e64f9],.el-button--primary[data-v-412e64f9]:active,.el-button--primary[data-v-412e64f9]:focus,.el-button--primary[data-v-412e64f9]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-412e64f9] .el-date-editor.el-input,[data-v-412e64f9] .el-select{width:100%!important}[data-v-412e64f9] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-412e64f9]{margin-top: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:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-412e64f9]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-412e64f9]{margin-bottom:20px}.infoWrap .right[data-v-412e64f9]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-412e64f9]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-412e64f9]{width:150px;height:150px}.salarySet h3[data-v-735f2758]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-735f2758],.salarySet .tableList .right[data-v-735f2758]{float:left}.salarySet .tableList .left[data-v-735f2758]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-735f2758]{width:56%;margin-left:2%}[data-v-735f2758] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-735f2758] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}
+.el-button--primary[data-v-6645f7f5],.el-button--primary[data-v-6645f7f5]:active,.el-button--primary[data-v-6645f7f5]:focus,.el-button--primary[data-v-6645f7f5]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-6645f7f5] .el-date-editor.el-input,[data-v-6645f7f5] .el-select{width:100%!important}[data-v-6645f7f5] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-6645f7f5]{margin-top: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:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-6645f7f5]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-6645f7f5]{margin-bottom:20px}.infoWrap .right[data-v-6645f7f5]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-6645f7f5]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-6645f7f5]{width:150px;height:150px}.salarySet h3[data-v-735f2758]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-735f2758],.salarySet .tableList .right[data-v-735f2758]{float:left}.salarySet .tableList .left[data-v-735f2758]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-735f2758]{width:56%;margin-left:2%}[data-v-735f2758] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-735f2758] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/css/chunk-0f2a5bcc.ab6c329c.css → dist/static/css/chunk-74f3b97c.e7effbdb.css

@@ -1 +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}.el-button--primary[data-v-675d1a78],.el-button--primary[data-v-675d1a78]:active,.el-button--primary[data-v-675d1a78]:focus,.el-button--primary[data-v-675d1a78]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-date-editor.el-input[data-v-675d1a78]{width:100%!important}.el-select[data-v-675d1a78]{width:98%!important}
+.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}.el-button--primary[data-v-faaf26a6],.el-button--primary[data-v-faaf26a6]:active,.el-button--primary[data-v-faaf26a6]:focus,.el-button--primary[data-v-faaf26a6]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-faaf26a6] .el-date-editor.el-input{width:100%!important}[data-v-faaf26a6] .el-select{width:98%!important}

dist/static/css/chunk-874b5212.402a95d8.css

@@ -1 +0,0 @@
-.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}.el-button--primary,.el-button--primary:active,.el-button--primary:focus,.el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}.el-dialog__body{padding:0 20px}.el-date-editor.el-input,.el-select{width:100%!important}

dist/static/css/chunk-8e1c118c.a2c2784c.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-1880412e],.el-button--primary[data-v-1880412e]:active,.el-button--primary[data-v-1880412e]:focus,.el-button--primary[data-v-1880412e]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-1880412e]{margin-top:40px}.el-col[data-v-1880412e]{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-1880412e]{width:200px;margin:0 20px}[data-v-1880412e] .el-tree-node__content{height:40px!important}.moreRule[data-v-1880412e]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-1880412e]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-1880412e]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-1880412e]{display:inline-block}.moreRuleIn .el-form-item[data-v-1880412e]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-1880412e] .el-form-item__content{margin-left:0!important}.max[data-v-1880412e],.min[data-v-1880412e]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-98dffb44.df79718b.css

@@ -1 +0,0 @@
-.floor[data-v-84a3d572]{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-84a3d572]{background:#f85043;margin-left:164px}.floor .add[data-v-84a3d572],.floor .remove[data-v-84a3d572]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-84a3d572]{background:#14928a;margin-left:20px}.studentMask[data-v-84a3d572]{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-84a3d572]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-84a3d572]{margin-bottom:20px}.studentMask .left h4[data-v-84a3d572]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-84a3d572]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-84a3d572]{padding-left:10px;line-height:25px}.studentMask .right[data-v-84a3d572]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-84a3d572]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-84a3d572],.resetClassForm .el-date-editor.el-input__inner[data-v-84a3d572]{width:180px}.el-date-editor.el-input[data-v-84a3d572],.el-date-editor.el-input__inner[data-v-84a3d572]{width:100px}

dist/static/css/chunk-a7be4802.f10a1309.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}[data-v-5c7b39d7] .el-button--primary,[data-v-5c7b39d7] .el-button--primary:active,[data-v-5c7b39d7] .el-button--primary:focus,[data-v-5c7b39d7] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-5c7b39d7] .el-dialog__body{padding:0 20px}[data-v-5c7b39d7] .el-date-editor.el-input,[data-v-5c7b39d7] .el-select{width:100%!important}

dist/static/css/chunk-bd3544fc.6e2e42d1.css

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

dist/static/css/chunk-ca8dcc80.4f84a002.css

@@ -1 +0,0 @@
-.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}.el-button--primary[data-v-171f89f8],.el-button--primary[data-v-171f89f8]:active,.el-button--primary[data-v-171f89f8]:focus,.el-button--primary[data-v-171f89f8]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-date-editor.el-input[data-v-171f89f8]{width:100%!important}.el-select[data-v-171f89f8]{width:98%!important}

dist/static/css/chunk-e0b29a98.00e87370.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}[data-v-89611290] .el-button--primary,[data-v-89611290] .el-button--primary:active,[data-v-89611290] .el-button--primary:focus,[data-v-89611290] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-89611290] .el-dialog__body{padding:0 20px}[data-v-89611290] .el-date-editor.el-input,[data-v-89611290] .el-select{width:100%!important}

dist/static/css/chunk-eaacea64.8d58865b.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-cd4046f0],.el-button--primary[data-v-cd4046f0]:active,.el-button--primary[data-v-cd4046f0]:focus,.el-button--primary[data-v-cd4046f0]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-cd4046f0]{margin-top:40px}.el-col[data-v-cd4046f0]{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-cd4046f0]{width:200px;margin:0 20px}[data-v-cd4046f0] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-ffd8e69a.cd1a3587.css

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

src/utils/vueFilter.js

@@ -266,7 +266,7 @@ Vue.filter('teamStatus', value => {
 // 学生状态
 /**studentStatus */
 Vue.filter('studentStatus', value => {
-  let template = ['正常', '退学', '退学中']
+  let template = ['在读', '已退课', '退课中']
   return template[value]
 })
 // 学生点名

src/views/categroyManager/insideSetting/adminManager.vue

@@ -54,9 +54,12 @@ export default {
       }
     }
   },
+  created () {
+    this.$route.query.page ? this.pageInfo.page = parseInt(this.$route.query.page) : this.pageInfo.page = 1
+  },
   mounted () {
     // console.log(store.getters.permission)
-    this.pageInfo.page = this.$route.query.page ? parseInt(this.$route.query.page) : 1
+
     this.getList()
   },
   methods: {

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -106,7 +106,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success('修改成功')
-        this.$router.push('/specialSetup/adminManager')
+        this.$router.push({ path: '/specialSetup/adminManager', query: { page: this.page } })
       } else {
         this.$message.error(res.msg)
       }

src/views/categroyManager/insideSetting/branchActive.vue

@@ -72,6 +72,14 @@ export default {
 
     }
   },
+  created () {
+    // if (this.$route.query.searchForm) {
+    //   this.$route.query.searchForm instanceof Object ? this.topForm = this.$route.query.searchForm : this.topForm = JSON.parse(this.$route.query.searchForm);
+    // }
+    if (this.$route.query.rules) {
+      this.$route.query.rules instanceof Object ? this.pageInfo = this.$route.query.rules : this.pageInfo = JSON.parse(this.$route.query.rules);
+    }
+  },
   mounted () {
     this.getList() // 获取列表数据
   },
@@ -89,10 +97,12 @@ export default {
       })
     },
     openActive (type, row) {
+      let pageInfo = JSON.stringify(this.pageInfo)
       let params = {
         path: '/vipClassSet/branchActiveOperation',
         query: {
-          type: type
+          type: type,
+          pageInfo
         }
       }
       if (row) {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -92,6 +92,7 @@ export default {
       organId: null,
       pageType: this.$route.query.type,
       id: this.$route.query.id,
+      pageInfo: this.$route.query.pageInfo,
       branchList: [],
       useBranchId: [], // 使用的分部编号
       result: {
@@ -217,13 +218,13 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success('修改成功')
-        this.$router.push('/vipClassSet/branchActive')
+        this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo } })
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel () {
-      this.$router.push('/vipClassSet/branchActive')
+      this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo } })
     },
     resetForm () {
       this.result = {