fix some bugs

src/views/knowledge/common/chart.vue

@@ -226,7 +226,16 @@ export default {
 	},
 	watch: {
 		nodes: function() {
-			this.chartNodes = this.nodes
+			this.chartNodes = []
+			const nodes = this.nodes
+			if(nodes){
+				for (let i = 0; i < nodes.length; i++) {
+					// 不知道为啥会有空id.
+					if(nodes[i].id){
+						this.chartNodes.push(nodes[i])
+					}
+				}
+			}
 		},
 		links: function() {
 			this.chartLinks = this.links
@@ -598,7 +607,7 @@ function linkStyle(link) {
 function getNodes(nodes) {
 	if(nodes){
 		nodes.forEach((node, index) => {
-			if (node.entID) node.id = node.entID
+			if (node.entId) node.id = node.entId
 			if (node.label === undefined) node.label = node.entName
 			if (!node_colors[node.entClsID]) {
 				node_colors[node.entClsID] = colors[index % nodes.length]
@@ -615,8 +624,8 @@ function getLinks(links) {
 	if(links){
 		links.forEach((link, index) => {
 			if (link.relID) link.id = link.relID
-			if (link.from === undefined) link.from = link.startEntID
-			if (link.to === undefined) link.to = link.endEntID
+			if (link.from === undefined) link.from = link.startEntId
+			if (link.to === undefined) link.to = link.endEntId
 			if (!link_colors[link.relClsID]) {
 				link_colors[link.relClsID] = colors[index % links.length]
 			}

src/views/knowledge/graphEntity/attrModelEditor.vue

@@ -75,10 +75,10 @@
 																:style="{ border: 'none' }">
 								<div class="menu-panel">
 									<p v-for="tab in item.children"
-										 :key="tab.relClsId"
+										 :key="tab.relClsID"
 										 class="left-menu-item"
-										 :class="{ active: activePanel === tab.relClsId }"
-										 @click="tabsChange(tab.relClsId)">
+										 :class="{ active: activePanel === tab.relClsID }"
+										 @click="tabsChange(tab.relClsID)">
 										<a-icon v-if="tab.direction === 'START'"
 														type="left-square" />
 										<a-icon v-if="tab.direction !== 'START'"
@@ -106,30 +106,27 @@
 						</a-collapse>
 						<div class="menu-panel">
 							<p v-for="tab in relclsList"
-								 :key="tab.relClsId"
+								 :key="tab.relClsID"
 								 class="left-menu-item"
-								 :class="{ active: activePanel === tab.relClsId }"
-								 @click="tabsChange(tab.relClsId)">
+								 :class="{ active: activePanel === tab.relClsID }"
+								 @click="tabsChange(tab.relClsID)">
 								<a-icon v-if="tab.direction === 'START'"
 												type="left-square" />
 								<a-icon v-if="tab.direction !== 'START'"
 												type="right-square" />
-								<!-- <ellipsis :length="50"
-													tooltip> -->
-									{{ tab.relClsName }}
-									<!-- <span slot="tooltipTitle"
+								<ellipsis :length="50"
+													tooltip>
+									<!-- {{ tab.relClsName }} -->
+									<span slot="tooltipTitle"
 												v-if="tab.direction === 'START'">
-										{{ entityClass }}->{{ tab.relClsName }}->{{
-                      tab.otherVName
-                    }}
+										{{ tab.relClsName }}->{{ tab.otherVName }}
 									</span>
 									<span slot="tooltipTitle"
 												v-else>
-										{{ tab.otherVName }}->{{ tab.relClsName }}->{{
-                      entityClass
-                    }} 
-									</span>-->
-								<!-- </ellipsis> -->
+										{{ tab.otherVName }}->{{ tab.relClsName }}
+									</span>
+									</ellipsis>
+								<!--
 							</p>
 						</div>
 					</a-collapse-panel>
@@ -140,10 +137,10 @@
 														:style="{ border: 'none' }">
 						<div class="menu-panel">
 							<p v-for="tab in attrcls"
-								 :key="tab.relClsId"
+								 :key="tab.relClsID"
 								 class="left-menu-item"
-								 :class="{ active: activePanel === tab.relClsId }"
-								 @click="tabsChange(tab.relClsId)">
+								 :class="{ active: activePanel === tab.relClsID }"
+								 @click="tabsChange(tab.relClsID)">
 								<a-icon v-if="tab.direction === 'START'"
 												type="left-square" />
 								<a-icon v-if="tab.direction !== 'START'"
@@ -311,8 +308,8 @@
 										style="float: right;margin-right: 10px;">上一步</a-button>
 				</div>
 				<div v-for="(tab, $index) in rlsList"
-						 :key="tab.relClsId">
-					<div v-if="activePanel === tab.relClsId"
+						 :key="tab.relClsID">
+					<div v-if="activePanel === tab.relClsID"
 							 style="padding: 15px 20px 0 20px;">
 						<attr-table ref="attrTableRef"
 												:entId="entId"
@@ -534,15 +531,15 @@
 
 					this.relclsLists.forEach((item) => {
 						item.children.forEach((_item) => {
-							vm.tabs.push(_item.relClsId);
+							vm.tabs.push(_item.relClsID);
 							vm.rlsList.push(_item);
 						});
 					});
 					this.relclsList.forEach((item) => {
-						vm.tabs.push(item.relClsId);
+						vm.tabs.push(item.relClsID);
 					});
 					this.attrcls.forEach((item) => {
-						vm.tabs.push(item.relClsId);
+						vm.tabs.push(item.relClsID);
 					});
 					vm.rlsList = this.rlsList.concat(this.relclsList.concat(this.attrcls));
 				});

src/views/knowledge/statistical/entityClassView.vue

@@ -75,7 +75,7 @@
   import { getAllEntityClass } from '@/api/graph/entityClass'
   import { getAllRelationClass } from '@/api/graph/relationClass'
   import { getGraphEntClsTree } from '@/api/graph/statisticalMap'
-  
+
 
   // 获取路径参数
   function getQueryVariable(variable) {
@@ -294,7 +294,7 @@
        * @params nodes: 处理好的实体数据, link: 处理好的关系数据
        * */
       drawChart(nodes, links) {
-        this.nodes = nodes
+        this.nodes = nodes.filter(item => item.id)
         this.links = links
         this.$refs.chart.destroyChart() // 先清空chart实例，再绘图
         this.$refs.chart.reDraw(undefined, nodes, links)

src/views/knowledge/statistical/statisticalMap_v1.vue

@@ -224,7 +224,7 @@ export default {
 				this.entName
 			).then((resp) => {
 				let data = resp.data
-				this.getJson(data)
+				// this.getJson(data)
 				this.$refs.chart.drawChart(
 					this.rootId,
 					data.entListVO,
@@ -323,18 +323,18 @@ export default {
 			)
             this.entName = value;
             this.getEntityList(undefined,this.degreeCache,value,this.entName).then(
-				(data) => {
-					this.getJson(data)
+				(resp) => {
+					// this.getJson(data)
 					this.isOpenRightMenu = false
-					this.entityClassList = data.entClsListVO
-					this.linkClassList = data.relClsListVO
-					this.nodes = data.entListVO
-					this.links = data.relListVO
+					this.entityClassList = resp.data.entClsListVO
+					this.linkClassList = resp.data.relClsListVO
+					this.nodes = resp.data.entListVO
+					this.links = resp.data.relListVO
 					this.rootId = undefined
 					this.$refs.chart.drawChart(
 						undefined,
-						data.entListVO,
-						data.relListVO
+						resp.data.entListVO,
+						resp.data.relListVO
 					)
 					this.spinning = false
 				}
@@ -358,18 +358,18 @@ export default {
 			}
 			this.spinning = true
 			this.getEntityList(selected.entId, this.degreeCache,this.entName).then(
-				(data) => {
-					this.getJson(data)
+				(resp) => {
+					// this.getJson(data)
 					this.isOpenRightMenu = false
-					this.entityClassList = data.entClsListVO
-					this.linkClassList = data.relClsListVO
-					this.nodes = data.entListVO
-					this.links = data.relListVO
+					this.entityClassList = resp.data.entClsListVO
+					this.linkClassList = resp.data.relClsListVO
+					this.nodes = resp.data.entListVO
+					this.links = resp.data.relListVO
 					this.rootId = selected.entId
 					this.$refs.chart.drawChart(
 						selected.entId,
-						data.entListVO,
-						data.relListVO
+						resp.data.entListVO,
+						resp.data.relListVO
 					)
 					this.spinning = false
 				}
@@ -493,21 +493,22 @@ export default {
                             entConditionQueries: entConditionQueries
                         }
                     
-                        getChart(data).then(__data => {
-                            this.getJson(__data)
+                        getChart(data).then(resp => {
+							debugger
+                            // this.getJson(__data)
 							this.tooltip.entityShow = false
 							this.tooltip.linkShow = false
-							this.entityClassList = __data.entClsListVO
-							this.linkClassList = __data.relClsListVO
-							this.nodes = __data.entListVO
-							this.links = __data.relListVO
+							this.entityClassList = resp.data.entClsListVO
+							this.linkClassList = resp.data.relClsListVO
+							this.nodes = resp.data.entListVO
+							this.links = resp.data.relListVO
 							this.directionsList.forEach((v) => {
 								v.checked = true
 							})
 							this.$refs.chart.reDraw(
 								this.rootId,
-								__data.entListVO,
-								__data.relListVO
+								resp.data.entListVO,
+								resp.data.relListVO
 							)
 							this.spinning = false
                         })
@@ -526,24 +527,24 @@ export default {
 		redrawChart(id) {
 			this.spinning = true
             if(this.chartType){
-                this.getEntityList(id, this.degreeCache,this.entName).then((data) => {
+                this.getEntityList(id, this.degreeCache,this.entName).then((resp) => {
                     this.rootId = id
                     this.tooltip.entId = false
                     this.tooltip.relID = false
                     this.$refs.fuzzySearch.clearSelected()
-                    this.entityClassList = data.entClsListVO
-                    this.linkClassList = data.relClsListVO
-                    this.nodes = data.entListVO
-                    this.links = data.relListVO
-                    this.$refs.chart.reDraw(id, data.entListVO, data.relListVO)        
+                    this.entityClassList = resp.data.entClsListVO
+                    this.linkClassList = resp.data.relClsListVO
+                    this.nodes = resp.data.entListVO
+                    this.links = resp.data.relListVO
+                    this.$refs.chart.reDraw(id, resp.data.entListVO, resp.data.relListVO)        
                     this.spinning = false
                 })
             }else{
                 //add
                 if(id!=this.rootId){//中心点变更
-                    this.getEntityList(id, this.degreeCache,this.entName).then((data) => {
-                        let nodes = data.entListVO
-                        let links = data.relListVO
+                    this.getEntityList(id, this.degreeCache,this.entName).then((resp) => {
+                        let nodes = resp.data.entListVO
+                        let links = resp.data.relListVO
                         let addNodes = nodes.filter(item =>{
                             return !this.nodes.some(c => {
                                 return c.entId===item.entId
@@ -599,20 +600,20 @@ export default {
 				// this.entityClassCache,
 				// this.linkClassCache,
 				// this.directionCache
-			).then((__data) => {
+			).then((resp) => {
 				this.tooltip.entityShow = false
 				this.tooltip.linkShow = false
-				this.entityClassList = __data.entClsListVO
-				this.linkClassList = __data.relClsListVO
-				this.nodes = __data.entListVO
-				this.links = __data.relListVO
+				this.entityClassList = resp.data.entClsListVO
+				this.linkClassList = resp.data.relClsListVO
+				this.nodes = resp.data.entListVO
+				this.links = resp.data.relListVO
 				this.directionsList.forEach((v) => {
 					v.checked = true
 				})
 				this.$refs.chart.reDraw(
 					this.rootId,
-					__data.entListVO,
-					__data.relListVO
+					resp.data.entListVO,
+					resp.data.relListVO
 				)
 				this.spinning = false
 			})
@@ -694,13 +695,13 @@ export default {
 					this.degreeCache,
                     this.entName
 				)
-				.then((res) => {
-					this.entityClassList = res.entClsListVO
-					this.linkClassList = res.relClsListVO
+				.then((resp) => {
+					this.entityClassList = resp.data.entClsListVO
+					this.linkClassList = resp.data.relClsListVO
 					this.$refs.chart.reDraw(
 						this.rootId,
-						res.entListVO,
-						res.relListVO
+						resp.data.entListVO,
+						resp.data.relListVO
 					)
 				})
 		},