Browse Source

富文本编辑器添加图片,视频时出现双斜杠的问题;

Alex 4 years ago
parent
commit
12206395e5

+ 4 - 2
src/components/Editor/index.vue

@@ -257,7 +257,8 @@ export default {
         // 获取光标所在位置
         // 获取光标所在位置
         let length = quill.getSelection().index;
         let length = quill.getSelection().index;
         // 插入图片 res.url为服务器返回的图片地址
         // 插入图片 res.url为服务器返回的图片地址
-        quill.insertEmbed(length, 'image',process.env.VUE_APP_BASE_API+res.fileName);
+        var fileName = res.fileName.replace('//', '/')
+        quill.insertEmbed(length, 'image',process.env.VUE_APP_BASE_API+ fileName);
         // 调整光标到最后
         // 调整光标到最后
         quill.setSelection(length + 1)
         quill.setSelection(length + 1)
       } else {
       } else {
@@ -293,7 +294,8 @@ export default {
         // 获取光标所在位置
         // 获取光标所在位置
         let length = quill.getSelection().index;
         let length = quill.getSelection().index;
         // 插入图片 res.url为服务器返回的图片地址
         // 插入图片 res.url为服务器返回的图片地址
-        quill.insertEmbed(length, 'video',process.env.VUE_APP_BASE_API+res.fileName);
+        var fileName = res.fileName.replace('//', '/')
+        quill.insertEmbed(length, 'video',process.env.VUE_APP_BASE_API+ fileName);
         // 调整光标到最后
         // 调整光标到最后
         quill.setSelection(length + 1)
         quill.setSelection(length + 1)
       } else {
       } else {

+ 5 - 0
src/views/system/family/detail/treeList.vue

@@ -59,6 +59,11 @@
       <el-table-column label="姓名" align="center" prop="name" width="100" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
       <el-table-column label="性别" align="center" prop="gender" :formatter="genderFormat" width="50" />
       <el-table-column label="性别" align="center" prop="gender" :formatter="genderFormat" width="50" />
       <el-table-column label="父辈" align="center" prop="father" width="100" />
       <el-table-column label="父辈" align="center" prop="father" width="100" />
+      <el-table-column label="代数" align="center" prop="generation" width="100" >
+        <template slot-scope="scope">
+          <span>第{{ scope.row.generation }}代</span>
+        </template>
+      </el-table-column>
       <el-table-column label="手机号" align="center" prop="mobile" width="200" />
       <el-table-column label="手机号" align="center" prop="mobile" width="200" />
       <el-table-column label="配偶" align="center" prop="spouse" width="100" />
       <el-table-column label="配偶" align="center" prop="spouse" width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 1 - 1
src/views/system/personalPage/index.vue

@@ -73,7 +73,7 @@
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="remarks" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remarks" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <el-button
           <el-button
             size="mini"
             size="mini"