commit

src/utils/buttonConfig.js

@@ -363,6 +363,15 @@ export const edbDataPermission = {
     edbData_checkRelatedEdb:'edbData:checkRelatedEdb',//查看关联指标
     edbData_checkCalcChart:'edbData:checkCalcChart',//查看计算指标
     edbData_enableOrDisable:'edbData:enableOrDisable',//启用/停用
+
+
+    /* 拆分 数据查看特有权限 */
+    edbBaseData_collect:'edbBaseData:collect',//收藏/移出
+    edbBaseData_view:'edbBaseData:view',//查看
+    edbBaseData_collectClassify_add:'edbBaseData:collectClassify:add',//收藏夹分类添加
+    edbBaseData_collectClassify_edit:'edbBaseData:collectClassify:edit',//收藏分类编辑
+    edbBaseData_collectClassify_del:'edbBaseData:collectClassify:del',//收藏分类删除
+    edbBaseData_collectClassify_move:'edbBaseData:collectClassify:move',//收藏分类移动
 }
 /*
  * ---------------------------------------------------------------------------ETA预测指标------------------------------------------------

src/views/dataEntry_manage/databaseList.vue

@@ -70,7 +70,7 @@
 			>
 				<i :class="{'el-icon-d-arrow-left':isMainLeftShow,'el-icon-d-arrow-right':!isMainLeftShow}"></i>
 			</span>
-			<!-- <target-tree /> -->
+			
 			<div class="main-left left" id="left" v-show="isMainLeftShow">
 				<div class="tree-cont">
 					<div style="padding-bottom:20px;padding-right:20px;display:flex;justify-content:space-between">
@@ -168,26 +168,7 @@
 									@click.stop="removeNode(node,data)"
 									v-if="!data.EdbCode&&(data.Button.DeleteButton)&&isEdbBtnShow('deleteCatalog')"
 								/>
-								<!-- 查看计算指标 -->
-								<!-- <i class="el-icon-view" 
-									v-if="data.EdbType===2&&![58,59,67,68,74].includes(data.Source)&&isEdbBtnShow('checkCalcChart')" 
-									@click.stop="viewNode(node,data)"></i> -->
-								<!-- 查看关联图表 -->
-								<!-- <img 
-									v-if="data.Button.ShowChartRelation&&isEdbBtnShow('checkRelatedChart')" 
-									@click.stop="showAssociateChart=true,showAssociateComputeData=false"
-									src="~@/assets/img/icons/associate_chart.png" 
-									style="width: 14px; height: 14px;margin-left: 8px"
-									alt=""
-								/> -->
-								<!-- 查看关联指标 -->
-								<!-- <img 
-									v-if="data.Button.ShowEdbRelation&&isEdbBtnShow('checkRelatedEdb')" 
-									@click.stop="showAssociateComputeData=true,showAssociateChart=false"
-									src="~@/assets/img/icons/associate_data.png" 
-									style="width: 14px; height: 14px;margin-left: 8px"
-									alt=""
-								/> -->
+							
 							</span>
 						</span>
 					</el-tree>
@@ -403,9 +384,8 @@
 				
 			</div>
 		</div>
-		<!-- 输入英文指标弹窗 -->
-		<!-- <set-en-name-dia :isOpenDialog="setEnName" @cancel="setEnName=false" 
-		:formData="formItemArray" @updateEnName="updateEnName" cType="ebd" /> -->
+
+
 
 		<!-- 目录弹窗 -->
 		<openDialog 
@@ -551,11 +531,7 @@
 			@success="updateNewest"
 		/>
 
-		 <!-- 指标历史记录 -->
-    <!-- <edbHistoryDialog
-      :isOpenDialog.sync="isLookHistory"
-      :edbId="lookEdbId"
-    /> -->
+
 		<!-- 指数修匀弹窗 -->
 		<SmoothEdbDialog 
 			:is-open-smooth="computed_type==='alpha'"
@@ -601,7 +577,7 @@ import addTargetDiaBase from './databaseComponents/addTargetDiaBase';
 import completeTargetDia from './databaseComponents/completeTargetDia'
 import computedDialog from './databaseComponents/computedDialog';
 import operationDialog from './databaseComponents/operationDialog';
-import createChart from './databaseComponents/createChart';
+// import createChart from './databaseComponents/createChart';
 import updateDialog from './databaseComponents/updateDialog';
 import replaceDialog from './databaseComponents/replaceDialog';
 import jointTargetDia from './databaseComponents/jointTargetDia';
@@ -628,7 +604,7 @@ export default {
 		completeTargetDia,
 		computedDialog,
 		operationDialog,
-		createChart,
+		// createChart,
 		updateDialog,
 		replaceDialog,
 		jointTargetDia,
@@ -728,8 +704,7 @@ export default {
 			edb_source:0,//指标来源 显示计算按钮
 			calculateLoading: false,//计算指标刷新loading
 			refreshLoading: false,//基础指标刷新loading
-			/* 一键成图弹窗 */
-			isCreateChart: false,
+
 			/* 一键更新弹窗 */
 			isUpdate:false,
 			/* 替换指标弹窗 */
@@ -841,11 +816,7 @@ export default {
 				return role;
 			}
 		},
-		/* 登录角色id */
-		roleId() {
-			let id = parseInt(localStorage.getItem('AdminId'));
-			return id;
-		},
+
 		//指标详情，也就是tableData[0]
 		EdbData(){
 			return this.tableData[0]?this.tableData[0]:{Button:{},DataInsertConfig:{},DataList:[]}
@@ -980,8 +951,6 @@ export default {
 						}
 					})
 					this.CanOpClassify = res.Data.CanOpClassify;
-					// this.currentLang = res.Data.Language === 'EN' ? 'en' : 'ch';
-					// this.setLangIntoStore()
 					this.showData = true;
 					/* 处理树展开和选中图表 */
 					params && this.selectCurrentNode(params);
@@ -1967,10 +1936,6 @@ export default {
 			})
 		},
 
-		/* 	一键成图 */
-		createChartHandle() {
-			this.isCreateChart = true;
-		},
 		
 		/* 重新刷新 重新计算后重置刷数据 */
 		initDataStatus() {