Commit 8388b47f by liyuhang19990520

解决冲突

parents e4fbab5e 3cb17c57
...@@ -1706,7 +1706,7 @@ ...@@ -1706,7 +1706,7 @@
}, },
"@videojs/http-streaming": { "@videojs/http-streaming": {
"version": "2.12.0", "version": "2.12.0",
"resolved": "https://registry.npmmirror.com/@videojs/http-streaming/download/@videojs/http-streaming-2.12.0.tgz", "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.12.0.tgz",
"integrity": "sha512-vdQA0lDYBXGJqV2T02AGqg1w4dcgyRoN+bYG+G8uF4DpCEMhEtUI0BA4tRu4/Njar8w/9D5k0a1KX40pcvM3fA==", "integrity": "sha512-vdQA0lDYBXGJqV2T02AGqg1w4dcgyRoN+bYG+G8uF4DpCEMhEtUI0BA4tRu4/Njar8w/9D5k0a1KX40pcvM3fA==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
...@@ -1721,7 +1721,7 @@ ...@@ -1721,7 +1721,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.16.3", "version": "7.16.3",
"resolved": "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
...@@ -1729,15 +1729,15 @@ ...@@ -1729,15 +1729,15 @@
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.9", "version": "0.13.9",
"resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
} }
} }
}, },
"@videojs/vhs-utils": { "@videojs/vhs-utils": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmmirror.com/@videojs/vhs-utils/download/@videojs/vhs-utils-3.0.4.tgz", "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz",
"integrity": "sha1-4lPuzY6TGPdn51IBDSE1h/lLsDo=", "integrity": "sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"global": "^4.4.0", "global": "^4.4.0",
...@@ -1746,7 +1746,7 @@ ...@@ -1746,7 +1746,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.16.3", "version": "7.16.3",
"resolved": "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
...@@ -1754,15 +1754,15 @@ ...@@ -1754,15 +1754,15 @@
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.9", "version": "0.13.9",
"resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
} }
} }
}, },
"@videojs/xhr": { "@videojs/xhr": {
"version": "2.6.0", "version": "2.6.0",
"resolved": "https://registry.nlark.com/@videojs/xhr/download/@videojs/xhr-2.6.0.tgz", "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz",
"integrity": "sha1-zYl+CtVPr0l5YbzOP6FtwVomu4A=", "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==",
"requires": { "requires": {
"@babel/runtime": "^7.5.5", "@babel/runtime": "^7.5.5",
"global": "~4.4.0", "global": "~4.4.0",
...@@ -2333,8 +2333,8 @@ ...@@ -2333,8 +2333,8 @@
}, },
"@xmldom/xmldom": { "@xmldom/xmldom": {
"version": "0.7.5", "version": "0.7.5",
"resolved": "https://registry.nlark.com/@xmldom/xmldom/download/@xmldom/xmldom-0.7.5.tgz?cache=0&sync_timestamp=1631600267721&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40xmldom%2Fxmldom%2Fdownload%2F%40xmldom%2Fxmldom-0.7.5.tgz", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
"integrity": "sha1-CfpR41bQfQviAGQrDk+R2ObdQI0=" "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="
}, },
"@xtuc/ieee754": { "@xtuc/ieee754": {
"version": "1.2.0", "version": "1.2.0",
...@@ -2422,8 +2422,8 @@ ...@@ -2422,8 +2422,8 @@
}, },
"aes-decrypter": { "aes-decrypter": {
"version": "3.1.2", "version": "3.1.2",
"resolved": "https://registry.npm.taobao.org/aes-decrypter/download/aes-decrypter-3.1.2.tgz", "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.2.tgz",
"integrity": "sha1-NUVUb46fa4eGQDOaJC7+Ihunp8s=", "integrity": "sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^3.0.0", "@videojs/vhs-utils": "^3.0.0",
...@@ -2433,7 +2433,7 @@ ...@@ -2433,7 +2433,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.16.3", "version": "7.16.3",
"resolved": "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
...@@ -2441,8 +2441,8 @@ ...@@ -2441,8 +2441,8 @@
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.9", "version": "0.13.9",
"resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
} }
} }
}, },
...@@ -5243,8 +5243,8 @@ ...@@ -5243,8 +5243,8 @@
}, },
"dom-walk": { "dom-walk": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.2.tgz", "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha1-DFSL7wSPTR8qlySQAiNgYNqj/YQ=" "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
}, },
"dom7": { "dom7": {
"version": "2.1.5", "version": "2.1.5",
...@@ -6543,8 +6543,8 @@ ...@@ -6543,8 +6543,8 @@
}, },
"global": { "global": {
"version": "4.4.0", "version": "4.4.0",
"resolved": "https://registry.npm.taobao.org/global/download/global-4.4.0.tgz", "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
"integrity": "sha1-PnsQUXkAajI+1xqvyj6cV6XMZAY=", "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
"requires": { "requires": {
"min-document": "^2.19.0", "min-document": "^2.19.0",
"process": "^0.11.10" "process": "^0.11.10"
...@@ -7155,7 +7155,7 @@ ...@@ -7155,7 +7155,7 @@
}, },
"individual": { "individual": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/individual/download/individual-2.0.0.tgz", "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
"integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=" "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
}, },
"infer-owner": { "infer-owner": {
...@@ -7463,8 +7463,8 @@ ...@@ -7463,8 +7463,8 @@
}, },
"is-function": { "is-function": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-function/download/is-function-1.0.2.tgz", "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
"integrity": "sha1-Twl/MKv2762smDOxfKXcA/gUTgg=" "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
}, },
"is-glob": { "is-glob": {
"version": "4.0.1", "version": "4.0.1",
...@@ -7825,7 +7825,7 @@ ...@@ -7825,7 +7825,7 @@
}, },
"keycode": { "keycode": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmmirror.com/keycode/download/keycode-2.2.1.tgz", "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
"integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg=="
}, },
"killable": { "killable": {
...@@ -8098,8 +8098,8 @@ ...@@ -8098,8 +8098,8 @@
}, },
"m3u8-parser": { "m3u8-parser": {
"version": "4.7.0", "version": "4.7.0",
"resolved": "https://registry.nlark.com/m3u8-parser/download/m3u8-parser-4.7.0.tgz", "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz",
"integrity": "sha1-4B6M4TYJit4bFO5pHqIPxNxgq/Y=", "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^3.0.0", "@videojs/vhs-utils": "^3.0.0",
...@@ -8108,7 +8108,7 @@ ...@@ -8108,7 +8108,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.16.3", "version": "7.16.3",
"resolved": "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
...@@ -8116,8 +8116,8 @@ ...@@ -8116,8 +8116,8 @@
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.9", "version": "0.13.9",
"resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
} }
} }
}, },
...@@ -8317,7 +8317,7 @@ ...@@ -8317,7 +8317,7 @@
}, },
"min-document": { "min-document": {
"version": "2.19.0", "version": "2.19.0",
"resolved": "https://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz", "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
"integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
"requires": { "requires": {
"dom-walk": "^0.1.0" "dom-walk": "^0.1.0"
...@@ -8520,8 +8520,8 @@ ...@@ -8520,8 +8520,8 @@
}, },
"mpd-parser": { "mpd-parser": {
"version": "0.19.2", "version": "0.19.2",
"resolved": "https://registry.npmmirror.com/mpd-parser/download/mpd-parser-0.19.2.tgz", "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.19.2.tgz",
"integrity": "sha1-aGEeZTzfLMHpBoiCXEoSm3+QB+A=", "integrity": "sha512-M5tAIdtBM2TN+OSTz/37T7V+h9ZLvhyNqq4TNIdtjAQ/Hg8UnMRf5nJQDjffcXag3POXi31yUJQEKOXdcAM/nw==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^3.0.2", "@videojs/vhs-utils": "^3.0.2",
...@@ -8531,7 +8531,7 @@ ...@@ -8531,7 +8531,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.16.3", "version": "7.16.3",
"resolved": "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
...@@ -8539,8 +8539,8 @@ ...@@ -8539,8 +8539,8 @@
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.9", "version": "0.13.9",
"resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
} }
} }
}, },
...@@ -8573,8 +8573,8 @@ ...@@ -8573,8 +8573,8 @@
}, },
"mux.js": { "mux.js": {
"version": "5.14.1", "version": "5.14.1",
"resolved": "https://registry.npmmirror.com/mux.js/download/mux.js-5.14.1.tgz", "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.14.1.tgz",
"integrity": "sha1-IJWD9FQlXZui/xu2GtWmhnz2GHg=", "integrity": "sha512-38kA/xjWRDzMbcpHQfhKbJAME8eTZVsb9U2Puk890oGvGqnyu8B/AkKdICKPHkigfqYX9MY20vje88TP14nhog==",
"requires": { "requires": {
"@babel/runtime": "^7.11.2" "@babel/runtime": "^7.11.2"
} }
...@@ -9501,8 +9501,8 @@ ...@@ -9501,8 +9501,8 @@
}, },
"pkcs7": { "pkcs7": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.nlark.com/pkcs7/download/pkcs7-1.0.4.tgz", "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
"integrity": "sha1-YJC55xFg2r9pIJ1xnLr6U4sAocs=", "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
"requires": { "requires": {
"@babel/runtime": "^7.5.5" "@babel/runtime": "^7.5.5"
} }
...@@ -10086,7 +10086,7 @@ ...@@ -10086,7 +10086,7 @@
}, },
"postcss-px2rem": { "postcss-px2rem": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/postcss-px2rem/download/postcss-px2rem-0.3.0.tgz", "resolved": "https://registry.npmjs.org/postcss-px2rem/-/postcss-px2rem-0.3.0.tgz",
"integrity": "sha1-DfpOiiaPp0eCc/DEtHxhmDSJQEE=", "integrity": "sha1-DfpOiiaPp0eCc/DEtHxhmDSJQEE=",
"requires": { "requires": {
"postcss": "^5.0.0", "postcss": "^5.0.0",
...@@ -10095,12 +10095,12 @@ ...@@ -10095,12 +10095,12 @@
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
}, },
"chalk": { "chalk": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "^2.2.1",
...@@ -10112,14 +10112,14 @@ ...@@ -10112,14 +10112,14 @@
"dependencies": { "dependencies": {
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
} }
} }
}, },
"has-flag": { "has-flag": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-1.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-1.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
}, },
"postcss": { "postcss": {
...@@ -10135,12 +10135,12 @@ ...@@ -10135,12 +10135,12 @@
}, },
"source-map": { "source-map": {
"version": "0.5.7", "version": "0.5.7",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-3.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
...@@ -10148,7 +10148,7 @@ ...@@ -10148,7 +10148,7 @@
}, },
"supports-color": { "supports-color": {
"version": "3.2.3", "version": "3.2.3",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-3.2.3.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"requires": { "requires": {
"has-flag": "^1.0.0" "has-flag": "^1.0.0"
...@@ -11213,7 +11213,7 @@ ...@@ -11213,7 +11213,7 @@
}, },
"rust-result": { "rust-result": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/rust-result/download/rust-result-1.0.0.tgz", "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
"integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=", "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
"requires": { "requires": {
"individual": "^2.0.0" "individual": "^2.0.0"
...@@ -11235,7 +11235,7 @@ ...@@ -11235,7 +11235,7 @@
}, },
"safe-json-parse": { "safe-json-parse": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.nlark.com/safe-json-parse/download/safe-json-parse-4.0.0.tgz", "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
"integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=", "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
"requires": { "requires": {
"rust-result": "^1.0.0" "rust-result": "^1.0.0"
...@@ -13448,8 +13448,8 @@ ...@@ -13448,8 +13448,8 @@
}, },
"url-toolkit": { "url-toolkit": {
"version": "2.2.3", "version": "2.2.3",
"resolved": "https://registry.nlark.com/url-toolkit/download/url-toolkit-2.2.3.tgz?cache=0&sync_timestamp=1625913241639&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-toolkit%2Fdownload%2Furl-toolkit-2.2.3.tgz", "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz",
"integrity": "sha1-ePqQEhWrusNBggZpMiICebgEUis=" "integrity": "sha512-Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="
}, },
"use": { "use": {
"version": "3.1.1", "version": "3.1.1",
...@@ -13583,7 +13583,7 @@ ...@@ -13583,7 +13583,7 @@
}, },
"video.js": { "video.js": {
"version": "7.17.0", "version": "7.17.0",
"resolved": "https://registry.npmmirror.com/video.js/download/video.js-7.17.0.tgz", "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.17.0.tgz",
"integrity": "sha512-8RbLu9+Pdpep9OTPncUHIvZXFgn/7hKdPnSTE/lGSnlFSucXtTUBp41R7NDwncscMLQ0WgazUbmFlvr4MNWMbA==", "integrity": "sha512-8RbLu9+Pdpep9OTPncUHIvZXFgn/7hKdPnSTE/lGSnlFSucXtTUBp41R7NDwncscMLQ0WgazUbmFlvr4MNWMbA==",
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
...@@ -13603,7 +13603,7 @@ ...@@ -13603,7 +13603,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": { "@babel/runtime": {
"version": "7.16.3", "version": "7.16.3",
"resolved": "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
...@@ -13611,20 +13611,20 @@ ...@@ -13611,20 +13611,20 @@
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.9", "version": "0.13.9",
"resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I=" "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
} }
} }
}, },
"videojs-font": { "videojs-font": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npm.taobao.org/videojs-font/download/videojs-font-3.2.0.tgz", "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
"integrity": "sha1-ISydP05Ow/pzRRZ9ZDFq3TXpIjI=" "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
}, },
"videojs-vtt.js": { "videojs-vtt.js": {
"version": "0.15.3", "version": "0.15.3",
"resolved": "https://registry.npm.taobao.org/videojs-vtt.js/download/videojs-vtt.js-0.15.3.tgz", "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz",
"integrity": "sha1-hCYDk7eUh/zxldk3L4Etf6uDqZM=", "integrity": "sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==",
"requires": { "requires": {
"global": "^4.3.1" "global": "^4.3.1"
} }
......
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
style="width: 100%" style="width: 100%"
:class="{delSelection: !selectBoo}" :class="{delSelection: !selectBoo}"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handle"
> >
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -216,11 +217,10 @@ ...@@ -216,11 +217,10 @@
content="编辑" content="编辑"
placement="top" placement="top"
:open-delay="500" :open-delay="500"
@click="handleClick(scope.row)"
> >
<div <div
class="icon bj" class="icon bj"
@click="handleClick(scope.row)" @click.stop="handleClick(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/bj.svg" src="../../assets/img/qbryk/bj.svg"
...@@ -238,6 +238,7 @@ ...@@ -238,6 +238,7 @@
<div <div
v-if="scope.row.collectstatus == 1" v-if="scope.row.collectstatus == 1"
class="icon sc" class="icon sc"
@click.stop
> >
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
...@@ -261,7 +262,7 @@ ...@@ -261,7 +262,7 @@
> >
<div <div
class="icon sc" class="icon sc"
@click="isShowGzBtn1(scope.row)" @click.stop="isShowGzBtn1(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/sc.svg" src="../../assets/img/qbryk/sc.svg"
...@@ -279,7 +280,7 @@ ...@@ -279,7 +280,7 @@
> >
<div <div
class="icon gx" class="icon gx"
@click="isShowGgrytmBtn(scope.row)" @click.stop="isShowGgrytmBtn(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/gx.svg" src="../../assets/img/qbryk/gx.svg"
...@@ -296,7 +297,7 @@ ...@@ -296,7 +297,7 @@
> >
<div <div
class="icon look" class="icon look"
@click="isShowFcxBtn1(scope.row)" @click.stop="isShowFcxBtn1(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/search.svg" src="../../assets/img/qbryk/search.svg"
...@@ -313,7 +314,7 @@ ...@@ -313,7 +314,7 @@
> >
<div <div
class="icon bz" class="icon bz"
@click="isShowFztmBtn(scope.row)" @click.stop="isShowFztmBtn(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/bz.svg" src="../../assets/img/qbryk/bz.svg"
...@@ -330,7 +331,7 @@ ...@@ -330,7 +331,7 @@
> >
<div <div
class="icon print" class="icon print"
@click="handleClick(scope.row)" @click.stop="handleClick(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/print.svg" src="../../assets/img/qbryk/print.svg"
...@@ -345,21 +346,26 @@ ...@@ -345,21 +346,26 @@
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<el-popconfirm <div
placement="top-start" @click.stop
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
class="icon del" class="icon del"
title="确认要删除该数据吗?该操作无法撤消!"
> >
<div slot="reference"> <el-popconfirm
<img placement="top-start"
src="../../assets/img/qbryk/del.svg" :hide-icon="true"
alt="" confirm-button-text="确认"
/> @onConfirm="delOne(scope.row.id)"
</div> class="icon del"
</el-popconfirm> title="确认要删除该数据吗?该操作无法撤消!"
>
<div slot="reference">
<img
src="../../assets/img/qbryk/del.svg"
alt=""
/>
</div>
</el-popconfirm>
</div>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
...@@ -431,6 +437,17 @@ ...@@ -431,6 +437,17 @@
:isShowXzry="isShowXzry" :isShowXzry="isShowXzry"
@closeXzry="closeXzry" @closeXzry="closeXzry"
> </xzry> > </xzry>
<!-- <el-drawer
title="我是标题"
:visible.sync="drawer"
:direction="direction"
:before-close="handleClose"
:with-header="false"
:modal='false'
>
<span>我来啦!</span>
</el-drawer> -->
</div> </div>
</el-container> </el-container>
</template> </template>
...@@ -457,7 +474,6 @@ export default { ...@@ -457,7 +474,6 @@ export default {
created () { created () {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
this.height = (this.height * w2) / w1; this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1; this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1; this.width2 = (this.width2 * w2) / w1;
...@@ -520,6 +536,19 @@ export default { ...@@ -520,6 +536,19 @@ export default {
}; };
}, },
methods: { methods: {
// 单击行抽屉
handle (row, event, column) {
console.log(row, event, column)
this.drawer = true
this.$bus.emit('isBlur', true)
},
handleClose (done) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => { });
},
cellClass (row) { cellClass (row) {
if (row.columnIndex === 0) { if (row.columnIndex === 0) {
return 'disableheadselection' return 'disableheadselection'
...@@ -733,7 +762,9 @@ export default { ...@@ -733,7 +762,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log("关注关闭", val); console.log("关注关闭", val);
this.isShowGz = val; this.isShowGz = val;
this.search(); if (val == false) {
this.search();
}
}, },
// 取消关注 // 取消关注
qxgz (val) { qxgz (val) {
...@@ -759,7 +790,9 @@ export default { ...@@ -759,7 +790,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log("更改条码关闭", val); console.log("更改条码关闭", val);
this.isShowGgrytm = val; this.isShowGgrytm = val;
this.search(); if (val == false) {
this.search();
}
}, },
//复制条码列表操作 //复制条码列表操作
...@@ -772,7 +805,9 @@ export default { ...@@ -772,7 +805,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log("closeFztm复制条码关闭", val); console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val; this.isShowFztm = val;
this.search(); if (val == false) {
this.search();
}
}, },
//发查询操作(多行) //发查询操作(多行)
......
...@@ -307,19 +307,19 @@ ...@@ -307,19 +307,19 @@
<el-table-column <el-table-column
prop="barcode" prop="barcode"
label="案事件编号" label="案事件编号"
:width="width1" :width="width4"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="fingerPlamNumber" prop="fingerPlamNumber"
label="指掌纹个数" label="指掌纹个数"
:width="width3" :width="width1"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="exportName" prop="exportName"
label="导出模式" label="导出模式"
:width="width3" :width="width1"
> >
</el-table-column> </el-table-column>
<el-table-column width="auto"> <el-table-column width="auto">
...@@ -370,8 +370,9 @@ export default { ...@@ -370,8 +370,9 @@ export default {
data () { data () {
return { return {
width3: 100, width3: 100,
width2: 210, width2: 240,
width1: 220, width1: 220,
width4: 400,
height: 500, height: 500,
dataType: null, // 导入类型 dataType: null, // 导入类型
barcode: "", // 条码号 barcode: "", // 条码号
...@@ -812,7 +813,7 @@ export default { ...@@ -812,7 +813,7 @@ export default {
this.$message.error("请选择需要复制条码号的数据!"); this.$message.error("请选择需要复制条码号的数据!");
} else { } else {
self.multipleSelection.forEach((item) => { self.multipleSelection.forEach((item) => {
self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh); self.ysxtAsjxgrybh.push(item.barcode);
}); });
this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(","); this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(",");
} }
...@@ -845,6 +846,7 @@ export default { ...@@ -845,6 +846,7 @@ export default {
*/ */
batch () { batch () {
this.isSelected = !this.isSelected; this.isSelected = !this.isSelected;
this.isShowTip = !this.isShowTip;
this.toggleSelection(); this.toggleSelection();
}, },
cancel () { cancel () {
...@@ -866,11 +868,11 @@ export default { ...@@ -866,11 +868,11 @@ export default {
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection); console.log(this.multipleSelection);
if (this.multipleSelection.length) { // if (this.multipleSelection.length) {
this.isShowTip = true; // this.isShowTip = true;
} else { // } else {
this.isShowTip = false; // this.isShowTip = false;
} // }
}, },
/** /**
* @description: pageSize 改变时会触发 * @description: pageSize 改变时会触发
......
...@@ -150,8 +150,14 @@ ...@@ -150,8 +150,14 @@
> >
复制条码 复制条码
</div> </div>
<div class="btn">导出FPTX</div> <div
<div class="btn">删除</div> class="btn"
@click="showType==1?isShowDcftpxBtn:dcFptx"
>FPTX导出</div>
<div
class="btn"
@click="showType==1?delMore:dcFptx"
>删除</div>
<div <div
class="btn send" class="btn send"
@click="isShowFcxBtn" @click="isShowFcxBtn"
...@@ -253,16 +259,16 @@ ...@@ -253,16 +259,16 @@
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="复制数据" content="改号"
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<div <div
class="icon bz" class="icon gx"
@click="isShowFztmBtn(scope.row)" @click.stop="isShowGgrytmBtn(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/bz.svg" src="../../assets/img/qbryk/gx.svg"
alt="" alt=""
/> />
</div> </div>
...@@ -284,6 +290,51 @@ ...@@ -284,6 +290,51 @@
/> />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="复制数据"
placement="top"
:open-delay="500"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top"
:open-delay="500"
>
<div
@click.stop
class="icon del"
>
<el-popconfirm
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
class="icon del"
title="确认要删除该数据吗?该操作无法撤消!"
>
<div slot="reference">
<img
src="../../assets/img/qbryk/del.svg"
alt=""
/>
</div>
</el-popconfirm>
</div>
</el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -326,19 +377,19 @@ ...@@ -326,19 +377,19 @@
<el-table-column <el-table-column
prop="followCase.collectunitName" prop="followCase.collectunitName"
label="提取单位" label="提取单位"
width="200" width="300"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="followCase.briefCase" prop="followCase.briefCase"
label="简要案情" label="简要案情"
width="300" width="500"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"
width="200" width="auto"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ops"> <div class="ops">
...@@ -363,20 +414,21 @@ ...@@ -363,20 +414,21 @@
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="复制数据" content="改号"
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<div <div
class="icon bz" class="icon gx"
@click="isShowFztmBtn(scope.row)" @click.stop="isShowGgrytmBtn(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/bz.svg" src="../../assets/img/qbryk/gx.svg"
alt="" alt=""
/> />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
...@@ -394,6 +446,51 @@ ...@@ -394,6 +446,51 @@
/> />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="复制数据"
placement="top"
:open-delay="500"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top"
:open-delay="500"
>
<div
@click.stop
class="icon del"
>
<el-popconfirm
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
class="icon del"
title="确认要删除该数据吗?该操作无法撤消!"
>
<div slot="reference">
<img
src="../../assets/img/qbryk/del.svg"
alt=""
/>
</div>
</el-popconfirm>
</div>
</el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -448,6 +545,18 @@ ...@@ -448,6 +545,18 @@
:type="type" :type="type"
@closeFztm="closeFztm" @closeFztm="closeFztm"
></fztm> ></fztm>
<!-- 导出FPTX弹窗 -->
<dcftpx
:isShowDcftpx="isShowDcftpx"
:rowData="rowData"
@closeDcftpx="closeDcftpx"
></dcftpx>
<!-- 导出FPTX弹窗 -->
<dcfptxAj
:isShowDcfptx1="isShowDcfptx1"
:rowData="rowData"
@closeDcfptx1="closeDcfptx1"
></dcfptxAj>
<!-- 发查询弹窗 --> <!-- 发查询弹窗 -->
<fcx <fcx
:isShowFcx="isShowFcx" :isShowFcx="isShowFcx"
...@@ -461,6 +570,8 @@ ...@@ -461,6 +570,8 @@
<script> <script>
import tjddl from "../AllPersonnelBase/modules/tjddl.vue"; // 添加到队列弹窗 import tjddl from "../AllPersonnelBase/modules/tjddl.vue"; // 添加到队列弹窗
import fztm from "../AllPersonnelBase/modules/fztm.vue"; // 复制数据弹窗 import fztm from "../AllPersonnelBase/modules/fztm.vue"; // 复制数据弹窗
import dcftpx from "../AllPersonnelBase/modules/dcftpx.vue"; //导出FPTX弹窗
import dcfptxAj from "../AllPersonnelBase/modules/dcfptxAj.vue" //导出FPTX弹窗
import fcx from "../AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗 import fcx from "../AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗
import moment from "moment"; import moment from "moment";
export default { export default {
...@@ -469,6 +580,8 @@ export default { ...@@ -469,6 +580,8 @@ export default {
tjddl, tjddl,
fztm, fztm,
fcx, fcx,
dcftpx,
dcfptxAj
}, },
data () { data () {
return { return {
...@@ -532,6 +645,9 @@ export default { ...@@ -532,6 +645,9 @@ export default {
sendTimeStart: "", // 开始时间 sendTimeStart: "", // 开始时间
sendTimeEnd: "", // 结束时间 sendTimeEnd: "", // 结束时间
isShowDcftpx: false, // 导出FPTX
isShowDcfptx1: false,// 导出FPTX
...@@ -561,14 +677,10 @@ export default { ...@@ -561,14 +677,10 @@ export default {
showType (newNum, oldNum) { showType (newNum, oldNum) {
// ... // ...
console.log(newNum, 123); console.log(newNum, 123);
this.search(); // this.search();
this.clear() this.clear()
}, },
}, },
mounted () {
this.search();
},
methods: { methods: {
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search () {
...@@ -636,6 +748,8 @@ export default { ...@@ -636,6 +748,8 @@ export default {
this.barcode = ""; // 条码号 this.barcode = ""; // 条码号
this.logicDatabase = "";// 逻辑分库 this.logicDatabase = "";// 逻辑分库
this.queryType = "";// 类型 this.queryType = "";// 类型
this.multipleSelection = [];
this.ysxtAsjxgrybh = null;
this.search() this.search()
}, },
// 复制条码号 获取选中条码值 // 复制条码号 获取选中条码值
...@@ -646,7 +760,7 @@ export default { ...@@ -646,7 +760,7 @@ export default {
this.$message.error("请选择需要复制条码号的数据!"); this.$message.error("请选择需要复制条码号的数据!");
} else { } else {
self.multipleSelection.forEach((item) => { self.multipleSelection.forEach((item) => {
self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh); self.ysxtAsjxgrybh.push(item.followPerson.barcode || item.followCase.barcode);
}); });
this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(","); this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(",");
} }
...@@ -672,6 +786,49 @@ export default { ...@@ -672,6 +786,49 @@ export default {
this.$message.error("抱歉,复制条码号失败!"); this.$message.error("抱歉,复制条码号失败!");
} }
}, },
// 导出FPTX
isShowDcftpxBtn () {
// 多行
console.log("导出FPTX");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据!");
// this.selectBoo = true;
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
this.isShowDcftpx = true;
} else {
this.$message.error("只能导出单条数据的FPTX!");
}
// if (this.multipleSelection.length === 0) {
// this.$message.error("请选择需要导出的数据!");
// this.selectBoo = true
// } else {
// this.rowData = this.multipleSelection
// this.isShowDcftpx = true;
// }
},
closeDcftpx (val) {
this.$bus.emit('isBlur', val)
console.log("导出FPTX关闭", val);
this.isShowDcftpx = val;
},
// 导出
dcFptx () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据!");
this.selectBoo = true
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
this.isShowDcfptx1 = true;
} else {
this.$message.error("只能导出单条数据的FPTX!");
}
},
closeDcfptx1 (val) {
this.$bus.emit('isBlur', val)
console.log('导出FPTX关闭', val)
this.isShowDcfptx1 = val
},
// 添加到队列 // 添加到队列
isShowTjddlBtn () { isShowTjddlBtn () {
console.log("添加到队列"); console.log("添加到队列");
...@@ -679,7 +836,15 @@ export default { ...@@ -679,7 +836,15 @@ export default {
this.$message.error("请选择需要添加到队列的数据!"); this.$message.error("请选择需要添加到队列的数据!");
this.isSelected = true; this.isSelected = true;
} else { } else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = this.multipleSelection; this.rowData = this.multipleSelection;
console.log('添加到队列', this.rowData)
this.isShowTjddl = true; this.isShowTjddl = true;
} }
}, },
...@@ -687,6 +852,55 @@ export default { ...@@ -687,6 +852,55 @@ export default {
console.log("添加到队列关闭", val); console.log("添加到队列关闭", val);
this.isShowTjddl = val; this.isShowTjddl = val;
}, },
// 多选删除
delMore () {
// 检查table选择的数据 如果没有选择则不可以删除
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据!");
this.selectBoo = true;
return;
} else {
// this.$bus.emit('isBlur', true)
this.$confirm('是否确认删除?', '提示')
.then(_ => {
// 封装删除的psns为数组
let psns = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
psns.push(this.multipleSelection[i].id);
}
this.doDelete(psns);
})
.catch(_ => { });
}
// // 封装删除的psns为数组
// let psns = [];
// for (let i = 0; i < this.multipleSelection.length; i++) {
// psns.push(this.multipleSelection[i].id);
// }
// this.doDelete(psns);
},
// 单选删除
delOne (val) {
console.log("删除数据");
// 将传入的psns转为数组
let psns = [];
psns.push(val);
console.info("删除接口里的psns:", psns);
this.doDelete(psns);
},
// 请求删除接口
doDelete (psns) {
this.$axios
.post("/api/personstore/delete", { psns: psns })
.then((response) => {
if (response.data.code === 0) {
this.$message.success("删除成功");
this.search();
} else {
this.$message.error("删除失败");
}
});
},
//复制条码列表操作 //复制条码列表操作
isShowFztmBtn (val) { isShowFztmBtn (val) {
console.log("复制条码", val); console.log("复制条码", val);
...@@ -696,7 +910,7 @@ export default { ...@@ -696,7 +910,7 @@ export default {
closeFztm (val) { closeFztm (val) {
console.log("closeFztm复制条码关闭", val); console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val; this.isShowFztm = val;
this.search(); // this.search();
}, },
//发查询操作(多行) //发查询操作(多行)
...@@ -728,6 +942,7 @@ export default { ...@@ -728,6 +942,7 @@ export default {
*/ */
batch () { batch () {
this.isSelected = !this.isSelected; this.isSelected = !this.isSelected;
this.isShowTip = !this.isShowTip;
this.toggleSelection(); this.toggleSelection();
}, },
cancel () { cancel () {
...@@ -740,6 +955,11 @@ export default { ...@@ -740,6 +955,11 @@ export default {
*/ */
handleClick (row) { handleClick (row) {
console.log(row); console.log(row);
if (this.showType == 1) {
this.$router.push("/ryzwbj/" + row.followPerson.personId + "/" + row.followPerson.barcode);
} else if (this.showType == 2) {
this.$router.push('/ajzwbj/' + row.followCase.caseId + '/' + row.followCase.barcode)
}
}, },
/** /**
* @description: 单选事件 * @description: 单选事件
...@@ -749,11 +969,11 @@ export default { ...@@ -749,11 +969,11 @@ export default {
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection); console.log(this.multipleSelection);
if (this.multipleSelection.length) { // if (this.multipleSelection.length) {
this.isShowTip = true; // this.isShowTip = true;
} else { // } else {
this.isShowTip = false; // this.isShowTip = false;
} // }
}, },
/** /**
* @description: pageSize 改变时会触发 * @description: pageSize 改变时会触发
...@@ -1141,4 +1361,16 @@ export default { ...@@ -1141,4 +1361,16 @@ export default {
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #333333; color: #333333;
} }
/deep/.el-table {
.cell:empty::before {
content: "---";
color: gray;
}
.is-leaf {
.cell:empty::before {
content: "---";
color: gray;
}
}
}
</style> </style>
...@@ -117,7 +117,7 @@ let targtOptions = []; ...@@ -117,7 +117,7 @@ let targtOptions = [];
export default { export default {
name: "dcftpx", name: "dcftpx",
props: { props: {
isShowDcfptx: { isShowDcfptx1: {
type: [Number, String, Boolean], type: [Number, String, Boolean],
default: false default: false
}, },
...@@ -146,10 +146,10 @@ export default { ...@@ -146,10 +146,10 @@ export default {
}; };
}, },
mounted () { mounted () {
this.dialogVisible = this.isShowDcfptx; this.dialogVisible = this.isShowDcfptx1;
}, },
watch: { watch: {
isShowDcfptx (newVal, oldVal) { isShowDcfptx1 (newVal, oldVal) {
this.dialogVisible = newVal; this.dialogVisible = newVal;
if (newVal == true) { if (newVal == true) {
this.getHpseqno() this.getHpseqno()
...@@ -157,33 +157,51 @@ export default { ...@@ -157,33 +157,51 @@ export default {
}, },
dialogVisible (val) { dialogVisible (val) {
console.log(this.dialogVisible, 123) console.log(this.dialogVisible, 123)
this.$emit('closeDcfptx', this.dialogVisible); targtOptions = [];
this.targts = targtOptions
this.$emit('closeDcfptx1', this.dialogVisible);
}, },
}, },
methods: { methods: {
focus () { focus () {
let reqParam = {
barcode: '', //条码号
imgNo: '',// 指纹序号
dataType: '',// 数据类型(原图)
baseMsg: null, // 基本信息 1导出 0不导出
isFeatures: null // 导出特征 1导出 0不导出
}
reqParam.barcode = this.rowData[0].ysxtAsjbh
reqParam.imgNo = this.checkedTargets.toString()
reqParam.dataType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
reqParam.isFeatures = this.tz == true ? 1 : 0
this.$axios this.$axios
.post("/api/export/case/" + this.rowData[0].ysxtAsjbh) .get("/api/export/case", { params: reqParam })
.then((response) => { .then((response) => {
console.log(response) console.log(response.data)
// var elink = document.createElement('a');
// elink.download = "案件.fptx";
// elink.style.display = 'none';
// var blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
// elink.href = URL.createObjectURL(blob);
// document.body.appendChild(elink);
// elink.click();
// document.body.removeChild(elink);
if (response.status === 200) { if (response.status === 200) {
if (response.data.code) { if (response.data.code) {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} else { } else {
// 创建隐藏的可下载链接 var elink = document.createElement('a');
let eleLink = document.createElement('a') elink.download = "案件.fptx";
// let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode elink.style.display = 'none';
// let url = 'http://www.meetfood.cn:2390/api/export/case/' + this.rowData[0].ysxtAsjbh var blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
let url = 'http://192.168.128.110:8099/api/export/case/' + this.rowData[0].ysxtAsjbh elink.href = URL.createObjectURL(blob);
eleLink.download = this.filenameexport document.body.appendChild(elink);
eleLink.style.display = 'none' elink.click();
eleLink.href = url document.body.removeChild(elink);
// 触发点击
document.body.appendChild(eleLink)
eleLink.click()
// 然后移除
document.body.removeChild(eleLink)
this.dialogVisible = false; this.dialogVisible = false;
// this.$router.push('/dclb') // this.$router.push('/dclb')
this.$router.push({ this.$router.push({
...@@ -196,6 +214,37 @@ export default { ...@@ -196,6 +214,37 @@ export default {
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} }
// if (response.status === 200) {
// if (response.data.code) {
// this.$message.error(response.data.message);
// } else {
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
// // let url = 'http://www.meetfood.cn:2390/api/export/case/' + this.rowData[0].ysxtAsjbh
// let url = 'http://192.168.128.110:8099/api/export/case/' + this.rowData[0].ysxtAsjbh
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
// // this.$router.push('/dclb')
// this.$router.push({
// path: '/dclb',
// query: {
// id: 2
// }
// })
// }
// } else {
// this.$message.error(response.data.message);
// }
}); });
...@@ -248,7 +297,6 @@ export default { ...@@ -248,7 +297,6 @@ export default {
targtOptions = []; targtOptions = [];
this.targts = targtOptions this.targts = targtOptions
this.dialogVisible = false; this.dialogVisible = false;
}, },
handleCheckAllChange (val) { handleCheckAllChange (val) {
this.checkedTargets = val ? targtOptions : []; this.checkedTargets = val ? targtOptions : [];
......
...@@ -369,7 +369,7 @@ export default { ...@@ -369,7 +369,7 @@ export default {
gdzwyscheckAll: true,// 滚动指纹右手全选 gdzwyscheckAll: true,// 滚动指纹右手全选
checkedGdyss: ['拇', '食', '中', '环', '小'], checkedGdyss: ['拇', '食', '中', '环', '小'],
gdyss: gdysOptions, gdyss: gdysOptions,
// 滚动指纹 // 滚动指纹
gdzwzsisIndeterminate: false,//滚动指纹左手状态 gdzwzsisIndeterminate: false,//滚动指纹左手状态
gdzwzscheckAll: true,// 滚动指纹左手全选 gdzwzscheckAll: true,// 滚动指纹左手全选
checkedGdzss: ['拇', '食', '中', '环', '小'], checkedGdzss: ['拇', '食', '中', '环', '小'],
...@@ -377,12 +377,12 @@ export default { ...@@ -377,12 +377,12 @@ export default {
// 平面指纹 // 平面指纹
pmzwisIndeterminate: false, // 滚动指纹状态 pmzwisIndeterminate: false, // 滚动指纹状态
pmzwCheckAll: true, // 滚动指纹全选 pmzwCheckAll: true, // 滚动指纹全选
// 滚动指纹右手 // 平面指纹右手
pmzwysisIndeterminate: false,//滚动指纹右手状态 pmzwysisIndeterminate: false,//滚动指纹右手状态
pmzwyscheckAll: true,// 滚动指纹右手全选 pmzwyscheckAll: true,// 滚动指纹右手全选
checkedPmyss: ['拇', '食', '中', '环', '小'], checkedPmyss: ['拇', '食', '中', '环', '小'],
pmyss: pmysOptions, pmyss: pmysOptions,
// 滚动指纹右 // 平面指纹左
pmzwzsisIndeterminate: false,//滚动指纹左手状态 pmzwzsisIndeterminate: false,//滚动指纹左手状态
pmzwzscheckAll: true,// 滚动指纹左手全选 pmzwzscheckAll: true,// 滚动指纹左手全选
checkedPmzss: ['拇', '食', '中', '环', '小'], checkedPmzss: ['拇', '食', '中', '环', '小'],
...@@ -548,26 +548,103 @@ export default { ...@@ -548,26 +548,103 @@ export default {
}, },
methods: { methods: {
focus () { focus () {
let barcode = null;
if (this.rowData[0].ysxtAsjxgrybh) {
barcode = this.rowData[0].ysxtAsjxgrybh
} else {
barcode = this.rowData[0].followPerson.barcode
}
let reqParam = {
barcode: '', //条码号
imgNo: '',// 指纹序号
dataType: '',// 数据类型(原图)
baseMsg: null, // 基本信息 1导出 0不导出
isFeatures: null // 导出特征 1导出 0不导出
}
let arr = []
for (let i = 0; i < this.checkedGdyss.length; i++) {
// console.log(this.checkedGdyss[i])
if (this.checkedGdyss[i] == '拇') {
arr.push(1)
} else if (this.checkedGdyss[i] == '食') {
arr.push(2)
} else if (this.checkedGdyss[i] == '中') {
arr.push(3)
} else if (this.checkedGdyss[i] == '环') {
arr.push(4)
} else if (this.checkedGdyss[i] == '小') {
arr.push(5)
}
}
for (let i = 0; i < this.checkedGdzss.length; i++) {
// console.log(this.checkedGdzss[i])
if (this.checkedGdzss[i] == '拇') {
arr.push(6)
} else if (this.checkedGdzss[i] == '食') {
arr.push(7)
} else if (this.checkedGdzss[i] == '中') {
arr.push(8)
} else if (this.checkedGdzss[i] == '环') {
arr.push(9)
} else if (this.checkedGdzss[i] == '小') {
arr.push(10)
}
}
for (let i = 0; i < this.checkedPmyss.length; i++) {
// console.log(this.checkedPmyss[i])
if (this.checkedPmyss[i] == '拇') {
arr.push(11)
} else if (this.checkedPmyss[i] == '食') {
arr.push(12)
} else if (this.checkedPmyss[i] == '中') {
arr.push(13)
} else if (this.checkedPmyss[i] == '环') {
arr.push(14)
} else if (this.checkedPmyss[i] == '小') {
arr.push(15)
}
}
for (let i = 0; i < this.checkedPmzss.length; i++) {
// console.log(this.checkedPmzss[i])
if (this.checkedPmzss[i] == '拇') {
arr.push(16)
} else if (this.checkedPmzss[i] == '食') {
arr.push(17)
} else if (this.checkedPmzss[i] == '中') {
arr.push(18)
} else if (this.checkedPmzss[i] == '环') {
arr.push(19)
} else if (this.checkedPmzss[i] == '小') {
arr.push(20)
}
}
console.log('导出序号', arr)
reqParam.barcode = barcode
reqParam.imgNo = arr.toString()
reqParam.dataType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
reqParam.isFeatures = this.tz == true ? 1 : 0
this.$axios this.$axios
.post("/api/export/person/" + this.rowData[0].ysxtAsjxgrybh) .get("/api/export/person/", { params: reqParam })
.then((response) => { .then((response) => {
console.log(response)
if (response.status === 200) { if (response.status === 200) {
if (response.data.code) { if (response.data.code) {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} else { } else {
// 创建隐藏的可下载链接 var elink = document.createElement('a');
let eleLink = document.createElement('a') elink.download = "人员.fptx";
// let url = 'http://www.meetfood.cn:2390/api/export/person/' + this.rowData[0].ysxtAsjxgrybh elink.style.display = 'none';
let url = 'http://192.168.128.110:8099/api/export/person/' + this.rowData[0].ysxtAsjxgrybh var blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
eleLink.download = this.filenameexport elink.href = URL.createObjectURL(blob);
eleLink.style.display = 'none' document.body.appendChild(elink);
eleLink.href = url elink.click();
// 触发点击 document.body.removeChild(elink);
document.body.appendChild(eleLink)
eleLink.click()
// 然后移除
document.body.removeChild(eleLink)
this.dialogVisible = false; this.dialogVisible = false;
// this.$router.push('/dclb') // this.$router.push('/dclb')
this.$router.push({ this.$router.push({
...@@ -580,6 +657,35 @@ export default { ...@@ -580,6 +657,35 @@ export default {
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} }
// if (response.status === 200) {
// if (response.data.code) {
// this.$message.error(response.data.message);
// } else {
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://www.meetfood.cn:2390/api/export/person/' + barcode
// let url = 'http://192.168.128.166:8099/api/export/person/' + barcode
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
// // this.$router.push('/dclb')
// this.$router.push({
// path: '/dclb',
// query: {
// id: 1
// }
// })
// }
// } else {
// this.$message.error(response.data.message);
// }
}); });
......
...@@ -581,8 +581,8 @@ export default { ...@@ -581,8 +581,8 @@ export default {
}, },
mounted () { mounted () {
this.dialogVisible = this.isShowFcx; this.dialogVisible = this.isShowFcx;
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询' // this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2' // this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2'
}, },
created () { created () {
}, },
...@@ -590,6 +590,8 @@ export default { ...@@ -590,6 +590,8 @@ export default {
isShowFcx (newVal, oldVal) { isShowFcx (newVal, oldVal) {
this.dialogVisible = newVal; this.dialogVisible = newVal;
if (newVal == true) { if (newVal == true) {
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2'
this.searchZTS() this.searchZTS()
this.searchsytsArr() this.searchsytsArr()
this.bcxh = this.rowData.length; this.bcxh = this.rowData.length;
...@@ -997,7 +999,7 @@ export default { ...@@ -997,7 +999,7 @@ export default {
}); });
cityOptions = [] cityOptions = []
this.dialogVisible = false; this.dialogVisible = false;
this.$store.commit('layout/delcachePageName','cxyrd'); this.$store.commit('layout/delcachePageName', 'cxyrd');
setTimeout(() => { setTimeout(() => {
this.$router.push('/cxyrd') this.$router.push('/cxyrd')
}, 20); }, 20);
......
...@@ -123,23 +123,28 @@ export default { ...@@ -123,23 +123,28 @@ export default {
if (valid) { if (valid) {
// alert('submit!'); // alert('submit!');
let reqUrl = ''; let reqUrl = '';
let newReqParams = {};
if (this.type == 'ry') { if (this.type == 'ry') {
reqUrl = '/api/personstore/copy' reqUrl = '/api/personstore/copyall/'
Object.assign(this.reqParam, this.rowData); // Object.assign(this.reqParam, this.rowData);
delete this.reqParam.id; // delete this.reqParam.id;
this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode; // this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
console.log(this.reqParam, '人员复制数据') // console.log(this.reqParam, '人员复制数据')
newReqParams.id = this.rowData.id
newReqParams.barcode = 'R' + this.ruleForm.barcode
} else if (this.type == 'aj') { } else if (this.type == 'aj') {
reqUrl = '/api/casestore/copyBarcode' reqUrl = '/api/casestore/copyall/'
let caseBase = {} // let caseBase = {}
Object.assign(caseBase, this.rowData); // Object.assign(caseBase, this.rowData);
delete caseBase.id; // delete caseBase.id;
caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode // caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode
this.reqParam.caseBase = caseBase // this.reqParam.caseBase = caseBase
console.log(this.reqParam, '案件复制数据') // console.log(this.reqParam, '案件复制数据')
newReqParams.id = this.rowData.id
newReqParams.barcode = 'A' + this.ruleForm.barcode
} }
this.$axios this.$axios
.put(reqUrl, this.reqParam) .post(reqUrl + '?' + 'id' + '=' + newReqParams.id + '&' + 'barcode' + '=' + newReqParams.barcode)
.then(response => { .then(response => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("复制成功"); this.$message.success("复制成功");
......
...@@ -132,18 +132,15 @@ export default { ...@@ -132,18 +132,15 @@ export default {
if (this.type == 'ry') { if (this.type == 'ry') {
reqUrl = '/api/personstore/updateBarcode' reqUrl = '/api/personstore/updateBarcode'
newReqParams.id = this.rowData.id newReqParams.id = this.rowData.id
newReqParams.ysxtAsjxgrybh = 'R' + this.reqParam.barcode newReqParams.barcode = 'R' + this.reqParam.barcode
} else if (this.type == 'aj') { } else if (this.type == 'aj') {
reqUrl = 'api/casestore/updateBarcode' reqUrl = '/api/casestore/updateBarcode'
let caseBase = {} newReqParams.id = this.rowData.id
caseBase.id = this.rowData.id newReqParams.barcode = 'A' + this.reqParam.barcode
caseBase.ysxtAsjbh = 'A' + this.reqParam.barcode
newReqParams.caseBase = caseBase
} }
// 确认提示 // 确认提示
this.$axios this.$axios
.put(reqUrl, newReqParams) .post(reqUrl + '?' + 'id' + '=' + newReqParams.id + '&' + 'barcode' + '=' + newReqParams.barcode)
.then(response => { .then(response => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("更改成功"); this.$message.success("更改成功");
......
<template>
<div>
<el-drawer
title="标题"
:visible.sync="drawer"
:direction="direction"
:before-close="handleClose"
:with-header="false"
:modal='false'
>
<span>我来啦!</span>
</el-drawer>
</div>
</template>
<script>
export default {
name: "gz",
props: {
isShowGz: {
type: [Number, String, Boolean],
default: false
},
rowData: {
default: false
}
},
data () {
return {
drawer: false,
direction: 'rtl',
};
},
mounted () {
this.dialogVisible = this.isShowGz;
},
watch: {
isShowGz (newVal, oldVal) {
this.dialogVisible = newVal;
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
this.$emit('closeGz', this.dialogVisible);
}
},
methods: {
}
};
</script>
...@@ -160,11 +160,14 @@ export default { ...@@ -160,11 +160,14 @@ export default {
mounted () { mounted () {
this.dialogVisible = this.isShowTjddl; this.dialogVisible = this.isShowTjddl;
// console.log('添加到队列类型', this.type) // console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列' // this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
}, },
watch: { watch: {
isShowTjddl (newVal, oldVal) { isShowTjddl (newVal, oldVal) {
this.dialogVisible = newVal; this.dialogVisible = newVal;
// console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
console.log('数据数据', this.rowData)
}, },
dialogVisible (val) { dialogVisible (val) {
console.log(this.dialogVisible, 123) console.log(this.dialogVisible, 123)
...@@ -193,8 +196,8 @@ export default { ...@@ -193,8 +196,8 @@ export default {
ysxtAsjxgrybh: '', ysxtAsjxgrybh: '',
id: '' id: ''
} }
arr.ysxtAsjxgrybh = this.rowData[i].ysxtAsjxgrybh; arr.ysxtAsjxgrybh = this.rowData[i].ysxtAsjxgrybh || this.rowData[i].barcode || this.rowData[i].followPerson.barcode;
arr.id = this.rowData[i].id; arr.id = this.rowData[i].id || this.rowData[i].followPerson.personId;
newReqParams.personDoList.push(arr) newReqParams.personDoList.push(arr)
this.reqParam = newReqParams this.reqParam = newReqParams
} }
...@@ -219,8 +222,8 @@ export default { ...@@ -219,8 +222,8 @@ export default {
ysxtAsjbh: '', ysxtAsjbh: '',
id: '' id: ''
} }
arr.ysxtAsjbh = this.rowData[i].ysxtAsjbh; arr.ysxtAsjbh = this.rowData[i].ysxtAsjbh || this.rowData[i].barcode || this.rowData[i].followCase.barcode;
arr.id = this.rowData[i].id; arr.id = this.rowData[i].id || this.rowData[i].followCase.caseId;
newReqParams.caseBaseList.push(arr) newReqParams.caseBaseList.push(arr)
this.reqParam = newReqParams this.reqParam = newReqParams
} }
......
...@@ -364,9 +364,9 @@ ...@@ -364,9 +364,9 @@
></gz> ></gz>
<!-- 导出FPTX弹窗 --> <!-- 导出FPTX弹窗 -->
<dcfptxAj <dcfptxAj
:isShowDcfptx="isShowDcfptx" :isShowDcfptx1="isShowDcfptx1"
:rowData="rowData" :rowData="rowData"
@closeDcfptx="closeDcfptx" @closeDcfptx1="closeDcfptx1"
></dcfptxAj> ></dcfptxAj>
<!-- 更改条码弹窗 --> <!-- 更改条码弹窗 -->
<ggrytm <ggrytm
...@@ -443,7 +443,7 @@ export default { ...@@ -443,7 +443,7 @@ export default {
disabled: false, // 新增案件按钮状态 disabled: false, // 新增案件按钮状态
isShowTjddl: false,// 添加到队列 isShowTjddl: false,// 添加到队列
isShowGz: false,// 关注 isShowGz: false,// 关注
isShowDcfptx: false,// 导出FPTX isShowDcfptx1: false,// 导出FPTX
isShowGgrytm: false,// 更改条码 isShowGgrytm: false,// 更改条码
isShowFztm: false, //复制条码 isShowFztm: false, //复制条码
isShowFcx: false, //发查询 isShowFcx: false, //发查询
...@@ -592,15 +592,15 @@ export default { ...@@ -592,15 +592,15 @@ export default {
this.selectBoo = true this.selectBoo = true
} else if (this.multipleSelection.length === 1) { } else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection; this.rowData = this.multipleSelection;
this.isShowDcfptx = true; this.isShowDcfptx1 = true;
} else { } else {
this.$message.error("只能导出单条数据的FPTX!"); this.$message.error("只能导出单条数据的FPTX!");
} }
}, },
closeDcfptx (val) { closeDcfptx1 (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log('导出FPTX关闭', val) console.log('导出FPTX关闭', val)
this.isShowDcfptx = val this.isShowDcfptx1 = val
}, },
// 复制成功时的回调函数 // 复制成功时的回调函数
onCopy (e) { onCopy (e) {
...@@ -669,7 +669,9 @@ export default { ...@@ -669,7 +669,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log('关注关闭', val) console.log('关注关闭', val)
this.isShowGz = val this.isShowGz = val
this.search() if (val == false) {
this.search();
}
}, },
// 取消关注 // 取消关注
qxgz (val) { qxgz (val) {
...@@ -696,7 +698,9 @@ export default { ...@@ -696,7 +698,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log('更改条码关闭', val) console.log('更改条码关闭', val)
this.isShowGgrytm = val this.isShowGgrytm = val
this.search() if (val == false) {
this.search();
}
}, },
//复制条码列表操作 //复制条码列表操作
isShowFztmBtn (val) { isShowFztmBtn (val) {
...@@ -708,7 +712,9 @@ export default { ...@@ -708,7 +712,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log('closeFztm复制条码关闭', val) console.log('closeFztm复制条码关闭', val)
this.isShowFztm = val this.isShowFztm = val
this.search() if (val == false) {
this.search();
}
}, },
//发查询操作(多行) //发查询操作(多行)
isShowFcxBtn () { isShowFcxBtn () {
...@@ -731,7 +737,7 @@ export default { ...@@ -731,7 +737,7 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log('发查询关闭', val) console.log('发查询关闭', val)
this.isShowFcx = val this.isShowFcx = val
this.search() // this.search()
}, },
// 新增案件操作 // 新增案件操作
isShowXzajBtn () { isShowXzajBtn () {
...@@ -741,7 +747,9 @@ export default { ...@@ -741,7 +747,9 @@ export default {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
console.log('新增案件关闭', val) console.log('新增案件关闭', val)
this.isShowXzaj = val this.isShowXzaj = val
this.search() if (val == false) {
this.search();
}
}, },
/** /**
* @description: 是否是批量操作 * @description: 是否是批量操作
...@@ -817,7 +825,7 @@ export default { ...@@ -817,7 +825,7 @@ export default {
// console.log(this.$route); // console.log(this.$route);
this.search(); this.search();
// 从门户中进来,直接打开新增案件弹出框 // 从门户中进来,直接打开新增案件弹出框
if(this.$route.query.xzaj === 'true') { if (this.$route.query.xzaj === 'true') {
this.isShowXzaj = true this.isShowXzaj = true
} }
}, },
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<!-- 一 --> <!-- 一 -->
<div <div
class="head" class="head"
v-if="showType == 1" v-if="showType == 1||showType ==3"
> >
<el-radio-group <!-- <el-radio-group
v-model="dataType" v-model="dataType"
class="chooseType" class="chooseType"
> >
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
:label="2" :label="2"
@click.native.prevent="clickitemdataType(2)" @click.native.prevent="clickitemdataType(2)"
>案件</el-radio> >案件</el-radio>
</el-radio-group> </el-radio-group> -->
<div class='search barcode'> <div class='search barcode'>
<div class='item'> 条码号:</div> <div class='item'> 条码号:</div>
<el-input <el-input
...@@ -174,7 +174,8 @@ ...@@ -174,7 +174,8 @@
v-model="showType" v-model="showType"
size="small" size="small"
> >
<el-radio-button label="1">人员案件</el-radio-button> <el-radio-button label="1">人员</el-radio-button>
<el-radio-button label="3">案件</el-radio-button>
<el-radio-button label="2">比中关系</el-radio-button> <el-radio-button label="2">比中关系</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
...@@ -201,7 +202,7 @@ ...@@ -201,7 +202,7 @@
<div class="btn">复制入库成功编号</div> <div class="btn">复制入库成功编号</div>
<div <div
class="btn" class="btn"
v-clipboard:copy="ysxtAsjxgrybh" v-clipboard:copy="copyNum"
@click="getBarcode" @click="getBarcode"
v-clipboard:success="onCopy" v-clipboard:success="onCopy"
v-clipboard:error="onError" v-clipboard:error="onError"
...@@ -209,6 +210,7 @@ ...@@ -209,6 +210,7 @@
复制条码 复制条码
</div> </div>
<div <div
v-if='showType!=2'
class="btn send" class="btn send"
@click="isShowFcxBtn" @click="isShowFcxBtn"
>发查询</div> >发查询</div>
...@@ -235,7 +237,7 @@ ...@@ -235,7 +237,7 @@
>清除</el-link> >清除</el-link>
</el-tag> </el-tag>
<!-- 五 --> <!-- 五 -->
<div v-if="showType == 1"> <div v-if="showType == 1 || showType == 3">
<el-table <el-table
:max-height="height" :max-height="height"
ref="multipleTable" ref="multipleTable"
...@@ -249,6 +251,7 @@ ...@@ -249,6 +251,7 @@
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- @expand-change="hadnlExpandChange" -->
<el-table-column <el-table-column
type="selection" type="selection"
width="auto" width="auto"
...@@ -303,7 +306,7 @@ ...@@ -303,7 +306,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="barcode" prop="barcode"
label="人员编号/案事件编号" :label="showType == 1?'人员编号':'案事件编号'"
:width="width1" :width="width1"
> >
</el-table-column> </el-table-column>
...@@ -568,7 +571,7 @@ ...@@ -568,7 +571,7 @@
<!-- 六 --> <!-- 六 -->
<div <div
class="block" class="block"
v-if="showType == 1" v-if="showType == 1|| showType == 3"
> >
<span class="record">共{{ total1 }}条记录 第{{ currPage1 }}/{{Tpage1}}页</span> <span class="record">共{{ total1 }}条记录 第{{ currPage1 }}/{{Tpage1}}页</span>
<el-pagination <el-pagination
...@@ -680,7 +683,7 @@ export default { ...@@ -680,7 +683,7 @@ export default {
logicDatabase: "", // 逻辑库 logicDatabase: "", // 逻辑库
startEndDate: null, // 时间 startEndDate: null, // 时间
taskNumber: "", // 任务号 taskNumber: "", // 任务号
showType: "1", // 1:人案 2:比中 showType: "1", // 1:人 3:案 2:比中
queryType: "", // 比中类型 queryType: "", // 比中类型
queryTypeOptions: [ queryTypeOptions: [
{ {
...@@ -704,1990 +707,6 @@ export default { ...@@ -704,1990 +707,6 @@ export default {
tableDate1: [], // 人员列表数据 tableDate1: [], // 人员列表数据
tableDate2: [], // 人员列表数据 tableDate2: [], // 人员列表数据
datahaha: [
{
"id": 243,
"taskNumber": "20211119171949",
"fileName": "A4301210000002021090033.fptx",
"barcode": "A4301210000002021090033",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T09:19:49.348+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "1",
"pcImportRecordGrandchildren": null
},
{
"id": 242,
"taskNumber": "20211119171904",
"fileName": "A4301210000002021090033.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T09:19:04.261+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "2",
"pcImportRecordGrandchildren": null
},
{
"id": 241,
"taskNumber": "20211119170152",
"fileName": "R4305280000002021105012.fptx",
"barcode": "R4305280000002021105012",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T09:01:52.882+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "3",
"pcImportRecordGrandchildren": null
},
{
"id": 240,
"taskNumber": "20211119160353",
"fileName": "R4303001744012021100039.fptx",
"barcode": "R4303001744012021100039",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T08:03:53.401+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "4",
"pcImportRecordGrandchildren": null
},
{
"id": 239,
"taskNumber": "20211119155718",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:57:18.460+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "5",
"pcImportRecordGrandchildren": null
},
{
"id": 238,
"taskNumber": "20211119154049",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:40:49.916+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "6",
"pcImportRecordGrandchildren": null
},
{
"id": 237,
"taskNumber": "20211119154025",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:40:25.935+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "7",
"pcImportRecordGrandchildren": null
},
{
"id": 236,
"taskNumber": "20211119153504",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:35:04.844+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "8",
"pcImportRecordGrandchildren": null
},
{
"id": 235,
"taskNumber": "20211119152833",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:28:33.669+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "9",
"pcImportRecordGrandchildren": null
},
{
"id": 234,
"taskNumber": "20211119152807",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:28:07.697+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "10",
"pcImportRecordGrandchildren": null
},
{
"id": 233,
"taskNumber": "20211119152621",
"fileName": "4301240000002021090017.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T07:26:21.639+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "11",
"pcImportRecordGrandchildren": null
},
{
"id": 231,
"taskNumber": "20211119143047",
"fileName": "430923G100002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:30:47.953+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "12",
"pcImportRecordGrandchildren": [
{
"id": 231,
"taskNumber": "20211119143047",
"fileName": "430923G100002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:30:47.953+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "121"
},
{
"id": 232,
"taskNumber": "20211119143047",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:30:47.953+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "122"
},
{
"id": 230,
"taskNumber": "20211119143047",
"fileName": "430795G000002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:30:47.953+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "123"
}
]
},
{
"id": 227,
"taskNumber": "20211119142828",
"fileName": "430923G100002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:28:28.514+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "13",
"pcImportRecordGrandchildren": [
{
"id": 227,
"taskNumber": "20211119142828",
"fileName": "430923G100002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:28:28.514+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "131"
},
{
"id": 229,
"taskNumber": "20211119142828",
"fileName": "4301001745002021100287.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:28:28.514+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "132"
},
{
"id": 228,
"taskNumber": "20211119142828",
"fileName": "4301001745002021100286.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:28:28.514+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "133"
},
{
"id": 226,
"taskNumber": "20211119142828",
"fileName": "430795G000002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-19T06:28:28.514+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "134"
}
]
},
{
"id": 225,
"taskNumber": "20211119111142",
"fileName": "4301210000002021090033.fptx",
"barcode": "A4301210000002021090033",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T03:11:42.060+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "14",
"pcImportRecordGrandchildren": null
},
{
"id": 224,
"taskNumber": "20211119104134",
"fileName": "A4301210000002021090041.fptx",
"barcode": "A4301210000002021090041",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:41:34.161+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "15",
"pcImportRecordGrandchildren": null
},
{
"id": 223,
"taskNumber": "20211119104038",
"fileName": "A4301210000002021090041.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:40:38.213+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "16",
"pcImportRecordGrandchildren": null
},
{
"id": 222,
"taskNumber": "20211119103747",
"fileName": "A4301210000002021090041.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:37:47.182+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "17",
"pcImportRecordGrandchildren": null
},
{
"id": 221,
"taskNumber": "20211119103410",
"fileName": "A4301210000002021090041.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:34:10.425+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "18",
"pcImportRecordGrandchildren": null
},
{
"id": 220,
"taskNumber": "20211119102324",
"fileName": "A4301210000002021090041.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:23:24.886+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "19",
"pcImportRecordGrandchildren": null
},
{
"id": 219,
"taskNumber": "20211119101940",
"fileName": "4301210000002021090146.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:19:40.269+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "20",
"pcImportRecordGrandchildren": null
},
{
"id": 218,
"taskNumber": "20211119100807",
"fileName": "A4301210000002021090041.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T02:08:07.941+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "21",
"pcImportRecordGrandchildren": null
},
{
"id": 217,
"taskNumber": "20211119095947",
"fileName": "R4303001744012021100039 (2).fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-19T01:59:47.036+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "22",
"pcImportRecordGrandchildren": null
},
{
"id": 216,
"taskNumber": "20211118200020",
"fileName": "A4301110000002021090196.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-18T12:00:20.690+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "23",
"pcImportRecordGrandchildren": null
},
{
"id": 215,
"taskNumber": "20211118184526",
"fileName": "R4303001744012021100039 (2).fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T10:45:26.721+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "24",
"pcImportRecordGrandchildren": null
},
{
"id": 214,
"taskNumber": "20211118175254",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T09:52:54.974+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "25",
"pcImportRecordGrandchildren": null
},
{
"id": 213,
"taskNumber": "20211118173033",
"fileName": "R4303001744012021100039.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T09:30:33.195+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "26",
"pcImportRecordGrandchildren": null
},
{
"id": 212,
"taskNumber": "20211118172406",
"fileName": "R4303001744012021100039 (2).fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T09:24:06.743+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "27",
"pcImportRecordGrandchildren": null
},
{
"id": 211,
"taskNumber": "20211118171501",
"fileName": "R4303001744012021100039 (2).fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T09:15:01.361+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "28",
"pcImportRecordGrandchildren": null
},
{
"id": 210,
"taskNumber": "20211118165828",
"fileName": "4303001744012021100039.fptx",
"barcode": "R4303001744012021100039",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T08:58:28.324+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "29",
"pcImportRecordGrandchildren": null
},
{
"id": 209,
"taskNumber": "20211118165121",
"fileName": "4305280000002021105012.fptx",
"barcode": "R4305280000002021105012",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T08:51:21.605+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "30",
"pcImportRecordGrandchildren": null
},
{
"id": 208,
"taskNumber": "20211118154210",
"fileName": "430795G000002021100002.fptx",
"barcode": "R430795G000002021100002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T07:42:10.163+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "31",
"pcImportRecordGrandchildren": [
{
"id": 208,
"taskNumber": "20211118154210",
"fileName": "430795G000002021100002.fptx",
"barcode": "R430795G000002021100002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T07:42:10.163+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "311"
},
{
"id": 207,
"taskNumber": "20211118154210",
"fileName": "430795G000002021100002.fptx",
"barcode": "R430795G000002021100002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-18T07:42:10.163+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "312"
}
]
},
{
"id": 206,
"taskNumber": "20211117212654",
"fileName": "人员 (1)/R4600834050002009030103.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:26:54.930+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "32",
"pcImportRecordGrandchildren": [
{
"id": 206,
"taskNumber": "20211117212654",
"fileName": "人员 (1)/R4600834050002009030103.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:26:54.930+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "321"
},
{
"id": 205,
"taskNumber": "20211117212654",
"fileName": "人员 (1)/R4600834050002008030103.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:26:54.930+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "322"
}
]
},
{
"id": 202,
"taskNumber": "20211117212205",
"fileName": "431123Gf84002021100004.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:22:05.068+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "33",
"pcImportRecordGrandchildren": [
{
"id": 202,
"taskNumber": "20211117212205",
"fileName": "431123Gf84002021100004.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:22:05.068+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "331"
},
{
"id": 204,
"taskNumber": "20211117212205",
"fileName": "431129s033002021100006.fptx",
"barcode": "R431129s033002021100006",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:22:05.068+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "332"
},
{
"id": 203,
"taskNumber": "20211117212205",
"fileName": "431126Gf00002021100014.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:22:05.068+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "333"
}
]
},
{
"id": 201,
"taskNumber": "20211117211952",
"fileName": "431123Gf84002021100004.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:19:52.902+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "34",
"pcImportRecordGrandchildren": null
},
{
"id": 200,
"taskNumber": "20211117211847",
"fileName": "431129s033002021100006.fptx",
"barcode": "R431129s033002021100006",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T13:18:47.866+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "35",
"pcImportRecordGrandchildren": null
},
{
"id": 199,
"taskNumber": "20211117193422",
"fileName": "4301110000002021090196.fptx",
"barcode": "A4301110000002021090196",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T11:34:22.658+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "36",
"pcImportRecordGrandchildren": null
},
{
"id": 196,
"taskNumber": "20211117171947",
"fileName": "4301110000002021090221.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T09:19:47.714+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "37",
"pcImportRecordGrandchildren": [
{
"id": 196,
"taskNumber": "20211117171947",
"fileName": "4301110000002021090221.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T09:19:47.714+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "371"
},
{
"id": 198,
"taskNumber": "20211117171947",
"fileName": "4301210000002021090035.fptx",
"barcode": "A4301210000002021090035",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T09:19:47.714+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "372"
},
{
"id": 197,
"taskNumber": "20211117171947",
"fileName": "4301210000002021090030.fptx",
"barcode": "A4301210000002021090030",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T09:19:47.714+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "373"
}
]
},
{
"id": 195,
"taskNumber": "20211117171858",
"fileName": "4301240200002021100014.fptx",
"barcode": "R4301240200002021100014",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:18:58.344+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "38",
"pcImportRecordGrandchildren": null
},
{
"id": 194,
"taskNumber": "20211117171804",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:18:04.379+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "39",
"pcImportRecordGrandchildren": null
},
{
"id": 193,
"taskNumber": "20211117171647",
"fileName": "4304054300002021100016.fptx",
"barcode": "R4304054300002021100016",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:16:47.389+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "40",
"pcImportRecordGrandchildren": null
},
{
"id": 192,
"taskNumber": "20211117171455",
"fileName": "4301001745002021100287.fptx",
"barcode": "R4301001745002021100287",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:14:55.752+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "41",
"pcImportRecordGrandchildren": null
},
{
"id": 191,
"taskNumber": "20211117171435",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:14:35.242+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "42",
"pcImportRecordGrandchildren": null
},
{
"id": 190,
"taskNumber": "20211117171317",
"fileName": "4301001745002021100287.fptx",
"barcode": "R4301001745002021100287",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:13:17.020+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "43",
"pcImportRecordGrandchildren": null
},
{
"id": 189,
"taskNumber": "20211117171203",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:12:03.888+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "44",
"pcImportRecordGrandchildren": null
},
{
"id": 188,
"taskNumber": "20211117171059",
"fileName": "4301044400002021105001.fptx",
"barcode": "R4301044400002021105001",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:10:59.860+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "45",
"pcImportRecordGrandchildren": null
},
{
"id": 187,
"taskNumber": "20211117171020",
"fileName": "430923G100002021100002.fptx",
"barcode": "R430923G100002021100002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:10:20.293+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "46",
"pcImportRecordGrandchildren": null
},
{
"id": 186,
"taskNumber": "20211117170847",
"fileName": "4301035400002021100020.fptx",
"barcode": "R4301035400002021100020",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T09:08:47.491+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "47",
"pcImportRecordGrandchildren": null
},
{
"id": 185,
"taskNumber": "20211117165708",
"fileName": "4301210000002021090132.fptx",
"barcode": "A4301210000002021090132",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T08:57:08.040+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "48",
"pcImportRecordGrandchildren": null
},
{
"id": 184,
"taskNumber": "20211117165425",
"fileName": "4301110000002021090199.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:54:25.834+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "49",
"pcImportRecordGrandchildren": null
},
{
"id": 183,
"taskNumber": "20211117165320",
"fileName": "4301210000002021090041.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T08:53:20.266+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "50",
"pcImportRecordGrandchildren": null
},
{
"id": 182,
"taskNumber": "20211117165250",
"fileName": "4301001745002021100287.fptx",
"barcode": "R4301001745002021100287",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:52:50.855+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "51",
"pcImportRecordGrandchildren": null
},
{
"id": 181,
"taskNumber": "20211117165205",
"fileName": "4301026200002021100043.fptx",
"barcode": "R4301026200002021100043",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:52:05.631+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "52",
"pcImportRecordGrandchildren": null
},
{
"id": 180,
"taskNumber": "20211117164539",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:45:39.953+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "53",
"pcImportRecordGrandchildren": null
},
{
"id": 179,
"taskNumber": "20211117164346",
"fileName": "4304054500002021100009.fptx",
"barcode": "R4304054500002021100009",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:43:46.819+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "54",
"pcImportRecordGrandchildren": null
},
{
"id": 178,
"taskNumber": "20211117164154",
"fileName": "430795G000002021100002.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:41:54.207+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "55",
"pcImportRecordGrandchildren": null
},
{
"id": 177,
"taskNumber": "20211117163456",
"fileName": "430923G100002021100002.fptx",
"barcode": "R430923G100002021100002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T08:34:56.764+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "56",
"pcImportRecordGrandchildren": null
},
{
"id": 176,
"taskNumber": "20211117163110",
"fileName": "4301240000002021090016.fptx",
"barcode": "A4301240000002021090016",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T08:31:10.986+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "57",
"pcImportRecordGrandchildren": [
{
"id": 176,
"taskNumber": "20211117163110",
"fileName": "4301240000002021090016.fptx",
"barcode": "A4301240000002021090016",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T08:31:10.986+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "571"
},
{
"id": 175,
"taskNumber": "20211117163110",
"fileName": "4301240000002021090015.fptx",
"barcode": "A4301240000002021090015",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T08:31:10.986+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "572"
}
]
},
{
"id": 171,
"taskNumber": "20211117150807",
"fileName": "4304210000012021090171.fptx",
"barcode": "A4304210000012021090171",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T07:08:07.168+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "58",
"pcImportRecordGrandchildren": [
{
"id": 171,
"taskNumber": "20211117150807",
"fileName": "4304210000012021090171.fptx",
"barcode": "A4304210000012021090171",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T07:08:07.168+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "581"
},
{
"id": 174,
"taskNumber": "20211117150807",
"fileName": "4304260000012021090047.fptx",
"barcode": "A4304260000012021090047",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T07:08:07.168+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "582"
},
{
"id": 173,
"taskNumber": "20211117150807",
"fileName": "4304220000012021090087.fptx",
"barcode": "A4304220000012021090087",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T07:08:07.168+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "583"
},
{
"id": 172,
"taskNumber": "20211117150807",
"fileName": "4304210000012021090174.fptx",
"barcode": "A4304210000012021090174",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T07:08:07.168+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "584"
},
{
"id": 170,
"taskNumber": "20211117150807",
"fileName": "4304210000012021090147.fptx",
"barcode": "A4304210000012021090147",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-17T07:08:07.168+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "585"
}
]
},
{
"id": 168,
"taskNumber": "20211117150057",
"fileName": "4308214500002021100048.fptx",
"barcode": "R4308214500002021100048",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T07:00:57.657+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "59",
"pcImportRecordGrandchildren": [
{
"id": 168,
"taskNumber": "20211117150057",
"fileName": "4308214500002021100048.fptx",
"barcode": "R4308214500002021100048",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T07:00:57.657+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "591"
},
{
"id": 169,
"taskNumber": "20211117150057",
"fileName": "4308214500002021100049.fptx",
"barcode": "R4308214500002021100049",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T07:00:57.657+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "592"
},
{
"id": 167,
"taskNumber": "20211117150057",
"fileName": "4308025500002021100005.fptx",
"barcode": "R4308025500002021100005",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T07:00:57.657+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "593"
}
]
},
{
"id": 166,
"taskNumber": "20211117145628",
"fileName": "4301045200002021100110.fptx",
"barcode": "R4301045200002021100110",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:56:28.144+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "60",
"pcImportRecordGrandchildren": [
{
"id": 166,
"taskNumber": "20211117145628",
"fileName": "4301045200002021100110.fptx",
"barcode": "R4301045200002021100110",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:56:28.144+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "601"
},
{
"id": 165,
"taskNumber": "20211117145628",
"fileName": "4301044400002021105002.fptx",
"barcode": "R4301044400002021105002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:56:28.144+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "602"
}
]
},
{
"id": 163,
"taskNumber": "20211117145315",
"fileName": "4305234100002021100090.fptx",
"barcode": "R4305234100002021100090",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:53:15.136+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "61",
"pcImportRecordGrandchildren": [
{
"id": 163,
"taskNumber": "20211117145315",
"fileName": "4305234100002021100090.fptx",
"barcode": "R4305234100002021100090",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:53:15.136+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "611"
},
{
"id": 164,
"taskNumber": "20211117145315",
"fileName": "4305254600002021100014.fptx",
"barcode": "R4305254600002021100014",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:53:15.136+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "612"
},
{
"id": 162,
"taskNumber": "20211117145315",
"fileName": "4305234100002021100089.fptx",
"barcode": "R4305234100002021100089",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-17T06:53:15.136+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "613"
}
]
},
{
"id": 161,
"taskNumber": "20211116165432",
"fileName": "4301045200002021100110.fptx",
"barcode": "R4301045200002021100110",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-16T08:54:32.373+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "62",
"pcImportRecordGrandchildren": null
},
{
"id": 160,
"taskNumber": "20211116154736",
"fileName": "4301210000002021090119.fptx",
"barcode": "A4301210000002021090119",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-16T07:47:36.316+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "63",
"pcImportRecordGrandchildren": null
},
{
"id": 159,
"taskNumber": "20211116154323",
"fileName": "4301210000002021090119.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-16T07:43:23.007+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "64",
"pcImportRecordGrandchildren": null
},
{
"id": 158,
"taskNumber": "20211116153956",
"fileName": "4301210000002021090119.fptx",
"barcode": null,
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-16T07:39:56.409+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "案件",
"statusName": "导入失败",
"sequenceNumber": "65",
"pcImportRecordGrandchildren": null
},
{
"id": 157,
"taskNumber": "20211115212330",
"fileName": "4301210000002021090119.fptx",
"barcode": "A4301210000002021090119",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-15T13:23:30.172+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "66",
"pcImportRecordGrandchildren": null
},
{
"id": 156,
"taskNumber": "20211115212133",
"fileName": "4301110000002021090199.fptx",
"barcode": "A4301110000002021090199",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-15T13:21:33.573+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "67",
"pcImportRecordGrandchildren": null
},
{
"id": 155,
"taskNumber": "20211113152923",
"fileName": "4312291700002021100011.fptx",
"barcode": "R4312291700002021100011",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T07:29:23.261+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "68",
"pcImportRecordGrandchildren": null
},
{
"id": 154,
"taskNumber": "20211113141539",
"fileName": "4301814200002021100053.fptx",
"barcode": "R4301814200002021100053",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T06:15:39.770+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "69",
"pcImportRecordGrandchildren": null
},
{
"id": 153,
"taskNumber": "20211113141120",
"fileName": "4301814200002021100053.fptx",
"barcode": "R4301814200002021100053",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T06:11:20.706+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "70",
"pcImportRecordGrandchildren": null
},
{
"id": 152,
"taskNumber": "20211113141041",
"fileName": "4301814200002021100053.fptx",
"barcode": "R4301814200002021100053",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T06:10:41.326+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "71",
"pcImportRecordGrandchildren": null
},
{
"id": 151,
"taskNumber": "20211113134512",
"fileName": "4301814200002021100053.fptx",
"barcode": "R4301814200002021100053",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T05:45:12.497+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "72",
"pcImportRecordGrandchildren": null
},
{
"id": 150,
"taskNumber": "20211113134320",
"fileName": "TT0.fptx",
"barcode": null,
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T05:43:20.806+0000",
"status": 0,
"failReason": "格式错误",
"dataTypeName": "人员",
"statusName": "导入失败",
"sequenceNumber": "73",
"pcImportRecordGrandchildren": null
},
{
"id": 148,
"taskNumber": "20211113115921",
"fileName": "4306025700002021090013.fptx",
"barcode": "A4306025700002021090013",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:59:21.164+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "74",
"pcImportRecordGrandchildren": [
{
"id": 148,
"taskNumber": "20211113115921",
"fileName": "4306025700002021090013.fptx",
"barcode": "A4306025700002021090013",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:59:21.164+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "741"
},
{
"id": 149,
"taskNumber": "20211113115921",
"fileName": "4306230000002021090007.fptx",
"barcode": "A4306230000002021090007",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:59:21.164+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "742"
},
{
"id": 147,
"taskNumber": "20211113115921",
"fileName": "4306025600002021090002.fptx",
"barcode": "A4306025600002021090002",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:59:21.164+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "743"
}
]
},
{
"id": 145,
"taskNumber": "20211113115514",
"fileName": "4304260000012021090084.fptx",
"barcode": "A4304260000012021090084",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:55:14.208+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "75",
"pcImportRecordGrandchildren": [
{
"id": 145,
"taskNumber": "20211113115514",
"fileName": "4304260000012021090084.fptx",
"barcode": "A4304260000012021090084",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:55:14.208+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "751"
},
{
"id": 146,
"taskNumber": "20211113115514",
"fileName": "4304260000012021090092.fptx",
"barcode": "A4304260000012021090092",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:55:14.208+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "752"
}
]
},
{
"id": 144,
"taskNumber": "20211113115027",
"fileName": "4301210000002021090044.fptx",
"barcode": "A4301210000002021090044",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:50:27.424+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "76",
"pcImportRecordGrandchildren": null
},
{
"id": 139,
"taskNumber": "20211113114833",
"fileName": "4301210000002021090030.fptx",
"barcode": "A4301210000002021090030",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:48:33.266+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "77",
"pcImportRecordGrandchildren": [
{
"id": 139,
"taskNumber": "20211113114833",
"fileName": "4301210000002021090030.fptx",
"barcode": "A4301210000002021090030",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:48:33.266+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "771"
},
{
"id": 143,
"taskNumber": "20211113114833",
"fileName": "4301210000002021090119.fptx",
"barcode": "A4301210000002021090119",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:48:33.266+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "772"
},
{
"id": 142,
"taskNumber": "20211113114833",
"fileName": "4301210000002021090044.fptx",
"barcode": "A4301210000002021090044",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:48:33.266+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "773"
},
{
"id": 141,
"taskNumber": "20211113114833",
"fileName": "4301210000002021090041.fptx",
"barcode": "A4301210000002021090041",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:48:33.266+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "774"
},
{
"id": 140,
"taskNumber": "20211113114833",
"fileName": "4301210000002021090035.fptx",
"barcode": "A4301210000002021090035",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:48:33.266+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "775"
}
]
},
{
"id": 138,
"taskNumber": "20211113114739",
"fileName": "4301110000002021090221.fptx",
"barcode": "A4301110000002021090221",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:47:39.487+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "78",
"pcImportRecordGrandchildren": null
},
{
"id": 137,
"taskNumber": "20211113114705",
"fileName": "4313826200002021100043.fptx",
"barcode": "R4313826200002021100043",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:47:05.322+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "79",
"pcImportRecordGrandchildren": null
},
{
"id": 136,
"taskNumber": "20211113114636",
"fileName": "4307210000002021105019.fptx",
"barcode": "R4307210000002021105019",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:46:36.258+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "80",
"pcImportRecordGrandchildren": null
},
{
"id": 135,
"taskNumber": "20211113114351",
"fileName": "4301044400002021105002.fptx",
"barcode": "R4301044400002021105002",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:43:51.708+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "81",
"pcImportRecordGrandchildren": null
},
{
"id": 134,
"taskNumber": "20211113114101",
"fileName": "4301026200002021100043.fptx",
"barcode": "R4301026200002021100043",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:41:01.122+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "82",
"pcImportRecordGrandchildren": null
},
{
"id": 132,
"taskNumber": "20211113113538",
"fileName": "4301026200002021100043.fptx",
"barcode": "R4301026200002021100043",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:35:38.627+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "83",
"pcImportRecordGrandchildren": null
},
{
"id": 133,
"taskNumber": "20211113113338",
"fileName": "4301001745002021100287.fptx",
"barcode": "R4301001745002021100287",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:33:38.746+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "84",
"pcImportRecordGrandchildren": [
{
"id": 133,
"taskNumber": "20211113113338",
"fileName": "4301001745002021100287.fptx",
"barcode": "R4301001745002021100287",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:33:38.746+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "841"
},
{
"id": 131,
"taskNumber": "20211113113338",
"fileName": "4301001745002021100287.fptx",
"barcode": "R4301001745002021100287",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:33:38.746+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "842"
}
]
},
{
"id": 130,
"taskNumber": "20211113113246",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:32:46.436+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "85",
"pcImportRecordGrandchildren": null
},
{
"id": 129,
"taskNumber": "20211113112804",
"fileName": "4307024900002021100001.fptx",
"barcode": "R4307024900002021100001",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:28:04.474+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "86",
"pcImportRecordGrandchildren": null
},
{
"id": 128,
"taskNumber": "20211113112719",
"fileName": "4301001745002021100286.fptx",
"barcode": "R4301001745002021100286",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T03:27:19.452+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "87",
"pcImportRecordGrandchildren": null
},
{
"id": 127,
"taskNumber": "20211113110127",
"fileName": "4301110000002021090199.fptx",
"barcode": "A4301110000002021090199",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T03:01:27.420+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "88",
"pcImportRecordGrandchildren": null
},
{
"id": 126,
"taskNumber": "20211113105614",
"fileName": "4331308100002021100010.fptx",
"barcode": "R4331308100002021100010",
"dataType": 1,
"logicDatabase": "1",
"importTime": "2021-11-13T02:56:14.019+0000",
"status": 1,
"failReason": "",
"dataTypeName": "人员",
"statusName": "导入成功",
"sequenceNumber": "89",
"pcImportRecordGrandchildren": null
},
{
"id": 125,
"taskNumber": "20211113105328",
"fileName": "4301110000002021090199.fptx",
"barcode": "A4301110000002021090199",
"dataType": 2,
"logicDatabase": "1",
"importTime": "2021-11-13T02:53:28.694+0000",
"status": 1,
"failReason": "",
"dataTypeName": "案件",
"statusName": "导入成功",
"sequenceNumber": "90",
"pcImportRecordGrandchildren": null
}
],
total1: null, // 总条数 total1: null, // 总条数
total2: null, // 总条数 total2: null, // 总条数
pageSize: 10, //当前选择要显示的条数 pageSize: 10, //当前选择要显示的条数
...@@ -2696,6 +715,8 @@ export default { ...@@ -2696,6 +715,8 @@ export default {
sendTimeStart: "", // 开始时间 sendTimeStart: "", // 开始时间
sendTimeEnd: "", // 结束时间 sendTimeEnd: "", // 结束时间
expanded: false, // 展开标志
...@@ -2705,7 +726,7 @@ export default { ...@@ -2705,7 +726,7 @@ export default {
isShowFcx: false, //发查询 isShowFcx: false, //发查询
type: "ry", // 人员还是案件 type: "ry", // 人员还是案件
rowData: {}, // 单行数据 rowData: {}, // 单行数据
ysxtAsjxgrybh: null, copyNum: null,
reqParam: { reqParam: {
// 请求参数 // 请求参数
page: { page: {
...@@ -2739,7 +760,7 @@ export default { ...@@ -2739,7 +760,7 @@ export default {
reqUrl = "/api/record/import/pc/search"; reqUrl = "/api/record/import/pc/search";
reqParam = { reqParam = {
taskNumber: "", // 任务号 taskNumber: "", // 任务号
dataType: null, // 人员or案件 dataType: 1, // 人员or案件
status: null, // 状态 status: null, // 状态
barcode: "", // 条码号 barcode: "", // 条码号
logicDatabase: "", // 逻辑分库 logicDatabase: "", // 逻辑分库
...@@ -2749,7 +770,6 @@ export default { ...@@ -2749,7 +770,6 @@ export default {
limit: null // 当页条数 limit: null // 当页条数
}; };
reqParam.taskNumber = this.taskNumber; reqParam.taskNumber = this.taskNumber;
reqParam.dataType = Number(this.dataType);
// reqParam.status = Number(this.status) // reqParam.status = Number(this.status)
reqParam.status = this.status != null ? Number(this.status) : null; reqParam.status = this.status != null ? Number(this.status) : null;
reqParam.barcode = this.barcode; reqParam.barcode = this.barcode;
...@@ -2775,12 +795,34 @@ export default { ...@@ -2775,12 +795,34 @@ export default {
reqParam.queryType = this.queryType; reqParam.queryType = this.queryType;
reqParam.offSet = this.currPage2; reqParam.offSet = this.currPage2;
reqParam.limit = this.pageSize reqParam.limit = this.pageSize
} else if (this.showType == 3) {
reqUrl = "/api/record/import/pc/search";
reqParam = {
taskNumber: "", // 任务号
dataType: 2, // 人员or案件
status: null, // 状态
barcode: "", // 条码号
logicDatabase: "", // 逻辑分库
sendTimeStart: null, // 开始时间
sendTimeEnd: null, // 结束时间
offSet: null, // 当前页数
limit: null // 当页条数
};
reqParam.taskNumber = this.taskNumber;
// reqParam.status = Number(this.status)
reqParam.status = this.status != null ? Number(this.status) : null;
reqParam.barcode = this.barcode;
reqParam.logicDatabase = this.logicDatabase;
reqParam.sendTimeStart = this.sendTimeStart = this.sendTimeStart;
reqParam.sendTimeEnd = this.sendTimeEnd = this.sendTimeStart;
reqParam.offSet = this.currPage1;
reqParam.limit = this.pageSize
} }
// console.info("请求===>", this.reqParam); // console.info("请求===>", this.reqParam);
this.$axios.post(reqUrl, reqParam).then((response) => { this.$axios.post(reqUrl, reqParam).then((response) => {
// console.info("查询结果===>", response); // console.info("查询结果===>", response);
if (response.data.code === 0) { if (response.data.code === 0) {
if (this.showType == 1) { if (this.showType == 1 || this.showType == 3) {
this.tableDate1 = response.data.ret.pcImportRecordChildren; this.tableDate1 = response.data.ret.pcImportRecordChildren;
this.total1 = response.data.ret.total; this.total1 = response.data.ret.total;
console.log('total', this.total1) console.log('total', this.total1)
...@@ -2796,6 +838,47 @@ export default { ...@@ -2796,6 +838,47 @@ export default {
} }
}); });
}, },
// // 展开或关闭行
// hadnlExpandChange (row, expanded) {
// // 获取展开标志
// this.expanded = expanded;
// // 获取下标
// var i = this.tableDate1.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// // var i = this.tableData.findIndex(table => table.id === row.id);
// // console.log(i);
// if (expanded) {
// this.list[i] = {
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
// expanded: true,
// };
// this.$forceUpdate();
// } else {
// console.info("折叠时row数据", this.list[i]);
// this.list[i] = {
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
// querylog: row.children[0].querylog,
// expanded: false,
// barcode: row.children[0].barcode,
// maxcandidatecnt: row.children[0].maxcandidatecnt,
// querytype: row.children[0].querytype,
// queryStateName: row.children[0].queryStateName,
// hitpossibility: row.children[0].hitpossibility,
// queryclass: row.children[0].queryclass,
// affirmtime: row.children[0].affirmtime,
// requestdatetime: row.children[0].requestdatetime,
// userdesc: row.children[0].userdesc,
// queryTypeName: row.children[0].queryTypeName,
// removeFlag: row.children[0].removeFlag,
// };
// console.log(this.list[i]);
// this.$forceUpdate();
// // console.info("塞完数据的row", this.list[i]);
// }
// },
clear () { clear () {
this.taskNumber = ""; // 任务号 this.taskNumber = ""; // 任务号
this.dataType = null; // 人员or案件 this.dataType = null; // 人员or案件
...@@ -2803,6 +886,7 @@ export default { ...@@ -2803,6 +886,7 @@ export default {
this.barcode = ""; // 条码号 this.barcode = ""; // 条码号
this.logicDatabase = "";// 逻辑分库 this.logicDatabase = "";// 逻辑分库
this.queryType = "";// 类型 this.queryType = "";// 类型
this.startEndDate = null;// 时间
this.search() this.search()
}, },
// 格式化参数 // 格式化参数
...@@ -2822,17 +906,17 @@ export default { ...@@ -2822,17 +906,17 @@ export default {
// 复制条码号 获取选中条码值 // 复制条码号 获取选中条码值
getBarcode () { getBarcode () {
let self = this; let self = this;
this.ysxtAsjxgrybh = []; this.copyNum = [];
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据!"); this.$message.error("请选择需要复制条码号的数据!");
} else { } else {
self.multipleSelection.forEach((item) => { self.multipleSelection.forEach((item) => {
self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh); self.copyNum.push(item.barcode);
}); });
this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(","); this.copyNum = this.copyNum.join(",");
} }
// else if (this.multipleSelection.length === 1) { // else if (this.multipleSelection.length === 1) {
// this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh; // this.copyNum = this.multipleSelection[0].copyNum;
// } else { // } else {
// this.$message.error("只能复制单条数据的条码号!"); // this.$message.error("只能复制单条数据的条码号!");
// } // }
...@@ -2842,7 +926,7 @@ export default { ...@@ -2842,7 +926,7 @@ export default {
if (this.multipleSelection.length != 0) { if (this.multipleSelection.length != 0) {
this.$message({ this.$message({
type: "success", type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功!" // message: "复制条码号:" + this.copyNum + "成功!"
message: "已复制到剪切板", message: "已复制到剪切板",
}); });
} }
...@@ -2860,6 +944,13 @@ export default { ...@@ -2860,6 +944,13 @@ export default {
this.$message.error("请选择需要添加到队列的数据!"); this.$message.error("请选择需要添加到队列的数据!");
this.isSelected = true; this.isSelected = true;
} else { } else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 3) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = this.multipleSelection; this.rowData = this.multipleSelection;
this.isShowTjddl = true; this.isShowTjddl = true;
} }
...@@ -2886,11 +977,25 @@ export default { ...@@ -2886,11 +977,25 @@ export default {
this.$message.error("请选择需要发查询的数据!"); this.$message.error("请选择需要发查询的数据!");
this.isSelected = true; this.isSelected = true;
} else { } else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 3) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = this.multipleSelection; this.rowData = this.multipleSelection;
this.isShowFcx = true; this.isShowFcx = true;
} }
}, },
isShowFcxBtn1 (val) { isShowFcxBtn1 (val) {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 3) {
this.type = 'aj'
console.log('案件案件')
}
console.log("单行人员发查询数据", val); console.log("单行人员发查询数据", val);
let rowVal = []; let rowVal = [];
rowVal.push(val); rowVal.push(val);
...@@ -2909,6 +1014,7 @@ export default { ...@@ -2909,6 +1014,7 @@ export default {
*/ */
batch () { batch () {
this.isSelected = !this.isSelected; this.isSelected = !this.isSelected;
this.isShowTip = !this.isShowTip;
this.toggleSelection(); this.toggleSelection();
}, },
cancel () { cancel () {
...@@ -2921,6 +1027,11 @@ export default { ...@@ -2921,6 +1027,11 @@ export default {
*/ */
handleClick (row) { handleClick (row) {
console.log(row); console.log(row);
if (this.showType == 1) {
this.$router.push("/ryzwbj/" + row.id + "/" + row.barcode);
} else if (this.showType == 3) {
this.$router.push('/ajzwbj/' + row.id + '/' + row.barcode)
}
}, },
/** /**
* @description: 单选事件 * @description: 单选事件
...@@ -2930,11 +1041,11 @@ export default { ...@@ -2930,11 +1041,11 @@ export default {
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection); console.log(this.multipleSelection);
if (this.multipleSelection.length) { // if (this.multipleSelection.length) {
this.isShowTip = true; // this.isShowTip = true;
} else { // } else {
this.isShowTip = false; // this.isShowTip = false;
} // }
}, },
/** /**
* @description: pageSize 改变时会触发 * @description: pageSize 改变时会触发
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-24 16:40:30 * @LastEditTime: 2021-11-24 18:33:09
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -94,10 +94,11 @@ module.exports = { ...@@ -94,10 +94,11 @@ module.exports = {
// target: "http://192.168.128.166:8099", // 湖南-张 // target: "http://192.168.128.166:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马 // target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.111:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
target: "http://www.meetfood.cn:2390/", // 湖南-线上 // target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment