Merge branch 'custom' of http://8.136.199.33:3000/eta_front/eta_front into custom

src/utils/buttonConfig.js

@@ -689,6 +689,7 @@ export const sysDepartPermission = {
     sysDepart_enable:'sysDepart:enable',//启用禁用
     sysDepart_del:'sysDepart:del',//用户删除
     sysDepart_saveUser_researchGroup:'sysDepart:saveUser:researchGroup',//添加/编辑用户表单中,研究方向的按钮
+    sysDepart_userType:'sysDepart:userType',//添加/编辑用户表单中,用户类型按钮
     sysDepart_saveUser_LabelVal:'sysDepart:saveUser:LabelVal',//姓名角色的标签
     sysDepart_classifyOpt_edit:'sysDepart:classifyOpt:edit',//添加/编辑部门
     sysDepart_classifyOpt_delete:'sysDepart:classifyOpt:delete',//删除部门

src/views/dataEntry_manage/databaseList.vue

@@ -1040,6 +1040,8 @@ export default {
 							}, 1000);
 						})
 						
+						// 重绘图表，刷新数据
+						this.$refs.createChart&&this.$refs.createChart.getEdbData()
 
 					}else {
 						this.tableData = [];

src/views/datasheet_manage/components/insertDateDia.vue

@@ -29,7 +29,7 @@
               />
               
               <span v-show="selectEdbInfo.Frequency" style="margin: 0 10px">{{$t('ETableChildren.frequency_lable')}}: {{ getFrequencyTrans(selectEdbInfo.Frequency) }}</span>
-              <span v-show="selectEdbInfo.LatestDate">{{$t('OnlineExcelPage.lastest_date_lab')}}: {{ selectEdbInfo.LatestDate }}</span>
+              <span v-show="selectEdbInfo.EndDate">{{$t('OnlineExcelPage.lastest_date_lab')}}: {{ selectEdbInfo.EndDate }}</span>
             </li>
             <li class="form-item" style="padding-left:10px">
               <label class="el-form-item__label">{{$t('ETableChildren.lagging_period_label')}}</label>
@@ -103,8 +103,8 @@ export default {
           if(this.info.DataTimeType===2) { //指标日期时获取指标详情
             const { Data } = await dataBaseInterface.targetDetail({EdbInfoId: valueObj.EdbInfoId})
 
-            const { EdbName,LatestDate,Frequency,EdbInfoId } = Data;
-            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId }
+            const { EdbName,LatestDate,Frequency,EdbInfoId,EndDate } = Data;
+            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId,EndDate }
 
             this.search_edb = valueObj.EdbInfoId;
             this.searchOptions = [this.selectEdbInfo];

src/views/ppt_manage/mixins/pptMixins.js

@@ -359,7 +359,7 @@ export default {
           x_max: res.Data.ChartInfo.XMax?Number(res.Data.ChartInfo.XMax):Number(res.Data.DataResp.XMaxValue),
         }
         this.setCrossVarietyChart();
-        this.changeRelevanceOptions();//更改英文一样
+        this.changeRelevanceOptions(currentLang);//更改英文一样
       }
 
       //根据图表数据获取配置项

src/views/system_manage/components/addUserDialog.vue

@@ -30,7 +30,7 @@
                         :label="item.Name" :value="item.Value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="用户类型" prop="IsLdap">
+            <el-form-item label="用户类型" prop="IsLdap" v-permission="permissionBtn.sysDepartPermission.sysDepart_userType">
                 <el-select v-model="userForm.IsLdap" placeholder="请选择用户类型">
                     <el-option label="系统用户" :value="0"></el-option>
                     <el-option label="域用户" :value="1"></el-option>