Merge branch 'gn_bug_fix' into debug

src/views/report_manage/reportV2/components/reportBaseInfoDia.vue

@@ -443,7 +443,7 @@ export default {
 
           if(this.formData.type===1) { //默认只带出作者
             this.formData.author = res.Data.List
-              ? res.Data.List[0].Author.split(",")
+              ? (res.Data.List[0].Author?res.Data.List[0].Author.split(","):[])
               : [];
           }else {
             this.chooseInheritReport(res.Data.List[0])

src/views/system_manage/dataRefreshSetting.vue

@@ -40,7 +40,7 @@
                             <el-option v-for="i in terminalCodeList" :key="i.TerminalCode"
                                 :label="i.Name" :value="i.TerminalCode"/>
                         </el-select> -->
-                        <el-cascader :placeholder="$t('SystemManage.DataRefresh.eta_class_select')" :no-match-text="$t('SystemManage.DataRefresh.complete_data_source')" clearable
+                        <el-cascader placeholder="数据查看分类" :no-match-text="$t('SystemManage.DataRefresh.complete_data_source')" clearable
                             v-model="selectOption.classify" @change="selectOptionChange('classify')"
                             :options="edbClassifyList" 
                             :show-all-levels="false"