Merge branch 'newmap' of http://173.18.12.196:3000/front/knowledgeMap into newmap

src/js/api.js

@@ -11,21 +11,6 @@ const api = {
   check: 'http://192.168.2.121:7010/test/testStandConvert',
   findEntity: "/entity/findEntity", //实体详情查询（根据id查询实体）
   deleteEntity: "/entity/deleteEntity", //批量删除实体
-
-  getCountList: "/kg/count/getCountList",
-  getCountInfo: "/kg/count/getCountInfo",
-  createEntity: "/entity/createEntity",//批量新增实体
-
-  updateEntityName: "/entity/updateEntityName",
-
-  createRelationship: "/relationship/createRelationship",
-  findRelationshipType: "/relationship/findRelationshipType", //根据名称模糊查询关系
-  updateRelationshipType: "/relationship/updateRelationshipType",
-  createEntityProperty: "/property/createEntityProperty", //批量新增实体属性
-  deleteRelationship: "/relationship/deleteRelationship",//批量删除关系
-  findEntityListByName: "/entity/findEntityListByName", //实体列表查询（根据标签和名字模糊查询实体）
-  updateEntityProperty: "/property/updateEntityProperty", //更新实体属性
-  deleteEntityProperty: "/property/deleteEntityProperty", //删除实体属性
   mergeEntity: "/entity/mergeEntity",//实体合并
 
 };

src/js/graphDataStatistics.js

@@ -1,7 +1,7 @@
 require("../css/graphDataStatistics.less")
 require("./../css/common.less");
 require("element-ui/lib/theme-chalk/index.css")
-const { post, api, getUrlArgObject } = require('./api.js');
+const { post, getUrlArgObject } = require('./api.js');
 
 const Vue = require("vue/dist/vue.esm.js").default;
 const ElementUI = require("element-ui/lib/index.js");
@@ -10,7 +10,10 @@ const $ = require('jquery')
 Vue.use(ElementUI)
 let myChart = null
 let timer = null //计时器标志
-
+const api = {
+  getCountList: "/kg/count/getCountList",
+  getCountInfo: "/kg/count/getCountInfo"
+}
 const vm = new Vue({
   el: "#app",
   name: "graphDataStatistics",

src/js/home.js

@@ -1,6 +1,6 @@
 require("../css/home.less")
 require("./../css/common.less");
-const { post, api, getUrlArgObject } = require('./api.js');
+const { post, getUrlArgObject } = require('./api.js');
 const Vue = require("vue/dist/vue.esm.js").default;
 const ElementUI = require("element-ui/lib/index.js");
 const $ = require('jquery')
@@ -11,6 +11,21 @@ const echarts = require("echarts");
 Vue.use(ElementUI)
 let myChart = null
 let timer = null //计时器标志
+const api = {
+  createEntity: "/entity/createEntity",//批量新增实体
+  getNode: "/kg/getNode",
+  updateEntityName: "/entity/updateEntityName",
+  deleteEntity: "/entity/deleteEntity",
+  createRelationship: "/relationship/createRelationship",
+  findRelationshipType: "/relationship/findRelationshipType", //根据名称模糊查询关系
+  updateRelationshipType: "/relationship/updateRelationshipType",
+  createEntityProperty: "/property/createEntityProperty", //批量新增实体属性
+  deleteRelationship: "/relationship/deleteRelationship",//批量删除关系
+  findEntityListByName: "/entity/findEntityListByName", //实体列表查询（根据标签和名字模糊查询实体）
+  updateEntityProperty: "/property/updateEntityProperty", //更新实体属性
+  deleteEntityProperty: "/property/deleteEntityProperty", //删除实体属性
+  mergeEntity: "/entity/mergeEntity",//实体合并
+}
 
 const vm = new Vue({
   el: "#app",
@@ -1030,12 +1045,10 @@ const vm = new Vue({
       });
     },
     handleLogin(event) {
-      // console.log("handleLogin", event)
       const { type, username } = event.data
       if (type === 'login') {
         this.username = username
         window.localStorage.setItem('username', JSON.stringify(username))
-        event.source.postMessage({ type: 'login', status: 'ok' }, event.origin);
       }
     }
   },
@@ -1074,10 +1087,11 @@ const vm = new Vue({
       this.nowDate = this.getNowDate()
     }, 1000)
     this.receiveIframeMsg()
-    window.addEventListener('message', this.handleLogin)
+
   },
   mounted() {
     localStorage.getItem('username') && (this.username = JSON.parse(localStorage.getItem('username')) || '管理员')
+    window.addEventListener('message', this.handleLogin)
     if (getUrlArgObject('page') === '2') {
       this.simpleUpdataPage = true
       this.currentPage = {