Merge branch 'gn2.6' into debug

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -124,5 +124,8 @@ export default {
   width: 95%;
   position: absolute;
   left: 2%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 </style>

src/views/ppt_manage/newVersion/components/selectImage.vue

@@ -26,7 +26,7 @@
             <el-pagination style="margin-top: 20px;text-align:center" @current-change="handleCurrentChange"
                 :current-page="page" :page-size="pageSize" layout="total, prev, pager, next, jumper" :total="total">
             </el-pagination>
-            <div style="text-align: center;padding: 30px 0;margin-top: 60px;">
+            <div style="text-align: right;padding: 30px 0;margin-top: 60px;">
                 <el-button style="width:120px;" @click="cancelHandle()">{{ $t('Dialog.cancel_btn') }}</el-button>
                 <el-button type="primary" style="margin-left:20px;width:120px;" @click="handleSave">{{
                     $t('Dialog.confirm_save_btn') }}</el-button>

src/views/system_manage/components/smartReportImgSet.vue

@@ -499,7 +499,7 @@ export default {
                     }
                     let res=''
                     if(this.ruleForm.ImageConfId){
-
+                        res=await apiSmartReport.pptEditMaterial(params)
                     }else{
                         res=await apiSmartReport.pptAddMaterial([params])
                     }