fix: gn2.6

src/utils/buttonConfig.js

@@ -430,6 +430,7 @@ export const chartLibPermission = {
     chartLib_uploadToForum:'chartLib:uploadToForum',//上传至社区
     chartLib_updateToForum:'chartLib:updateToForum',//同步至社区
     chartLib_withdrawfromForum:'chartLib:withdrawfromForum',//从社区撤回
+    chartLib_sourceEdit:'chartLib:sourceEdit',//编辑数据来源
 }
 
 /*
@@ -494,6 +495,7 @@ export const etaTablePermission = {
     etaTable_customize_mix_download:'etaTable:customize:mix:download',//下载
     etaTable_customize_mix_save:'etaTable:customize:mix:save',//保存
     etaTable_customize_mix_del:'etaTable:customize:mix:del',//删除
+    etaTable_customize_mix_source_edit:'etaTable:customize:mix:classifyOpt:sourceEdit',//编辑数据来源
 
     //数据表格页面
     etaTable_customize_data_sheetAdd: 'etaTable:customize:data:sheetAdd',//添加数据表格按钮
@@ -505,6 +507,7 @@ export const etaTablePermission = {
     etaTable_customize_data_download:'etaTable:customize:data:download',//下载
     etaTable_customize_data_del:'etaTable:customize:data:del',//删除
     etaTable_customize_data_save:'etaTable:customize:data:save',//保存
+    etaTable_customize_data_sourceEdit:'etaTable:customize:data:classifyOpt:sourceEdit',//编辑数据来源
 
     /*-----------excel表格页面--------- */
     etaTable_excel:'etaTable:excel',//添加Excel表格这个按钮显示不显示
@@ -620,6 +623,7 @@ export const statisticPermission = {
     corrAnalysis_classifyOpt_edit:'corrAnalysis:classifyOpt:edit',//添加/编辑分类
     corrAnalysis_classifyOpt_delete:'corrAnalysis:classifyOpt:delete',//删除分类
     corrAnalysis_classifyOpt_move:'corrAnalysis:classifyOpt:move',//移动分类
+    corrAnalysis_source_edit:'corrAnalysis:sourceEdit',//编辑数据来源
         /*---图表操作栏--- */
     corrAnalysis_del:'corrAnalysis:del',
     corrAnalysis_enNameSetting:'corrAnalysis:enNameSetting',
@@ -687,6 +691,7 @@ export const statisticPermission = {
     rangeAnalysis_classifyOpt_edit:'rangeAnalysis:classifyOpt:edit',//添加编辑分类
     rangeAnalysis_classifyOpt_delete:'rangeAnalysis:classifyOpt:delete',//删除分类
     rangeAnalysis_classifyOpt_move:'rangeAnalysis:classifyOpt:move',//删除分类
+    rangeAnalysis_source_edit:'rangeAnalysis:sourceEdit',//编辑数据来源
     /*---图表操作栏--- */
     rangeAnalysis_del:'rangeAnalysis:del',
     rangeAnalysis_copyWechat:'rangeAnalysis:copyWechat',
@@ -826,8 +831,14 @@ export const baseConfigPermission = {
     etaBaseConfig_biApprove:'etaBaseConfig:biApprove',//BI看板审批
     etaBaseConfig_login:'baseSetting:loginSetting',//登录
     etaBaseConfig_watermark_ybShare:'etaBaseConfig:watermark:ybShare',//如果没权限,表单不显示也不校验
-    etaBaseConfig_source_see:'baseSetting:sourceSetting:see',//资源库查看
+    etaBaseConfig_source_see:'baseSetting:sourceSetting:see',//资源库版图查看
     etaBaseConfig_source_upload:'baseSetting:sourceSetting:upload',//资源库上传
+    etaBaseConfig_source_edit:'baseSetting:sourceSetting:edit',//资源库编辑
+    etaBaseConfig_source_del:'baseSetting:sourceSetting:del',//资源库删除
+    etaBaseConfig_source_ppt_upload:'pptMaterial:upload',//资源库ppt上传
+    etaBaseConfig_source_ppt_see:'pptMaterial:find',//资源库ppt查看
+    etaBaseConfig_source_ppt_edit:'pptMaterial:edit',//资源库ppt编辑
+    etaBaseConfig_source_ppt_del:'pptMaterial:delete',//资源库ppt删除
     // 登录设置
     etaBaseConfig_login_systemLogo_mobile:'baseSetting:loginSetting:systemLogo:mobile',//系统logo移动端
     etaBaseConfig_login_systemLogo_pc:'baseSetting:loginSetting:systemLogo:pc',//系统logoPC端

src/views/chartRelevance_manage/components/saveChartSetting.vue

@@ -33,7 +33,7 @@
                 </el-form-item>
                 <el-form-item label="数据来源">
                     <div class="flex-align">
-                        <el-input :autosize="{ minRows: 2, maxRows: 4}" style="width: 250px;margin-right: 5px;" type="textarea" maxlength="50" show-word-limit v-model="settingData.SourcesFrom.text"></el-input>
+                        <el-input :disabled="!permissionBtn.checkPermissionBtn(permissionBtn.statisticPermission.corrAnalysis_source_edit)" :autosize="{ minRows: 2, maxRows: 4}" style="width: 250px;margin-right: 5px;" type="textarea" maxlength="50" show-word-limit v-model="settingData.SourcesFrom.text"></el-input>
                         <el-switch v-model="settingData.SourcesFrom.isShow"></el-switch>
                     </div>
                 </el-form-item>

src/views/dataEntry_manage/addChart.vue

@@ -578,7 +578,7 @@
 									style="margin:0 15px;"
 									@change="changeSourceVisable"
 								/>
-								<span class="editsty" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Chart.chart_edit_btn')}}</span>
+								<span class="editsty" v-if="permissionBtn.checkPermissionBtn(permissionBtn.chartLibPermission.chartLib_sourceEdit)" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Chart.chart_edit_btn')}}</span>
 							</div>
 
 							<!-- 是否堆积 -->

src/views/dataEntry_manage/editChart.vue

@@ -583,7 +583,7 @@
 									style="margin:0 15px;"
 									@change="changeSourceVisable"
 								/>
-								<span class="editsty" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Chart.chart_edit_btn')}}</span>
+								<span class="editsty" v-if="permissionBtn.checkPermissionBtn(permissionBtn.chartLibPermission.chartLib_sourceEdit)" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Chart.chart_edit_btn')}}</span>
 							</div>
 
 							<!-- 是否堆积 -->

src/views/datasheet_manage/customSheetEdit.vue

@@ -98,7 +98,7 @@
         style="margin:0 15px;"
         @change="(e) => {sheetSourceFrom.isShow=e,sheetForm.SourcesFrom=JSON.stringify(sheetSourceFrom)}"
       />
-      <span class="editsty" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Common.edit_btn')}}</span>
+      <span class="editsty" v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_data_sourceEdit)" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Common.edit_btn')}}</span>
     </div>
 
     <!-- 数据来源编辑弹窗 -->

src/views/datasheet_manage/mixedSheetEdit.vue

@@ -67,7 +67,7 @@
         style="margin:0 15px;"
         @change="(e) => {sheetSourceFrom.isShow=e,sheetForm.SourcesFrom=JSON.stringify(sheetSourceFrom)}"
       />
-      <span class="editsty" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Common.edit_btn')}}</span>
+      <span class="editsty" v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_mix_source_edit)" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Common.edit_btn')}}</span>
     </div>
 
     <!-- 数据来源编辑弹窗 -->

src/views/intervalAnalysis/components/chartSetWrap.vue

@@ -82,8 +82,10 @@
           </div>
         </div>
         <el-form-item :label="$t('Edb.Detail.source')" prop="source">
-          <el-input v-model="formData.source" style="width:80%"></el-input>
-          <el-switch v-model="formData.showSource"></el-switch>
+          <div class="flex-align">
+            <el-input :disabled="!permissionBtn.checkPermissionBtn(permissionBtn.statisticPermission.rangeAnalysis_source_edit)" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" maxlength="50" show-word-limit v-model="formData.source" style="width:80%;margin-right: 5px;"></el-input>
+            <el-switch v-model="formData.showSource"></el-switch>
+          </div>
         </el-form-item>
       </el-form>
       <div class="dia-bot">
@@ -238,4 +240,14 @@ div{
     text-align: center;
   }
 }
+</style>
+
+<style lang="scss">
+.flex-align{
+  display: flex;
+  align-items: center;
+  .el-textarea .el-input__count{
+      background: transparent;
+  }
+}
 </style>

src/views/ppt_manage/newVersion/components/selectImage.vue

@@ -174,7 +174,6 @@ export default {
                 }
 
                 .opt-box {
-                    display: none;
                     position: absolute;
                     z-index: 5;
                     width: 100%;

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -296,7 +296,7 @@
         :CoverContent="CoverContent"
         @saveCover="saveCover2"
         @close="isShowChooseCover=false"
-        @chooseMoreCover="openSelectImage(1,firstPage.BackgroundImgId,firstPage.BackgroundImg)"
+        @chooseMoreCover="coverChooseImage()"
     />
     <!-- 批量删除弹窗 -->
     <delete-page-dialog 
@@ -581,6 +581,10 @@ export default {
           }
         }
     },
+    // 选择封面弹框选择更多模板
+    coverChooseImage(){
+        this.openSelectImage(1,this.$refs.ChooseCoverNewRef.pageData.BackgroundImgId,this.$refs.ChooseCoverNewRef.pageData.BackgroundImg)
+    },
     // 打开选择背景图、封底图、封面图
     openSelectImage(type,id,url){
         this.$refs.selectImageRef.showHandle(type,id,url)

src/views/system_manage/components/smartReportImgSet.vue

@@ -7,7 +7,7 @@
                 <el-option :label="libraryType==2?$t('SystemManage.BaseConfig.ppt_type02'):$t('SystemManage.BaseConfig.resource_type02')" :value="2"></el-option>
                 <el-option v-if="libraryType==2" :label="$t('SystemManage.BaseConfig.ppt_type03')" :value="3"></el-option>
             </el-select>
-            <el-button type="primary" style="float:right" @click="handleShowUploadPop" v-permission="permissionBtn.baseConfigPermission.etaBaseConfig_source_upload">{{libraryType==1?$t('SystemManage.BaseConfig.resource_btn04'):$t('SystemManage.BaseConfig.resource_btn01')}}</el-button>
+            <el-button type="primary" style="float:right" @click="handleShowUploadPop" v-if="(libraryType==1&&permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_upload)) || (libraryType==2&&permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_upload))">{{libraryType==1?$t('SystemManage.BaseConfig.resource_btn04'):$t('SystemManage.BaseConfig.resource_btn01')}}</el-button>
         </div>
 
         <div class="select-status-box" v-if="selectIds.length>0">
@@ -29,13 +29,13 @@
                     <div class="item" @click="handleShowImgFull(item)">
                         <img src="~@/assets/img/icons/fullsreen.png" alt="">
                     </div>
-                    <el-dropdown @command="handleClickOpt">
+                    <el-dropdown @command="handleClickOpt" v-if="(libraryType==1&&(permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_edit)|| permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_del))) || (libraryType==2&&(permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_edit) || permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_del)))">
                     <div class="item">
                         <img src="~@/assets/img/icons/more.png" alt="">
                     </div>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item :command="{type:'edit',data:item}">{{$t('Dialog.title_prefix_edit')}}</el-dropdown-item>
-                        <el-dropdown-item :command="{type:'del',data:item}" style="color: #AD352F;">{{$t('Table.delete_btn')}}</el-dropdown-item>
+                        <el-dropdown-item v-if="(libraryType==1&&permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_edit)) || (libraryType==2&&permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_edit))" :command="{type:'edit',data:item}">{{$t('Dialog.title_prefix_edit')}}</el-dropdown-item>
+                        <el-dropdown-item v-if="(libraryType==1&&permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_del)) || (libraryType==2&&permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_del))" :command="{type:'del',data:item}" style="color: #AD352F;">{{$t('Table.delete_btn')}}</el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown>
                 </div>
@@ -190,17 +190,18 @@
                     <el-input v-model="ruleForm.ImageName" :placeholder="$t('SystemManage.BaseConfig.resource_placeholder01')"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('SystemManage.BaseConfig.resource_label02')" prop="ImageType">
-                    <el-radio-group v-model="ruleForm.ImageType">
+                    <el-radio-group :disabled="ruleForm.ImageConfId" v-model="ruleForm.ImageType">
                         <el-radio :label="1">{{$t('SystemManage.BaseConfig.ppt_type01')}}</el-radio>
                         <el-radio :label="2">{{$t('SystemManage.BaseConfig.ppt_type02')}}</el-radio>
                         <el-radio :label="3">{{$t('SystemManage.BaseConfig.ppt_type03')}}</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item 
+                <el-form-item
                     :label="$t('SystemManage.BaseConfig.resource_btn01')" 
                     prop="Url"
                 >
-                    <el-upload 
+                    <el-upload
+                        :disabled="ruleForm.ImageConfId" 
                         action="" 
                         accept="image/*" 
                         :http-request="handleUploadImg" 
@@ -214,7 +215,7 @@
                                 <img class="upload-img" :src="ruleForm.Url" alt="">
                                 <div class="upload-mask">
                                     <i class="el-icon-zoom-in" @click.stop="handleShowImgPpt()"></i>
-                                    <i class="el-icon-delete" @click.stop="ruleForm.Url=''"></i>
+                                    <i class="el-icon-delete" v-if="!ruleForm.ImageConfId" @click.stop="ruleForm.Url=''"></i>
                                 </div>
                             </template>
                         </div>
@@ -512,10 +513,10 @@ export default {
             })   
         },
         cancelPpt(){
+            this.uploadImgPpt=false
             this.$nextTick(()=>{
                 this.$refs.ruleForms.clearValidate()
-            })
-            this.uploadImgPpt=false
+            })        
         },
         cancelHandle(){
             this.step=1
@@ -589,6 +590,9 @@ export default {
                     ImageType:''
                 }
                 this.uploadImgPpt=true
+                this.$nextTick(()=>{
+                    this.$refs.ruleForms.clearValidate()
+                }) 
             }
         },
 

src/views/system_manage/etaBaseConfig.vue

@@ -429,8 +429,8 @@
         </template>
         <template v-if="sectionType==2&&isShowSource">
             <el-radio-group v-model="libraryType" style="margin:16px 0 0 30px;">
-                <el-radio-button label="1">{{$t('SystemManage.BaseConfig.smart_layout_resource_library')}}</el-radio-button>
-                <el-radio-button label="2">{{$t('SystemManage.BaseConfig.ppt_resource_library')}}</el-radio-button>
+                <el-radio-button label="1" v-if="permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_see)">{{$t('SystemManage.BaseConfig.smart_layout_resource_library')}}</el-radio-button>
+                <el-radio-button label="2" v-if="permissionBtn.checkPermissionBtn(permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_see)">{{$t('SystemManage.BaseConfig.ppt_resource_library')}}</el-radio-button>
             </el-radio-group>
             <!-- 资源库 -->
             <smartReportImgSet :libraryType="libraryType" />
@@ -704,6 +704,8 @@ export default {
         isShowSource(){
             return this.permissionBtn.checkPermissionBtn(
                 this.permissionBtn.baseConfigPermission.etaBaseConfig_source_see
+            ) || this.permissionBtn.checkPermissionBtn(
+                this.permissionBtn.baseConfigPermission.etaBaseConfig_source_ppt_see
             )
         },
 
@@ -890,6 +892,7 @@ export default {
     },
     mounted(){
         this.getBaseConfig()
+        this.libraryType=this.permissionBtn.checkPermissionBtn(this.permissionBtn.baseConfigPermission.etaBaseConfig_source_see)?'1':'2'
     }
 };
 </script>