1
0

15 Коммитууд e797810575 ... e6e5587ecf

Эзэн SHA1 Мессеж Огноо
  twzydn20000928 e6e5587ecf 增加导入功能 2 жил өмнө
  allen 6b9182aa16 fix update flow 2 жил өмнө
  allen b3d96acad6 update label for entity 2 жил өмнө
  allen 8d83d1b6e7 fix bugs 2 жил өмнө
  allen 7d40f16315 add save 2 жил өмнө
  allen 1ec21cc6d9 add view doc for subtask 2 жил өмнө
  allen e4a2169fae dev 2 жил өмнө
  allen fcc64a260d dev 2 жил өмнө
  allen 19620ccedf add graph for entity 2 жил өмнө
  allen 5b04bee24b dev question 2 жил өмнө
  allen 4bc2cced53 Merge branch 'dev_xlk' 2 жил өмнө
  allen b4b631df91 dev 2 жил өмнө
  allen 2e998348d7 通过实体类实体类关系构建实体和实体关系 2 жил өмнө
  allen 6034923627 fix ui 2 жил өмнө
  allen 1503aab7f3 update css 2 жил өмнө

+ 29 - 90
package-lock.json

@@ -12,6 +12,7 @@
         "@riophae/vue-treeselect": "0.4.0",
         "@tiptap/core": "^2.0.2",
         "@tiptap/extension-highlight": "^2.0.0-beta.218",
+        "@tiptap/pm": "^2.0.3",
         "@tiptap/starter-kit": "^2.0.2",
         "@tiptap/vue-2": "^2.0.0-beta.218",
         "@wangeditor/editor": "^5.1.23",
@@ -2038,8 +2039,7 @@
     "node_modules/@linaria/core": {
       "version": "3.0.0-beta.13",
       "resolved": "https://registry.npmmirror.com/@linaria/core/-/core-3.0.0-beta.13.tgz",
-      "integrity": "sha512-3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg==",
-      "peer": true
+      "integrity": "sha512-3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg=="
     },
     "node_modules/@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -2153,7 +2153,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/@remirror/core-constants/-/core-constants-2.0.0.tgz",
       "integrity": "sha512-vpePPMecHJllBqCWXl6+FIcZqS+tRUM2kSCCKFeEo1H3XUEv3ocijBIPhnlSAa7g6maX+12ATTgxrOsLpWVr2g==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.13.10"
       }
@@ -2162,7 +2161,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/@remirror/core-helpers/-/core-helpers-2.0.1.tgz",
       "integrity": "sha512-s8M1pn33aBUhduvD1QR02uUQMegnFkGaTr4c1iBzxTTyg0rbQstzuQ7Q8TkL6n64JtgCdJS9jLz2dONb2meBKQ==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.13.10",
         "@linaria/core": "3.0.0-beta.13",
@@ -2185,7 +2183,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2194,7 +2191,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz",
       "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -2203,7 +2199,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/@remirror/types/-/types-1.0.0.tgz",
       "integrity": "sha512-7HQbW7k8VxrAtfzs9FxwO6XSDabn8tSFDi1wwzShOnU+cvaYpfxu0ygyTk3TpXsag1hgFKY3ZIlAfB4WVz2LkQ==",
-      "peer": true,
       "dependencies": {
         "type-fest": "^2.0.0"
       }
@@ -2212,7 +2207,6 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-2.19.0.tgz",
       "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-      "peer": true,
       "engines": {
         "node": ">=12.20"
       }
@@ -2474,7 +2468,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/@tiptap/pm/-/pm-2.0.3.tgz",
       "integrity": "sha512-I9dsInD89Agdm1QjFRO9dmJtU1ldVSILNPW0pEhv9wYqYVvl4HUj/JMtYNqu2jWrCHNXQcaX/WkdSdvGJtmg5g==",
-      "peer": true,
       "dependencies": {
         "prosemirror-changeset": "^2.2.0",
         "prosemirror-collab": "^1.3.0",
@@ -2590,14 +2583,12 @@
     "node_modules/@types/object.omit": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/@types/object.omit/-/object.omit-3.0.0.tgz",
-      "integrity": "sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw==",
-      "peer": true
+      "integrity": "sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw=="
     },
     "node_modules/@types/object.pick": {
       "version": "1.3.2",
       "resolved": "https://registry.npmmirror.com/@types/object.pick/-/object.pick-1.3.2.tgz",
-      "integrity": "sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg==",
-      "peer": true
+      "integrity": "sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg=="
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -2614,8 +2605,7 @@
     "node_modules/@types/throttle-debounce": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
-      "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==",
-      "peer": true
+      "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ=="
     },
     "node_modules/@uppy/companion-client": {
       "version": "2.2.2",
@@ -4869,7 +4859,6 @@
       "version": "2.1.10",
       "resolved": "https://registry.npmmirror.com/case-anything/-/case-anything-2.1.10.tgz",
       "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ==",
-      "peer": true,
       "engines": {
         "node": ">=12.13"
       }
@@ -6065,8 +6054,7 @@
     "node_modules/crelt": {
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/crelt/-/crelt-1.0.5.tgz",
-      "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==",
-      "peer": true
+      "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
@@ -6793,8 +6781,7 @@
     "node_modules/dash-get": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/dash-get/-/dash-get-1.0.2.tgz",
-      "integrity": "sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ==",
-      "peer": true
+      "integrity": "sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ=="
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
@@ -11067,7 +11054,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmmirror.com/linkify-it/-/linkify-it-4.0.1.tgz",
       "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
-      "peer": true,
       "dependencies": {
         "uc.micro": "^1.0.1"
       }
@@ -11604,8 +11590,7 @@
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmmirror.com/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "peer": true
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
     "node_modules/map-cache": {
       "version": "0.2.2",
@@ -11630,7 +11615,6 @@
       "version": "13.0.1",
       "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-13.0.1.tgz",
       "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
-      "peer": true,
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "~3.0.1",
@@ -11645,14 +11629,12 @@
     "node_modules/markdown-it/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "peer": true
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/markdown-it/node_modules/entities": {
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz",
       "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "peer": true,
       "engines": {
         "node": ">=0.12"
       }
@@ -11681,8 +11663,7 @@
     "node_modules/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "peer": true
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
@@ -12630,7 +12611,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/object.omit/-/object.omit-3.0.0.tgz",
       "integrity": "sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==",
-      "peer": true,
       "dependencies": {
         "is-extendable": "^1.0.0"
       },
@@ -14305,7 +14285,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/prosemirror-changeset/-/prosemirror-changeset-2.2.0.tgz",
       "integrity": "sha512-QM7ohGtkpVpwVGmFb8wqVhaz9+6IUXcIQBGZ81YNAKYuHiFJ1ShvSzab4pKqTinJhwciZbrtBEk/2WsqSt2PYg==",
-      "peer": true,
       "dependencies": {
         "prosemirror-transform": "^1.0.0"
       }
@@ -14314,7 +14293,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/prosemirror-collab/-/prosemirror-collab-1.3.0.tgz",
       "integrity": "sha512-+S/IJ69G2cUu2IM5b3PBekuxs94HO1CxJIWOFrLQXUaUDKL/JfBx+QcH31ldBlBXyDEUl+k3Vltfi1E1MKp2mA==",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.0.0"
       }
@@ -14354,7 +14332,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/prosemirror-history/-/prosemirror-history-1.3.0.tgz",
       "integrity": "sha512-qo/9Wn4B/Bq89/YD+eNWFbAytu6dmIM85EhID+fz9Jcl9+DfGEo8TTSrRhP15+fFEoaPqpHSxlvSzSEbmlxlUA==",
-      "peer": true,
       "dependencies": {
         "prosemirror-state": "^1.2.2",
         "prosemirror-transform": "^1.0.0",
@@ -14383,7 +14360,6 @@
       "version": "1.10.1",
       "resolved": "https://registry.npmmirror.com/prosemirror-markdown/-/prosemirror-markdown-1.10.1.tgz",
       "integrity": "sha512-s7iaTLiX+qO5z8kF2NcMmy2T7mIlxzkS4Sp3vTKSYChPtbMpg6YxFkU0Y06rUg2WtKlvBu7v1bXzlGBkfjUWAA==",
-      "peer": true,
       "dependencies": {
         "markdown-it": "^13.0.1",
         "prosemirror-model": "^1.0.0"
@@ -14393,7 +14369,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/prosemirror-menu/-/prosemirror-menu-1.2.1.tgz",
       "integrity": "sha512-sBirXxVfHalZO4f1ZS63WzewINK4182+7dOmoMeBkqYO8wqMBvBS7wQuwVOHnkMWPEh0+N0LJ856KYUN+vFkmQ==",
-      "peer": true,
       "dependencies": {
         "crelt": "^1.0.0",
         "prosemirror-commands": "^1.0.0",
@@ -14413,7 +14388,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.1.tgz",
       "integrity": "sha512-vYBdIHsYKSDIqYmPBC7lnwk9DsKn8PnVqK97pMYP5MLEDFqWIX75JiaJTzndBii4bRuNqhC2UfDOfM3FKhlBHg==",
-      "peer": true,
       "dependencies": {
         "prosemirror-model": "^1.19.0"
       }
@@ -14454,7 +14428,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.3.tgz",
       "integrity": "sha512-lGrjMrn97KWkjQSW/FjdvnhJmqFACmQIyr6lKYApvHitDnKsCoZz6XzrHB7RZYHni/0NxQmZ01p/2vyK2SkvaA==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.13.10",
         "@remirror/core-constants": "^2.0.0",
@@ -14471,7 +14444,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -15168,8 +15140,7 @@
     "node_modules/rope-sequence": {
       "version": "1.3.3",
       "resolved": "https://registry.npmmirror.com/rope-sequence/-/rope-sequence-1.3.3.tgz",
-      "integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q==",
-      "peer": true
+      "integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q=="
     },
     "node_modules/run-async": {
       "version": "2.4.1",
@@ -17865,8 +17836,7 @@
     "node_modules/uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmmirror.com/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "peer": true
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/uglify-js": {
       "version": "3.4.10",
@@ -21535,8 +21505,7 @@
     "@linaria/core": {
       "version": "3.0.0-beta.13",
       "resolved": "https://registry.npmmirror.com/@linaria/core/-/core-3.0.0-beta.13.tgz",
-      "integrity": "sha512-3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg==",
-      "peer": true
+      "integrity": "sha512-3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -21626,7 +21595,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/@remirror/core-constants/-/core-constants-2.0.0.tgz",
       "integrity": "sha512-vpePPMecHJllBqCWXl6+FIcZqS+tRUM2kSCCKFeEo1H3XUEv3ocijBIPhnlSAa7g6maX+12ATTgxrOsLpWVr2g==",
-      "peer": true,
       "requires": {
         "@babel/runtime": "^7.13.10"
       }
@@ -21635,7 +21603,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/@remirror/core-helpers/-/core-helpers-2.0.1.tgz",
       "integrity": "sha512-s8M1pn33aBUhduvD1QR02uUQMegnFkGaTr4c1iBzxTTyg0rbQstzuQ7Q8TkL6n64JtgCdJS9jLz2dONb2meBKQ==",
-      "peer": true,
       "requires": {
         "@babel/runtime": "^7.13.10",
         "@linaria/core": "3.0.0-beta.13",
@@ -21657,14 +21624,12 @@
         "deepmerge": {
           "version": "4.3.1",
           "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
-          "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-          "peer": true
+          "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
         },
         "throttle-debounce": {
           "version": "3.0.1",
           "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz",
-          "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==",
-          "peer": true
+          "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg=="
         }
       }
     },
@@ -21672,7 +21637,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/@remirror/types/-/types-1.0.0.tgz",
       "integrity": "sha512-7HQbW7k8VxrAtfzs9FxwO6XSDabn8tSFDi1wwzShOnU+cvaYpfxu0ygyTk3TpXsag1hgFKY3ZIlAfB4WVz2LkQ==",
-      "peer": true,
       "requires": {
         "type-fest": "^2.0.0"
       },
@@ -21680,8 +21644,7 @@
         "type-fest": {
           "version": "2.19.0",
           "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-2.19.0.tgz",
-          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-          "peer": true
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
         }
       }
     },
@@ -21879,7 +21842,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/@tiptap/pm/-/pm-2.0.3.tgz",
       "integrity": "sha512-I9dsInD89Agdm1QjFRO9dmJtU1ldVSILNPW0pEhv9wYqYVvl4HUj/JMtYNqu2jWrCHNXQcaX/WkdSdvGJtmg5g==",
-      "peer": true,
       "requires": {
         "prosemirror-changeset": "^2.2.0",
         "prosemirror-collab": "^1.3.0",
@@ -21987,14 +21949,12 @@
     "@types/object.omit": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/@types/object.omit/-/object.omit-3.0.0.tgz",
-      "integrity": "sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw==",
-      "peer": true
+      "integrity": "sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw=="
     },
     "@types/object.pick": {
       "version": "1.3.2",
       "resolved": "https://registry.npmmirror.com/@types/object.pick/-/object.pick-1.3.2.tgz",
-      "integrity": "sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg==",
-      "peer": true
+      "integrity": "sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -22011,8 +21971,7 @@
     "@types/throttle-debounce": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
-      "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==",
-      "peer": true
+      "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ=="
     },
     "@uppy/companion-client": {
       "version": "2.2.2",
@@ -23877,8 +23836,7 @@
     "case-anything": {
       "version": "2.1.10",
       "resolved": "https://registry.npmmirror.com/case-anything/-/case-anything-2.1.10.tgz",
-      "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ==",
-      "peer": true
+      "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -24875,8 +24833,7 @@
     "crelt": {
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/crelt/-/crelt-1.0.5.tgz",
-      "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==",
-      "peer": true
+      "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="
     },
     "cross-spawn": {
       "version": "7.0.3",
@@ -25429,8 +25386,7 @@
     "dash-get": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/dash-get/-/dash-get-1.0.2.tgz",
-      "integrity": "sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ==",
-      "peer": true
+      "integrity": "sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ=="
     },
     "dashdash": {
       "version": "1.14.1",
@@ -28918,7 +28874,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmmirror.com/linkify-it/-/linkify-it-4.0.1.tgz",
       "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
-      "peer": true,
       "requires": {
         "uc.micro": "^1.0.1"
       }
@@ -29362,8 +29317,7 @@
     "make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmmirror.com/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "peer": true
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
     "map-cache": {
       "version": "0.2.2",
@@ -29382,7 +29336,6 @@
       "version": "13.0.1",
       "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-13.0.1.tgz",
       "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
-      "peer": true,
       "requires": {
         "argparse": "^2.0.1",
         "entities": "~3.0.1",
@@ -29394,14 +29347,12 @@
         "argparse": {
           "version": "2.0.1",
           "resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "peer": true
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
         "entities": {
           "version": "3.0.1",
           "resolved": "https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz",
-          "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-          "peer": true
+          "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="
         }
       }
     },
@@ -29429,8 +29380,7 @@
     "mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "peer": true
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
     },
     "media-typer": {
       "version": "0.3.0",
@@ -30217,7 +30167,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/object.omit/-/object.omit-3.0.0.tgz",
       "integrity": "sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==",
-      "peer": true,
       "requires": {
         "is-extendable": "^1.0.0"
       }
@@ -31638,7 +31587,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/prosemirror-changeset/-/prosemirror-changeset-2.2.0.tgz",
       "integrity": "sha512-QM7ohGtkpVpwVGmFb8wqVhaz9+6IUXcIQBGZ81YNAKYuHiFJ1ShvSzab4pKqTinJhwciZbrtBEk/2WsqSt2PYg==",
-      "peer": true,
       "requires": {
         "prosemirror-transform": "^1.0.0"
       }
@@ -31647,7 +31595,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/prosemirror-collab/-/prosemirror-collab-1.3.0.tgz",
       "integrity": "sha512-+S/IJ69G2cUu2IM5b3PBekuxs94HO1CxJIWOFrLQXUaUDKL/JfBx+QcH31ldBlBXyDEUl+k3Vltfi1E1MKp2mA==",
-      "peer": true,
       "requires": {
         "prosemirror-state": "^1.0.0"
       }
@@ -31687,7 +31634,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/prosemirror-history/-/prosemirror-history-1.3.0.tgz",
       "integrity": "sha512-qo/9Wn4B/Bq89/YD+eNWFbAytu6dmIM85EhID+fz9Jcl9+DfGEo8TTSrRhP15+fFEoaPqpHSxlvSzSEbmlxlUA==",
-      "peer": true,
       "requires": {
         "prosemirror-state": "^1.2.2",
         "prosemirror-transform": "^1.0.0",
@@ -31716,7 +31662,6 @@
       "version": "1.10.1",
       "resolved": "https://registry.npmmirror.com/prosemirror-markdown/-/prosemirror-markdown-1.10.1.tgz",
       "integrity": "sha512-s7iaTLiX+qO5z8kF2NcMmy2T7mIlxzkS4Sp3vTKSYChPtbMpg6YxFkU0Y06rUg2WtKlvBu7v1bXzlGBkfjUWAA==",
-      "peer": true,
       "requires": {
         "markdown-it": "^13.0.1",
         "prosemirror-model": "^1.0.0"
@@ -31726,7 +31671,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/prosemirror-menu/-/prosemirror-menu-1.2.1.tgz",
       "integrity": "sha512-sBirXxVfHalZO4f1ZS63WzewINK4182+7dOmoMeBkqYO8wqMBvBS7wQuwVOHnkMWPEh0+N0LJ856KYUN+vFkmQ==",
-      "peer": true,
       "requires": {
         "crelt": "^1.0.0",
         "prosemirror-commands": "^1.0.0",
@@ -31746,7 +31690,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.1.tgz",
       "integrity": "sha512-vYBdIHsYKSDIqYmPBC7lnwk9DsKn8PnVqK97pMYP5MLEDFqWIX75JiaJTzndBii4bRuNqhC2UfDOfM3FKhlBHg==",
-      "peer": true,
       "requires": {
         "prosemirror-model": "^1.19.0"
       }
@@ -31787,7 +31730,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.3.tgz",
       "integrity": "sha512-lGrjMrn97KWkjQSW/FjdvnhJmqFACmQIyr6lKYApvHitDnKsCoZz6XzrHB7RZYHni/0NxQmZ01p/2vyK2SkvaA==",
-      "peer": true,
       "requires": {
         "@babel/runtime": "^7.13.10",
         "@remirror/core-constants": "^2.0.0",
@@ -31798,8 +31740,7 @@
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "peer": true
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
         }
       }
     },
@@ -32391,8 +32332,7 @@
     "rope-sequence": {
       "version": "1.3.3",
       "resolved": "https://registry.npmmirror.com/rope-sequence/-/rope-sequence-1.3.3.tgz",
-      "integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q==",
-      "peer": true
+      "integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q=="
     },
     "run-async": {
       "version": "2.4.1",
@@ -34622,8 +34562,7 @@
     "uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmmirror.com/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "peer": true
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "uglify-js": {
       "version": "3.4.10",

+ 7 - 0
src/api/extract/subTask.js

@@ -50,3 +50,10 @@ export function approveSubTask(id, status, extractResult) {
     data: extractResult
   })
 }
+
+export function getDocPathBySunTaskId(subTaskId) {
+  return request({
+    url: `/extract/subTask/getDocPathBySunTaskId/${subTaskId}`,
+    method: 'get',
+  })
+}

+ 8 - 0
src/api/knowledge/search.js

@@ -33,4 +33,12 @@ export function getTop10() {
     url: '/suport/question/getTop10',
     method: 'get',
   })
+}
+
+// 根据实体id查询实体1层关系
+export function getRelationByEntityId(id) {
+  return request({
+    url: `/kg/getRelationByEntityId/${id}`,
+    method: 'get',
+  })
 }

+ 17 - 0
src/api/neo4j/class_relation.js

@@ -42,3 +42,20 @@ export function delClass_relation(id) {
     method: 'delete'
   })
 }
+
+// 根据实体类id查询实体类关系
+export function getClassRelationOptionByClassId(startId, endId) {
+  return request({
+    url: `/neo4j/class_relation/getClassRelationOptionByClassId/${startId}/${endId}`,
+    method: 'get'
+  })
+}
+
+// 查询实体类关系详细
+export function addEntityAndRelation(data) {
+  return request({
+    url: `/suport/relation/addEntityRelation`,
+    method: 'post',
+    data: data
+  })
+}

+ 8 - 0
src/api/showInfo/breakdown.js

@@ -67,6 +67,14 @@ export function getMajorCountByMonth(date) {
   })
 }
 
+// 根据月份获取故障件数
+export function getUnitCountByMonth(date) {
+  return request({
+    url: `/showInfo/breakdown/getUnitCountByMonth/${date}`,
+    method: 'get'
+  })
+}
+
 // 获取所有飞机状态
 export function getAircraftStatus(params) {
   return request({

+ 18 - 0
src/api/suport/hand.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询构建流程详细
+export function getExtractByHandBySubtaskId(subtaskId) {
+  return request({
+    url: '/suport/hand/getExtractByHandBySubtaskId/' + subtaskId,
+    method: 'get'
+  })
+}
+
+// 新增构建流程
+export function submitBySubTask(data, isApprove) {
+  return request({
+    url: `/suport/hand/submitBySubTask/${isApprove}`,
+    method: 'post',
+    data: data
+  })
+}

+ 8 - 0
src/api/suport/piont.js

@@ -42,3 +42,11 @@ export function delPiont(id) {
     method: 'delete'
   })
 }
+
+// 查询检查点管理列表
+export function getPointOption() {
+  return request({
+    url: '/suport/piont/getOption',
+    method: 'get',
+  })
+}

+ 7 - 0
src/assets/styles/ruoyi.scss

@@ -349,4 +349,11 @@
 }
 .el-tabs__item {
 	color: #bfcbd9;
+}
+.selected {
+	background-color: transparent;
+}
+
+.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
+    background-color: white;
 }

+ 128 - 0
src/components/Echarts/TreeNode.vue

@@ -0,0 +1,128 @@
+<template>
+  <div>
+    <div id="chart" style="width: 600px; height: 400px;"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+  mounted() {
+    this.initChart();
+  },
+  methods: {
+    initChart() {
+      const chart = echarts.init(document.getElementById('chart'));
+
+      // 初始数据
+      const data = {
+        name: '节点1',
+        children: []
+      };
+
+      // 点击节点时的处理函数
+      const handleClick = (event, node) => {
+        event.stopPropagation();
+
+        // 添加左节点
+        const addLeftNode = () => {
+          const leftNode = {
+            name: '左节点',
+            children: []
+          };
+          node.children.unshift(leftNode);
+          this.updateChart();
+        };
+
+        // 添加右节点
+        const addRightNode = () => {
+          const rightNode = {
+            name: '右节点',
+            children: []
+          };
+          node.children.push(rightNode);
+          this.updateChart();
+        };
+
+        // 删除节点
+        const deleteNode = () => {
+          const parent = node.parent;
+          if (parent) {
+            const index = parent.children.indexOf(node);
+            if (index !== -1) {
+              parent.children.splice(index, 1);
+              this.updateChart();
+            }
+          }
+        };
+
+        // 创建按钮
+        const addButton = (text, handler) => {
+          const button = document.createElement('button');
+          button.innerText = text;
+          button.addEventListener('click', handler);
+          return button;
+        };
+
+        // 弹出按钮面板
+        const panel = document.createElement('div');
+        panel.appendChild(addButton('添加左节点', addLeftNode));
+        panel.appendChild(addButton('添加右节点', addRightNode));
+        panel.appendChild(addButton('删除该节点', deleteNode));
+        panel.style.position = 'absolute';
+        panel.style.top = event.clientY + 'px';
+        panel.style.left = event.clientX + 'px';
+        panel.style.background = '#fff';
+        panel.style.padding = '10px';
+        panel.style.border = '1px solid #ccc';
+
+        document.body.appendChild(panel);
+      };
+
+      // 更新图表数据
+      this.updateChart = () => {
+        const option = {
+          series: [{
+            type: 'tree',
+            data: [data],
+            top: '10%',
+            left: '10%',
+            bottom: '10%',
+            right: '10%',
+            symbol: 'emptyCircle',
+            symbolSize: 7,
+            initialTreeDepth: -1,
+            expandAndCollapse: false,
+            label: {
+              position: 'bottom',
+              verticalAlign: 'middle',
+              align: 'center',
+              fontSize: 10
+            },
+            leaves: {
+              label: {
+                position: 'right',
+                verticalAlign: 'middle',
+                align: 'left'
+              }
+            },
+            emphasis: {
+              focus: 'descendant'
+            },
+            animationDurationUpdate: 750
+          }]
+        };
+
+        chart.setOption(option);
+      };
+
+      // 监听点击事件
+      chart.on('click', handleClick);
+
+      // 初始化图表数据
+      this.updateChart();
+    }
+  }
+};
+</script>

+ 10 - 3
src/components/Echarts/graph.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="chart" ref="gCharts" class="chart"></div>
+  <div id="chart" ref="gCharts" class="chart" :style="'width:'+width+'px;height:'+height+'px'"></div>
 </template>
 <script>
 import * as echarts from "echarts";
@@ -10,6 +10,14 @@ export default {
       type: Object,
       required: true,
     },
+    width: {
+      type: Number,
+      default: 900,
+    },
+    height: {
+      type: Number,
+      default: 600,
+    },
   },
   watch: {
     chartList: {
@@ -61,6 +69,7 @@ export default {
         // this.myChart = echarts.init(document.getElementById("chart"));
         this.myChart = echarts.init(this.$refs.gCharts);
         this.myChart.on("click", (params) => {
+          console.info('params',params)
           if (params.dataType === "node") {
             //判断点击的是图表的节点部分
             this.nodeClick(params);
@@ -183,8 +192,6 @@ export default {
 </script>
 <style scoped>
 .chart {
-  width: 900px;
-  height: 600px;
   border: 1px solid wheat;
 }
 </style>

+ 6 - 1
src/router/search/index.js

@@ -7,7 +7,12 @@ export default  [
     name: 'search',
     component: Home,
     meta: { title: '检索中心', icon: 'dashboard', activeMenu: '' }
-  }
+  },
+  {
+    path: '/question',
+    component: () => import('@/views/searchV2/question'),
+    hidden: true
+  },
   // {
   //     path: '/search/nav',
   //     name: 'nav',

+ 218 - 0
src/views/extract/info/classCreateV2.vue

@@ -0,0 +1,218 @@
+<template>
+  <div :loading="loading">
+    <el-row>
+      <span>
+        <el-col :span="5" class="center-span">
+          <el-button v-show="!readonly" type="primary" plain icon="el-icon-plus" size="mini" @click="createPage()" :loading="loading">新建页</el-button>
+        </el-col>
+        <el-col :span="readonly?12:5" class="center-span">
+          <el-button type="primary" plain icon="el-icon-back" size="mini" @click="previousPage()" :loading="loading">上一页</el-button>
+        </el-col>
+        <el-col :span="readonly?12:5" class="center-span">
+          <el-button type="primary" plain icon="el-icon-right" size="mini" @click="nextPage()" :loading="loading">下一页</el-button>
+        </el-col>
+        <el-col :span="4" class="center-span">
+          <el-button v-show="!readonly" type="primary" plain icon="el-icon-check" size="mini" @click="handleApprove(0)" :loading="loading">保存</el-button>
+        </el-col>
+        <el-col :span="4" class="center-span">
+          <el-button v-show="!readonly" type="primary" plain icon="el-icon-check" size="mini" @click="handleApprove(1)" :loading="loading">提交</el-button>
+        </el-col>
+      </span>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <div style="margin: 10px; max-height: calc(100vh - 220px);overflow: auto;">
+          <ViewPdf :src="showPdfPath"/>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <el-card style="margin: 10px; max-height: calc(100vh - 220px);overflow: auto;" :loading="loading">
+          <el-form ref="form" :model="extractByHands[pageNum]" label-width="80px" >
+            <div v-for="(entityClass, detailIndex) in extractByHands[pageNum].details" :key="'entityClass'+pageNum+detailIndex" style="margin:5px">
+              <el-row>{{ entityClass.entityClassName }}</el-row>
+              <el-row v-for="(entity, index) in entityClass.entityList" :key="'entity'+pageNum+index" style="margin:5px">
+                <el-col :span="23">
+                  <el-input v-model="entityClass.entityList[index]" type="textarea" size="mini"/>
+                </el-col>
+                <el-col :span="1">
+                  <el-button @click="remove(detailIndex,index)" icon="el-icon-minus" circle type="primary" size="mini"/>
+                </el-col>
+              </el-row>
+              <el-row style="margin:5px" class="center-span"><el-button @click="add(detailIndex)" type="primary" icon="el-icon-plus" size="mini" /></el-row>
+            </div>
+          </el-form>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+  
+<script>
+import { getExtractByHandBySubtaskId, submitBySubTask } from "@/api/suport/hand";
+import { getEntityClassOption } from '@/api/neo4j/class'
+import { getDocPathBySunTaskId } from '@/api/extract/subTask'
+import ViewPdf from '@/views/search/pdf/view'
+
+export default {
+  name: "ClassCreateResult",
+  components: { ViewPdf },
+  props:{
+    subTask: {
+      type: Object,
+    },
+    readonly: {
+      type: Boolean,
+    },
+  },
+
+  data() {
+    return {
+      loading: false,
+      pageNum:0,
+      maxPageNum:0,
+      extractByHands:[
+        {
+          id:null,
+          subTaskId:this.subTask.id,
+          pageNo:0,
+          details:[]
+        }
+      ],
+      classes:[],
+      classMap: new Map(),
+      showPdfPath: '',
+    };
+  },
+  created() {
+    this.getClass()
+    this.getPdfPath()
+  },
+
+  computed: {
+  },
+
+  mounted() {
+  },
+  methods: {
+    getResult(){
+      this.loading = true
+      getExtractByHandBySubtaskId(this.subTask.id).then(resp =>{
+          
+          if(resp.data){
+            this.extractByHands = resp.data
+            for(let extractByHand of this.extractByHands) {
+              for(let detail of extractByHand.details) {
+                detail.entityClassName = this.classMap.get(detail.entityClassId)
+              }
+            }
+          } else {
+            this.extractByHands[this.pageNum].details = this.getNewDetails();
+          }
+          
+          this.loading = false
+        }
+      )
+    },
+    getClass() {
+      getEntityClassOption().then(resp => {
+        this.classes = resp.data
+        let classMap = new Map()
+        for(let clazz of this.classes){
+          classMap.set(clazz.id,clazz.name)
+        }
+        this.classMap = classMap
+        this.getResult()
+      })
+    },
+    getNewDetails() {
+      let details = []
+      if(this.classes && this.classes.length >0){
+        for(let clazz of this.classes) {
+          let detail = {
+            id:null,
+            entityClassId: clazz.id,
+            entityClassName: clazz.name,
+            entityList:['']
+          }
+          details.push(detail)
+        }
+      }
+      return details;
+    },
+    getPdfPath(){
+      getDocPathBySunTaskId(this.subTask.id).then(resp => {
+        this.showPdfPath = process.env.VUE_APP_BASE_API + resp.data
+      })
+    },
+    handleApprove(isApprove) {
+      this.loading = true
+      submitBySubTask(this.extractByHands, isApprove).then(resp => {
+        if(isApprove){
+          let message ='提交成功'
+          this.$message({
+            message,
+            type: 'success'
+          });
+          this.loading = false
+          this.$emit("closeInfo")
+        } else {
+          this.extractByHands=resp.data
+          for(let extractByHand of this.extractByHands) {
+            for(let detail of extractByHand.details) {
+              detail.entityClassName = this.classMap.get(detail.entityClassId)
+            }
+          }
+          let message ='保存成功'
+          this.$message({
+            message,
+            type: 'success'
+          });
+          this.loading = false
+        }
+      })
+    },
+
+    handleDelete(index) {
+      this.entityClassRelationList.splice(index, 1);
+    },
+    remove(classIndex, entityIndex){
+      this.extractByHands[this.pageNum].details[classIndex].entityList.splice(entityIndex,1)
+    },
+    add(classIndex){
+      this.extractByHands[this.pageNum].details[classIndex].entityList.push('')
+    },
+    createPage(){
+      this.maxPageNum = this.maxPageNum+1
+      let extractByHand = {
+          id:null,
+          subTaskId: this.subTask.id,
+          pageNo: this.maxPageNum,
+          details: this.getNewDetails()
+        }
+        this.extractByHands.push(extractByHand)
+        this.pageNum = this.extractByHands.length-1
+    },
+    previousPage(){
+      if(this.pageNum === 0){
+        this.$message.error('已经是第一页了');
+      } else {
+        this.pageNum--
+      }
+    },
+    nextPage(){
+      if(this.pageNum === this.extractByHands.length - 1){
+        this.$message.error('已经是最后一页了');
+      } else {
+        this.pageNum++
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.center-span {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

+ 3 - 126
src/views/extract/info/indexV2.vue

@@ -77,12 +77,12 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block" style="margin-top: 15px">
+          <!-- <div class="block" style="margin-top: 15px">
                 <el-pagination align="center" @size-change="handleSizeChange" @current-change="handleCurrentChange"
                     :current-page="currentPage" :page-sizes="[1, 5, 10, 20]" :page-size="pageSize"
                     layout="total, sizes, prev, pager, next, jumper" :total="input.knowledgeList.length">
                 </el-pagination>
-            </div>
+            </div> -->
         </el-card>
       </el-col>
     </el-row>
@@ -117,129 +117,6 @@ export default {
       loading: false,
       result:{},
       input: {
-        docInfo: {
-          docId: 11,
-          taskId: 13,
-          subTaskId: 33,
-          docName: "张三.pdf",
-          docAddress:
-            "https://gitee.com/rewriter08/label_demo/raw/master/example.pdf",
-        },
-        sentenceList: [
-          {
-            id: 0,
-            text: "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-          },
-          {
-            id: 1,
-            text: " 1045号汽车故障报告故障现象打开点火开关,操作左前电动座椅开关,座椅6个方向均不动作故障原因六向电动座椅线束磨破搭铁修复方法包扎磨破线束,从新固定。",
-          },
-          { id: 2, text: " \x0c" },
-        ],
-        knowledgeList: [
-          {
-            sentenceId: 0,
-            sentence:
-              "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-            start: "转向",
-            end: "有“咯噔”声",
-            relation: "检测工具",
-            startPosition: [5, 7],
-            endPosition: [8, 14],
-          },
-          {
-            sentenceId: 0,
-            sentence:
-              "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-            start: "转向",
-            end: "缺油",
-            relation: "部件故障",
-            startPosition: [5, 7],
-            endPosition: [27, 29],
-          },
-          {
-            sentenceId: 0,
-            sentence:
-              "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-            start: "转向机",
-            end: "有“咯噔”声",
-            relation: "检测工具",
-            startPosition: [19, 22],
-            endPosition: [8, 14],
-          },
-          {
-            sentenceId: 0,
-            sentence:
-              "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-            start: "转向机",
-            end: "缺油",
-            relation: "部件故障",
-            startPosition: [19, 22],
-            endPosition: [27, 29],
-          },
-          {
-            sentenceId: 0,
-            sentence:
-              "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-            start: "转向轴",
-            end: "有“咯噔”声",
-            relation: "检测工具",
-            startPosition: [23, 26],
-            endPosition: [8, 14],
-          },
-          {
-            sentenceId: 0,
-            sentence:
-              "故障现象:转向时有“咯噔”声原因分析:转向机与转向轴处缺油解决措施:向此处重新覆盖一层润滑脂后,故障消失。",
-            start: "转向轴",
-            end: "缺油",
-            relation: "部件故障",
-            startPosition: [23, 26],
-            endPosition: [27, 29],
-          },
-          {
-            sentenceId: 1,
-            sentence:
-              " 1045号汽车故障报告故障现象打开点火开关,操作左前电动座椅开关,座椅6个方向均不动作故障原因六向电动座椅线束磨破搭铁修复方法包扎磨破线束,从新固定。",
-            start: "座椅",
-            end: "不动作",
-            relation: "部件故障",
-            startPosition: [34, 36],
-            endPosition: [41, 44],
-          },
-          {
-            sentenceId: 1,
-            sentence:
-              " 1045号汽车故障报告故障现象打开点火开关,操作左前电动座椅开关,座椅6个方向均不动作故障原因六向电动座椅线束磨破搭铁修复方法包扎磨破线束,从新固定。",
-            start: "座椅",
-            end: "磨破搭铁",
-            relation: "检测工具",
-            startPosition: [34, 36],
-            endPosition: [56, 60],
-          },
-          {
-            sentenceId: 1,
-            sentence:
-              " 1045号汽车故障报告故障现象打开点火开关,操作左前电动座椅开关,座椅6个方向均不动作故障原因六向电动座椅线束磨破搭铁修复方法包扎磨破线束,从新固定。",
-            start: "六向电动座椅线束",
-            end: "不动作",
-            relation: "检测工具",
-            startPosition: [48, 56],
-            endPosition: [41, 44],
-          },
-          {
-            sentenceId: 1,
-            sentence:
-              " 1045号汽车故障报告故障现象打开点火开关,操作左前电动座椅开关,座椅6个方向均不动作故障原因六向电动座椅线束磨破搭铁修复方法包扎磨破线束,从新固定。",
-            start: "六向电动座椅线束",
-            end: "磨破搭铁",
-            relation: "性能故障",
-            startPosition: [48, 56],
-            endPosition: [56, 60],
-          },
-        ],
-        code: 200,
-        msg: "success",
       },
       spo: {
         sentenceId: -1,
@@ -290,7 +167,7 @@ export default {
         this.result = response.data
       });
       getResultJson(this.subTask.id).then(response => {
-        // this.input = response.data
+        this.input = response.data
         this.createEditor()
         this.loading = false
       });

+ 6 - 6
src/views/extract/subTask/index.vue

@@ -49,7 +49,7 @@
                 icon="el-icon-warning-outline"
                 @click="createClass(scope.row)"
                 v-hasPermi="['extract:subTask:edit']"
-              >构建</el-button>
+              >手动抽取</el-button>
               <el-button
                 v-show="scope.row.type == 3 && scope.row.status == 0"
                 size="mini"
@@ -81,7 +81,7 @@
                 icon="el-icon-warning-outline"
                 @click="viewResult2(scope.row)"
                 v-hasPermi="['extract:subTask:edit']"
-              >查看构建结果</el-button>
+              >查看抽取结果</el-button>
               <el-button
                 v-show="scope.row.type == 3 && scope.row.status == 3"
                 size="mini"
@@ -148,7 +148,7 @@
       </div>
     </el-dialog>
     <el-dialog :title="tripletInfoOpenTitle" v-if="tripletInfoOpen" :visible.sync="tripletInfoOpen" width="80%" append-to-body destroy-on-close :close-on-click-modal="false">
-      <IndexV2 :subTask="subTask" @closeInfo="closeInfo" :readonly="tripletInfoReadOnly"/>
+      <IndexV3 :subTask="subTask" @closeInfo="closeInfo" :readonly="tripletInfoReadOnly"/>
     </el-dialog>
     <el-dialog :title="createInfoOpenTitle" v-if="createInfoOpen" :visible.sync="createInfoOpen" width="80%" append-to-body destroy-on-close :close-on-click-modal="false">
       <classCreateV :subTask="subTask" @closeInfo="closeInfo" :readonly="createInfoReadOnly"/>
@@ -168,13 +168,13 @@
 import { listSubTask, getSubTask, delSubTask, addSubTask, updateSubTask } from "@/api/extract/subTask";
 import { getSentence } from "@/api/extract/result";
 import TripletInfo from '@/views/extract/info';
-import IndexV2 from '@/views/extract/info/indexV2';
-import classCreateV from '@/views/extract/info/classCreateV';
+import IndexV3 from '@/views/extract/info/indexV3';
+import classCreateV from '@/views/extract/info/classCreateV2';
 import buildFlow from '@/views/extract/info/buildFlow';
 export default {
   name: "SubTask",
   dicts: ['extract_sub_task_status', 'extract_sub_task_list'],
-  components: { TripletInfo,IndexV2,classCreateV,buildFlow },
+  components: { TripletInfo,IndexV3,classCreateV,buildFlow },
   props: {
     task: {
       type: Object,

+ 113 - 4
src/views/knowledge/entity/index.vue

@@ -1,6 +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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
       <el-form-item label="实体名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -63,8 +63,18 @@
 
     <el-table v-loading="loading" :data="entityList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="实体名称" align="center" prop="name" />
-      <el-table-column label="实体描述" align="center" prop="content" />
+      <el-table-column label="实体名称" align="center" prop="name" >
+        <template slot-scope="scope">
+          <div @click="showGraphDialog(scope.row)">
+            {{ scope.row.name }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="实体类" align="center" prop="labels">
+        <template slot-scope="scope">
+          {{ scope.row.labels.join(', ') }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -102,21 +112,38 @@
         <el-form-item label="实体描述" prop="content">
           <el-input v-model="form.content" placeholder="请输入实体描述" />
         </el-form-item>
+        <el-form-item label="实体类" prop="labels">
+          <el-select v-model="form.labels" clearable multiple filterable placeholder="请选择">
+            <el-option
+              v-for="item in classOption"
+              :key="item.name"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogGraphVisible" @close="closeGraphDialog" @mouseleave="closeGraphDialog" width="500px">
+      <Graph ref="charts" :chartList="chartData" :width="450" :height="450"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listEntity, getEntity, delEntity, addEntity, updateEntity } from "@/api/knowledge/entity";
+import { getRelationByEntityId } from '@/api/knowledge/search'
 import {bit2Info} from '@/utils/validate'
+import Graph from '@/components/Echarts/graph'
+import { getEntityClassOption  } from "@/api/neo4j/class";
 
 export default {
   name: "Entity",
+  components: { Graph },
   data() {
     return {
       // 遮罩层
@@ -147,12 +174,26 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      dialogGraphVisible: false,
+      searchList: {},
+      chartData: {
+        seriesData: [],
+        linksData: [],
+      },
+      classOption: []
     };
   },
   created() {
     this.getList();
+    this.getOption()
   },
+  // mounted() {
+  //   this.bindTableEvents();
+  // },
+  // beforeDestroy() {
+  //   this.unbindTableEvents();
+  // },
   methods: {
     /** 查询实体管理列表 */
     bit2Info,
@@ -246,7 +287,75 @@ export default {
       this.download('knowledge/entity/export', {
         ...this.queryParams
       }, `entity_${new Date().getTime()}.xlsx`)
+    },
+    showGraphDialog(row) {
+      // 显示对话框,并设置内容
+      getRelationByEntityId(row.id).then(resp => {
+        let respData = resp.data
+        if(respData.data.length === 0){
+          this.$message({
+            message: '没有找到匹配的数据',
+            type: 'warning'
+          });
+        }
+        let seriesData = []
+        let linksData = []
+        for (let item of respData.data) {
+          seriesData.push(
+            { name: item.name }
+          )
+        }
+        for (let link of respData.links) {
+          linksData.push(
+            {
+              source: link.fromName,
+              target: link.toName,
+              label: {
+                show: true, // 是否显示line的文字
+                formatter: link.name // line的文字
+              },
+            }
+          )
+        }
+        this.chartData = {
+          seriesData,
+          linksData,
+        }
+        this.dialogGraphVisible = true;
+      })
+    },
+    closeGraphDialog() {
+      // 关闭对话框
+      this.dialogGraphVisible = false;
+    },
+    getOption(){
+      getEntityClassOption().then(resp => {
+        this.classOption = resp.data
+      })
     }
+    // bindTableEvents() {
+    //   const tableBody = this.$el.querySelector('.el-table__body-wrapper');
+    //   if (tableBody) {
+    //     tableBody.addEventListener('mouseenter', this.handleMouseEnter);
+    //     tableBody.addEventListener('mouseleave', this.handleMouseLeave);
+    //   }
+    // },
+    // unbindTableEvents() {
+    //   const tableBody = this.$el.querySelector('.el-table__body-wrapper');
+    //   if (tableBody) {
+    //     tableBody.removeEventListener('mouseenter', this.handleMouseEnter);
+    //     tableBody.removeEventListener('mouseleave', this.handleMouseLeave);
+    //   }
+    // },
+    // handleMouseEnter(event) {
+    //   if (event.target.tagName === 'TD') {
+    //     const firstColumnCell = event.target.parentNode.firstElementChild;
+    //     this.showDialog(firstColumnCell.textContent);
+    //   }
+    // },
+    // handleMouseLeave() {
+    //   this.closeGraphDialog();
+    // }
   }
 };
 </script>

+ 144 - 7
src/views/knowledge/entityRelation/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" @submit.native.prevent>
       <el-form-item label="实体关系名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -26,6 +26,16 @@
           v-hasPermi="['knowledge:entityRelation:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAddByClass"
+          v-hasPermi="['knowledge:entityRelation:add']"
+        >根据类新增</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -126,13 +136,61 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="openByClass" width="500px" append-to-body>
+      <el-form ref="formClass" :model="formByClass" :rules="rulesByClass" label-width="100px">
+        <el-form-item label="起点实体类" prop="subEntityClassId">
+          <el-select v-model="formByClass.subEntityClassId" placeholder="请选择起点实体" value-key="id" filterable @change="getEntityClassRelationOption">
+            <el-option
+              v-for="item in entityClassOption"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="终点实体类" prop="objEntityClassId">
+          <el-select v-model="formByClass.objEntityClassId" placeholder="请选择终点实体" value-key="id" filterable @change="getEntityClassRelationOption">
+            <el-option
+              v-for="item in entityClassOption"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实体关系类" prop="entityClassRelId">
+          <el-select v-model="formByClass.entityClassRelId" placeholder="请选实体关系类" value-key="id" filterable clearable >
+            <el-option
+              v-for="item in entityClassRelationOption"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="起点实体" prop="subEntity">
+          <el-input type="textarea" :rows="2" v-model="formByClass.subEntity" placeholder="请输入起点实体" />
+        </el-form-item>
+        <el-form-item label="终点实体" prop="objEntity">
+          <el-input type="textarea" :rows="2"  v-model="formByClass.objEntity" placeholder="请输入终点实体" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormByClass(1)">提交并继续添加</el-button>
+        <el-button type="primary" @click="submitFormByClass(0)">提交并关闭</el-button>
+        <el-button @click="cancelByClass">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listEntityRelation, getEntityRelation, delEntityRelation, addEntityRelation, updateEntityRelation } from "@/api/knowledge/entityRelation";
 import { findAll } from "@/api/knowledge/entity";
-import {bit2Info} from '@/utils/validate'
+import { getEntityClassOption } from "@/api/neo4j/class"
+import { getClassRelationOptionByClassId, addEntityAndRelation } from "@/api/neo4j/class_relation"
+import { bit2Info } from '@/utils/validate'
 
 export default {
   name: "EntityRelation",
@@ -164,15 +222,48 @@ export default {
       },
       // 表单参数
       form: {},
+      formByClass: {},
       // 表单校验
       rules: {
+        name: [
+          {required: true, message: '实体关系名称不能为空', trigger: 'blur'},
+        ],
+        startNode: [
+          {required: true, message: '起点实体不能为空', trigger: 'blur'},
+        ],
+        endNode: [
+          {required: true, message: '终点实体不能为空', trigger: 'blur'},
+        ],
       },
-      entityList: []
+      rulesByClass: {
+        subEntityClassId: [
+          {required: true, message: '起点实体类不能为空', trigger: 'blur'},
+        ],
+        objEntityClassId: [
+          {required: true, message: '终点实体类不能为空', trigger: 'blur'},
+        ],
+        entityClassRelId: [
+          {required: true, message: '实体关系类不能为空', trigger: 'blur'},
+        ],
+        subEntity: [
+          {required: true, message: '起点实体不能为空', trigger: 'blur'},
+        ],
+        objEntity: [
+          {required: true, message: '终点实体不能为空', trigger: 'blur'},
+        ],
+      },
+      entityList: [],
+      entityClassOption: [],
+      entityClassRelationOption: [],
+      openByClass: false,
     };
   },
   created() {
     this.getList();
-    this.findAllEntity();
+    this.getOption();
+  },
+  activated(){
+    this.getOption();
   },
   methods: {
     /** 查询实体关系管理列表 */
@@ -268,12 +359,58 @@ export default {
         ...this.queryParams
       }, `entityRelation_${new Date().getTime()}.xlsx`)
     },
-    findAllEntity(){
+    getOption(){
       findAll().then(resp => {
         this.entityList = resp
-        console.info(resp)
       })
-    }
+      getEntityClassOption().then(resp => {
+        this.entityClassOption = resp.data
+      })
+    },
+    getEntityClassRelationOption(){
+      delete this.formByClass.entityClassRelId;
+      if(this.formByClass.subEntityClassId && this.formByClass.objEntityClassId) {
+        getClassRelationOptionByClassId(this.formByClass.subEntityClassId, this.formByClass.objEntityClassId).then(resp => {
+          this.entityClassRelationOption = resp.data;
+        })
+      } else {
+        this.entityClassRelationOption = []
+      }
+    },
+    handleAddByClass(){
+      this.resetClass();
+      this.openByClass = true;
+      this.title = "添加实体及实体关系";
+    },
+    resetClass(){
+      this.formByClass = {
+        // name: null,
+        // content: null,
+        // startNode: null,
+        // endNode: null,
+      };
+      this.resetForm("formClass");
+    },
+    cancelByClass(){
+      this.openByClass = false;
+      this.resetClass();
+    },
+    submitFormByClass(type){
+      this.$refs["formClass"].validate(valid => {
+        if (valid) {
+          addEntityAndRelation(this.formByClass).then(reps => {
+            this.$modal.msgSuccess("提交成功");
+            if(type) {
+              this.handleAddByClass()
+            } else {
+              this.openByClass = false;
+              this.getList();
+            }
+            
+          })
+        }
+      })
+    },
   }
 };
 </script>

+ 39 - 0
src/views/knowledge/search/CustomNode.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>
+    <div class="node-container" ref="nodeContainer"></div>
+    <button @click="handleButtonClick">按钮</button>
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts';
+
+export default {
+  mounted() {
+    this.renderNode();
+  },
+  methods: {
+    renderNode() {
+      // 使用Echarts渲染节点
+      const chart = echarts.init(this.$refs.nodeContainer);
+      // 在这里可以编写你的节点配置和数据
+      // 示例:
+      const options = {
+        // Echarts配置项
+        // ...
+      };
+      chart.setOption(options);
+    },
+    handleButtonClick() {
+      // 按钮点击事件处理逻辑
+      // ...
+    }
+  }
+}
+</script>
+
+<style>
+.node-container {
+  height: 300px; /* 调整节点容器的高度 */
+}
+</style>

+ 250 - 88
src/views/knowledge/search/chartByD3.vue

@@ -1,101 +1,263 @@
 <template>
-  <div class="app-container" ref="svgContainer"></div>
+  <div>
+    <div id="chart" style="width: 1000px; height: 700px"></div>
+    <button v-show="selectedNode" @click="addLeftNode">添加左节点</button>
+    <button v-show="selectedNode" @click="addRightNode">添加右节点</button>
+    <button v-show="selectedNode" @click="deleteNode">删除该节点</button>
+    <button v-show="selectedNode" @click="updateNode">修改该节点</button>
+
+    <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="startId">
+          <el-select
+            v-model="form.id"
+            placeholder="请选择检查点"
+            value-key="id"
+            filterable
+          >
+            <el-option
+              v-for="item in pointList"
+              :key="item.id"
+              :label="item.check_piont"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
+
+
 <script>
-import * as d3 from 'd3';
+import echarts from "echarts";
+import { getPointOption } from "@/api/suport/piont";
 
 export default {
+  data() {
+    return {
+      chartInstance: null,
+      selectedNode: null,
+      treeData: [
+        // 初始节点
+        {
+          name: "Root",
+          value: null,
+          children: [],
+          borderColor: {
+            color: "#ccc"
+          }
+        },
+      ],
+      title: "",
+      open: false,
+      form: {},
+      rules: {},
+      pointList: [],
+      ecode:'',
+    };
+  },
+
+  created() {
+    this.getPointOption();
+  },
+
   mounted() {
-    const svgContainer = this.$refs.svgContainer;
-    const width = svgContainer.clientWidth;
-    const height = svgContainer.clientHeight;
-
-    const links = [
-      { source: "A", target: "B", value: 1 },
-      { source: "A", target: "C", value: 2 },
-      { source: "B", target: "C", value: 3 },
-      { source: "B", target: "D", value: 4 },
-      { source: "C", target: "D", value: 5 },
-    ];
-
-    const nodes = [
-      { id: "A", x: 100, y: 100 },
-      { id: "B", x: 200, y: 100 },
-      { id: "C", x: 150, y: 200 },
-      { id: "D", x: 250, y: 200 },
-    ];
-
-    const svg = d3.select(svgContainer).append("svg")
-      .attr("width", width)
-      .attr("height", height);
-
-    const link = svg.selectAll("line")
-      .data(links)
-      .join("line")
-      .attr("stroke", "black")
-      .attr("stroke-width", d => d.value);
-
-    const node = svg.selectAll("circle")
-      .data(nodes)
-      .join("circle")
-      .attr("r", 20)
-      .attr("fill", "red")
-      .call(drag(simulation));
-
-    const label = svg.selectAll("text")
-      .data(nodes)
-      .join("text")
-      .text(d => d.id)
-      .attr("x", d => d.x)
-      .attr("y", d => d.y);
-
-    const simulation = d3.forceSimulation(nodes)
-      .force("link", d3.forceLink(links).id(d => d.id))
-      .force("charge", d3.forceManyBody())
-      .force("center", d3.forceCenter(width / 2, height / 2));
-
-    simulation.on("tick", () => {
-      link
-        .attr("x1", d => d.source.x)
-        .attr("y1", d => d.source.y)
-        .attr("x2", d => d.target.x)
-        .attr("y2", d => d.target.y);
-
-      node
-        .attr("cx", d => d.x)
-        .attr("cy", d => d.y);
-
-      label
-        .attr("x", d => d.x)
-        .attr("y", d => d.y - 25);
-    });
-
-    function drag(simulation) {
-
-      function dragstarted(event) {
-        if (!event.active) simulation.alphaTarget(0.3).restart();
-        event.subject.fx = event.subject.x;
-        event.subject.fy = event.subject.y;
+    this.chartInstance = echarts.init(document.getElementById("chart"));
+    this.chartInstance.on("click", this.selectNode); // 监听点击事件
+    this.renderChart();
+    this.levelOrder();
+  },
+  beforeDestroy() {
+    this.chartInstance.off("click", this.selectNode); // 移除监听事件
+  },
+  methods: {
+    renderChart() {
+      const option = {
+        // ECharts配置项
+        tooltip: {
+          trigger: "item",
+          triggerOn: "mousemove",
+        },
+        series: [
+          {
+            type: "tree",
+            data: this.treeData,
+            left: "2%",
+            right: "2%",
+            top: "8%",
+            bottom: "20%",
+            symbol: "emptyCircle",
+            orient: "vertical",
+            symbolSize: 30,
+            itemStyle: {
+              color: null,
+            },
+            expandAndCollapse: false,
+            label: {
+              position: "bottom",
+              rotate: 0,
+              verticalAlign: "middle",
+              align: "center",
+              fontSize: 15,
+              distance: 10,
+            },
+            animationDurationUpdate: 750,
+            initialTreeDepth: 10,
+          },
+        ],
+      };
+
+      this.chartInstance.setOption(option);
+    },
+
+    reset() {
+      this.form = {
+        id: null,
+        code: null,
+        checkPiont: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+
+    selectNode(params) {
+      if (params.data && params.data.name) {
+        this.selectedNode = params.data;
       }
+    },
 
-      function dragged(event) {
-        event.subject.fx = event.x;
-        event.subject.fy = event.y;
+    addLeftNode() {
+      const newNode = { name: "Left Node", value: null, children: [], itemStyle: {borderColor: "#FF0000"} };
+      this.selectedNode.children.unshift(newNode);
+      this.treeData = this.chartInstance.getOption().series[0].data;
+      this.chartInstance.clear();
+      this.renderChart();
+      this.levelOrder();
+    },
+    addRightNode() {
+      const newNode = { name: "Right Node", value: null, children: [],itemStyle: {borderColor: "#0000FF"} };
+      this.selectedNode.children.push(newNode);
+      this.treeData = this.chartInstance.getOption().series[0].data;
+      this.chartInstance.clear();
+      this.renderChart();
+      this.levelOrder();
+    },
+    deleteNode() {
+      this.treeData = this.chartInstance.getOption().series[0].data;
+      const parentNode = this.findParentNode(this.treeData, this.selectedNode);
+      if (parentNode) {
+        const index = parentNode.children.indexOf(this.selectedNode);
+        parentNode.children.splice(index, 1);
+        this.chartInstance.clear();
+        this.renderChart();
+        this.levelOrder();
+        this.selectedNode = null;
+      }
+    },
+    findParentNode(tree, targetNode) {
+      for (const node of tree) {
+        for (const child of node.children) {
+          if (child.name === targetNode.name) {
+            return node;
+          }
+        }
+        if (node.children.length > 0) {
+          const parentNode = this.findParentNode(node.children, targetNode);
+          if (parentNode) {
+            return parentNode;
+          }
+        }
       }
+      return null;
+    },
 
-      function dragended(event) {
-        if (!event.active) simulation.alphaTarget(0);
-        event.subject.fx = null;
-        event.subject.fy = null;
+    updateNode() {
+      this.reset();
+      this.form.id = this.selectedNode.value;
+      this.open = true;
+      this.title = "修改检查点";
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.selectedNode.value = this.form.id;
+      for (const point of this.pointList) {
+        if (point.id === this.form.id) {
+          this.selectedNode.name = point.check_piont;
+          break;
+        }
       }
+      this.open = false;
+      this.treeData = this.chartInstance.getOption().series[0].data;
+      this.chartInstance.clear();
+      this.renderChart();
+      this.levelOrder();
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+
+    getPointOption() {
+      getPointOption().then((resp) => {
+        this.pointList = resp.data;
+        console.info(resp);
+      });
+    },
 
-      return d3.drag()
-        .on("start", dragstarted)
-        .on("drag",
-          dragged)
-        .on("end", dragended);
-    }
-  }
-}
-</script>
+    levelOrder() {
+        const ret = [];
+        if (!this.treeData) {
+            return ret;
+        }
+        const q = [];
+        q.push(this.treeData[0]);
+        while (q.length !== 0) {
+            const currentLevelSize = q.length;
+            const nullNode = { name: "", value: 0, children: [],itemStyle: {} };
+            for (let i = 1; i <= currentLevelSize; ++i) {
+                const node = q.shift();
+                ret.push(node.value);
+                let n = node.children.length;
+                if (n == 0 && node.value != 0) {
+                  q.push(nullNode);
+                  q.push(nullNode);
+                }
+                else if (n == 1) {
+                  if (node.children[0].itemStyle.borderColor == "#FF0000"){
+                    q.push(node.children[0]);
+                    q.push(nullNode);
+                  }
+                  else {
+                    q.push(nullNode);
+                    q.push(node.children[0]);
+                  }
+                }
+                else if (n == 2) {
+                  q.push(node.children[0]);
+                  q.push(node.children[1]);
+                }
+            }
+        }
+        let n = ret.length;
+        while (ret[n-1] === 0) {
+          ret.pop();
+          n--;
+        }
+        this.$emit('flowEncode', ret.join(','));
+    },
+  },
+};
+</script>

+ 6 - 6
src/views/neo4j/class/index.vue

@@ -1,6 +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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" @submit.native.prevent>
       <el-form-item label="实体类名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -63,9 +63,9 @@
 
     <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="id" />
+      <!-- <el-table-column label="实体类ID" align="center" prop="id" /> -->
       <el-table-column label="实体类名称" align="center" prop="name" />
-      <el-table-column label="实体类描述" align="center" prop="desc" />
+      <!-- <el-table-column label="实体类描述" align="center" prop="desc" /> -->
       <el-table-column label="实体类背景颜色" align="center" prop="backGroundColor">
         <template slot-scope="scope">
           <el-color-picker v-model="scope.row.backGroundColor" size="mini" disabled></el-color-picker>
@@ -105,10 +105,10 @@
         <el-form-item label="实体类名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入实体类名称" />
         </el-form-item>
-        <el-form-item label="实体类描述" prop="desc">
+        <!-- <el-form-item label="实体类描述" prop="desc">
           <el-input v-model="form.desc" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="实体类背景颜色" prop="backGroundColor">
+        </el-form-item> -->
+        <el-form-item label="背景颜色" prop="backGroundColor">
           <el-color-picker v-model="form.backGroundColor"></el-color-picker>
         </el-form-item>
       </el-form>

+ 16 - 16
src/views/neo4j/class_relation/index.vue

@@ -1,6 +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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px" @submit.native.prevent>
       <el-form-item label="实体类关系名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="起点实体类" prop="startId">
+      <!-- <el-form-item label="起点实体类" prop="startId">
         <el-input
           v-model="queryParams.startId"
           placeholder="请输入起点实体类"
@@ -24,7 +24,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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>
@@ -64,7 +64,7 @@
           v-hasPermi="['neo4j:class_relation:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -73,21 +73,21 @@
           @click="handleExport"
           v-hasPermi="['neo4j:class_relation:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="class_relationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="实体类关系名称" align="center" prop="name" />
-      <el-table-column label="实体类关系描述" align="center" prop="desc" />
+      <!-- <el-table-column label="实体类关系描述" align="center" prop="desc" /> -->
+      <el-table-column label="起点实体类" align="center" prop="startName" />
+      <el-table-column label="终点实体类" align="center" prop="endName" />
       <el-table-column label="实体类背景颜色" align="center" prop="backGroundColor" >
         <template slot-scope="scope">
           <el-color-picker v-model="scope.row.backGroundColor" size="mini" disabled></el-color-picker>
         </template>
       </el-table-column>
-      <el-table-column label="起点实体类" align="center" prop="startName" />
-      <el-table-column label="终点实体类" align="center" prop="endName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,16 +118,13 @@
 
     <!-- 添加或修改实体类关系对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="实体类关系名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入实体类名称" />
         </el-form-item>
-        <el-form-item label="实体类关系描述" prop="desc">
+        <!-- <el-form-item label="实体类关系描述" prop="desc">
           <el-input v-model="form.desc" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="实体类关系背景颜色" prop="backGroundColor">
-          <el-color-picker v-model="form.backGroundColor"></el-color-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="起点实体类" prop="startId">
           <el-select v-model="form.startId" placeholder="请选择起点实体类" value-key="id" filterable >
             <el-option
@@ -148,6 +145,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="背景颜色" prop="backGroundColor">
+          <el-color-picker v-model="form.backGroundColor"></el-color-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -204,7 +204,7 @@ export default {
     this.getEntityClassOption();
   },
   activated(){
-    this.tEntityClassOption();
+    this.getEntityClassOption();
   },
   methods: {
     /** 查询实体类关系列表 */

+ 0 - 1
src/views/searchV2/breakdown/base.vue

@@ -61,7 +61,6 @@ export default {
       }
       getGraphByEntiry(this.queryParams).then((resp) => {
         let respData = resp.data
-        debugger
         if(respData.data.length === 0){
           this.$message({
             message: '没有找到匹配的数据',

+ 38 - 9
src/views/searchV2/question/index.vue

@@ -3,11 +3,10 @@
       <el-row>
         <el-col :span="6">
           <el-card class="chat-msg">
-            <ul>
-              <li v-for="item in top10" :key="item.question" @click="searchByTop10(item.question)">
-                {{ item.question }}
-              </li>
-            </ul>
+            <p>热点问题</p>
+            <p v-for="(item,index) in top10" :key="item.question" @click="searchByTop10(item.question)">
+                {{ index+1+'. '+item.question }}
+              </p>
           </el-card>
         </el-col>
         <el-col :span="12">
@@ -19,8 +18,7 @@
                   alt="avatar"
                   class="avatar"
                 />
-                <div :class="['bubble', message.sender === 'user' ? 'user-bubble' : message.sender === 'ai' ? 'ai-bubble' : 'system-bubble']">
-                  {{ message.content }}
+                <div :class="['bubble', message.sender === 'user' ? 'user-bubble' : message.sender === 'ai' ? 'ai-bubble' : 'system-bubble']">{{message.content}}
                   <el-button v-if="message.sender === 'system' && requestError" size="mini" type="text" @click="retry(message.oldMsg)" style="margin-left:10px;width:80px">&nbsp;&nbsp;重&nbsp;&nbsp;试</el-button>
                 </div>
               </div>
@@ -68,6 +66,7 @@ export default {
   },
   created(){
     this.getTop10();
+    this.firstGreeting();
   },
   mounted(){
     this.hint = this.getHint();
@@ -140,6 +139,33 @@ export default {
       searchByTop10(question){
         this.inputMessage = question;
         this.sendMessage(null)
+      },
+      getTimeState() {
+        // 获取当前时间
+        let timeNow = new Date();
+        // 获取当前小时
+        let hours = timeNow.getHours();
+        // 设置默认文字
+        let text = ``;
+        // 判断当前时间段
+        if (hours >= 0 && hours <= 10) {
+            text = `早上`;
+        } else if (hours > 12 && hours <= 14) {
+            text = `中午`;
+        } else if (hours > 14 && hours <= 18) {
+            text = `下午`;
+        } else if (hours > 18 && hours <= 24) {
+            text = `晚上`;
+        }
+        // 返回当前时间段对应的状态
+        return text;
+      },
+      firstGreeting() {
+        let greeting = `${this.$store.state.user.name}先生,${this.getTimeState()}好!有什么疑问可以帮助到您,请在下面的对话框输入您的问题`
+        this.messages.push({
+          sender: "ai",
+          content: greeting,
+        });
       }
   },
 };
@@ -147,6 +173,7 @@ export default {
   
 <style scoped>
 .chat-window {
+  white-space: pre-wrap;
   overflow-y: scroll;
   margin-bottom: 10px;
   border: 0px;
@@ -249,11 +276,12 @@ export default {
 
 .chat-window-wrapper {
   border: 2px solid #45a1ff;
-  height: calc(100vh - 200px);
+  height: calc(100vh - 100px);
   /* max-height: 500px; */
   overflow-y: auto;
   margin-left: 5px;
   margin-right: 5px;
+  margin-top: 20px;
 }
 
 .chat-window {
@@ -261,8 +289,9 @@ export default {
   /* min-height: 100%; */
 }
 .chat-msg {
-  height: calc(100vh - 200px);
+  height: calc(100vh - 40px);
   white-space: pre-wrap;
   font-size: 1rem;
+  margin-top: 20px;
 }
 </style>

+ 44 - 11
src/views/showInfo/breakdown/statistics/index.vue

@@ -5,21 +5,27 @@
     </el-row>
     <el-row>
       <el-col :span="12">
-        <div ref="pieChart" style="height: 400px;"></div>
+        <div ref="pieChart" style="height: 400px;margin-top: 36px;"></div>
       </el-col>
       <el-col :span="12">
+        <el-select v-model="type" placeholder="请选择" @change="changeType">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
         <div ref="pieChart2" style="height: 400px;"></div>
       </el-col>
     </el-row>
-    
-    
   </div>
 </template>
 
 <script>
 import * as echarts from 'echarts';
 import moment from "moment";
-import { getBreakDownCountByMonth, getAirplaneModelCountByMonth, getMajorCountByMonth } from "@/api/showInfo/breakdown";
+import { getBreakDownCountByMonth, getAirplaneModelCountByMonth, getMajorCountByMonth, getUnitCountByMonth } from "@/api/showInfo/breakdown";
 export default {
   name: "BrakDownShow",
   data() {
@@ -27,15 +33,24 @@ export default {
       lineChartData: [],
       pieChartData: [],
       pieChartData2: [],
+      type:1,
+      typeOptions:[
+        {
+          value: 1,
+          label: '部件'
+        },{
+          value: 2,
+          label: '专业'
+        }
+      ],
+      currentDate: '',
     };
   },
   mounted() {
     this.initLineChartData(); // 初始化图表数据
     let date = moment().format('YYYY-MM');
     this.initPieChartData(date);
-    // this.initPieChart();
     this.initPieChartData2(date);
-    // this.initPieChart2();
   },
   methods: {
     /**
@@ -129,7 +144,7 @@ export default {
             formatter: function (params) {
               return params.data  // 显示具体数值
             }
-          }
+          },
         }]
       };
       // 上述代码中,在title、xAxis、yAxis和series的属性中都添加了textStyle或color属性,并将其设置为白色。这样就可以改变文字颜色了。如果你需要修改其他部分的颜色,可以根据需要查找对应的属性设置。
@@ -140,6 +155,7 @@ export default {
       myChart.on('click', function (params) {
         that.initPieChartData(params.name)
         that.initPieChartData2(params.name)
+        that.currentDate = params.name
       })
     },
 
@@ -192,12 +208,29 @@ export default {
       myChart.setOption(pieChartOption);
     },
 
+    changeType(){
+      let date = this.currentDate? this.currentDate : moment().format('YYYY-MM')
+      this.initPieChartData2(date)
+    },
+
     initPieChartData2(date) {
-      getMajorCountByMonth(date).then(resp => {
-        this.initPieChart2(date, resp.data); // 初始化图表
-      });
+      if(this.type===1){
+        getUnitCountByMonth(date).then(resp => {
+          this.initPieChart2(date, resp.data); // 初始化图表
+        }); 
+      } else {
+        getMajorCountByMonth(date).then(resp => {
+          this.initPieChart2(date, resp.data); // 初始化图表
+        });
+      }
     },
     initPieChart2(date, pieChartData){
+      let chartTitle = '';
+      if(this.type===1){
+        chartTitle = `月度故障部件统计(${date})`
+      } else {
+        chartTitle = `月度故障专业统计(${date})`
+      }
       const chartDom = this.$refs.pieChart2;
       const myChart = echarts.init(chartDom);
 
@@ -210,7 +243,7 @@ export default {
 
       let pieChartOption =  {
         title: {
-          text: `月度故障专业统计(${date})`,
+          text: chartTitle,
           textStyle: {
             color: 'white'
           }

+ 129 - 50
src/views/suport/flow/index.vue

@@ -1,6 +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
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+      @submit.native.prevent
+    >
       <el-form-item label="故障名称" prop="errorAppearance">
         <el-input
           v-model="queryParams.errorAppearance"
@@ -10,8 +18,16 @@
         />
       </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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -24,7 +40,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['suport:flow:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -35,7 +52,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['suport:flow:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -46,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['suport:flow:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -56,7 +75,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['suport:flow:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -66,37 +86,59 @@
           size="mini"
           @click="handleImport"
           v-hasPermi="['suport:flow:add']"
-          >导入</el-button>
+          >导入</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="flowList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="flowList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="故障名称" align="center" prop="errorAppearance" />
       <el-table-column label="流程数据" align="center" prop="flowEncode" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleGraph(scope.row)"
+            v-hasPermi="['suport:flow:edit']"
+            >图修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['suport:flow:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['suport:flow:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -104,14 +146,20 @@
     />
 
     <!-- 添加或修改故障名称对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog v-if="open" :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" @submit.native.prevent>
         <el-form-item label="故障名称" prop="errorAppearance">
-          <el-input v-model="form.errorAppearance" placeholder="请输入故障名称" />
+          <el-input
+            v-model="form.errorAppearance"
+            placeholder="请输入故障名称"
+          />
         </el-form-item>
         <el-form-item label="流程数据" prop="flowEncode">
           <el-input v-model="form.flowEncode" type="textarea" placeholder="请输入内容" />
         </el-form-item>
+        <div>
+          <chartByD3 @handleEncode="handleFlowEncode" :codes="form.flowEncode" />
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -143,7 +191,8 @@
         <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link
@@ -164,11 +213,13 @@
 </template>
 
 <script>
-import { listFlow, getFlow, delFlow, addFlow, updateFlow } from "@/api/suport/flow";
+import { listFlow, getInfo, delFlow, addFlow, updateFlow } from "@/api/suport/flow";
 import { getToken } from "@/utils/auth";
+import chartByD3 from "@/views/knowledge/search/chartByD3.vue";
 
 export default {
   name: "Flow",
+  components: { chartByD3 },
   data() {
     return {
       // 遮罩层
@@ -200,8 +251,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
       upload: {
         // 是否显示弹出层
         open: false,
@@ -221,14 +271,14 @@ export default {
   created() {
     this.getList();
   },
-  activated(){
+  activated() {
     this.getList();
   },
   methods: {
     /** 查询故障名称列表 */
     getList() {
       this.loading = true;
-      listFlow(this.queryParams).then(response => {
+      listFlow(this.queryParams).then((response) => {
         this.flowList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -249,7 +299,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -265,38 +315,51 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加故障名称";
+      this.title = "添加故障";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getFlow(id).then(response => {
+      const id = row.id || this.ids;
+      getInfo(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改故障";
+      });
+    },
+
+    /** 图修改按钮操作 */
+    handleGraph(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getInfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改故障名称";
+        this.title = "修改故障";
       });
     },
+
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
+          // this.form.flowEncode = this.form._flowEncode
           if (this.form.id != null) {
-            updateFlow(this.form).then(response => {
+            updateFlow(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addFlow(this.form).then(response => {
+            addFlow(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -308,18 +371,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除故障名称编号为"' + ids + '"的数据项?').then(function() {
-        return delFlow(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除故障名称编号为"' + ids + '"的数据项?')
+        .then(function () {
+          return delFlow(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('suport/flow/export', {
-        ...this.queryParams
-      }, `flow_${new Date().getTime()}.xlsx`)
+      this.download(
+        "suport/flow/export",
+        {
+          ...this.queryParams,
+        },
+        `flow_${new Date().getTime()}.xlsx`
+      );
     },
 
     /** 导入按钮操作 */
@@ -329,11 +400,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download(
-        "suport/flow/importTemplate",
-        {},
-        `排故流程导入模板.xlsx`
-      );
+      this.download("suport/flow/importTemplate", {}, `排故流程导入模板.xlsx`);
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -357,6 +424,18 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-  }
+    // 父组件自定义事件
+    closeInfo() {
+      this.flowInfoOpen = false;
+      this.createInfoOpen = false;
+      this.tripletInfoOpen = false;
+      this.subTask = {};
+      this.getListByTaskId();
+    },
+
+    handleFlowEncode(data) {
+      this.form.flowEncode = data;
+    }
+  },
 };
 </script>

+ 1 - 1
src/views/upload/uploadManage/index.vue

@@ -206,7 +206,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      uploadFileType: ["pdf","xml","xls","xlsx"],
+      uploadFileType: ["pdf","xml","xls","xlsx","doc","docx"],
       // 查询参数
       queryParams: {
         pageNum: 1,