Merge branch 'toB_ETA1.2'

src/views/system_manage/etaBaseConfig.vue

@@ -331,9 +331,11 @@ export default {
                 const {WatermarkChart,UseXf,CnPptCoverImgs,EnPptCoverImgs} = res.Data
                 this.checkList = WatermarkChart==='true'?['研报图表']:[]
                 this.Iflytek = UseXf==='true'?true:false
-                this.formData = res.Data
-                this.formData.CnPptCoverImgs = CnPptCoverImgs.length?CnPptCoverImgs.split(','):[]
-                this.formData.EnPptCoverImgs = EnPptCoverImgs.length?EnPptCoverImgs.split(','):[]
+                if(res.Data){
+                    this.formData = res.Data
+                    this.formData.CnPptCoverImgs = CnPptCoverImgs.length?CnPptCoverImgs.split(','):[]
+                    this.formData.EnPptCoverImgs = EnPptCoverImgs.length?EnPptCoverImgs.split(','):[]
+                }
                 this.configLoading&&this.configLoading.close()
             })
         },