Merge branch 'fix_dw'

src/views/system_manage/etaBaseConfig.vue

@@ -497,7 +497,8 @@ export default {
                 this.checkList = WatermarkChart==='true'?['研报图表']:[]
                 this.Iflytek = UseXf==='true'?true:false
                 if(res.Data){
-                    this.formData = res.Data
+                    // this.$set(this,'formData',res.Data)
+                    this.formData = {...this.formData,...res.Data}
                     this.formData.CnPptCoverImgs = CnPptCoverImgs.length?CnPptCoverImgs.split(','):[]
                     this.formData.EnPptCoverImgs = EnPptCoverImgs.length?EnPptCoverImgs.split(','):[]
                 }