同步代码

package.json

@@ -6,11 +6,12 @@
   "dependencies": {
     "bluebird": "^3.5.5",
     "dayjs": "^1.11.13",
-    "element-ui": "^2.15.14",
+    "element-ui": "^2.7.2",
     "es3ify-loader": "^0.2.0",
     "jquery": "^1.12.4",
     "poplar-annotation": "^2.0.3",
-    "vue": "^2.6.14",
+    "umy-ui": "1.0",
+    "vue": "^2.6.11",
     "webpack-cli": "^3.3.1",
     "zn": "file:"
   },

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/index.css">
+  <link rel="stylesheet" href="./elementUI/theme-chalk_2.7.2/index.css">
 
   <style>
     /*vue未加载好使隐藏页面*/
@@ -24,7 +24,7 @@
       </div>
     </header>
     <main>
-      <el-table :data="tableData" border style="width: 100%" show-summary :max-height="MAX_TABLE_HEIGHT">
+      <el-table :data="tableData" border style="width: 100%;" show-summary :max-height="MAX_TABLE_HEIGHT">
         <el-table-column type="index" :index="(currentPage-1)*selectPageSize+1" align="center" label="序号"
           width="100"></el-table-column>
         <el-table-column prop="nodeType" align="center" label="实体类型"></el-table-column>
@@ -32,6 +32,22 @@
         <el-table-column prop="relationType" align="center" sortable label="相关关系类型"></el-table-column>
         <el-table-column prop="relationNum" align="center" sortable label="相关关系数量"></el-table-column>
       </el-table>
+      <u-table :data="tableData" :border="false" style="width: 100%">
+        <template slot="empty">
+          没有查询到符合条件的记录
+        </template>
+        <u-table-column prop="name" label="名字" width="180">
+        </u-table-column>
+        <u-table-column prop="sex" label="性别" width="180">
+        </u-table-column>
+        <u-table-column prop="age" label="年龄">
+          <template v-slot="scope">
+            <el-select v-model="scope.row.sex">
+              <el-option v-for="item in sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </template>
+        </u-table-column>
+      </u-table>
     </main>
     <footer>
       <div class="pagination" v-if="total>10">

src/js/api.js

@@ -12,7 +12,21 @@ const api = {
   findEntity: "/entity/findEntity", //实体详情查询（根据id查询实体）
   deleteEntity: "/entity/deleteEntity", //批量删除实体
   mergeEntity: "/entity/mergeEntity",//实体合并
+  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", //删除实体属性
+
+  getCountList: "/kg/count/getCountList",
+  getCountInfo: "/kg/count/getCountInfo"
 };
 $(".goto-homeStatic").on("click", function () {
   window.location.href = "http://192.168.2.121:5666" + $(this).attr("link");

src/js/graphDataStatistics.js

@@ -1,19 +1,17 @@
 require("../css/graphDataStatistics.less")
 require("./../css/common.less");
-require("element-ui/lib/theme-chalk/index.css")
-const { post, getUrlArgObject } = require('./api.js');
-
+// require("element-ui/lib/theme-chalk/index.css")
+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 $ = require('jquery')
-
+// import UmyUi from 'umy-ui'
+// Vue.use(UmyUi);
+// const ElementUI = require("../public/elementUI/index.js");
 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",
@@ -121,7 +119,3 @@ const vm = new Vue({
 
   }
 })
-
-module.exports = {
-
-}

src/js/home.js

@@ -1,8 +1,8 @@
 require("../css/home.less")
 require("./../css/common.less");
-const { post, getUrlArgObject } = require('./api.js');
+const { post, api, getUrlArgObject } = require('./api.js');
 const Vue = require("vue/dist/vue.esm.js").default;
-const ElementUI = require("element-ui/lib/index.js");
+const ElementUI = require("../public/elementUI/index.js");
 const $ = require('jquery')
 const dayjs = require('dayjs')
 // 引入dayjs的中文
@@ -11,21 +11,7 @@ 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",

src/public/elementUI/theme-chalk_2.7.2/aside.css

@@ -0,0 +1 @@
+.el-aside{overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-flex-negative:0;flex-shrink:0}

src/public/elementUI/theme-chalk_2.7.2/card.css

@@ -0,0 +1 @@
+.el-card{border-radius:4px;border:1px solid #EBEEF5;background-color:#FFF;overflow:hidden;color:#303133;-webkit-transition:.3s;transition:.3s}.el-card.is-always-shadow,.el-card.is-hover-shadow:focus,.el-card.is-hover-shadow:hover{-webkit-box-shadow:0 2px 12px 0 rgba(0,0,0,.1);box-shadow:0 2px 12px 0 rgba(0,0,0,.1)}.el-card__header{padding:18px 20px;border-bottom:1px solid #EBEEF5;-webkit-box-sizing:border-box;box-sizing:border-box}.el-card__body{padding:20px}

src/public/elementUI/theme-chalk_2.7.2/container.css

@@ -0,0 +1 @@
+.el-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-preferred-size:auto;flex-basis:auto;-webkit-box-sizing:border-box;box-sizing:border-box;min-width:0}.el-container.is-vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}

src/public/elementUI/theme-chalk_2.7.2/footer.css

@@ -0,0 +1 @@
+.el-footer{padding:0 20px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-flex-negative:0;flex-shrink:0}

src/public/elementUI/theme-chalk_2.7.2/header.css

@@ -0,0 +1 @@
+.el-header{padding:0 20px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-flex-negative:0;flex-shrink:0}

src/public/elementUI/theme-chalk_2.7.2/main.css

@@ -0,0 +1 @@
+.el-main{display:block;-webkit-box-flex:1;-ms-flex:1;flex:1;-ms-flex-preferred-size:auto;flex-basis:auto;overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box;padding:20px}

src/public/elementUI/theme-chalk_2.7.2/option-group.css

@@ -0,0 +1 @@
+.el-select-group{margin:0;padding:0}.el-select-group__wrap{position:relative;list-style:none;margin:0;padding:0}.el-select-group__wrap:not(:last-of-type){padding-bottom:24px}.el-select-group__wrap:not(:last-of-type)::after{content:'';position:absolute;display:block;left:20px;right:20px;bottom:12px;height:1px;background:#E4E7ED}.el-select-group__title{padding-left:20px;font-size:12px;color:#909399;line-height:30px}.el-select-group .el-select-dropdown__item{padding-left:20px}

src/public/elementUI/theme-chalk_2.7.2/radio-group.css

@@ -0,0 +1 @@
+.el-radio-group{display:inline-block;line-height:1;vertical-align:middle;font-size:0}

src/public/elementUI/theme-chalk_2.7.2/steps.css

@@ -0,0 +1 @@
+.el-steps{display:-webkit-box;display:-ms-flexbox;display:flex}.el-steps--simple{padding:13px 8%;border-radius:4px;background:#f5f7fa}.el-steps--horizontal{white-space:nowrap}.el-steps--vertical{height:100%;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-flow:column;flex-flow:column}

src/public/elementUI/theme-chalk_2.7.2/timeline.css

@@ -0,0 +1 @@
+.el-timeline{margin:0;font-size:14px;list-style:none}.el-timeline .el-timeline-item:last-child .el-timeline-item__tail{display:none}

src/public/elementUI/theme-chalk_2.8.2/aside.css

@@ -0,0 +1 @@
+.el-aside{overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-flex-negative:0;flex-shrink:0}

src/public/elementUI/theme-chalk_2.8.2/card.css

@@ -0,0 +1 @@
+.el-card{border-radius:4px;border:1px solid #EBEEF5;background-color:#FFF;overflow:hidden;color:#303133;-webkit-transition:.3s;transition:.3s}.el-card.is-always-shadow,.el-card.is-hover-shadow:focus,.el-card.is-hover-shadow:hover{-webkit-box-shadow:0 2px 12px 0 rgba(0,0,0,.1);box-shadow:0 2px 12px 0 rgba(0,0,0,.1)}.el-card__header{padding:18px 20px;border-bottom:1px solid #EBEEF5;-webkit-box-sizing:border-box;box-sizing:border-box}.el-card__body{padding:20px}