allen пре 2 година
родитељ
комит
4308849dde

+ 13 - 5
src/api/knowledge/entity.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询实体管理列表
 export function listEntity(query) {
   return request({
-    url: '/knowledge/entity/list',
+    url: '/neo4j/entity/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listEntity(query) {
 // 查询实体管理详细
 export function getEntity(entId) {
   return request({
-    url: '/knowledge/entity/' + entId,
+    url: '/neo4j/entity/' + entId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getEntity(entId) {
 // 新增实体管理
 export function addEntity(data) {
   return request({
-    url: '/knowledge/entity',
+    url: '/neo4j/entity',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addEntity(data) {
 // 修改实体管理
 export function updateEntity(data) {
   return request({
-    url: '/knowledge/entity',
+    url: '/neo4j/entity',
     method: 'put',
     data: data
   })
@@ -38,7 +38,15 @@ export function updateEntity(data) {
 // 删除实体管理
 export function delEntity(entId) {
   return request({
-    url: '/knowledge/entity/delete/' + entId,
+    url: '/neo4j/entity/' + entId,
     method: 'delete'
   })
 }
+
+// 查询实体管理列表
+export function findAll() {
+  return request({
+    url: '/neo4j/entity/findAll',
+    method: 'get',
+  })
+}

+ 5 - 5
src/api/knowledge/entityRelation.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询实体关系管理列表
 export function listEntityRelation(query) {
   return request({
-    url: '/knowledge/entityRelation/list',
+    url: '/neo4j/relation/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listEntityRelation(query) {
 // 查询实体关系管理详细
 export function getEntityRelation(relId) {
   return request({
-    url: '/knowledge/entityRelation/' + relId,
+    url: '/neo4j/relation/' + relId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getEntityRelation(relId) {
 // 新增实体关系管理
 export function addEntityRelation(data) {
   return request({
-    url: '/knowledge/entityRelation',
+    url: '/neo4j/relation',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addEntityRelation(data) {
 // 修改实体关系管理
 export function updateEntityRelation(data) {
   return request({
-    url: '/knowledge/entityRelation',
+    url: '/neo4j/relation',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateEntityRelation(data) {
 // 删除实体关系管理
 export function delEntityRelation(relId) {
   return request({
-    url: '/knowledge/entityRelation/' + relId,
+    url: '/neo4j/relation/' + relId,
     method: 'delete'
   })
 }

+ 1 - 1
src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 240px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -69,7 +69,7 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      // margin-right: 12px;
     }
 
     & .sidebar-title {

+ 1 - 1
src/views/index.vue

@@ -177,7 +177,7 @@
         getBreakdownSchedule(this.queryBreakdownParams).then(resp => {
           let rows = resp.rows
           for(let row of rows){
-            row.countDown = 30-Math.round((new Date()- new Date(row.discoveryDate))/24/60/60/1000)
+            row.countDown = Math.round((30-(new Date()- new Date(row.discoveryDate))/24/60/60/1000)*24)
           }
           this.breakdownList = resp.rows;
           this.breakdownTotal = resp.total;

+ 18 - 74
src/views/knowledge/entity/index.vue

@@ -1,46 +1,14 @@
 <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="实体名称" prop="entName">
+      <el-form-item label="实体名称" prop="name">
         <el-input
-          v-model="queryParams.entName"
+          v-model="queryParams.name"
           placeholder="请输入实体名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="实体描述" prop="entMemo">
-        <el-input
-          v-model="queryParams.entMemo"
-          placeholder="请输入实体描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实体类id" prop="entClsID" style="display: none">
-        <el-input
-          v-model="queryParams.entClsID"
-          placeholder="请输入实体类id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否模板" prop="isModel">
-        <el-input
-          v-model="queryParams.isModel"
-          placeholder="请输入是否模板"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实体iconId" prop="entIconId" style="display: none">
-        <el-input
-          v-model="queryParams.entIconId"
-          placeholder="请输入实体iconId"
-          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>
@@ -80,7 +48,7 @@
           v-hasPermi="['knowledge:entity:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -89,18 +57,14 @@
           @click="handleExport"
           v-hasPermi="['knowledge:entity:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="entityList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="实体id" align="center" prop="entId" v-if="false"/>
-      <el-table-column label="实体名称" align="center" prop="entName" />
-      <el-table-column label="实体描述" align="center" prop="entMemo" />
-      <el-table-column label="实体类id" align="center" prop="entClsID" v-if="false"/>
-      <el-table-column label="是否模板" align="center" prop="isModel" :formatter="bit2Info"/>
-      <el-table-column label="实体iconId" align="center" prop="entIconId" v-if="false"/>
+      <el-table-column label="实体名称" align="center" prop="name" />
+      <el-table-column label="实体描述" align="center" prop="content" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -132,20 +96,11 @@
     <!-- 添加或修改实体管理对话框 -->
     <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="实体名称" prop="entName">
-          <el-input v-model="form.entName" placeholder="请输入实体名称" />
-        </el-form-item>
-        <el-form-item label="实体描述" prop="entMemo">
-          <el-input v-model="form.entMemo" placeholder="请输入实体描述" />
-        </el-form-item>
-        <el-form-item label="实体类id" prop="entClsID">
-          <el-input v-model="form.entClsID" placeholder="请输入实体类id" />
-        </el-form-item>
-        <el-form-item label="是否模板" prop="isModel">
-          <el-input v-model="form.isModel" placeholder="请输入是否模板" />
+        <el-form-item label="实体名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入实体名称" />
         </el-form-item>
-        <el-form-item label="实体iconId" prop="entIconId">
-          <el-input v-model="form.entIconId" placeholder="请输入实体iconId" />
+        <el-form-item label="实体描述" prop="content">
+          <el-input v-model="form.content" placeholder="请输入实体描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -186,11 +141,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        entName: null,
-        entMemo: null,
-        entClsID: null,
-        isModel: null,
-        entIconId: null,
+        name: null,
       },
       // 表单参数
       form: {},
@@ -208,8 +159,8 @@ export default {
     getList() {
       this.loading = true;
       listEntity(this.queryParams).then(response => {
-        this.entityList = response.rows;
-        this.total = response.total;
+        this.entityList = response.content;
+        this.total = response.totalElements;
         this.loading = false;
       });
     },
@@ -221,16 +172,9 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        entId: null,
-        entName: null,
-        entMemo: null,
-        entClsID: null,
-        isModel: null,
-        entIconId: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
+        id: null,
+        name: null,
+        content: null,
       };
       this.resetForm("form");
     },
@@ -259,7 +203,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const entId = row.entId || this.ids
+      const entId = row.id || this.ids
       getEntity(entId).then(response => {
         this.form = response.data;
         this.open = true;
@@ -288,7 +232,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const entIds = row.entId || this.ids;
+      const entIds = row.id || this.ids;
       this.$modal.confirm('是否确认删除实体管理编号为"' + entIds + '"的数据项?').then(function() {
         return delEntity(entIds);
       }).then(() => {

+ 49 - 63
src/views/knowledge/entityRelation/index.vue

@@ -1,34 +1,10 @@
 <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="实体关系值" prop="relClsId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="实体关系名称" prop="name">
         <el-input
-          v-model="queryParams.relClsId"
-          placeholder="请输入实体关系值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="起点实体id" prop="startEntId" style="display: none">
-        <el-input
-          v-model="queryParams.startEntId"
-          placeholder="请输入起点实体id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="终点实体id" prop="endEntId" style="display: none">
-        <el-input
-          v-model="queryParams.endEntId"
-          placeholder="请输入终点实体id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否模板" prop="isModel">
-        <el-input
-          v-model="queryParams.isModel"
-          placeholder="请输入是否模板"
+          v-model="queryParams.name"
+          placeholder="请输入实体关系名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -72,7 +48,7 @@
           v-hasPermi="['knowledge:entityRelation:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -81,17 +57,15 @@
           @click="handleExport"
           v-hasPermi="['knowledge:entityRelation:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="entityRelationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="实体关系id" align="center" prop="relId" v-if="false"/>
-      <el-table-column label="实体关系值" align="center" prop="relClsId" />
-      <el-table-column label="起点实体id" align="center" prop="startEntId" v-if="false"/>
-      <el-table-column label="终点实体id" align="center" prop="endEntId" v-if="false"/>
-      <el-table-column label="是否模板" align="center" prop="isModel" :formatter="bit2Info"/>
+      <el-table-column label="实体关系名称" align="center" prop="name" />
+      <el-table-column label="起点实体" align="center" prop="startNode.name" />
+      <el-table-column label="终点实体" align="center" prop="endNode.name" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -122,18 +96,29 @@
 
     <!-- 添加或修改实体关系管理对话框 -->
     <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="实体关系值" prop="relClsId">
-          <el-input v-model="form.relClsId" placeholder="请输入实体关系值" />
-        </el-form-item>
-        <el-form-item label="起点实体id" prop="startEntId">
-          <el-input v-model="form.startEntId" placeholder="请输入起点实体id" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="实体关系名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入实体关系名称" />
         </el-form-item>
-        <el-form-item label="终点实体id" prop="endEntId">
-          <el-input v-model="form.endEntId" placeholder="请输入终点实体id" />
+        <el-form-item label="起点实体" prop="startNode">
+          <el-select v-model="form.startNode" placeholder="请选择起点实体" value-key="id" filterable >
+            <el-option
+              v-for="item in entityList"
+              :key="item.id"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="是否模板" prop="isModel">
-          <el-input v-model="form.isModel" placeholder="请输入是否模板" />
+        <el-form-item label="终点实体" prop="endNode">
+          <el-select v-model="form.endNode" placeholder="请选择终点实体" value-key="id" filterable >
+            <el-option
+              v-for="item in entityList"
+              :key="item.id"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -146,6 +131,7 @@
 
 <script>
 import { listEntityRelation, getEntityRelation, delEntityRelation, addEntityRelation, updateEntityRelation } from "@/api/knowledge/entityRelation";
+import { findAll } from "@/api/knowledge/entity";
 import {bit2Info} from '@/utils/validate'
 
 export default {
@@ -174,20 +160,19 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        relClsId: null,
-        startEntId: null,
-        endEntId: null,
-        isModel: null,
+        name: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      entityList: []
     };
   },
   created() {
     this.getList();
+    this.findAllEntity();
   },
   methods: {
     /** 查询实体关系管理列表 */
@@ -195,8 +180,8 @@ export default {
     getList() {
       this.loading = true;
       listEntityRelation(this.queryParams).then(response => {
-        this.entityRelationList = response.rows;
-        this.total = response.total;
+        this.entityRelationList = response.content;
+        this.total = response.totalElements;
         this.loading = false;
       });
     },
@@ -208,15 +193,10 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        relId: null,
-        relClsId: null,
-        startEntId: null,
-        endEntId: null,
-        isModel: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
+        name: null,
+        content: null,
+        startNode: null,
+        endNode: null,
       };
       this.resetForm("form");
     },
@@ -245,7 +225,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const relId = row.relId || this.ids
+      const relId = row.id || this.ids
       getEntityRelation(relId).then(response => {
         this.form = response.data;
         this.open = true;
@@ -274,7 +254,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const relIds = row.relId || this.ids;
+      const relIds = row.id || this.ids;
       this.$modal.confirm('是否确认删除实体关系管理编号为"' + relIds + '"的数据项?').then(function() {
         return delEntityRelation(relIds);
       }).then(() => {
@@ -287,6 +267,12 @@ export default {
       this.download('knowledge/entityRelation/export', {
         ...this.queryParams
       }, `entityRelation_${new Date().getTime()}.xlsx`)
+    },
+    findAllEntity(){
+      findAll().then(resp => {
+        this.entityList = resp
+        console.info(resp)
+      })
     }
   }
 };

+ 3 - 3
src/views/searchV2/breakdown/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
       <el-tabs v-model="activeName" @tab-click="handleClick" >
-          <el-tab-pane label="故障~故障" name="first">
+          <el-tab-pane label="故障关联分析" name="first">
             <Sbreakdown name1="故障" name2 ="故障"/>
           </el-tab-pane>
-          <el-tab-pane label="故障部件" name="second">
+          <el-tab-pane label="故障部件关联分析" name="second">
             <Sbreakdown name1="故障" name2 ="部件"/>
           </el-tab-pane>
-          <el-tab-pane label="部件~部件" name="third">
+          <el-tab-pane label="部件关联分析" name="third">
             <Sbreakdown name1="部件" name2 ="部件"/>
           </el-tab-pane>
       </el-tabs>

+ 1 - 121
src/views/showInfo/breakdown/index.vue

@@ -1,38 +1,6 @@
 <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="战区" prop="warZone">
-        <el-input
-          v-model="queryParams.warZone"
-          placeholder="请输入战区"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基地" prop="base">
-        <el-input
-          v-model="queryParams.base"
-          placeholder="请输入基地"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="师" prop="division">
-        <el-input
-          v-model="queryParams.division"
-          placeholder="请输入师"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="旅团" prop="brigade">
-        <el-input
-          v-model="queryParams.brigade"
-          placeholder="请输入旅团"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="机型" prop="airplaneModel">
         <el-input
           v-model="queryParams.airplaneModel"
@@ -57,14 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发现日期" prop="discoveryDate">
-        <el-date-picker clearable
-          v-model="queryParams.discoveryDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择发现日期">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="专业" prop="major">
         <el-input
           v-model="queryParams.major"
@@ -73,22 +33,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="故障描述" prop="describe">
-        <el-input
-          v-model="queryParams.describe"
-          placeholder="请输入故障描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="故障原因" prop="reason">
-        <el-input
-          v-model="queryParams.reason"
-          placeholder="请输入故障原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="故障件名称" prop="breakdownUnitName">
         <el-input
           v-model="queryParams.breakdownUnitName"
@@ -97,70 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="故障件号码" prop="breakdownUnitNumber">
-        <el-input
-          v-model="queryParams.breakdownUnitNumber"
-          placeholder="请输入故障件号码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="故障件所属系统" prop="unitSystem">
-        <el-input
-          v-model="queryParams.unitSystem"
-          placeholder="请输入故障件所属系统"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="故障后果" prop="consequence">
-        <el-input
-          v-model="queryParams.consequence"
-          placeholder="请输入故障后果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="故障责任" prop="duty">
-        <el-input
-          v-model="queryParams.duty"
-          placeholder="请输入故障责任"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="故换件名称" prop="replaceUnitName">
-        <el-input
-          v-model="queryParams.replaceUnitName"
-          placeholder="请输入故换件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="故换件号码" prop="replaceUnitNumber">
-        <el-input
-          v-model="queryParams.replaceUnitNumber"
-          placeholder="请输入故换件号码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排除方法" prop="method">
-        <el-input
-          v-model="queryParams.method"
-          placeholder="请输入排除方法"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修复日期" prop="repairedDate">
-        <el-date-picker clearable
-          v-model="queryParams.repairedDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择修复日期">
-        </el-date-picker>
-      </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>