mo 4 lat temu
rodzic
commit
f701652c33

+ 11 - 3
src/App.vue

@@ -384,9 +384,17 @@ input[type="number"] {
 }
 .el-select__tags {
   .el-tag.el-tag--info.el-tag--small.el-tag--light {
-    max-width: 85px;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    .el-select__tags-text {
+        flex-wrap: nowrap;
+      max-width: 60px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: inline-block;
+    }
   }
 }
 </style>

+ 3 - 4
src/views/teamDetail/components/modals/create-user-pay.vue

@@ -2,7 +2,7 @@
   <div>
     <el-alert title="班级信息" :closable="false" class="alert" type="info">
     </el-alert>
-    <el-form :model="form" label-width="100px">
+    <el-form :model="form" label-width="120px">
       <el-row>
         <el-col :span="12">
           <el-form-item label="声部班">
@@ -59,11 +59,10 @@
         </el-col>
               <el-col :span="12">
           <el-form-item label="线上基础技能班">
-            <select-all
+            <el-select
               v-model.trim="form.highonline"
               filterable
               clearable
-              multiple
             >
               <el-option
                 v-for="(item, index) in highonlineList.filter(item => item.lockFlag != 1)"
@@ -71,7 +70,7 @@
                 :value="item.id"
                 :label="item.name"
               ></el-option>
-            </select-all>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>

+ 11 - 4
src/views/teamDetail/components/studentList.vue

@@ -1133,20 +1133,23 @@ export default {
           this.soundList = res.data;
         }
       });
-
+    // this.getMusicClass()
       // 获取乐团基本信息
       getMusicGroup({ musicGroupId: this.teamid }).then(
         (res) => (this.baseInfo = res.data)
       );
       // 获取乐团所有合奏课
-      getMusicGroupAllClass({ musicGroupId: this.teamid }).then((res) => {
+
+    },
+    getMusicClass(){
+            getMusicGroupAllClass({ musicGroupId: this.teamid }).then((res) => {
         if (res.code == 200) {
           this.classList = res.data;
           this.signList = [];
           this.mixList = [];
           this.highList = [];
           this.snapList = [];
-
+          this.highonlineList = [];
           this.classList.forEach((item) => {
             if (item.type == "NORMAL") {
               this.signList.push(item);
@@ -1739,7 +1742,11 @@ export default {
     },
   },
   watch: {
-
+    createUserPayVisible(val){
+      if(val){
+        this.getMusicClass()
+      }
+    },
     "quitForm.isMaintenanceFee"(val) {
       if (val) {
         this.quitForm.maintenanceFee = 300;

+ 2 - 2
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {