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

package.json

@@ -7,7 +7,6 @@
     "axios": "^0.18.0",
     "bluebird": "^3.5.5",
     "dayjs": "^1.11.13",
-    "element-ui": "^2.7.2",
     "es3ify-loader": "^0.2.0",
     "jquery": "^1.12.4",
     "poplar-annotation": "^2.0.3",

src/html/graphDataStatistics.html

@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>知识图谱系统</title>
-  <link rel="stylesheet" href="./elementUI/theme-chalk_2.7.2/index.css">
+  <link rel="stylesheet" href="/elementUI/2.7.2/theme-chalk/index.css">
 
   <style>
     /*vue未加载好使隐藏页面*/

src/html/home.html

@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>知识图谱维护管理</title>
-  <link rel="stylesheet" href="./elementUI/theme-chalk/index.css">
+  <link rel="stylesheet" href="/elementUI/2.7.2/theme-chalk/index.css">
   </script>
   <style>
 
@@ -27,7 +27,7 @@
       <el-container>
         <!-- background-color="#D5E9FE" -->
         <el-aside :width="isCollapse?'69px':'268px'" v-if="!simpleUpdataPage">
-            <!-- <div class="logo" contenteditable="false">知识图谱维护管理</div> -->
+          <!-- <div class="logo" contenteditable="false">知识图谱维护管理</div> -->
           <div :class="isCollapse? 'collapse-sign collapse-sign-open': 'collapse-sign collapse-sign-close'"
             @click="isCollapse=!isCollapse"></div>
           <el-menu :default-active="currentPage.id" :collapse-transition="false" :collapse="isCollapse"

src/html/login.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>登录</title>
 
-  <link rel="stylesheet" href="./elementUI/theme-chalk/index.css">
+  <link rel="stylesheet" href="/elementUI/2.7.2/theme-chalk/index.css">
 
   <style>
   </style>

src/js/graphDataStatistics.js

@@ -4,7 +4,7 @@ require("./../css/common.less");
 const { post, api, getUrlArgObject } = require('./api.js');
 const $ = require('jquery')
 const Vue = require("vue/dist/vue.esm.js").default;
-const ElementUI = require("element-ui/lib/index.js");
+const ElementUI = require("../public/elementUI/2.7.2/index");
 // import UmyUi from 'umy-ui'
 // Vue.use(UmyUi);
 // const ElementUI = require("../public/elementUI/index.js");
@@ -115,7 +115,7 @@ const vm = new Vue({
   },
   mounted() {
   },
-  destroyed() {
+  beforeDestroy() {
 
   }
 })

src/js/home.js

@@ -1,8 +1,10 @@
 require("../css/home.less")
 require("./../css/common.less");
 const { post, api, getUrlArgObject } = require('./api.js');
+const { saveLocalVar, getLocalVar } = require("../js/utils.js")
 const Vue = require("vue/dist/vue.esm.js").default;
-const ElementUI = require("../public/elementUI/index.js");
+const ElementUI = require("../public/elementUI/2.7.2/index");
+console.log(ElementUI)
 const $ = require('jquery')
 const dayjs = require('dayjs')
 // 引入dayjs的中文
@@ -1047,8 +1049,11 @@ const vm = new Vue({
       const { type, username, userId } = event.data
       if (type === 'login') {
         this.username = username
-        window.localStorage.setItem('username', JSON.stringify(username))
-        window.localStorage.setItem('userId', JSON.stringify(userId))
+        saveLocalVar('username', username)
+        saveLocalVar('userId', userId)
+        // window.localStorage.setItem('username', JSON.stringify(username))
+        // window.localStorage.setItem('userId', JSON.stringify(userId))
+        event.source.postMessage({ type: 'login', status: 'ok' }, '*')
       }
     }
   },
@@ -1090,7 +1095,8 @@ const vm = new Vue({
 
   },
   mounted() {
-    localStorage.getItem('username') && (this.username = JSON.parse(localStorage.getItem('username')) || '管理员')
+    // localStorage.getItem('username') && (this.username = JSON.parse(localStorage.getItem('username')) || '管理员')
+    this.username = getLocalVar('username') || '管理员'
     window.addEventListener('message', this.handleLogin)
     if (getUrlArgObject('page') === '2') {
       this.simpleUpdataPage = true
@@ -1102,7 +1108,7 @@ const vm = new Vue({
       }
     }
   },
-  destroyed() {
+  beforeDestroy() {
     //销毁定时器
     clearInterval(timer)
     window.removeEventListener('message', this.handleLogin)

src/js/login.js

@@ -1,7 +1,7 @@
 require("../css/login.less")
 require("./../css/common.less");
 const Vue = require('vue/dist/vue.esm.js').default
-const ElementUI = require("element-ui/lib/index.js")
+const ElementUI = require("../public/elementUI/2.7.2/index")
 Vue.use(ElementUI)
 const vm = new Vue({
   el: '#app',
@@ -58,5 +58,5 @@ const vm = new Vue({
   },
   created: function () { },
   mounted: function () { },
-  destroyed: function () { },
+  beforeDestroy: function () { },
 })

src/js/selfKnowledgeGraph.js

@@ -31,8 +31,10 @@ const { drawGraph, updateTree, getGraph, getTree, getNode, getTab, renderTab, se
 const { post, get, api, getUrlArgObject, ifHideLogo} = require('./api.js');
 const $ = require('jquery')
 const Vue = require("vue/dist/vue.esm.js").default;
+const ElementUI = require("../public/elementUI/2.7.2/index.js");
 
-const ElementUI = require("element-ui/lib/index.js");
+// import UmyUi from 'umy-ui'
+// Vue.use(UmyUi);
 /**右侧侧边栏折叠*/
 let isRightCollapse = false
 let self = getUrlArgObject("self") ? true : false;
@@ -48,19 +50,19 @@ window.knowledgeMapData = {}//当前右键节点数据
 window.graphMapUpdatedData = null //实时更新的关系图数据
 window.graphMap = null //当前关系图实例对象
 window.knowledgeMapSetting = {
-    self: self,
-    operation: "view", //操作类型,修改
-    draggable: true, //是否能拖拽节点
-    zTree: !noTree,//是否有zTree
-    expandPropertyId: [],//存储展开属性的nodeId
-    expandRelationshipsId: [],//存储展开关系的nodeId
-    currentNodeId: -1,//存储右侧显示的节点的nodeId
-    legends: [],//图例
-    selected: {},//选中的数据
-    showLegend: true, //是否显示图例
-    showLegendNum: 0,//展示图例的数量
-    showLegendAll: false,//是否展示全部图例
-    records: [],//历史记录
+  self: self,
+  operation: "view", //操作类型,修改
+  draggable: true, //是否能拖拽节点
+  zTree: !noTree,//是否有zTree
+  expandPropertyId: [],//存储展开属性的nodeId
+  expandRelationshipsId: [],//存储展开关系的nodeId
+  currentNodeId: -1,//存储右侧显示的节点的nodeId
+  legends: [],//图例
+  selected: {},//选中的数据
+  showLegend: true, //是否显示图例
+  showLegendNum: 0,//展示图例的数量
+  showLegendAll: false,//是否展示全部图例
+  records: [],//历史记录
 }
 if (noTree) {
     $(".content .right").css('display', 'none')

src/js/utils.js

@@ -1,12 +1,53 @@
-const medicalTermDefaultMap={
-    "disease":"高血压3级",
-    "symptom":"背痛",
-    "operation":"动脉缝合术",
-    "drug":"地辛高",
-    "lis":"白细胞计数",
-    "pacs":"肝彩超",
+const medicalTermDefaultMap = {
+    "disease": "高血压3级",
+    "symptom": "背痛",
+    "operation": "动脉缝合术",
+    "drug": "地辛高",
+    "lis": "白细胞计数",
+    "pacs": "肝彩超",
 }
 
-module.exports ={
+function saveSessionVar(name, value) {
+    sessionStorage.setItem(name, JSON.stringify(value));
+}
+
+function getSessionVar(name) {
+    return sessionStorage.getItem(name) && JSON.parse(sessionStorage.getItem(name));
+}
+
+function deleteSessionVar(name) {
+    return sessionStorage.removeItem(name);
+}
+
+function clearSessionVar() {
+    sessionStorage.clear();
+}
+
+function saveLocalVar(name, value) {
+    localStorage.setItem(name, JSON.stringify(value));
+}
+
+function getLocalVar(name) {
+    return localStorage.getItem(name) && JSON.parse(localStorage.getItem(name));
+}
+
+
+function deleteLocalVar(name) {
+    return localStorage.removeItem(name);
+}
+
+function clearLocalVar() {
+    localStorage.clear();
+}
+
+module.exports = {
+    saveSessionVar,
+    getSessionVar,
+    deleteSessionVar,
+    clearSessionVar,
+    saveLocalVar,
+    getLocalVar,
+    deleteLocalVar,
+    clearLocalVar,
     medicalTermDefaultMap
 }