收藏目录

src/api/modules/chartApi.js

@@ -1441,7 +1441,7 @@ const edbCollectInterface = {
 		},
 		
 		/**
-		 * 取消收藏发指标
+		 * 取消收藏指标
 		 * @param {*} params ClassifyId EdbInfoId
 		 * @returns 
 		 */
@@ -1455,7 +1455,7 @@ const edbCollectInterface = {
 		 * @returns 
 		 */
 		getCollectEdb: params => {
-			return http.post('/datamanage/edb_collect/list',params)
+			return http.get('/datamanage/edb_collect/list',params)
 		},
 }
 

src/components/antvVueComponents/tooltipCom.vue

@@ -103,12 +103,13 @@ export default {
       this.show=false
     },
     nodeClick(){
-      if(this.params.stopNodeClick) return 
+      if(this.params.stopNodeClick) return
       //EdbInfoType 1:跳预测指标详情 0:跳指标库详情
-      const { ClassifyId, UniqueCode, EdbInfoId, EdbInfoType } = this.data.routeQuery
-      let { href } =
-      this.$router.resolve({ path: EdbInfoType === 1 ? '/predictEdb' : '/database', query: { code: UniqueCode, id:
-      EdbInfoId, classifyId: ClassifyId } });
+      const { ClassifyId, UniqueCode, EdbInfoId, EdbInfoType,EdbType,HaveOperaAuth } = this.data.routeQuery
+      if(!HaveOperaAuth) return this.$message.warning('暂无指标权限')
+
+      let { href } = this.$router.resolve({ path: EdbInfoType === 1 ? '/predictEdb' : (EdbType===1?'/edbBasicbase':'/database'), 
+        query: { code: UniqueCode, id:EdbInfoId, classifyId: ClassifyId } });
       window.open(href, '_blank');
     }
   },

src/utils/buttonConfig.js

@@ -366,12 +366,11 @@ export const edbDataPermission = {
 
 
     /* 拆分 数据查看特有权限 */
-    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',//收藏分类移动
+    edbData_edbCollect_collect:'edbData:edbCollect:collect',//收藏/移出
+    edbBaseData_view:'edbBaseData:view',//查看`
+    edbData_edbCollectClassify_save:'edbData:edbCollectClassify:save',//收藏分类编辑
+    edbData_edbCollectClassify_remove:'edbData:edbCollectClassify:remove',//收藏分类删除
+    edbData_edbCollectClassify_move:'edbData:edbCollectClassify:move',//收藏分类移动
 }
 /*
  * ---------------------------------------------------------------------------ETA预测指标------------------------------------------------

src/views/dataEntry_manage/databaseComponents/addCollectClassifyDia.vue

@@ -0,0 +1,112 @@
+<template>
+  <el-dialog
+		:visible.sync="show"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="form.classifyId?'编辑目录':'新增目录'"
+		@close="closeDia"
+		custom-class="edbCollect-classify-dialog"
+		center
+		width="650px"
+		v-dialogDrag
+  >
+    <el-form 
+        :model="classifyForm" 
+        :rules="formRules" 
+        ref="formRef" 
+        hide-required-asterisk
+        label-width="auto"
+    >
+        <!-- 目录名称 -->
+        <el-form-item prop="classifyName" label="目录名称">
+            <el-input 
+                type="text" 
+                v-model="classifyForm.classifyName" 
+                placeholder="请输入目录名称"
+                style="width:80%"
+            />
+        </el-form-item>
+    </el-form>
+
+    <div class="footer" style="margin-top: 20px;">
+        <el-button
+          @click="closeDia"
+        >{{ $t('Dialog.cancel_btn') }}</el-button>
+        <el-button
+          @click="saveClassifyHandle"
+        type="primary"
+        >{{ $t('Dialog.confirm_save_btn') }}</el-button>
+    </div>
+  </el-dialog>  
+</template>
+
+<script>
+import { edbCollectInterface } from '@/api/modules/chartApi'
+export default {
+  props: {
+    show: {
+      type: Boolean
+    },
+    form: {
+      type:Object
+    }
+  },
+  watch: {
+    show(newVal) {
+      if(!newVal) return 
+      this.classifyForm.classifyName = this.form.name;
+    }
+  },
+  data() {
+    return {
+      classifyForm: {
+        classifyName:""
+      },
+
+      formRules: {
+        classifyName: [{ required:true,message:'目录名称不能为空',trigger:'blur'}]
+      }
+    }
+  },
+  methods: {
+    closeDia() {
+      this.$refs.formRef.resetFields()
+      this.$emit('update:show',false)
+    },
+
+    async saveClassifyHandle() {
+      await this.$refs.formRef.validate()
+      
+      const res = this.form.classifyId
+        ? await edbCollectInterface.editCollectClassify({
+            ClassifyName: this.classifyForm.classifyName,
+            ClassifyId: this.form.classifyId
+          })
+        : await edbCollectInterface.addCollectClassify({
+            ClassifyName: this.classifyForm.classifyName,
+          })
+
+      if(res.Ret !== 200) return
+      this.$message.success(this.form.classifyId?'编辑成功':'新增成功');
+      this.closeDia()
+      this.$emit('confirm')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.edbCollect-classify-dialog {
+  .el-form {
+    padding: 0 40px;
+  }
+  .footer {
+    display: flex;
+    justify-content: center;
+    margin: 40px 0;
+    .el-button {
+      width: 130px;
+    }
+  }
+}
+</style>

src/views/dataEntry_manage/databaseComponents/collectEdbMenu.vue

@@ -3,22 +3,29 @@
         ref="catalogTree"
         class="catalog-tree other-tree"
         empty-text="暂无图库"
-        :data="ownClassifyList"
-        node-key="nodeKeyId"
+        :data="data"
+        node-key="UniqueCode"
         :expand-on-click-node="false"
-        @current-change="(data,node)=>{nodeChange(data,node)}"
+        @current-change="(data,node)=>{$parent.nodeChange(data,node)}"
         >
         <div class="custom-tree-node" slot-scope="{ data }">
-            <span class="tree-label">{{ data.name }}</span>
+            <span class="tree-label">{{ data.ClassifyName }}</span>
             <div class="right-item right-item-box" >
-                <el-dropdown @command="handleCommand" trigger="click" v-if="data.MyChartClassifyId">
-                <span class="el-dropdown-link"> 
-                    <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="{key:'copy'}" :disabled="select_classify_userid === roleId"><!-- 复制 -->{{$t('MyEtaPage.option_op_copy')}}</el-dropdown-item>
-                </el-dropdown-menu>
-                </el-dropdown>
+                <img
+                  src="~@/assets/img/set_m/edit.png"
+                  alt=""
+                  style="width: 15px; height: 14px; margin-right: 8px"
+                  @click.stop="$parent.handleOpenCollectClassify(data)"
+                  v-if="!data.EdbCode&&$parent.isEdbBtnShow('edbData_edbCollectClassify_save')"
+                />
+
+                <img
+                  src="~@/assets/img/set_m/del_icon.png"
+                  alt=""
+                  style="width: 14px; height: 14px;"
+                  @click.stop="removeCollectNode(data)"
+                  v-if="!data.EdbCode&&$parent.isEdbBtnShow('edbData_edbCollectClassify_remove')"
+                />
             </div>
         </div>
     </el-tree>
@@ -34,10 +41,24 @@ export default {
   },
   data() {
     return {
-      ownClassifyList: []
-
+    }
+  },
+  methods: {
+    removeCollectNode({ClassifyId}) {
+      this.$confirm('若删除该目录，则目录下收藏的所有指标将被清除, 是否继续?',
+          '提示',
+          { type: 'warning' }
+      ).then(async () => {
+        const res = await edbCollectInterface.delCollectClassify({
+          ClassifyId
+        })
 
+        if(res.Ret !== 200) return
+        this.$message.success('删除成功')
 
+        this.$emit('change')
+      })
+      
     }
   }
 }

src/views/dataEntry_manage/databaseComponents/edbCollectDia.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="edbCollectDia-container">
     <el-dialog
-      :visible.sync="isAddMyDialog"
+      :visible.sync="show"
       :close-on-click-modal="false"
       :modal-append-to-body="false"
       title="收藏"
@@ -15,18 +15,17 @@
         <div class="classify-cont">
           <el-tag
             v-for="item in classifyArr"
-            :class="['classify-tag',{'act': selected_classify.includes(item.MyChartClassifyId)}]"
-            :key="item.MyChartClassifyId"
+            :class="['classify-tag',{'act': checkedClassifys.includes(item.ClassifyId)}]"
+            :key="item.ClassifyId"
             type="info"
             effect="plain"
-            @click="chooseClassify(item.MyChartClassifyId)"
+            @click="chooseClassify(item.ClassifyId)"
           >
-            {{ item.MyChartClassifyName }}
+            {{ item.ClassifyName }}
           </el-tag>
         </div>
-        <span class="add-cont" @click="addClassify">
-          <i class="el-icon-circle-plus-outline" />
-          新增
+        <span class="add-cont" @click="$parent.handleOpenCollectClassify">
+          <i class="el-icon-circle-plus-outline" />新增
         </span>
       </div>
       <div class="dia-bot">
@@ -40,18 +39,14 @@
 </template>
 
 <script>
-import { mychartInterface } from '@/api/api.js'
-import pubDialog from '@/components/pubDialog.vue';
+import { edbCollectInterface } from '@/api/modules/chartApi'
 export default {
 	name:'',
-	components: {
-		pubDialog
-	},
 	props: {
-		isAddMyDialog: {
+		show: {
 			type: Boolean,
 		},
-    add_id: {
+    edbId: {
       type: Number,
     },
     add_ids: {
@@ -60,32 +55,16 @@ export default {
     }
 	},
 	watch: {
-		isAddMyDialog(newval) {
+		show(newval) {
 			if(newval) {
 				this.getClassify();
-        console.log(this.add_ids)
 			}
 		}
 	},
 	data () {
 		return {
 			classifyArr:[],//分类列表
-      selected_classify: [],
-			//新增弹窗
-			isClassifyDia: false,
-      dia_title: /* '新增分类' */this.$t('EtaChartPage.add_my_classify'),
-      dialogKeyArrs: [
-        {
-          label: /* '分类名称' */ this.$t('Chart.classify_name_label'),
-          prop: 'name',
-          type: 'input',
-          maxlen: 10,
-          placeholder: /* '请输入分类名称' */this.$t('Chart.InputHolderAll.input_classify'),
-        },
-      ],
-      formData: {
-        name: ''
-      },
+      checkedClassifys: [],
 			addRules: {
 				name:[
 					{ required: true, message: /* '分类名称不能为空' */this.$t('Chart.Vailds.classify_msg'), trigger: 'blur' },
@@ -96,62 +75,42 @@ export default {
 	methods: {
 		/* 获取分类列表 */
 		getClassify() {
-			mychartInterface.classifyList()
+			edbCollectInterface.getEdbCollectClassifyOne()
 				.then(res => {
 					if(res.Ret !== 200) return
-					this.classifyArr = res.Data ? res.Data.List : [];
-          this.selected_classify = _.cloneDeep(this.add_ids);
+					this.classifyArr = res.Data || [];
+          this.checkedClassifys = _.cloneDeep(this.add_ids);
 				})
 		},
 
     chooseClassify(id) {
-      if(this.selected_classify.includes(id)) {
-        let index = this.selected_classify.indexOf(id);
-        this.selected_classify.splice(index, 1);
+      if(this.checkedClassifys.includes(id)) {
+        let index = this.checkedClassifys.indexOf(id);
+        this.checkedClassifys.splice(index, 1);
       }else {
-        this.selected_classify.push(id);
+        this.checkedClassifys.push(id);
       }
     },
 
-		/* 添加分类 */
-		addClassify() {
-			this.isClassifyDia = true;
-		},
-    /* 新增分类回调 */
-    addNewClassifyHandle({name}) {
-      mychartInterface.addClassify({
-        MyChartClassifyName: name
-      }).then(res => {
-        if(res.Ret !== 200) return
-        this.isClassifyDia = false;
-        this.getClassify();
-      })
-    },
-
     /* 加入收藏 */
     saveHandle() {
-      if(!this.selected_classify.length) return this.$message.warning(/* '请选择分类' */this.$t('MsgPrompt.select_category'));
-      mychartInterface.add({
-        ChartInfoId: this.add_id,
-        MyChartClassifyId: this.selected_classify
+      if(!this.checkedClassifys.length) return this.$message.warning('请选择分类');
+      edbCollectInterface.edbCollect({
+        EdbInfoId: this.edbId,
+        ClassifyId: this.checkedClassifys[0]
       }).then(res => {
         if(res.Ret !== 200) return 
-        this.$message.success(/* '已加入我的图库' */this.$t('Chart.OptMsg.add_mine_success'))
-        this.$emit('addSuccess',res.Data)
+        this.$message.success('收藏成功')
+        this.$emit('success',res.Data)
+        this.cancelHandle()
       })
     },
-
-    init() {
-      this.selected_classify = [];
-    },
     
 		cancelHandle() {
-      this.init()
-			this.$emit('cancel')
+      this.checkedClassifys = [];
+			this.$emit('update:show')
 		}
 	},
-	created() {},
-	mounted() {},
 }
 </script>
 <style lang="scss">

src/views/dataEntry_manage/databaseList.vue

@@ -189,7 +189,7 @@
 									<!-- 删除节点 如果是分类，判断data.Button.DeleteButton不变；如果是指标，不显示(ETA1.0.3) -->
 									<img
 										slot="reference"
-										src="~@/assets/img/set_m/del.png"
+										src="~@/assets/img/set_m/del_icon.png"
 										alt=""
 										style="width: 14px; height: 14px;"
 										@click.stop="removeNode(node,data)"
@@ -204,17 +204,30 @@
 						<collectEdbMenu
 							v-else
 							:data="treeData"
+							@change="getTreeData"
 						/>
 					</div>
 
-					<div class="noDepart" @click="addLevelOneHandle" v-if="CanOpClassify&&isEdbBtnShow('editCatalog')">
-						<img
-							src="~@/assets/img/set_m/add_ico.png"
-							alt=""
-							style="width: 16px; height: 16px; margin-right: 10px"
-						/>
-						<span>{{$t('EtaBasePage.add_first_menu_btn')}}</span>
-					</div>
+					<template>
+						<!-- 新增分类 -->
+						<div class="noDepart" @click="addLevelOneHandle" v-if="classifyShowType==='public'&&CanOpClassify&&isEdbBtnShow('editCatalog')">
+							<img
+								src="~@/assets/img/set_m/add_ico.png"
+								alt=""
+								style="width: 16px; height: 16px; margin-right: 10px"
+							/>
+							<span>{{$t('EtaBasePage.add_first_menu_btn')}}</span>
+						</div>
+						<!-- 新增收藏分类 -->
+						<div class="noDepart" @click="handleOpenCollectClassify" v-if="classifyShowType==='own'&&isEdbBtnShow('edbData_edbCollectClassify_save')">
+							<img
+								src="~@/assets/img/set_m/add_ico.png"
+								alt=""
+								style="width: 16px; height: 16px; margin-right: 10px"
+							/>
+							<span>{{$t('EtaBasePage.add_first_menu_btn')}}</span>
+						</div>
+					</template>
 				</div>
 				<span class="move-btn resize" v-drag id="resize" @mousemove="dynamicNode&&resetNodeStyle(dynamicNode)">
 				</span>
@@ -253,7 +266,7 @@
 								class="enable-toggle-btn" :style="{'color': item.NoUpdate==1?'#0052D9':'#D54941'}"
 								@click="toggleEdbRefreshStatus(item)">{{item.NoUpdate==1?$t('SystemManage.DataRefresh.enable'):$t('SystemManage.DataRefresh.disable') }}</span>
 
-								<span class="deletesty" v-if="classifyShowType==='own'">移出</span>
+								<span class="deletesty" v-if="classifyShowType==='own'&&isEdbBtnShow('edbData_edbCollect_collect')" @click="handleRemoveCollect(item)">移出</span>
 							</div>
 							<img src="~@/assets/img/icons/edb-stopping.png" class="stop-mark" v-if="([2,34].includes(item.Source) || item.EdbType==2) && ( item.IsSupplierStop==1 || (item.IsSupplierStop==0&&item.NoUpdate==1))" />
 						</div>
@@ -264,6 +277,7 @@
 					<tableNoData :text="$t('Table.no_edb_msg')"/>
 				</div>
 			</div>
+
 			<!-- 指标详情 -->
 			<div class="main-right right detail-wrap" id="right" v-show="isShowDetail">
 				<div class="detail" v-if="EdbData.HaveOperaAuth">
@@ -281,10 +295,11 @@
 								: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="EdbData.EdbType===1 && isEdbBtnShow('edbBaseData_collect')"
+								v-if=" isEdbBtnShow('edbData_edbCollect_collect')"
 								type="text" 
-								@click="handleCollectEdb" 
+								@click="EdbData.IsCollect?handleRemoveCollect():handleCollectEdb()" 
 							>{{EdbData.IsCollect?'移出':'收藏'}}</el-button>
 							<el-button 
 								v-if="isEdbBtnShow('update')"
@@ -608,6 +623,20 @@
 		<!-- 指标已经被引用 -->
 		<edbHasUsedDia :show.sync="edbHasUsedDiaShow" :dataList="hasUsedList"/>
 
+		<!-- 指标收藏弹窗 -->
+		<edbCollectDia
+			ref="edbCollectRef"
+			:show.sync="isOpenEdbCollectDia"
+			:edbId="selected_edbid"
+			@success="edbData.IsCollect=true"
+		/>
+
+		<!-- 添加收藏分类弹窗 -->
+		<addCollectClassifyDia
+			:show.sync="isOpenCollectClassifyDia"
+			:form="collectClassifyForm"
+			@confirm="getTreeData();isOpenEdbCollectDia&&$refs.edbCollectRef.getClassify()"
+		/>
 	</div>
 </template>
 
@@ -642,6 +671,7 @@ import setLangInfoDia from './components/setLangInfo.vue'
 import edbHasUsedDia from './components/edbHasUsedDia.vue';
 import collectEdbMenu from './databaseComponents/collectEdbMenu.vue';
 import edbCollectDia from './databaseComponents/edbCollectDia.vue';
+import addCollectClassifyDia from './databaseComponents/addCollectClassifyDia.vue';
 export default {
 	name: '',
 	components: {
@@ -670,7 +700,8 @@ export default {
 		setLangInfoDia,
 		edbHasUsedDia,
 		collectEdbMenu,
-		edbCollectDia
+		edbCollectDia,
+		addCollectClassifyDia
 	},
 	directives: {
 		drag(el, bindings,vnode) {
@@ -810,7 +841,12 @@ export default {
 			hasUsedList:[],
 
 			/* 目录分类 */
-			classifyShowType:'public'
+			classifyShowType:'public',
+			//指标收藏弹窗
+			isOpenEdbCollectDia: false,
+			//收藏分类弹窗
+			isOpenCollectClassifyDia: false,
+			collectClassifyForm: {}
 		};
 	},
 	watch: {
@@ -992,7 +1028,11 @@ export default {
 				'checkCalcChart':edbDataPermission.edbData_checkCalcChart,//查看计算指标
 				'enableOrDisable':edbDataPermission.edbData_enableOrDisable,//启用/停用
 
-				'edbBaseData_collect': edbDataPermission.edbBaseData_collect,//收藏移出
+				'edbData_edbCollect_collect': edbDataPermission.edbData_edbCollect_collect,//收藏移出
+				'edbData_edbCollectClassify_save': edbDataPermission.edbData_edbCollectClassify_save,//收藏分类编辑
+				'edbData_edbCollectClassify_remove': edbDataPermission.edbData_edbCollectClassify_remove,//收藏分类删除
+				'edbData_edbCollectClassify_move': edbDataPermission.edbData_edbCollectClassify_move,//收藏分类移动
+				'edbData_edbCollectClassify_remove': edbDataPermission.edbData_edbCollectClassify_remove,//收藏分类移动
 			}
 			return checkPermissionBtn(BtnMap[type])
 		},
@@ -1008,21 +1048,24 @@ export default {
 
 	
 					if(res.Ret!==200) return 
-					const arr=res.Data.AllNodes || []
-					this.treeData=arr.map(item=>{
-						return {
-							...item,
-							// isLeaf:item.Children.length?false:true
-						}
-					})
-					
-					this.CanOpClassify = res.Data.CanOpClassify;
 					this.showData = true;
 
 					if(this.classifyShowType==='public') {
+						const arr=res.Data.AllNodes || []
+						this.treeData=arr.map(item=>{
+							return {
+								...item,
+								// isLeaf:item.Children.length?false:true
+							}
+						})
+						
+						this.CanOpClassify = res.Data.CanOpClassify;
+
 						/* 处理树展开和选中图表 */
 						params && this.selectCurrentNode(params);
 						!params && this.select_node && this.$refs.menuTree.setCurrentKey(this.select_node);
+					}else {
+						this.treeData = res.Data||[]
 					}
 		},
 		/* 获取最新的指标 默认展示 */
@@ -1115,21 +1158,27 @@ export default {
 			})
 		}),
 		//获取指标图表列表
-		getEdbChartList(){
-			dataBaseInterface.getEdbChartList({
-				PageSize:this.PageSize,
-				CurrentIndex:this.CurrentIndex,
-				ClassifyId:this.select_classifyId,
-				IsOnlyMe:this.IsOnlyMe,
-				EdbType: this.isBasicBase?1:2
-			}).then(res=>{
+		async getEdbChartList(){
+			const res = this.classifyShowType === 'own' 
+				? await edbCollectInterface.getCollectEdb({
+						PageSize:this.PageSize,
+						CurrentIndex:this.CurrentIndex,
+						ClassifyId:this.select_classifyId,
+						Keyword: this.search_txt
+					})
+ 				:	await dataBaseInterface.getEdbChartList({
+						PageSize:this.PageSize,
+						CurrentIndex:this.CurrentIndex,
+						ClassifyId:this.select_classifyId,
+						IsOnlyMe:this.IsOnlyMe,
+						EdbType: this.isBasicBase?1:2
+					})
 				if(res.Ret!==200) return
 				if(res.Data){
 					this.chartList = this.CurrentIndex===1?res.Data.List:[...this.chartList,...res.Data.List]
 					this.Total = res.Data.Paging.Totals||0
 					this.IsListEnd = res.Data.Paging.IsEnd
 				}
-			})
 		},
 		// 切换刷新状态
 		async toggleEdbRefreshStatus(item,type='list'){
@@ -2073,7 +2122,7 @@ export default {
 				return
 			}
 			//根据页面宽度 判断标签数量是否达到上限
-			const listWidth = document.querySelector('.database-label').offsetWidth
+			const listWidth = document.querySelector('.database-label')&&document.querySelector('.database-label').offsetWidth
 			const minWidth=170+20
 			const maxNum = Math.floor(listWidth/minWidth)
 			if(this.labelList.length>=maxNum){
@@ -2205,7 +2254,27 @@ export default {
 
 		/* 收藏指标 */
 		handleCollectEdb() {
+			this.isOpenEdbCollectDia = true
+		},
+
+		async handleRemoveCollect(item=null) {
+			const res = await edbCollectInterface.edbCollectCancel({
+				ClassifyId: this.select_classifyId,
+				EdbInfoId: item?item.EdbInfoId:this.selected_edbid
+			})
+
+			if(res.Ret !== 200) return 
+			this.$message.success('收藏成功')
+			this.getTreeData()
+			this.getEdbChartList()
+		},
 
+		handleOpenCollectClassify(data=null) {
+			this.collectClassifyForm = {
+				name: data?data.ClassifyName:'',
+				classifyId:data?data.ClassifyId:0
+			}
+			this.isOpenCollectClassifyDia = true
 		}
 	},
 	//离开页面时保存标签

src/views/edbHistoryPage.vue

@@ -185,7 +185,9 @@ export default {
                         ClassifyId:this.treeData.ClassifyId, 
                         UniqueCode:this.treeData.UniqueCode, 
                         EdbInfoId:this.treeData.EdbInfoId, 
-                        EdbInfoType:this.treeData.EdbInfoType
+                        EdbInfoType:this.treeData.EdbInfoType,
+                        EdbType:this.treeData.EdbType,
+                        HaveOperaAuth:this.treeData.HaveOperaAuth,
                     },
                     isRoot:true,
                     isLeaf:(this.treeData.Child && this.treeData.Child.length>0)?false:true,
@@ -232,7 +234,9 @@ export default {
                             ClassifyId:element.ClassifyId, 
                             UniqueCode:element.UniqueCode, 
                             EdbInfoId:element.EdbInfoId, 
-                            EdbInfoType:element.EdbInfoType
+                            EdbInfoType:element.EdbInfoType,
+                            EdbType:element.EdbType,
+                            HaveOperaAuth:element.HaveOperaAuth,
                         },
                         isRoot:false,
                         isLeaf:(element.Child && element.Child.length>0)?false:true,