Karsa 8 月之前
父节点
当前提交
51a0647502

+ 5 - 1
src/views/dataEntry_manage/databaseComponents/openDialog.vue

@@ -99,6 +99,9 @@ export default {
 		},
 		formData: {
 			type: Object,//{parentArr父级数据,isEDB:true 是否为指标}
+		},
+		isBasicBase: {
+			type: Boolean
 		}
 	},
 	watch: {
@@ -175,7 +178,8 @@ export default {
           res = await dataBaseInterface.nodeAdd({
 						ClassifyName: this.formData.levelVal||'',
 						ParentId:this.formData.parent_id || 0,
-						Level: this.formData.level
+						Level: this.formData.level,
+						ClassifyType: this.isBasicBase ? 0 : 2
 					})
         }
 				

+ 21 - 11
src/views/dataEntry_manage/databaseList.vue

@@ -52,7 +52,7 @@
 
 				<el-input
 					v-else
-					v-model="search_txt" 
+					v-model="searchCollectWord" 
 					:placeholder="$t('Edb.InputHolderAll.input_name_orid')"
 					style="width: 260px;"
 					@change="getEdbChartList"
@@ -256,11 +256,12 @@
 								<span v-show="currentLang=='zh'">{{ item.EdbName }}</span> 
 								<span v-show="currentLang=='en'">{{ item.EdbNameEn || item.EdbName }}</span>
 							</div>
+							<!-- !item.HaveOperaAuth ? $icons.lock_big : -->
 							<div class="image" @click="detailShowHandle(item)"
-								:style="{background: `no-repeat top/cover url('${!item.HaveOperaAuth ? $icons.lock_big : item.ChartImage}')`}">
+								:style="{background: `no-repeat top/cover url('${ item.ChartImage}')`}">
 							</div>
 							<div class="info">
-								{{$t('EtaBasePage.time_show')}}:{{item.CreateTime.substring(0,10)}}
+								{{$t('EtaBasePage.time_show')}}:{{item.CreateTime?item.CreateTime.substring(0,10):''}}
 								<!-- wind和钢联化工的指标、计算指标显示 启用/停用-->
 								<span v-if="([2,34].includes(item.Source) || item.EdbType==2) && isEdbBtnShow('enableOrDisable')&&item.IsSupplierStop!=1" 
 								class="enable-toggle-btn" :style="{'color': item.NoUpdate==1?'#0052D9':'#D54941'}"
@@ -295,12 +296,12 @@
 								:style="{'color': EdbData.NoUpdate==1?'#0052D9':'#D54941'}"
 								@click="toggleEdbRefreshStatus(EdbData,'detail')" 
 							>{{EdbData.NoUpdate==1?$t('SystemManage.DataRefresh.enable'):$t('SystemManage.DataRefresh.disable') }}<!-- 启用/停用 --></el-button>
-							<!-- EdbData.EdbType===1 && -->
+
 							<el-button 
-								v-if=" isEdbBtnShow('edbData_edbCollect_collect')"
-								type="text" 
-								@click="EdbData.IsCollect?handleRemoveCollect():handleCollectEdb()" 
-							>{{EdbData.IsCollect?'移出':'收藏'}}</el-button>
+								v-if="isBasicBase&&isEdbBtnShow('edbData_edbCollect_collect')"
+								type="text"
+								@click="classifyShowType==='own'?handleRemoveCollect():handleCollectEdb()" 
+							>{{classifyShowType==='own'?'移出':'收藏'}}</el-button>
 							<el-button 
 								v-if="isEdbBtnShow('update')"
 								type="text" 
@@ -449,6 +450,7 @@
 		<openDialog 
 			:isOpenDialog="isOpenDialog"
 			:title="dialog_title"
+			:isBasicBase="isBasicBase"
 			:formData="dialogForm"
 			@closeDia="isOpenDialog=false"
 			@sucessCallback="sucessCallback"
@@ -842,6 +844,7 @@ export default {
 
 			/* 目录分类 */
 			classifyShowType:'public',
+			searchCollectWord:'',
 			//指标收藏弹窗
 			isOpenEdbCollectDia: false,
 			//收藏分类弹窗
@@ -1066,6 +1069,9 @@ export default {
 						!params && this.select_node && this.$refs.menuTree.setCurrentKey(this.select_node);
 					}else {
 						this.treeData = res.Data||[]
+						this.select_classify =
+							this.select_classify ||
+							(this.treeData.length ? this.treeData[0].ClassifyId:0);
 					}
 		},
 		/* 获取最新的指标 默认展示 */
@@ -1108,7 +1114,7 @@ export default {
 						// 展开目录
 						this.defaultShowNodes=classify_arr.map(item=>item.UniqueCode)
 						//设置tree高亮
-						this.$nextTick(()=>{
+						this.$refs.menuTree&&this.$nextTick(()=>{
 							setTimeout(() => {
 								this.$refs.menuTree.setCurrentKey(UniqueCode);
 							}, 1000);
@@ -1133,7 +1139,7 @@ export default {
 							this.$refs.edb_detail_data.$refs.valueUl.scrollTop=0
 						}
 					}
-					this.$nextTick(()=>{
+					this.$refs.menuTree&&this.$nextTick(()=>{
 						const _node = this.$refs.menuTree.getNode(this.select_node)
 						this.dynamicNode = _node;
 						this.dynamicNode&&this.resetNodeStyle(this.dynamicNode)
@@ -1164,7 +1170,7 @@ export default {
 						PageSize:this.PageSize,
 						CurrentIndex:this.CurrentIndex,
 						ClassifyId:this.select_classifyId,
-						Keyword: this.search_txt
+						Keyword: this.searchCollectWord
 					})
  				:	await dataBaseInterface.getEdbChartList({
 						PageSize:this.PageSize,
@@ -2246,8 +2252,12 @@ export default {
 		/* 切换分类类型 */
 		handleChangeClassifyType() {
 			this.defaultShowNodes = [];
+			this.chartList = [];
+			this.Total = 0;
 			this.selected_edbid = 0;
 			this.select_classifyId = 0;
+			this.search_txt = '';
+			this.searchCollectWord = '';
 			this.getTreeData()
 			this.getEdbChartList()
 		},

+ 3 - 3
src/views/system_manage/dataOperaAuth.vue

@@ -301,8 +301,8 @@ export default {
   computed: {
     tabs(){
       const tabs = [
-        { label: this.$t('SystemManage.OperateAuth.tab01'), key: 1 },
-        { label: this.$t('SystemManage.OperateAuth.tab02'), key: 2 },
+        // { label: this.$t('SystemManage.OperateAuth.tab01'), key: 1 },
+        // { label: this.$t('SystemManage.OperateAuth.tab02'), key: 2 },
         // { label: this.$t('SystemManage.OperateAuth.tab03'), key: 3 },
         { label: '数据查看', key: 3 },
         { label: '指标加工', key: 7 },
@@ -607,7 +607,7 @@ export default {
     },
 
     changeSet() {
-      this.changeTab({key: this.currAuthSet===1?1:3})
+      this.changeTab({key: 3})
       this.getUserDataCount()
     },