适配后端接口

src/api/graph/attrClass.js

@@ -8,7 +8,7 @@ import request from '@/utils/request'
 
 function getAttrClassById(entClsID, data) {
 	return request({
-		url: `/attrcls/${entClsID}/list`,
+		url: `/knowledge/classAttribute/attrcls/${entClsID}/list`,
 		method: 'get',
 		params: {
 			id: entClsID,
@@ -55,12 +55,12 @@ function getAttrClassById2(entClsID, data) {
  */
 function addAttrClass(data) {
 	return request({
-		url: `/attrcls/add`,
+		url: `/knowledge/classAttribute/attrcls/add`,
 		method: 'post',
 		data: {
 			attrClsName: data.attrClsName,
 			attrUnit: data.attrUnit,
-			entAndAttrType: data.entAndAttrType,
+			entAndAttrType: data.attrType,
 			entClsID: data.entClsID,
 			attrClsMemo: data.attrClsMemo,
 			valueType: data.valueType,
@@ -68,7 +68,8 @@ function addAttrClass(data) {
 			isPublic: data.isPublic,
 			maxValue: data.maxValue,
 			minValue: data.minValue,
-			notNull: data.notNull
+			notNull: data.notNull,
+			attrType: data.attrType
 		}
 	})
 }
@@ -103,7 +104,7 @@ function addAttrClass(data) {
 function updateAttrClass(data) {
 	return request({
 		method: 'post',
-		url: `/attrcls/update`,
+		url: `/knowledge/classAttribute/attrcls/update`,
 		data: {
 			attrClsID: data.attrClsID,
 			attrClsName: data.attrClsName,
@@ -115,7 +116,7 @@ function updateAttrClass(data) {
 			isPublic: data.isPublic,
 			maxValue: data.maxValue,
 			minValue: data.minValue,
-			notNull: data.notNull
+			notNull: data.notNull,
 		}
 	})
 }
@@ -143,7 +144,7 @@ function updateAttrClass(data) {
 function delAttrClass(entClsID) {
 	return request({
 		method: 'post',
-		url: `/attrcls/del/${entClsID}`,
+		url: `/knowledge/classAttribute/attrcls/del/${entClsID}`,
 		params: {
 			id: entClsID
 		}

src/api/graph/entityClass.js

@@ -50,7 +50,7 @@ function delEntityClass(id) {
 function addEntityClass(data) {
 	return request({
 		method: 'post',
-		url: `/entcls/add`,
+		url: `/knowledge/class/entcls/add`,
 		data: {
 			entClsName: data.entClsName,
 			pid: data.pid,
@@ -79,7 +79,7 @@ function addEntityClass(data) {
 function getAllEntityClass(isIcon) {
 	return request({
 		method: 'get',
-		url: `/entcls`,
+		url: `/knowledge/class/entcls`,
 		data: {
 			isIcon: isIcon
 		}
@@ -123,7 +123,7 @@ function getAllEntclsRootTree() {
 function getEntityClass(id) {
 	return request({
 		method: 'get',
-		url: `/entcls/${id}`,
+		url: `/knowledge/class/entcls/${id}`,
 		params: {
 			id: id
 		}
@@ -158,7 +158,7 @@ function getEntityClass(id) {
 function updateEntityClass(type, id, name, entClsMemo, entClsIcon, backGroundColor) {
 	return request({
 		method: 'post',
-		url: `/entcls/update`,
+		url: `/knowledge/class/entcls/update`,
 		data: {
 			entClsAllowAttrType: type,
 			entClsID: id,
@@ -248,7 +248,7 @@ function owlFileExport(id) {
 function entClsTreeLazy(id) {
 	return request({
 		method: 'get',
-		url: `/entcls/tree`,
+		url: `/knowledge/class/entcls/tree`,
 		data: {
 			entClsID: id
 		}
@@ -299,9 +299,9 @@ function getEntClsParents(id) {
 //新的getEntClsNoneList函数
 function getEntClsNoneList(id) {
 	return request({
-		method: 'post',
-		url: `/attrcls/none/list`,
-		data: {
+		method: 'get',
+		url: `/knowledge/classAttribute/attrcls/none/list`,
+		params: {
 			entClsID: id
 		}
 	})

src/api/graph/relationClass.js

@@ -22,7 +22,7 @@ import request from '@/utils/request'
 function getAllRelationClassList(id, entClsType) {
 	return request({
 		method: 'get',
-		url: `/relcls/${id}/list`,
+		url: `/knowledge/classRelation/relcls/${id}/list`,
 		params: {
 			id: id,
 			entClsType: entClsType,
@@ -49,7 +49,7 @@ function getAllRelationClassList(id, entClsType) {
 function deleteRelationClass(id) {
 	return request({
 		method: 'post',
-		url: `/relcls/del/${id}`,
+		url: `/knowledge/classRelation/relcls/del/${id}`,
 		params: {
 			id: id
 		}
@@ -78,11 +78,11 @@ function deleteRelationClass(id) {
 function getAllRelationClassListByName(name, isModel, current, size) {
 	return request({
 		method: 'get',
-		url: `/relcls/list`,
-		data: {
+		url: `/knowledge/classRelation/relcls/list`,
+		params: {
 			name: name,
-			current,
-			size,
+			pageNum: current,
+			pageSize: size,
 			isModel
 		}
 	})
@@ -105,7 +105,7 @@ function getAllRelationClassListByName(name, isModel, current, size) {
 function editRelationClass(data) {
 	return request({
 		method: 'post',
-		url: `/relcls/update`,
+		url: `/knowledge/classRelation/relcls/update`,
 		data: data
 	})
 }
@@ -127,7 +127,7 @@ function editRelationClass(data) {
 function addRelationClass(data) {
 	return request({
 		method: 'post',
-		url: `/relcls/add`,
+		url: `/knowledge/classRelation/relcls/add`,
 		data: data
 	})
 }

src/views/knowledge/class/index.vue

@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="实体类图标" prop="entClsIcon">
+      <el-form-item label="图标id" prop="entClsIconId">
         <el-input
-          v-model="queryParams.entClsIcon"
-          placeholder="请输入实体类图标"
+          v-model="queryParams.entClsIconId"
+          placeholder="请输入图标id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -49,6 +49,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否根节点" prop="isRoot">
+        <el-input
+          v-model="queryParams.isRoot"
+          placeholder="请输入是否根节点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -103,15 +111,17 @@
 
     <el-table v-loading="loading" :data="classList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="实体类ID" align="center" prop="entClsId" />
+      <el-table-column label="实体类ID" align="center" prop="entClsID" />
       <el-table-column label="实体类父节点ID" align="center" prop="pid" />
       <el-table-column label="实体类名称" align="center" prop="entClsName" />
       <el-table-column label="实体类描述" align="center" prop="entClsMemo" />
-      <el-table-column label="实体类图标" align="center" prop="entClsIcon" />
+      <el-table-column label="图标id" align="center" prop="entClsIconId" />
       <el-table-column label="实体类背景颜色" align="center" prop="backGroundColor" />
       <el-table-column label="实体类类型" align="center" prop="clsType" />
       <el-table-column label="是否存在子类" align="center" prop="childCount" />
       <el-table-column label="待审属性节点个数" align="center" prop="noneCount" />
+      <el-table-column label="允许的属性类型" align="center" prop="entClsAllowAttrType" />
+      <el-table-column label="是否根节点" align="center" prop="isRoot" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,7 +141,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -152,8 +162,8 @@
         <el-form-item label="实体类描述" prop="entClsMemo">
           <el-input v-model="form.entClsMemo" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="实体类图标" prop="entClsIcon">
-          <el-input v-model="form.entClsIcon" placeholder="请输入实体类图标" />
+        <el-form-item label="图标id" prop="entClsIconId">
+          <el-input v-model="form.entClsIconId" placeholder="请输入图标id" />
         </el-form-item>
         <el-form-item label="实体类背景颜色" prop="backGroundColor">
           <el-input v-model="form.backGroundColor" placeholder="请输入实体类背景颜色" />
@@ -164,6 +174,9 @@
         <el-form-item label="待审属性节点个数" prop="noneCount">
           <el-input v-model="form.noneCount" placeholder="请输入待审属性节点个数" />
         </el-form-item>
+        <el-form-item label="是否根节点" prop="isRoot">
+          <el-input v-model="form.isRoot" placeholder="请输入是否根节点" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -205,11 +218,13 @@ export default {
         pid: null,
         entClsName: null,
         entClsMemo: null,
-        entClsIcon: null,
+        entClsIconId: null,
         backGroundColor: null,
         clsType: null,
         childCount: null,
         noneCount: null,
+        entClsAllowAttrType: null,
+        isRoot: null
       },
       // 表单参数
       form: {},
@@ -239,11 +254,11 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        entClsId: null,
+        entClsID: null,
         pid: null,
         entClsName: null,
         entClsMemo: null,
-        entClsIcon: null,
+        entClsIconId: null,
         backGroundColor: null,
         clsType: null,
         childCount: null,
@@ -251,7 +266,9 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        entClsAllowAttrType: null,
+        isRoot: null
       };
       this.resetForm("form");
     },
@@ -267,7 +284,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.entClsId)
+      this.ids = selection.map(item => item.entClsID)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -280,8 +297,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const entClsId = row.entClsId || this.ids
-      getClass(entClsId).then(response => {
+      const entClsID = row.entClsID || this.ids
+      getClass(entClsID).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改实体类";
@@ -291,7 +308,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.entClsId != null) {
+          if (this.form.entClsID != null) {
             updateClass(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -309,9 +326,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const entClsIds = row.entClsId || this.ids;
-      this.$modal.confirm('是否确认删除实体类编号为"' + entClsIds + '"的数据项？').then(function() {
-        return delClass(entClsIds);
+      const entClsIDs = row.entClsID || this.ids;
+      this.$modal.confirm('是否确认删除实体类编号为"' + entClsIDs + '"的数据项？').then(function() {
+        return delClass(entClsIDs);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/knowledge/classAttribute/index.vue

@@ -9,14 +9,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="实体类id" prop="entClsId">
+      <el-form-item label="属性单位" prop="attrUnit">
         <el-input
-          v-model="queryParams.entClsId"
+          v-model="queryParams.attrUnit"
+          placeholder="请输入属性单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实体类id" prop="entClsID">
+        <el-input
+          v-model="queryParams.entClsID"
           placeholder="请输入实体类id"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="属性类描述" prop="attrClsMemo">
+        <el-input
+          v-model="queryParams.attrClsMemo"
+          placeholder="请输入属性类描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="domainKey" prop="domainKey">
         <el-input
           v-model="queryParams.domainKey"
@@ -25,9 +41,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="isPublic" prop="arePublic">
+      <el-form-item label="domain" prop="domain">
+        <el-input
+          v-model="queryParams.domain"
+          placeholder="请输入domain"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="isPublic" prop="isPublic">
         <el-input
-          v-model="queryParams.arePublic"
+          v-model="queryParams.isPublic"
           placeholder="请输入isPublic"
           clearable
           @keyup.enter.native="handleQuery"
@@ -57,6 +81,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="entUseCount" prop="entUseCount">
+        <el-input
+          v-model="queryParams.entUseCount"
+          placeholder="请输入entUseCount"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="isEdit" prop="isEdit">
+        <el-input
+          v-model="queryParams.isEdit"
+          placeholder="请输入isEdit"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -111,18 +151,23 @@
 
     <el-table v-loading="loading" :data="classAttributeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="属性id" align="center" prop="attrClsId" />
+      <el-table-column label="关系id" align="center" prop="attrClsID" />
       <el-table-column label="属性类名称" align="center" prop="attrClsName" />
       <el-table-column label="属性单位" align="center" prop="attrUnit" />
-      <el-table-column label="ELEM" align="center" prop="entAndAttrType" />
-      <el-table-column label="实体类id" align="center" prop="entClsId" />
+      <el-table-column label="属性类型" align="center" prop="entAndAttrType" />
+      <el-table-column label="属性类型" align="center" prop="attrType" />
+      <el-table-column label="实体类id" align="center" prop="entClsID" />
       <el-table-column label="属性类描述" align="center" prop="attrClsMemo" />
-      <el-table-column label="数据类型" align="center" prop="valueType" />
+      <el-table-column label="值类型 (TEXT) " align="center" prop="valueType" />
+      <el-table-column label="值类型 (TEXT) " align="center" prop="attrValueType" />
       <el-table-column label="domainKey" align="center" prop="domainKey" />
-      <el-table-column label="isPublic" align="center" prop="arePublic" />
+      <el-table-column label="domain" align="center" prop="domain" />
+      <el-table-column label="isPublic" align="center" prop="isPublic" />
       <el-table-column label="最大值" align="center" prop="maxValue" />
       <el-table-column label="最小值" align="center" prop="minValue" />
       <el-table-column label="是否可以为空" align="center" prop="notNull" />
+      <el-table-column label="entUseCount" align="center" prop="entUseCount" />
+      <el-table-column label="isEdit" align="center" prop="isEdit" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -158,19 +203,22 @@
           <el-input v-model="form.attrClsName" placeholder="请输入属性类名称" />
         </el-form-item>
         <el-form-item label="属性单位" prop="attrUnit">
-          <el-input v-model="form.attrUnit" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.attrUnit" placeholder="请输入属性单位" />
         </el-form-item>
-        <el-form-item label="实体类id" prop="entClsId">
-          <el-input v-model="form.entClsId" placeholder="请输入实体类id" />
+        <el-form-item label="实体类id" prop="entClsID">
+          <el-input v-model="form.entClsID" placeholder="请输入实体类id" />
         </el-form-item>
         <el-form-item label="属性类描述" prop="attrClsMemo">
-          <el-input v-model="form.attrClsMemo" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.attrClsMemo" placeholder="请输入属性类描述" />
         </el-form-item>
         <el-form-item label="domainKey" prop="domainKey">
           <el-input v-model="form.domainKey" placeholder="请输入domainKey" />
         </el-form-item>
-        <el-form-item label="isPublic" prop="arePublic">
-          <el-input v-model="form.arePublic" placeholder="请输入isPublic" />
+        <el-form-item label="domain" prop="domain">
+          <el-input v-model="form.domain" placeholder="请输入domain" />
+        </el-form-item>
+        <el-form-item label="isPublic" prop="isPublic">
+          <el-input v-model="form.isPublic" placeholder="请输入isPublic" />
         </el-form-item>
         <el-form-item label="最大值" prop="maxValue">
           <el-input v-model="form.maxValue" placeholder="请输入最大值" />
@@ -181,6 +229,12 @@
         <el-form-item label="是否可以为空" prop="notNull">
           <el-input v-model="form.notNull" placeholder="请输入是否可以为空" />
         </el-form-item>
+        <el-form-item label="entUseCount" prop="entUseCount">
+          <el-input v-model="form.entUseCount" placeholder="请输入entUseCount" />
+        </el-form-item>
+        <el-form-item label="isEdit" prop="isEdit">
+          <el-input v-model="form.isEdit" placeholder="请输入isEdit" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -222,14 +276,19 @@ export default {
         attrClsName: null,
         attrUnit: null,
         entAndAttrType: null,
-        entClsId: null,
+        attrType: null,
+        entClsID: null,
         attrClsMemo: null,
         valueType: null,
+        attrValueType: null,
         domainKey: null,
-        arePublic: null,
+        domain: null,
+        isPublic: null,
         maxValue: null,
         minValue: null,
         notNull: null,
+        entUseCount: null,
+        isEdit: null,
       },
       // 表单参数
       form: {},
@@ -259,18 +318,23 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        attrClsId: null,
+        attrClsID: null,
         attrClsName: null,
         attrUnit: null,
         entAndAttrType: null,
-        entClsId: null,
+        attrType: null,
+        entClsID: null,
         attrClsMemo: null,
         valueType: null,
+        attrValueType: null,
         domainKey: null,
-        arePublic: null,
+        domain: null,
+        isPublic: null,
         maxValue: null,
         minValue: null,
         notNull: null,
+        entUseCount: null,
+        isEdit: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -290,7 +354,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.attrClsId)
+      this.ids = selection.map(item => item.attrClsID)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -303,8 +367,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const attrClsId = row.attrClsId || this.ids
-      getClassAttribute(attrClsId).then(response => {
+      const attrClsID = row.attrClsID || this.ids
+      getClassAttribute(attrClsID).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改实体类属性";
@@ -314,7 +378,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.attrClsId != null) {
+          if (this.form.attrClsID != null) {
             updateClassAttribute(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -332,9 +396,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const attrClsIds = row.attrClsId || this.ids;
-      this.$modal.confirm('是否确认删除实体类属性编号为"' + attrClsIds + '"的数据项？').then(function() {
-        return delClassAttribute(attrClsIds);
+      const attrClsIDs = row.attrClsID || this.ids;
+      this.$modal.confirm('是否确认删除实体类属性编号为"' + attrClsIDs + '"的数据项？').then(function() {
+        return delClassAttribute(attrClsIDs);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/knowledge/classRelation/index.vue

@@ -1,34 +1,50 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="起点实体类ID" prop="startId">
+      <el-form-item label="关系类名称" prop="relClsName">
         <el-input
-          v-model="queryParams.startId"
-          placeholder="请输入起点实体类ID"
+          v-model="queryParams.relClsName"
+          placeholder="请输入关系类名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="终点实体类ID" prop="endId">
+      <el-form-item label="关系类描述" prop="relClsMemo">
         <el-input
-          v-model="queryParams.endId"
-          placeholder="请输入终点实体类ID"
+          v-model="queryParams.relClsMemo"
+          placeholder="请输入关系类描述"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="关系类名称" prop="relClsName">
+      <el-form-item label="关系类背景颜色" prop="backGroundColor">
         <el-input
-          v-model="queryParams.relClsName"
-          placeholder="请输入关系类名称"
+          v-model="queryParams.backGroundColor"
+          placeholder="请输入关系类背景颜色"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="关系类背景颜色" prop="backGroundColor">
+      <el-form-item label="是否模板" prop="isModel">
         <el-input
-          v-model="queryParams.backGroundColor"
-          placeholder="请输入关系类背景颜色"
+          v-model="queryParams.isModel"
+          placeholder="请输入是否模板"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="起点实体类ID" prop="startID">
+        <el-input
+          v-model="queryParams.startID"
+          placeholder="请输入起点实体类ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="终点实体类ID" prop="endID">
+        <el-input
+          v-model="queryParams.endID"
+          placeholder="请输入终点实体类ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -87,13 +103,14 @@
 
     <el-table v-loading="loading" :data="classRelationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="关系id" align="center" prop="relClsId" />
-      <el-table-column label="起点实体类ID" align="center" prop="startId" />
-      <el-table-column label="终点实体类ID" align="center" prop="endId" />
+      <el-table-column label="关系id" align="center" prop="relClsID" />
       <el-table-column label="关系类名称" align="center" prop="relClsName" />
       <el-table-column label="关系类描述" align="center" prop="relClsMemo" />
       <el-table-column label="关系类背景颜色" align="center" prop="backGroundColor" />
       <el-table-column label="关系类类型" align="center" prop="clsType" />
+      <el-table-column label="是否模板" align="center" prop="isModel" />
+      <el-table-column label="起点实体类ID" align="center" prop="startID" />
+      <el-table-column label="终点实体类ID" align="center" prop="endID" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -125,21 +142,24 @@
     <!-- 添加或修改实体类关系对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="起点实体类ID" prop="startId">
-          <el-input v-model="form.startId" placeholder="请输入起点实体类ID" />
-        </el-form-item>
-        <el-form-item label="终点实体类ID" prop="endId">
-          <el-input v-model="form.endId" placeholder="请输入终点实体类ID" />
-        </el-form-item>
         <el-form-item label="关系类名称" prop="relClsName">
           <el-input v-model="form.relClsName" placeholder="请输入关系类名称" />
         </el-form-item>
         <el-form-item label="关系类描述" prop="relClsMemo">
-          <el-input v-model="form.relClsMemo" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.relClsMemo" placeholder="请输入关系类描述" />
         </el-form-item>
         <el-form-item label="关系类背景颜色" prop="backGroundColor">
           <el-input v-model="form.backGroundColor" placeholder="请输入关系类背景颜色" />
         </el-form-item>
+        <el-form-item label="是否模板" prop="isModel">
+          <el-input v-model="form.isModel" placeholder="请输入是否模板" />
+        </el-form-item>
+        <el-form-item label="起点实体类ID" prop="startID">
+          <el-input v-model="form.startID" placeholder="请输入起点实体类ID" />
+        </el-form-item>
+        <el-form-item label="终点实体类ID" prop="endID">
+          <el-input v-model="form.endID" placeholder="请输入终点实体类ID" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -178,21 +198,22 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        startId: null,
-        endId: null,
         relClsName: null,
         relClsMemo: null,
         backGroundColor: null,
         clsType: null,
+        isModel: null,
+        startID: null,
+        endID: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        startId: [
+        startID: [
           { required: true, message: "起点实体类ID不能为空", trigger: "blur" }
         ],
-        endId: [
+        endID: [
           { required: true, message: "终点实体类ID不能为空", trigger: "blur" }
         ],
       }
@@ -219,13 +240,14 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        relClsId: null,
-        startId: null,
-        endId: null,
+        relClsID: null,
         relClsName: null,
         relClsMemo: null,
         backGroundColor: null,
         clsType: null,
+        isModel: null,
+        startID: null,
+        endID: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -245,7 +267,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.relClsId)
+      this.ids = selection.map(item => item.relClsID)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -258,8 +280,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const relClsId = row.relClsId || this.ids
-      getClassRelation(relClsId).then(response => {
+      const relClsID = row.relClsID || this.ids
+      getClassRelation(relClsID).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改实体类关系";
@@ -269,7 +291,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.relClsId != null) {
+          if (this.form.relClsID != null) {
             updateClassRelation(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -287,9 +309,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const relClsIds = row.relClsId || this.ids;
-      this.$modal.confirm('是否确认删除实体类关系编号为"' + relClsIds + '"的数据项？').then(function() {
-        return delClassRelation(relClsIds);
+      const relClsIDs = row.relClsID || this.ids;
+      this.$modal.confirm('是否确认删除实体类关系编号为"' + relClsIDs + '"的数据项？').then(function() {
+        return delClassRelation(relClsIDs);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/knowledge/graphClass/attrEditor.vue

@@ -537,9 +537,8 @@ export default {
       _vm.spinning=true;
       if (this.type === "NONE") {
         getEntClsNoneList(_vm.id).then((resp) => {
-          let result = resp.data
+          const attrClsVOList = resp.data
           _vm.spinning=false;
-          const { attrClsVOList } = result;
           if (attrClsVOList) {
             if (!attrClsVOList.attrUnit) {
               attrClsVOList.attrUnit = "";

src/views/knowledge/graphClass/entityClassZtree.vue

@@ -92,7 +92,7 @@ export default {
       setting: {
         async: {
           enable: true,
-          url: window.global.baseUrl() + "/entcls/tree",
+          url: window.global.baseUrl() + "/knowledge/class/entcls/tree",
           dataFilter: ajaxDataFilter,
         },
       },

src/views/knowledge/graphClass/relationEditor.vue

@@ -32,17 +32,11 @@
             <a-list-item slot="renderItem" slot-scope="item">
                 <a-list-item-meta @click="handleChangeEntityRouter(item.relClsID)" style="position: relative; padding-right: 70px;">
                     <p slot="title" :class="$route.params.relationId===item.relClsID ? 'selected' : '' " style="display: flex;position: relative">
-                        <a-tooltip placement="topLeft" v-if="entClsType === 'START' ">
+                        <a-tooltip placement="topLeft">
                             <template slot="title">
-                                <span>{{item.startEntClsName}}->{{item.relClsName}} ->{{item.endEntCls&&item.endEntCls.entClsName}}</span>
+                                <span>{{item.startName}}->{{item.relClsName}} ->{{item.endName}}</span>
                             </template>
-                            <a class="rela-box" >{{item.startEntClsName}}->{{item.relClsName}} ->{{item.endEntCls&&item.endEntCls.entClsName}}</a>
-                        </a-tooltip>
-                        <a-tooltip placement="topLeft" v-else>
-                            <template slot="title">
-                                <span>{{item.endEntCls&&item.endEntCls.entClsName}}->{{item.relClsName}} ->{{item.startEntClsName}}</span>
-                            </template>
-                            <a class="rela-box">{{item.endEntCls&&item.endEntCls.entClsName}}->{{item.relClsName}} ->{{item.startEntClsName}}</a>
+                            <a class="rela-box" >{{item.startName}}->{{item.relClsName}} ->{{item.endName}}</a>
                         </a-tooltip>
                         <span class="eddit-box"
                               @click.stop="handleDelRelationClass(item.relClsID)">

src/views/knowledge/modal/addAttrClassModal.vue

@@ -280,9 +280,9 @@ export default {
       }
       param["isPublic"] = this.isPublic ? "1" : "0"; // 自定义页面必须传
       param["attrClsName"] = result.attrClsName || "";
-      param["attrUnit"] = encodeURI(result.attrUnit) || "";
+      param["attrUnit"] = result.attrUnit || "";
       param["valueType"] = result.valueType || "";
-      param["attrClsMemo"] = encodeURI(result.attrClsMemo) || "";
+      param["attrClsMemo"] = result.attrClsMemo || "";
       param["notNull"] = this.notNull || false;
       param["maxValue"] = result.maxValue || "";
       param["minValue"] = result.minValue || "";

src/views/knowledge/modal/getRelationClsListModal.vue

@@ -55,13 +55,14 @@ import { getAllRelationClassListByName } from "@/api/graph/relationClass"
     },
     methods: {
       getRelationList() {
-        getAllRelationClassListByName('', false, this.pagination.current, this.pagination.pageSize).then(data => {
+        getAllRelationClassListByName('', false, this.pagination.current, this.pagination.pageSize).then(resp => {
+
           this.dataCache = []
-          this.data = data.records;
+          this.data = resp.rows;
           this.data.forEach(item => {
             this.dataCache.push(item.relClsID)
           })
-          this.pagination.total =data.total
+          this.pagination.total =resp.total
           this.spinning = false
         });
         console.log(this.pagination.total)