diff --git a/src/views/modules/medical/inherit.vue b/src/views/modules/medical/inherit.vue
index 8011ddf..94dc218 100644
--- a/src/views/modules/medical/inherit.vue
+++ b/src/views/modules/medical/inherit.vue
@@ -36,8 +36,8 @@
                <img :src="scope.row.img" alt="" style="width:70px;height:100px" />
             </template>
         </el-table-column>
-        <el-table-column label="内容" align="center"  prop="content">
-        </el-table-column>
+        <!-- <el-table-column label="内容" align="center"  prop="content">
+        </el-table-column> -->
         <el-table-column label="分类" align="center"  prop="type">
             <template slot-scope="scope">
                 {{ filterAA(scope.row.type) }}
@@ -93,7 +93,7 @@
                 </el-row>
                 <el-row type="flex" justify="center">
                     <el-form-item label="内容" prop="content" label-width="48px">
-                        <el-input style="width:500px" v-model="addForm.content"></el-input>
+                        <el-input style="width:500px" v-model="addForm.content" :rows="5" type="textarea"></el-input>
                     </el-form-item>
                 </el-row>
                 <el-row type="flex" justify="center">
@@ -112,7 +112,7 @@
                     </el-form-item>
                 </el-row>
                 <el-row type="flex" justify="center">
-                    <el-form-item label="图片" prop="img">
+                    <el-form-item label="图片" prop="img" label-width="48px">
                         <el-upload :limit="1" class="el-uploadfeng "
                             ref="files"
                             :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
diff --git a/src/views/modules/medical/light.vue b/src/views/modules/medical/light.vue
index 723807d..7987333 100644
--- a/src/views/modules/medical/light.vue
+++ b/src/views/modules/medical/light.vue
@@ -82,6 +82,23 @@
                         <el-input style="width:500px" v-model="addForm.url"></el-input>
                     </el-form-item>
                 </el-row>
+                <el-row type="flex" justify="center">
+                    <el-form-item label="资源文件" prop="img" label-width="100px">
+                        <el-upload :limit="1" class="el-uploadfeng "
+                            ref="files"
+                            :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
+                            :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
+                            :file-list="fileList" :on-success="handlePicSuccess" accept=".mp3,.mp4,.gif,.mpeg,.mpg" :on-remove="handleRemove">
+                            <i class="el-icon-plus"></i>
+                        </el-upload>
+                        <!-- <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+                            <video width="100%" :src="addForm.url" alt="">
+                            <video controls width="250" v-if="dataForm.video != ''">   
+                                <source :src="dataForm.video" type="video/mp4" />
+                            </video>
+                        </el-dialog> -->
+                    </el-form-item>
+                </el-row>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="cancleClose">取 消</el-button>
@@ -93,9 +110,11 @@
     </div>
 </template>
 <script>
+import global from '../../common/common.vue' //引入共用组间
 export default {
     data () {
         return {
+            baseUrl: global.baseUrl,
             typeList: [
                 {
                     dictValue:'吴门之歌',
@@ -132,7 +151,8 @@ export default {
             dataListSelections: [],
             addOrUpdateVisible: false,
             bookIds:[],
-            titlesub: '新增'
+            titlesub: '新增',
+            fileList: [],
         }
     },
     components: {
@@ -223,6 +243,15 @@ export default {
             this.addForm.name = row.name
             this.addForm.type = row.type.toString()
             this.addForm.url = row.url
+            this.fileList = []
+            var img = {
+                name: '',
+                url: row.img
+            }
+            var attr = []
+            attr.push(img)
+            this.fileList = attr
+            console.log('this.fileList', this.fileList);
             this.addOrUpdateVisible = true
             
         },
@@ -241,6 +270,8 @@ export default {
                 "type": '',
                 "url": ''
             }
+            
+            this.fileList = []
         },
         // 删除
         deleteHandle (id) {
@@ -291,7 +322,30 @@ export default {
                     })
                 }
             })
-        }
+        },
+        handlePictureCardPreview(file) {
+            this.addForm.url = file.url;
+            this.dialogVisible = true;
+        },
+        handlePicSuccess(res, file) {
+        // console.log(res,'res')
+            if (res.msg == "success") {
+            this.addForm.url = res.url;
+            this.fileList.push({
+                name: file.name,
+                url: res.url
+            })
+            console.log(this.dataForm.url,'url')
+            this.$message.success("上传成功");
+            } else {
+            this.$message.error("上传失败");
+            }
+        },
+        handleRemove(file, fileList) {
+            this.addForm.url = '';
+            this.fileList = fileList
+            // this.addForm.noneBtnImg = fileList.length >= this.addForm.limitCountImg;
+        },
     }
 }
 </script>