修改

src/components/education/educationEdit.vue

@@ -206,12 +206,21 @@
                   </el-form-item>
                   <el-form-item label="关联讲师">
                     <template v-if="addMsg.TeacherList.length>0">
-                      <el-tag v-for="(item,index) in addMsg.TeacherList" closable size="small"
+                      <div>
+                        <div class="Teacher_List" v-for="(item,index) in addMsg.TeacherList" :key="index">
+                           <div class="Teacher_tou">
+                             <img style="width:100%;height:100%;" :src="item.TeacherLogo" alt=""/>
+                           </div>
+                           {{item.Name}}
+                          <el-button @click="yichuTeacher(index)" class="edu_edlBtn" type="danger" icon="el-icon-close" circle></el-button>
+                        </div>
+                      </div>
+                      <!-- <el-tag v-for="(item,index) in addMsg.TeacherList" closable size="small"
                         @close="yichuTeacher(index)" style="margin-right:5px;" :key="index"> 
                         {{item.Name}}
-                      </el-tag>
+                      </el-tag> -->
                     </template>
-                    <el-button @click="choosejsDig=true" size="mini">选择教师</el-button>
+                    <el-button @click="choosejsDig=true" style="position:relative;top:-4px;" size="mini">选择教师</el-button>
                   </el-form-item>
                   <el-form-item label="标签" size="small">
                     <el-tag :key="tag" size="small" v-for="tag in dynamicTags" closable :disable-transitions="false"
@@ -668,7 +677,7 @@
       </span>
     </el-dialog>
     <!-- 课程弹窗 -->
-    <el-dialog title="新增课程" :visible.sync="courseDialog" width="500px">
+    <el-dialog :title="commonTitle" :visible.sync="courseDialog" width="500px">
       <el-form label-width="100px">
         <el-form-item label="名称">
           <el-input v-model="courseMsg.Name" size="small"></el-input>
@@ -686,7 +695,10 @@
         </el-form-item>
         <el-form-item label="试看">
           <el-input v-model="courseMsg.Number" @keyup.native="checkInteger(courseMsg,'Number')" size="small">
-            <template slot="append">秒</template>
+            <template slot="append">
+              <span v-if="courseMsg.Type==1">秒</span>
+              <span v-else>页</span>
+            </template>
           </el-input>
           <div style="color:red;">设置为0表示不限制试看</div>
         </el-form-item>
@@ -965,6 +977,7 @@
         dynamicTags: [],
         inputVisible: false,
         inputValue: '',
+        commonTitle:'新增课程',
       };
     },
     created() {
@@ -1695,12 +1708,14 @@
       },
       getckedTeachArr() {
         this.addMsg.TeacherList = [];
+        console.log(this.ckedTeacher,'this.ckedTeacher');
         this.ckedTeacher.forEach(x => {
           this.teacherList.forEach(y => {
             if (x == y.ID) {
               this.addMsg.TeacherList.push({
                 TeacherId: y.ID,
-                Name: y.Name
+                Name: y.Name,
+                TeacherLogo:y.TeacherLogo
               })
             }
           })
@@ -1800,6 +1815,7 @@
       },
       //修改课件
       updateCourse(subItem, index) {
+        this.commonTitle='修改课程';
         this.isReplace = index;
         this.courseDialog = true;
         this.courseMsg.Id = subItem.Id;
@@ -2158,6 +2174,7 @@
     width: 100%;
     height: 100%;
     border: 1px solid #EBEEF5;
+    border-bottom:0;
   }
 
   .courseHeader {
@@ -2182,7 +2199,7 @@
 
   .courseContent {
     width: 100%;
-    height: 500px;
+    max-height: 500px;
     overflow-y: scroll;
   }
 
@@ -2276,4 +2293,30 @@
   .directorGoodsEdit .el-checkbox{
     margin-bottom:10px;
   }
+  .Teacher_List{
+    padding:2px 5px;
+    position: relative;
+    margin-right:5px;
+    border:1px solid #d1d1d1;
+    border-radius:4px;
+    display: flex;
+    align-items: center;
+    line-height: normal;
+    font-size: 12px;
+    float: left;
+  }
+  .Teacher_tou{
+    width:25px;
+    height:25px;
+    overflow: hidden;
+    margin-right:3px;
+    border-radius: 50%;
+    display: inline-block;
+  }
+  .edu_edlBtn{
+    position: absolute;
+    right:-8px;
+    top:-14px;
+    padding:1px 1px !important;
+  }
 </style>

src/components/global/ChooseFile.vue

@@ -209,7 +209,8 @@
             var result = {
               selectId: this.emitmsg[0].selectId,
               url: this.emitmsg[0].url,
-              name:this.emitmsg[0].name
+              name:this.emitmsg[0].name,
+              PathType:this.emitmsg[0].PathType
             };
             this.$emit('SelectFile', result)
           }
@@ -256,7 +257,8 @@
             this.emitmsg.push({
               selectId: item.Id,
               url: item.Path,
-              name:item.Name
+              name:item.Name,
+              PathType:item.PathType
             });
           }
         } else {
@@ -264,7 +266,8 @@
           this.emitmsg.push({
             selectId: item.Id,
             url: item.Path,
-            name:item.Name
+            name:item.Name,
+            PathType:item.PathType
           });
         }
         this.selectId = item.Id;

src/components/global/Choosevideo.vue

@@ -242,7 +242,8 @@
           Path:item.Path,
           Id: item.Id,
           Image:item.Image,
-          VideoTime:item.VideoTime
+          VideoTime:item.VideoTime,
+          PathType:item.PathType
         }
         this.selectId = item.Id;
       },

src/components/setup/uploadSettings.vue

@@ -3,14 +3,18 @@
     <div class="el-card__body">
       <div style="margin-bottom: 20px;">
         <el-button size="small" @click="dialogVisible=true">添加存储位置</el-button>
-        <!-- <el-button size="small">选取账户存储</el-button> -->
-        <div style="margin-top: 20px">
+        <div style="margin: 10px 0">
           <div>商城创建者：T1219561424</div>
-          <div>商城当前上传设置：腾讯云COS</div>
         </div>
         <div class='table-body'>
           <el-table :data="tableData" v-loading="loading" border style="width: 100%">
             <el-table-column fixed prop="Bucket" label="存储位置" width="519">
+              <template slot-scope="scope">
+                <div style="position:relative">
+                  {{scope.row.Bucket}}
+                  <img v-if="scope.row.IsDefault==1" style="position:absolute;left:-10px;top:-58px;width:60px;" src="../../assets/img/userman/select.png"/>
+                </div>
+              </template>
             </el-table-column>
 
             <el-table-column fixed label="使用中" width="568">
@@ -44,7 +48,7 @@
                   <img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="设为默认" placement="top">
-                  <img src="../../assets/img/userman/detail.png" alt="" class="imgstyle" @click="setMoren(scope.row)">
+                  <img src="../../assets/img/userman/status_5_active.png" alt="" class="imgstyle" @click="setMoren(scope.row)">
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -335,5 +339,7 @@
     margin-right: 4px;
     font-size: 12px;
   }
-
+  .uploadSettings .el-table .cell{
+    overflow: visible;
+  }
 </style>