소스 검색

上传相关

natasha 1 년 전
부모
커밋
67f8fd8c4a

+ 4 - 1
src/components/Header.vue

@@ -14,7 +14,10 @@
     <div class="userName">
       <el-dropdown @command="handleChange">
         <span class="el-dropdown-link">
-            <img class="avatar" :src="touxiang?touxiang:userMessage.image_url?userMessage.image_url:require('../assets/avatar.png')" />
+            <el-image
+                :src="touxiang?touxiang:userMessage.image_url?userMessage.image_url:require('../assets/avatar.png')"
+                fit="cover" style="width:24px;height:24px;margin:0 8px">
+            </el-image>
             <span class="name">{{userMessage.user_name}}</span><i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">

+ 1 - 1
src/components/Setting.vue

@@ -5,7 +5,7 @@
             <div class="avator-box">
             <el-image
                 :src="info.sys_user&&info.sys_user.image_url?info.sys_user.image_url:info.image_url?info.image_url:require('../assets/avatar.png')"
-                fit="contain">
+                fit="cover" style="width:96px;height:96px;">
             </el-image>
             <a class="img-crop" v-if="page!=='personCheck'">
                 <upload :datafileList="infoForm.cover_image_list" :filleNumber="99" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" />

+ 23 - 14
src/components/Upload.vue

@@ -18,11 +18,19 @@
       :on-remove="handleRemove"
       :show-file-list="showList?false:true"
     >
-      
-      <el-button size="mini" type="primary">
-        <svg-icon icon-class="upload"></svg-icon>
-        上传
-      </el-button>
+      <template v-if="styleType==='upload'">
+        <div class="upload-style">
+            <i class="el-icon-plus avatar-uploader-icon"></i>
+            <br/>
+            Upload
+        </div>
+      </template>
+      <template v-else>
+        <el-button size="mini" type="primary">
+            <svg-icon icon-class="upload"></svg-icon>
+            上传
+        </el-button>
+      </template>
       <div
         slot="tip"
         class="el-upload__tip"
@@ -45,7 +53,8 @@ export default {
     "changeFillId",
     "fileName",
     "showList",
-    "tips"
+    "tips",
+    "styleType"
   ],
   data() {
     return {
@@ -207,13 +216,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.zhezhao {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100vh;
-  background: rgba(0, 0, 0, 0.4);
-  z-index: 10000;
+.upload-style{
+    padding: 8px;
+    border-radius: 2px;
+    border: 1px dashed #E5E6EB;
+    background: #F2F3F5;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 22px;
 }
 </style>

+ 6 - 5
src/views/content_manage/course_manage/CreateLive.vue

@@ -25,11 +25,12 @@
             <div class="create-bottom">
                 <el-form :model="organizeForm" :rules="rulesOrganize" ref="organizeForm" label-width="100px" class="registerForm" v-if="stepIndex===0">
                     <el-form-item label="课程封面" prop="cover_image_url">
-                        <upload :datafileList="organizeForm.cover_image_list" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" :filleNumber="1" v-if="!organizeForm.cover_image_url" />
+                        <upload :datafileList="organizeForm.cover_image_list" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" :filleNumber="1" v-if="!organizeForm.cover_image_url" styleType="upload" />
                         <div class="cover-box" v-else @mouseover="Imagemouseover('coverFlag',true)" @mouseout="Imagemouseover('coverFlag',false)">
-                            <el-image :src="organizeForm.cover_image_url" fit="contain" style="max-width:200px;max-height:200px;"></el-image>
+                            <el-image :src="organizeForm.cover_image_url" fit="cover" style="width:200px;height:280px;"></el-image>
                             <p v-show="coverFlag" @click="handleDeleteFile('cover',0)"><i class="el-icon-delete"></i></p>
                         </div>
+                        <p class="tips">建议上传宽高比为5:7的图</p>
                     </el-form-item>
                     <el-form-item label="课程名称" prop="title">
                         <el-input v-model="organizeForm.title" placeholder="请输入课程名称" @blur="handleTrim('organizeForm','title')"></el-input>
@@ -430,14 +431,14 @@ export default {
 .cover-box{
     position: relative;
     width: 200px;
-    height: 200px;
+    height: 280px;
     p{
         position: absolute;
         bottom: 0;
         left: 0;
         width: 100%;
-        height: 200px;
-        line-height: 200px;
+        height: 280px;
+        line-height: 280px;
         font-size: 20px;
         text-align: center;
         cursor: pointer;

+ 6 - 5
src/views/content_manage/course_manage/CreateRecorded.vue

@@ -29,11 +29,12 @@
             <div class="create-bottom">
                 <el-form :model="organizeForm" :rules="rulesOrganize" ref="organizeForm" label-width="100px" class="registerForm" v-if="stepIndex===0">
                     <el-form-item label="课程封面" prop="cover_image_url">
-                        <upload :datafileList="organizeForm.cover_image_list" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" :filleNumber="1" v-if="!organizeForm.cover_image_url" />
+                        <upload :datafileList="organizeForm.cover_image_list" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" :filleNumber="1" v-if="!organizeForm.cover_image_url" styleType="upload" />
                         <div class="cover-box" v-else @mouseover="Imagemouseover('coverFlag',true)" @mouseout="Imagemouseover('coverFlag',false)">
-                            <el-image :src="organizeForm.cover_image_url" fit="contain" style="max-width:200px;max-height:200px;"></el-image>
+                            <el-image :src="organizeForm.cover_image_url" fit="cover" style="width:200px;height:280px;"></el-image>
                             <p v-show="coverFlag" @click="handleDeleteFile('cover',0)"><i class="el-icon-delete"></i></p>
                         </div>
+                        <p class="tips">建议上传宽高比为5:7的图</p>
                     </el-form-item>
                     <el-form-item label="课程名称" prop="title">
                         <el-input v-model="organizeForm.title" placeholder="请输入课程名称" @blur="handleTrim('organizeForm','title')"></el-input>
@@ -779,14 +780,14 @@ export default {
 .cover-box{
     position: relative;
     width: 200px;
-    height: 200px;
+    height: 280px;
     p{
         position: absolute;
         bottom: 0;
         left: 0;
         width: 100%;
-        height: 200px;
-        line-height: 200px;
+        height: 280px;
+        line-height: 280px;
         font-size: 20px;
         text-align: center;
         cursor: pointer;

+ 15 - 4
src/views/organize_manage/PersonList.vue

@@ -92,7 +92,12 @@
                             min-width="132"
                             class-name="user-info">
                             <template slot-scope="scope">
-                                <img class="touxiang" :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')" />
+                                <el-image
+                                    class="touxiang"
+                                    :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')"
+                                    fit="cover" style="width:24px;height:24px;margin-right:8px">
+                                </el-image>
+                                <!-- <img class="touxiang" :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')" /> -->
                                 <span class="name">{{scope.row.user_name}}</span>
                             </template>
                         </el-table-column>
@@ -219,7 +224,12 @@
                             min-width="132"
                             class-name="user-info">
                             <template slot-scope="scope">
-                                <img class="touxiang" :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')" />
+                                <el-image
+                                    class="touxiang"
+                                    :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')"
+                                    fit="cover" style="width:24px;height:24px;margin-right:8px">
+                                </el-image>
+                                <!-- <img class="touxiang" :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')" /> -->
                                 <span class="name">{{scope.row.user_name}}</span>
                             </template>
                         </el-table-column>
@@ -624,9 +634,10 @@ export default {
             if(!row&&arr.length===0){
                 return false
             }
-            let Mname = "/OrgServer/Manager/PersonManager/DeletePerson";
+            let Mname = "/OrgServer/Manager/PersonManager/BatchDeleteOrgPerson";
             let data = {
-                id_list: arr?arr:[row.id]
+                org_id: this.id,
+                person_id_list: arr?arr:[row.id]
             };
             getLogin(Mname, data).then(res => {
                 this.$message.success("删除成功");

+ 6 - 6
src/views/people_manage/CreatePerson.vue

@@ -28,9 +28,9 @@
             <div class="create-bottom">
                 <el-form :model="registerForm" :rules="rulesRegister" ref="registerForm" label-width="100px" class="registerForm" v-if="stepIndex===0">
                     <el-form-item label="头像" prop="cover_image_url">
-                        <upload :datafileList="registerForm.cover_image_list" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" :filleNumber="1" v-if="!registerForm.cover_image_url" />
+                        <upload :datafileList="registerForm.cover_image_list" :changeFillId="handleAvatarSuccess" :fileName="'cover'" :showList="true" uploadType="image" :filleNumber="1" v-if="!registerForm.cover_image_url" styleType="upload" />
                         <div class="cover-box" v-else @mouseover="Imagemouseover('coverFlag',true)" @mouseout="Imagemouseover('coverFlag',false)">
-                            <el-image :src="registerForm.cover_image_url" fit="contain" style="max-width:200px;max-height:200px;"></el-image>
+                            <el-image :src="registerForm.cover_image_url" fit="cover" style="width:100px;height:100px;"></el-image>
                             <p v-show="coverFlag" @click="handleDeleteFile('cover',0)"><i class="el-icon-delete"></i></p>
                         </div>
                     </el-form-item>
@@ -535,15 +535,15 @@ export default {
 }
 .cover-box{
     position: relative;
-    width: 200px;
-    height: 200px;
+    width: 100px;
+    height: 100px;
     p{
         position: absolute;
         bottom: 0;
         left: 0;
         width: 100%;
-        height: 200px;
-        line-height: 200px;
+        height: 100px;
+        line-height: 100px;
         font-size: 20px;
         text-align: center;
         cursor: pointer;

+ 6 - 1
src/views/people_manage/index.vue

@@ -58,7 +58,12 @@
                         width="200"
                         class-name="user-info">
                         <template slot-scope="scope">
-                            <img class="touxiang" :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')" />
+                            <el-image
+                                class="touxiang"
+                                :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')"
+                                fit="cover" style="width:24px;height:24px;margin-right:8px">
+                            </el-image>
+                            <!-- <img class="touxiang" :src="scope.row.image_url?scope.row.image_url:require('../../assets/avatar.png')" /> -->
                             <span class="name">{{scope.row.user_name}}</span>
                         </template>
                     </el-table-column>