Merge branch 'requirement_235'

src/lang/modules/Slides/pptPresent.js

@@ -53,7 +53,7 @@ export const presentEn = {
   please_fill_title_msg: "Please fill in PPT title",
   merging_successful_msg: " Merging successful",
   shared_users_lable: "Shared users",
-  ficc_researchers_radio: "All FICC researchers",
+  all_users_radio: "All Users",
   specify_members_radio: "Specify members",
   please_select_researcher: "Please select a researcher",
   please_select_directory: "Please select a directory",
@@ -160,7 +160,7 @@ export const presentZh = {
   please_fill_title_msg: "请填写PPT标题",
   merging_successful_msg: " 合并成功",
   shared_users_lable: "共享用户",
-  ficc_researchers_radio: "全部ficc研究员",
+  all_users_radio: "全部用户",
   specify_members_radio: "指定成员",
   please_select_researcher: "请选择研究员",
   please_select_directory_msg: "请选择目录",

src/views/ppt_manage/newVersion/components/catalog/chooseShareUserDia.vue

@@ -14,7 +14,7 @@
       <div style="margin-bottom: 20px;">
         <label style="margin-right: 40px"> {{$t('Slides.shared_users_lable')}}</label>
         <el-radio-group v-model="share_type" size="mini" @change="select_users=[]">
-          <el-radio :label="1">{{$t('Slides.ficc_researchers_radio')}}</el-radio>
+          <el-radio :label="1">{{$t('Slides.all_users_radio')}}</el-radio>
           <el-radio :label="2">{{$t('Slides.specify_members_radio')}}</el-radio>
         </el-radio-group>
       </div>