Merge branch 'gn2.6' into debug

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

@@ -23,10 +23,12 @@
                     <p class="name">{{ item.ImgName || item.ImageName }}</p>
                 </div>
             </div>
-            <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: right;padding: 30px 0;margin-top: 60px;">
+            <div style="margin-top: 20px;display: flex;justify-content:flex-end;padding-right: 40px;">
+                <el-pagination  @current-change="handleCurrentChange"
+                    :current-page="page" :page-size="pageSize" layout="total, prev, pager, next, jumper" :total="total">
+                </el-pagination>
+            </div>
+            <div style="text-align:center;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>
@@ -71,10 +73,10 @@ export default {
     mounted() {
     },
     methods: {
-        handleShowImgFull(e){
+        handleShowImgFull(e) {
             console.log(e);
-            this.picShowList=[e.Url]
-            this.showPptViewer=true
+            this.picShowList = [e.Url]
+            this.showPptViewer = true
         },
         handleCurrentChange(val) {
             this.page = val