Skip to content

F
founder_vue
Commit 70cccda5 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 4078b390 2154ff9e
Showing with 1384 additions and 341 deletions
package-lock.json
...@@ -1041,7 +1041,6 @@ ...@@ -1041,7 +1041,6 @@
"version": "7.11.2", "version": "7.11.2",
"resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.11.2.tgz", "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.11.2.tgz",
"integrity": "sha1-9UnBPHVMxAuHZEufqfCaapX+BzY=", "integrity": "sha1-9UnBPHVMxAuHZEufqfCaapX+BzY=",
"dev": true,
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
}, },
...@@ -1049,8 +1048,7 @@ ...@@ -1049,8 +1048,7 @@
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.13.7", "version": "0.13.7",
"resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.7.tgz?cache=0&sync_timestamp=1595456117883&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.7.tgz", "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.7.tgz?cache=0&sync_timestamp=1595456117883&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.7.tgz",
"integrity": "sha1-ysLazIoepnX+qrrriugziYrkb1U=", "integrity": "sha1-ysLazIoepnX+qrrriugziYrkb1U="
"dev": true
} }
} }
}, },
...@@ -1706,6 +1704,71 @@ ...@@ -1706,6 +1704,71 @@
} }
} }
}, },
"@videojs/http-streaming": {
"version": "2.12.0",
"resolved": "https://registry.npmmirror.com/@videojs/http-streaming/download/@videojs/http-streaming-2.12.0.tgz",
"integrity": "sha512-vdQA0lDYBXGJqV2T02AGqg1w4dcgyRoN+bYG+G8uF4DpCEMhEtUI0BA4tRu4/Njar8w/9D5k0a1KX40pcvM3fA==",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "3.0.4",
"aes-decrypter": "3.1.2",
"global": "^4.4.0",
"m3u8-parser": "4.7.0",
"mpd-parser": "0.19.2",
"mux.js": "5.14.1",
"video.js": "^6 || ^7"
},
"dependencies": {
"@babel/runtime": {
"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",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"regenerator-runtime": {
"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",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
}
}
},
"@videojs/vhs-utils": {
"version": "3.0.4",
"resolved": "https://registry.npmmirror.com/@videojs/vhs-utils/download/@videojs/vhs-utils-3.0.4.tgz",
"integrity": "sha1-4lPuzY6TGPdn51IBDSE1h/lLsDo=",
"requires": {
"@babel/runtime": "^7.12.5",
"global": "^4.4.0",
"url-toolkit": "^2.2.1"
},
"dependencies": {
"@babel/runtime": {
"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",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"regenerator-runtime": {
"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",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
}
}
},
"@videojs/xhr": {
"version": "2.6.0",
"resolved": "https://registry.nlark.com/@videojs/xhr/download/@videojs/xhr-2.6.0.tgz",
"integrity": "sha1-zYl+CtVPr0l5YbzOP6FtwVomu4A=",
"requires": {
"@babel/runtime": "^7.5.5",
"global": "~4.4.0",
"is-function": "^1.0.1"
}
},
"@vue/babel-helper-vue-jsx-merge-props": { "@vue/babel-helper-vue-jsx-merge-props": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz", "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
...@@ -2323,6 +2386,11 @@ ...@@ -2323,6 +2386,11 @@
"@xtuc/long": "4.2.2" "@xtuc/long": "4.2.2"
} }
}, },
"@xmldom/xmldom": {
"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",
"integrity": "sha1-CfpR41bQfQviAGQrDk+R2ObdQI0="
},
"@xtuc/ieee754": { "@xtuc/ieee754": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz", "resolved": "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz",
...@@ -2407,6 +2475,32 @@ ...@@ -2407,6 +2475,32 @@
"integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=", "integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
"dev": true "dev": true
}, },
"aes-decrypter": {
"version": "3.1.2",
"resolved": "https://registry.npm.taobao.org/aes-decrypter/download/aes-decrypter-3.1.2.tgz",
"integrity": "sha1-NUVUb46fa4eGQDOaJC7+Ihunp8s=",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^3.0.0",
"global": "^4.4.0",
"pkcs7": "^1.0.4"
},
"dependencies": {
"@babel/runtime": {
"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",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"regenerator-runtime": {
"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",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
}
}
},
"agent-base": { "agent-base": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "https://registry.npm.taobao.org/agent-base/download/agent-base-6.0.2.tgz", "resolved": "https://registry.npm.taobao.org/agent-base/download/agent-base-6.0.2.tgz",
...@@ -3606,11 +3700,6 @@ ...@@ -3606,11 +3700,6 @@
"simple-get": "^3.0.3" "simple-get": "^3.0.3"
} }
}, },
"canvas2image": {
"version": "1.0.5",
"resolved": "https://registry.nlark.com/canvas2image/download/canvas2image-1.0.5.tgz",
"integrity": "sha1-Z2oJS0NjiIordmLli5zl07+8nRQ="
},
"case-sensitive-paths-webpack-plugin": { "case-sensitive-paths-webpack-plugin": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npm.taobao.org/case-sensitive-paths-webpack-plugin/download/case-sensitive-paths-webpack-plugin-2.3.0.tgz", "resolved": "https://registry.npm.taobao.org/case-sensitive-paths-webpack-plugin/download/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
...@@ -5207,6 +5296,11 @@ ...@@ -5207,6 +5296,11 @@
} }
} }
}, },
"dom-walk": {
"version": "0.1.2",
"resolved": "https://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.2.tgz",
"integrity": "sha1-DFSL7wSPTR8qlySQAiNgYNqj/YQ="
},
"dom7": { "dom7": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz", "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz",
...@@ -6502,6 +6596,15 @@ ...@@ -6502,6 +6596,15 @@
"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
"dev": true "dev": true
}, },
"global": {
"version": "4.4.0",
"resolved": "https://registry.npm.taobao.org/global/download/global-4.4.0.tgz",
"integrity": "sha1-PnsQUXkAajI+1xqvyj6cV6XMZAY=",
"requires": {
"min-document": "^2.19.0",
"process": "^0.11.10"
}
},
"globals": { "globals": {
"version": "11.12.0", "version": "11.12.0",
"resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1596709302233&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz", "resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1596709302233&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz",
...@@ -7105,6 +7208,11 @@ ...@@ -7105,6 +7208,11 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true "dev": true
}, },
"individual": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/individual/download/individual-2.0.0.tgz",
"integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
},
"infer-owner": { "infer-owner": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz", "resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
...@@ -7408,6 +7516,11 @@ ...@@ -7408,6 +7516,11 @@
"integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=", "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=",
"dev": true "dev": true
}, },
"is-function": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-function/download/is-function-1.0.2.tgz",
"integrity": "sha1-Twl/MKv2762smDOxfKXcA/gUTgg="
},
"is-glob": { "is-glob": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz", "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
...@@ -7765,6 +7878,11 @@ ...@@ -7765,6 +7878,11 @@
"verror": "1.10.0" "verror": "1.10.0"
} }
}, },
"keycode": {
"version": "2.2.1",
"resolved": "https://registry.npmmirror.com/keycode/download/keycode-2.2.1.tgz",
"integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg=="
},
"killable": { "killable": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz", "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
...@@ -8033,6 +8151,31 @@ ...@@ -8033,6 +8151,31 @@
"yallist": "^2.1.2" "yallist": "^2.1.2"
} }
}, },
"m3u8-parser": {
"version": "4.7.0",
"resolved": "https://registry.nlark.com/m3u8-parser/download/m3u8-parser-4.7.0.tgz",
"integrity": "sha1-4B6M4TYJit4bFO5pHqIPxNxgq/Y=",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^3.0.0",
"global": "^4.4.0"
},
"dependencies": {
"@babel/runtime": {
"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",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"regenerator-runtime": {
"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",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
}
}
},
"make-dir": { "make-dir": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz", "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
...@@ -8227,6 +8370,14 @@ ...@@ -8227,6 +8370,14 @@
"integrity": "sha1-0Tdj019hPQnsN+uzC6wEacDuj0M=", "integrity": "sha1-0Tdj019hPQnsN+uzC6wEacDuj0M=",
"optional": true "optional": true
}, },
"min-document": {
"version": "2.19.0",
"resolved": "https://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz",
"integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
"requires": {
"dom-walk": "^0.1.0"
}
},
"mini-css-extract-plugin": { "mini-css-extract-plugin": {
"version": "0.9.0", "version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz", "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz",
...@@ -8422,6 +8573,32 @@ ...@@ -8422,6 +8573,32 @@
"run-queue": "^1.0.3" "run-queue": "^1.0.3"
} }
}, },
"mpd-parser": {
"version": "0.19.2",
"resolved": "https://registry.npmmirror.com/mpd-parser/download/mpd-parser-0.19.2.tgz",
"integrity": "sha1-aGEeZTzfLMHpBoiCXEoSm3+QB+A=",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^3.0.2",
"@xmldom/xmldom": "^0.7.2",
"global": "^4.4.0"
},
"dependencies": {
"@babel/runtime": {
"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",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"regenerator-runtime": {
"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",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
}
}
},
"ms": { "ms": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
...@@ -8449,6 +8626,14 @@ ...@@ -8449,6 +8626,14 @@
"integrity": "sha1-FjDEKyJR/4HiooPelqVJfqkuXg0=", "integrity": "sha1-FjDEKyJR/4HiooPelqVJfqkuXg0=",
"dev": true "dev": true
}, },
"mux.js": {
"version": "5.14.1",
"resolved": "https://registry.npmmirror.com/mux.js/download/mux.js-5.14.1.tgz",
"integrity": "sha1-IJWD9FQlXZui/xu2GtWmhnz2GHg=",
"requires": {
"@babel/runtime": "^7.11.2"
}
},
"mz": { "mz": {
"version": "2.7.0", "version": "2.7.0",
"resolved": "https://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz", "resolved": "https://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz",
...@@ -9369,6 +9554,14 @@ ...@@ -9369,6 +9554,14 @@
"pinkie": "^2.0.0" "pinkie": "^2.0.0"
} }
}, },
"pkcs7": {
"version": "1.0.4",
"resolved": "https://registry.nlark.com/pkcs7/download/pkcs7-1.0.4.tgz",
"integrity": "sha1-YJC55xFg2r9pIJ1xnLr6U4sAocs=",
"requires": {
"@babel/runtime": "^7.5.5"
}
},
"pkg-dir": { "pkg-dir": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz", "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
...@@ -10196,8 +10389,7 @@ ...@@ -10196,8 +10389,7 @@
"process": { "process": {
"version": "0.11.10", "version": "0.11.10",
"resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz", "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
"dev": true
}, },
"process-nextick-args": { "process-nextick-args": {
"version": "2.0.1", "version": "2.0.1",
...@@ -11074,6 +11266,14 @@ ...@@ -11074,6 +11266,14 @@
"aproba": "^1.1.1" "aproba": "^1.1.1"
} }
}, },
"rust-result": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/rust-result/download/rust-result-1.0.0.tgz",
"integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
"requires": {
"individual": "^2.0.0"
}
},
"rxjs": { "rxjs": {
"version": "6.6.3", "version": "6.6.3",
"resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.6.3.tgz?cache=0&sync_timestamp=1600896740146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.6.3.tgz", "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.6.3.tgz?cache=0&sync_timestamp=1600896740146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.6.3.tgz",
...@@ -11088,6 +11288,14 @@ ...@@ -11088,6 +11288,14 @@
"resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz", "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz",
"integrity": "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY=" "integrity": "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY="
}, },
"safe-json-parse": {
"version": "4.0.0",
"resolved": "https://registry.nlark.com/safe-json-parse/download/safe-json-parse-4.0.0.tgz",
"integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
"requires": {
"rust-result": "^1.0.0"
}
},
"safe-regex": { "safe-regex": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz", "resolved": "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz",
...@@ -13293,6 +13501,11 @@ ...@@ -13293,6 +13501,11 @@
"unidecode": "0.1.8" "unidecode": "0.1.8"
} }
}, },
"url-toolkit": {
"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",
"integrity": "sha1-ePqQEhWrusNBggZpMiICebgEUis="
},
"use": { "use": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz", "resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz",
...@@ -13423,6 +13636,54 @@ ...@@ -13423,6 +13636,54 @@
"extsprintf": "^1.2.0" "extsprintf": "^1.2.0"
} }
}, },
"video.js": {
"version": "7.17.0",
"resolved": "https://registry.npmmirror.com/video.js/download/video.js-7.17.0.tgz",
"integrity": "sha512-8RbLu9+Pdpep9OTPncUHIvZXFgn/7hKdPnSTE/lGSnlFSucXtTUBp41R7NDwncscMLQ0WgazUbmFlvr4MNWMbA==",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/http-streaming": "2.12.0",
"@videojs/vhs-utils": "^3.0.3",
"@videojs/xhr": "2.6.0",
"aes-decrypter": "3.1.2",
"global": "^4.4.0",
"keycode": "^2.2.0",
"m3u8-parser": "4.7.0",
"mpd-parser": "0.19.2",
"mux.js": "5.14.1",
"safe-json-parse": "4.0.0",
"videojs-font": "3.2.0",
"videojs-vtt.js": "^0.15.3"
},
"dependencies": {
"@babel/runtime": {
"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",
"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"regenerator-runtime": {
"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",
"integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
}
}
},
"videojs-font": {
"version": "3.2.0",
"resolved": "https://registry.npm.taobao.org/videojs-font/download/videojs-font-3.2.0.tgz",
"integrity": "sha1-ISydP05Ow/pzRRZ9ZDFq3TXpIjI="
},
"videojs-vtt.js": {
"version": "0.15.3",
"resolved": "https://registry.npm.taobao.org/videojs-vtt.js/download/videojs-vtt.js-0.15.3.tgz",
"integrity": "sha1-hCYDk7eUh/zxldk3L4Etf6uDqZM=",
"requires": {
"global": "^4.3.1"
}
},
"vm-browserify": { "vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1589344261391&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz", "resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1589344261391&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz",
......
package.json
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
"sass-resources-loader": "^2.1.1", "sass-resources-loader": "^2.1.1",
"serve": "^12.0.0", "serve": "^12.0.0",
"tui-image-editor": "^3.15.0", "tui-image-editor": "^3.15.0",
"video.js": "^7.17.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-awesome-swiper": "^3.1.3", "vue-awesome-swiper": "^3.1.3",
"vue-bus": "^1.2.1", "vue-bus": "^1.2.1",
......
src/components/Confirmation.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-15 14:15:58 * @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-15 14:34:26 * @LastEditTime: 2021-11-19 18:35:19
* @LastEditors: Please set LastEditors * @LastEditors: 赵鹏龙
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue * @FilePath: \founder_vue\src\components\confrim.vue
--> -->
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
:content="content" :content="content"
placement="top" placement="top"
:open-delay="500" :open-delay="500"
:disabled="disaledToolTipe"
> >
<slot></slot> <slot></slot>
<el-popconfirm <el-popconfirm
...@@ -43,9 +44,14 @@ export default { ...@@ -43,9 +44,14 @@ export default {
//是否出现二次选择框 //是否出现二次选择框
hintBoo: { hintBoo: {
type: Boolean, type: Boolean,
default: false, default: false
},
}, },
// 禁用 tooTipe 悬浮标识
disaledToolTipe: {
type: Boolean,
default: false
}
}
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
......
src/components/ImageEd.scss
...@@ -110,6 +110,12 @@ div { ...@@ -110,6 +110,12 @@ div {
.bzd { .bzd {
margin-right: 40px; margin-right: 40px;
} }
.slt_disabled {
img {
width: 100%;
height: 100%;
}
}
.size, .size,
.line { .line {
&::after { &::after {
...@@ -1110,6 +1116,9 @@ div { ...@@ -1110,6 +1116,9 @@ div {
width: 40px; width: 40px;
height: 40px; height: 40px;
margin-right: 20px; margin-right: 20px;
img {
cursor: pointer;
}
} }
} }
.lt_main_middle .lt_main_footer { .lt_main_middle .lt_main_footer {
......
src/components/ImageEd.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 14:39:52 * @Date: 2021-09-07 14:39:52
* @LastEditTime: 2021-11-15 11:13:36 * @LastEditTime: 2021-11-19 15:30:03
* @LastEditors: Please set LastEditors * @LastEditors: 林永鑫
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\main.js * @FilePath: \founder_vue\src\main.js
*/ */
import Vue from "vue"; import Vue from "vue";
import "./plugins/axios"; import "./plugins/axios";
...@@ -16,14 +16,15 @@ import Util from "./utils/util"; ...@@ -16,14 +16,15 @@ import Util from "./utils/util";
import VueWechatTitle from "vue-wechat-title"; import VueWechatTitle from "vue-wechat-title";
import Watermark from "./utils/watermark.js"; import Watermark from "./utils/watermark.js";
import Driver from "driver.js"; import Driver from "driver.js";
import Video from "video.js";
import "video.js/dist/video-js.css";
import "driver.js/dist/driver.min.css"; import "driver.js/dist/driver.min.css";
import "./assets/css/global.css"; import "./assets/css/global.css";
import "./assets/css/el-table-style.css"; import "./assets/css/el-table-style.css";
import VueClipboard from "vue-clipboard2"; import VueClipboard from "vue-clipboard2";
import VueBus from "vue-bus"; import VueBus from "vue-bus";
// import "lib-flexible"; // import "lib-flexible";
import './utils/rem' import "./utils/rem";
//引入svg组件 //引入svg组件
import IconSvg from "./utils/IconSvg.vue"; import IconSvg from "./utils/IconSvg.vue";
...@@ -47,6 +48,8 @@ Vue.prototype.$driver = new Driver({ ...@@ -47,6 +48,8 @@ Vue.prototype.$driver = new Driver({
prevBtnText: "上一步" // Previous button text for this step prevBtnText: "上一步" // Previous button text for this step
}); });
Vue.prototype.$video = Video;
import Nsloading from "./components/Loading.vue"; import Nsloading from "./components/Loading.vue";
Vue.prototype.$store = store; Vue.prototype.$store = store;
......
src/views/AllPersonnelBase/qbalk.vue
...@@ -814,7 +814,12 @@ export default { ...@@ -814,7 +814,12 @@ export default {
} }
}, },
mounted () { mounted () {
// console.log(this.$route);
this.search(); this.search();
// 从门户中进来，直接打开新增案件弹出框
if(this.$route.query.xzaj === 'true') {
this.isShowXzaj = true
}
}, },
computed: { computed: {
/** /**
......
src/views/Editor/modules/ajzwbjLeft.scss
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
} }
.desc { .desc {
color: #055fe7; color: #055fe7;
font-weight: normal;
font-family: MicrosoftYaHei;
} }
} }
.ryzwbj-content { .ryzwbj-content {
......
src/views/Editor/modules/imageEd.scss
...@@ -29,7 +29,6 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -29,7 +29,6 @@ $transOrigin: var(--transOrigin, 0px, 0px);
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
z-index: 99999;
.size-options { .size-options {
z-index: 10; z-index: 10;
position: absolute; position: absolute;
...@@ -65,6 +64,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -65,6 +64,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
img { img {
cursor: pointer;
width: 20px; width: 20px;
height: 20px; height: 20px;
object-fit: contain; object-fit: contain;
...@@ -91,7 +91,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -91,7 +91,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.history, .history,
.rubber { .rubber {
margin-right: 8px; margin-right: 8px;
z-index: 999999; //z-index: 999999;
} }
.download { .download {
margin-right: 40px; margin-right: 40px;
...@@ -150,7 +150,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -150,7 +150,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
} }
.lineOptions { .lineOptions {
padding: 14px 24px; padding: 14px 24px;
z-index: 9999; //z-index: 9999;
position: absolute; position: absolute;
top: 35px; top: 35px;
left: 0; left: 0;
...@@ -689,6 +689,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -689,6 +689,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
img { img {
cursor: pointer;
width: 20px; width: 20px;
height: 20px; height: 20px;
object-fit: contain; object-fit: contain;
...@@ -1019,7 +1020,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1019,7 +1020,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
align-items: center; align-items: center;
padding: 0 16px; padding: 0 16px;
background: #e9f3fd; background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.4); box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.4);
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
.top-title-left { .top-title-left {
font-size: 16px; font-size: 16px;
...@@ -1171,6 +1172,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1171,6 +1172,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
img { img {
width: 25px; width: 25px;
height: 25px; height: 25px;
cursor: pointer;
} }
.number { .number {
position: absolute; position: absolute;
...@@ -1186,6 +1188,17 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1186,6 +1188,17 @@ $transOrigin: var(--transOrigin, 0px, 0px);
color: #ffffff; color: #ffffff;
} }
} }
.tzd-d {
position: relative;
cursor: pointer;
width: 40px;
height: 40px;
img {
width: 40px;
height: 40px;
cursor: pointer;
}
}
.bzd { .bzd {
margin-left: 24px; margin-left: 24px;
cursor: pointer; cursor: pointer;
...@@ -1198,10 +1211,22 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1198,10 +1211,22 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
cursor: pointer;
width: 25px; width: 25px;
height: 25px; height: 25px;
} }
} }
.bzd-d {
margin-left: 24px;
cursor: pointer;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
} }
.xstz, .xstz,
.xszyqy { .xszyqy {
...@@ -1256,10 +1281,22 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1256,10 +1281,22 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
cursor: pointer;
width: 25px; width: 25px;
height: 25px; height: 25px;
} }
} }
.dp-d {
cursor: pointer;
margin-right: 24px;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.clearConfirm { .clearConfirm {
z-index: 10; z-index: 10;
position: absolute; position: absolute;
...@@ -1386,7 +1423,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1386,7 +1423,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 336px; width: 336px;
height: 32px; height: 32px;
background: #e9f3fd; background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.39); box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.39);
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
line-height: 32px; line-height: 32px;
} }
...@@ -1517,6 +1554,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1517,6 +1554,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px solid #e6e9ec; border: 1px solid #e6e9ec;
text-align: center;
} }
.range-narrow { .range-narrow {
margin-right: 10px; margin-right: 10px;
......
src/views/Editor/modules/imageEd.vue
...@@ -11,31 +11,31 @@ ...@@ -11,31 +11,31 @@
<div class="imageEd"> <div class="imageEd">
<div class="imageEd_header"> <div class="imageEd_header">
<div class="center"> <div class="center">
<el-tooltip class="item" effect="dark" content="撤销"> <el-tooltip class="item" effect="dark" content="撤销" :open-delay="500">
<div class="icon back disabled disabled2" id="btn-undo" @mousedown="mouseDownBack" @mouseup="mouseUpBack"> <div class="icon back disabled disabled2" id="btn-undo" @mousedown="mouseDownBack" @mouseup="mouseUpBack">
<img src="@/assets/img/zcedit/back.png" alt="" v-show="!back_active"> <img src="@/assets/img/zcedit/back.png" alt="" v-show="!back_active">
<img src="@/assets/img/zcedit/back_a.png" alt="" v-show="back_active"> <img src="@/assets/img/zcedit/back_a.png" alt="" v-show="back_active">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="恢复"> <el-tooltip class="item" effect="dark" content="恢复" :open-delay="500">
<div class="icon go disabled disabled2" id="btn-redo" @mousedown="mouseDownGo" @mouseup="mouseUpGo"> <div class="icon go disabled disabled2" id="btn-redo" @mousedown="mouseDownGo" @mouseup="mouseUpGo">
<img src="@/assets/img/zcedit/go.png" alt="" v-show="!go_active"> <img src="@/assets/img/zcedit/go.png" alt="" v-show="!go_active">
<img src="@/assets/img/zcedit/go_a.png" alt="" v-show="go_active"> <img src="@/assets/img/zcedit/go_a.png" alt="" v-show="go_active">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="移动"> <el-tooltip class="item" effect="dark" content="移动" :open-delay="500">
<div class="icon drag" @click="hand"> <div class="icon drag" @click="hand">
<img v-if="!isHand" src="@/assets/img/zcedit/drag.png" alt=""> <img v-if="!isHand" src="@/assets/img/zcedit/drag.png" alt="">
<img v-else src="@/assets/img/zcedit/drag_a.png" alt=""> <img v-else src="@/assets/img/zcedit/drag_a.png" alt="">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="放大"> <el-tooltip class="item" effect="dark" content="放大" :open-delay="500">
<div class="icon enlarge" @click="enlarge"> <div class="icon enlarge" @click="enlarge">
<img v-if="!isEnlarge" src="@/assets/img/zcedit/enlarge.png" alt=""> <img v-if="!isEnlarge" src="@/assets/img/zcedit/enlarge.png" alt="">
<img v-else src="@/assets/img/zcedit/enlarge_a.png" alt=""> <img v-else src="@/assets/img/zcedit/enlarge_a.png" alt="">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="原尺寸显示"> <el-tooltip class="item" effect="dark" content="原尺寸显示" :open-delay="500">
<div class="size_mix"> <div class="size_mix">
<div class="icon_size" @click="sizeChange"> <div class="icon_size" @click="sizeChange">
<img class="size" v-if="!isActive" src="@/assets/img/zcedit/size.png" alt=""> <img class="size" v-if="!isActive" src="@/assets/img/zcedit/size.png" alt="">
...@@ -46,12 +46,14 @@ ...@@ -46,12 +46,14 @@
</div> </div>
</el-tooltip> </el-tooltip>
<div class="rotate_mix"> <div class="rotate_mix">
<el-tooltip class="item" effect="dark" content="旋转" :open-delay="500">
<div class="icon_rotate" @click="rotateChange"> <div class="icon_rotate" @click="rotateChange">
<img class="rotate" v-if="!isActive_rotate" src="@/assets/img/zcedit/rotate.png" alt=""> <img class="rotate" v-if="!isActive_rotate" src="@/assets/img/zcedit/rotate.png" alt="">
<img class="rotate" v-else src="@/assets/img/zcedit/rotate_a.png" alt=""> <img class="rotate" v-else src="@/assets/img/zcedit/rotate_a.png" alt="">
<img class="arrow" v-if="!isActive_rotate" src="@/assets/img/zcedit/arrow.png" alt=""> <img class="arrow" v-if="!isActive_rotate" src="@/assets/img/zcedit/arrow.png" alt="">
<img class="arrow" v-else src="@/assets/img/zcedit/arrow_a.png" alt=""> <img class="arrow" v-else src="@/assets/img/zcedit/arrow_a.png" alt="">
</div> </div>
</el-tooltip>
<div class="rotateOptions" v-show="isRotateOptions"> <div class="rotateOptions" v-show="isRotateOptions">
<!-- <div class="rotateOptions" v-show="true"> --> <!-- <div class="rotateOptions" v-show="true"> -->
<div class="top"> <div class="top">
...@@ -115,12 +117,12 @@ ...@@ -115,12 +117,12 @@
<div class="item-name">适中</div> <div class="item-name">适中</div>
</div> </div>
</div> </div>
<el-tooltip class="item" effect="dark" content="下载"> <el-tooltip class="item" effect="dark" content="下载" :open-delay="500">
<div class="icon download" id="btn-download"> <div class="icon download" id="btn-download">
<img src="@/assets/img/zcedit/download.png" alt=""> <img src="@/assets/img/zcedit/download.png" alt="">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="缩略图"> <el-tooltip class="item" effect="dark" content="缩略图" :open-delay="500">
<div class="icon bzd" @click="onchangePreview" v-if="zwType=='掌纹'"> <div class="icon bzd" @click="onchangePreview" v-if="zwType=='掌纹'">
<img src="@/assets/img/zcedit/bzd.png" alt=""> <img src="@/assets/img/zcedit/bzd.png" alt="">
</div> </div>
...@@ -189,13 +191,19 @@ ...@@ -189,13 +191,19 @@
<div class="item-name">圆形绘制</div> <div class="item-name">圆形绘制</div>
</div> </div>
</div> --> </div> -->
<div class="tzd" @click="tzdChange"> <div class="tzd" @click="tzdChange" v-show="isHandTZD">
<img src="@/assets/img/rybj/tzd.png" alt=""> <img src="@/assets/img/rybj/tzd.png" alt="">
<div class="number">{{ tzdnumber }}</div> <div class="number">{{ tzdnumber }}</div>
</div> </div>
<div class="bzd" @click="directionChange"> <div class="tzd-d" @click="tzdChange" v-show="!isHandTZD">
<img src="@/assets/img/rybj/tzd_d.png" alt="">
</div>
<div class="bzd" @click="directionChange" v-show="isdirection">
<img src="@/assets/img/rybj/bzd.png" alt=""> <img src="@/assets/img/rybj/bzd.png" alt="">
</div> </div>
<div class="bzd-d" @click="directionChange" v-show="!isdirection">
<img src="@/assets/img/rybj/bzd_d.png" alt="">
</div>
</div> </div>
<div class="xstz"> <div class="xstz">
<el-checkbox v-model="isTZ">显示特征</el-checkbox> <el-checkbox v-model="isTZ">显示特征</el-checkbox>
...@@ -205,7 +213,13 @@ ...@@ -205,7 +213,13 @@
</div> --> </div> -->
<div class="zdtq-line"></div> <div class="zdtq-line"></div>
<div class="btns-bottom"> <div class="btns-bottom">
<div class="dp" @click="getAutoTzd(true)"><img src="@/assets/img/rybj/dp.png" alt=""></div> <!-- <div class="dp" @click="getAutoTzd(true)"><img src="@/assets/img/rybj/dp.png" alt=""></div>-->
<div class="dp" v-if="isAutoTzd" @mouseup="isAutoTzd=false;">
<img src="@/assets/img/rybj/dp.png" alt="" />
</div>
<div class="dp-d" @mousedown="getAutoTzd(true)" v-else>
<img src="@/assets/img/rybj/dp_d.png" alt="" />
</div>
<!-- <div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>--> <!-- <div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>-->
<!-- <div class="clearConfirm" v-show="isShowClearDialog">--> <!-- <div class="clearConfirm" v-show="isShowClearDialog">-->
<!-- <div class="tips">确认要清空操作吗？该操作无法撤消！</div>--> <!-- <div class="tips">确认要清空操作吗？该操作无法撤消！</div>-->
...@@ -316,6 +330,8 @@ import "@/icons/direction.svg"; ...@@ -316,6 +330,8 @@ import "@/icons/direction.svg";
export default { export default {
data() { data() {
return { return {
// 是否点击了自动提取
isAutoTzd: false,
// 是否点击了返回 // 是否点击了返回
go_active: false, go_active: false,
// 是否点击了撤销 // 是否点击了撤销
...@@ -1226,6 +1242,10 @@ export default { ...@@ -1226,6 +1242,10 @@ export default {
imageEditor.resetZoom(); imageEditor.resetZoom();
self.sourceImage = sourceImage; self.sourceImage = sourceImage;
imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then(function(sizeValue) { imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then(function(sizeValue) {
// 更新工具栏的优先级
setTimeout(() => {
$(".center").css('z-index', '99999')
}, 1200)
// 更新newHeight和newWidth // 更新newHeight和newWidth
self.newHeight = sizeValue.newHeight; self.newHeight = sizeValue.newHeight;
self.newWidth = sizeValue.newWidth; self.newWidth = sizeValue.newWidth;
...@@ -1794,6 +1814,7 @@ export default { ...@@ -1794,6 +1814,7 @@ export default {
} }
// 从数据库中获取数据 // 从数据库中获取数据
if (flag) { if (flag) {
this.isAutoTzd = true
let res = await this.$axios({ let res = await this.$axios({
method: "get", method: "get",
url: "/api/export/trait/xml/person/" + this.barcode + "/" + this.seq, url: "/api/export/trait/xml/person/" + this.barcode + "/" + this.seq,
...@@ -2057,6 +2078,7 @@ export default { ...@@ -2057,6 +2078,7 @@ export default {
* @return {*} * @return {*}
*/ */
async directionChange() { async directionChange() {
this.isdirection = !this.isdirection;
let res = await this.$axios({ let res = await this.$axios({
method: "get", method: "get",
url: "/api/traint/export/xml/trait/" + this.barcode + "/" + this.seq, url: "/api/traint/export/xml/trait/" + this.barcode + "/" + this.seq,
...@@ -2065,7 +2087,6 @@ export default { ...@@ -2065,7 +2087,6 @@ export default {
console.log(res); console.log(res);
let deg = res.data.fpt5FingerMsg.zwfx_tzfx; let deg = res.data.fpt5FingerMsg.zwfx_tzfx;
console.log(5555); console.log(5555);
this.isdirection = !this.isdirection;
if (this.isdirection) { if (this.isdirection) {
// 通过接口获取角度 // 通过接口获取角度
document.getElementsByTagName("body")[0].style.setProperty("--directionRotate", deg + "deg"); document.getElementsByTagName("body")[0].style.setProperty("--directionRotate", deg + "deg");
......
src/views/Editor/modules/imageEdAJ.scss
...@@ -26,7 +26,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -26,7 +26,7 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
z-index: 99999; //z-index: 99999;
.size-options { .size-options {
z-index: 10; z-index: 10;
position: absolute; position: absolute;
...@@ -62,6 +62,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -62,6 +62,7 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
img { img {
cursor: pointer;
width: 20px; width: 20px;
height: 20px; height: 20px;
object-fit: contain; object-fit: contain;
...@@ -597,6 +598,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -597,6 +598,7 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
img { img {
cursor: pointer;
width: 20px; width: 20px;
height: 20px; height: 20px;
object-fit: contain; object-fit: contain;
...@@ -688,15 +690,18 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -688,15 +690,18 @@ $directionRotate: var(--directionRotate, 0deg);
width: 20px; width: 20px;
height: 20px; height: 20px;
object-fit: contain; object-fit: contain;
cursor: pointer;
} }
.rotate { .rotate {
margin-right: 15px; margin-right: 15px;
cursor: pointer;
} }
.arrow { .arrow {
width: 10.25px; width: 10.25px;
height: 5.84px; height: 5.84px;
img { img {
object-fit: contain; object-fit: contain;
cursor: pointer;
} }
} }
} }
...@@ -886,7 +891,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -886,7 +891,7 @@ $directionRotate: var(--directionRotate, 0deg);
} }
} }
.zzwswitch { .zzwswitch {
z-index: 9999; //z-index: 9999;
position: absolute; position: absolute;
right: 8px; right: 8px;
top: 16px; top: 16px;
...@@ -1023,7 +1028,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1023,7 +1028,7 @@ $directionRotate: var(--directionRotate, 0deg);
line-height: 32px; line-height: 32px;
padding-left: 16px; padding-left: 16px;
background: #e9f3fd; background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.4); box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.4);
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
font-size: 15px; font-size: 15px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
...@@ -1148,12 +1153,24 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1148,12 +1153,24 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
cursor: pointer;
width: 26px; width: 26px;
height: 26px; height: 26px;
} }
} }
.blcbtn-d {
margin-right: 8px;
cursor: pointer;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.blcbtn-options { .blcbtn-options {
z-index: 100; z-index: 10;
position: absolute; position: absolute;
top: 50px; top: 50px;
left: 16px; left: 16px;
...@@ -1210,6 +1227,9 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1210,6 +1227,9 @@ $directionRotate: var(--directionRotate, 0deg);
width: 188px; width: 188px;
height: 40px; height: 40px;
} }
///deep/.el-input-number .el-input__inner {
// text-align: left !important;
//}
} }
} }
.blc-btns { .blc-btns {
...@@ -1282,11 +1302,13 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1282,11 +1302,13 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
cursor: pointer;
width: 14px; width: 14px;
height: 14px; height: 14px;
} }
} }
span { span {
cursor: pointer;
padding: 0; padding: 0;
margin-left: 7px; margin-left: 7px;
font-size: 14px; font-size: 14px;
...@@ -1304,6 +1326,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1304,6 +1326,7 @@ $directionRotate: var(--directionRotate, 0deg);
margin-right: 4px; margin-right: 4px;
} }
input { input {
text-align: center;
outline: none; outline: none;
width: 34px; width: 34px;
height: 21px; height: 21px;
...@@ -1422,6 +1445,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1422,6 +1445,7 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex; display: flex;
align-items: center; align-items: center;
input { input {
text-align: center;
outline: none; outline: none;
width: 34px; width: 34px;
height: 21px; height: 21px;
...@@ -1452,6 +1476,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1452,6 +1476,7 @@ $directionRotate: var(--directionRotate, 0deg);
} }
} }
.center { .center {
z-index: 1 !important;
margin-top: 10px; margin-top: 10px;
width: 336px; width: 336px;
height: 160px; height: 160px;
...@@ -1475,7 +1500,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1475,7 +1500,7 @@ $directionRotate: var(--directionRotate, 0deg);
width: 336px; width: 336px;
height: 32px; height: 32px;
background: #e9f3fd; background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.4); box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.4);
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1501,16 +1526,19 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1501,16 +1526,19 @@ $directionRotate: var(--directionRotate, 0deg);
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
.clear_icon { .clear_icon {
width: 12px; cursor: pointer;
width: 14px;
height: 14px; height: 14px;
display: flex; display: flex;
margin-right: 4px; margin-right: 4px;
img { img {
cursor: pointer;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.name { .name {
cursor: pointer;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #055fe7; color: #055fe7;
...@@ -1534,7 +1562,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1534,7 +1562,7 @@ $directionRotate: var(--directionRotate, 0deg);
} }
} }
.save-type-options { .save-type-options {
z-index: 10; z-index: 100;
position: absolute; position: absolute;
top: 35px; top: 35px;
right: 10px; right: 10px;
...@@ -1595,11 +1623,10 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1595,11 +1623,10 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 16px; padding: 0 16px;
position: relative;
.rotateOptions { .rotateOptions {
z-index: 100; z-index: 100;
position: absolute; position: absolute;
top: 50px; top: 100px;
right: 16px; right: 16px;
width: 240px; width: 240px;
height: 200px; height: 200px;
...@@ -1656,6 +1683,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1656,6 +1683,7 @@ $directionRotate: var(--directionRotate, 0deg);
width: 30px; width: 30px;
height: 30px; height: 30px;
img { img {
cursor: pointer;
width: 30px; width: 30px;
height: 30px; height: 30px;
object-fit: contain; object-fit: contain;
...@@ -1676,6 +1704,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1676,6 +1704,7 @@ $directionRotate: var(--directionRotate, 0deg);
width: 30px; width: 30px;
height: 30px; height: 30px;
img { img {
cursor: pointer;
width: 30px; width: 30px;
height: 30px; height: 30px;
object-fit: contain; object-fit: contain;
...@@ -1699,9 +1728,11 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1699,9 +1728,11 @@ $directionRotate: var(--directionRotate, 0deg);
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.flap_x_icon { .flap_x_icon {
cursor: pointer;
width: 22px; width: 22px;
height: 22px; height: 22px;
img { img {
cursor: pointer;
object-fit: contain; object-fit: contain;
width: 22px; width: 22px;
height: 22px; height: 22px;
...@@ -1725,6 +1756,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1725,6 +1756,7 @@ $directionRotate: var(--directionRotate, 0deg);
width: 22px; width: 22px;
height: 22px; height: 22px;
img { img {
cursor: pointer;
object-fit: contain; object-fit: contain;
width: 22px; width: 22px;
height: 22px; height: 22px;
...@@ -1742,20 +1774,39 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1742,20 +1774,39 @@ $directionRotate: var(--directionRotate, 0deg);
} }
} }
.rotate_bottom { .rotate_bottom {
margin-top: 10px; margin-top: 20px;
width: 100%; width: 100%;
.progress { .progress {
width: 100%; width: 100%;
#input-rotation-range { #input-rotation-range {
width: 100%; width: 100%;
} }
/deep/ .el-slider__runway {
width: 100%;
height: 3px;
margin: 0;
background-color: #eeeeee;
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #ffffff;
border: 2px solid #055fe7;
margin-bottom: 2px;
}
} }
.desc { .desc {
margin-top: 10px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
.qj_v { .qj_v {
text-align: center;
width: 40px; width: 40px;
height: 21px; height: 21px;
background: #ffffff; background: #ffffff;
...@@ -1766,6 +1817,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1766,6 +1817,7 @@ $directionRotate: var(--directionRotate, 0deg);
} }
} }
.zyhz { .zyhz {
position: relative;
cursor: pointer; cursor: pointer;
width: 64px; width: 64px;
height: 40px; height: 40px;
...@@ -1777,19 +1829,37 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1777,19 +1829,37 @@ $directionRotate: var(--directionRotate, 0deg);
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.zyhz-left { .zyhz-left {
cursor: pointer;
width: 25px; width: 25px;
height: 25px; height: 25px;
margin-right: 10px; margin-right: 10px;
} }
.zyhz-right { .zyhz-right {
cursor: pointer;
width: 10px; width: 10px;
height: 6px; height: 6px;
} }
} }
.zyhz-d {
position: relative;
.zyhz-left-d {
cursor: pointer;
width: 64px;
height: 40px;
}
.zyhz-right-d {
position: absolute;
cursor: pointer;
width: 10px;
height: 6px;
top: 20px;
right: 8px;
}
}
.zyhz-options { .zyhz-options {
z-index: 10; z-index: 10;
position: absolute; position: absolute;
top: 45px; top: 100px;
left: 15px; left: 15px;
width: 118px; width: 118px;
height: 64px; height: 64px;
...@@ -1824,6 +1894,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1824,6 +1894,7 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
cursor: pointer;
width: 25px; width: 25px;
height: 25px; height: 25px;
} }
...@@ -1841,6 +1912,21 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1841,6 +1912,21 @@ $directionRotate: var(--directionRotate, 0deg);
color: #ffffff; color: #ffffff;
} }
} }
.tzd-d {
margin-left: 20px;
position: relative;
cursor: pointer;
width: 40px;
height: 40px;
display: flex;
justify-content: center;
align-items: center;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.bzd { .bzd {
margin-left: 24px; margin-left: 24px;
cursor: pointer; cursor: pointer;
...@@ -1853,6 +1939,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1853,6 +1939,7 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
cursor: pointer;
width: 25px; width: 25px;
height: 25px; height: 25px;
} }
...@@ -1870,10 +1957,22 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1870,10 +1957,22 @@ $directionRotate: var(--directionRotate, 0deg);
align-items: center; align-items: center;
justify-content: center; justify-content: center;
img { img {
cursor: pointer;
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
} }
.rule-d {
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.rotate { .rotate {
cursor: pointer; cursor: pointer;
margin-left: 20px; margin-left: 20px;
...@@ -1887,10 +1986,22 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1887,10 +1986,22 @@ $directionRotate: var(--directionRotate, 0deg);
align-items: center; align-items: center;
justify-content: center; justify-content: center;
img { img {
width: 24px; cursor: pointer;
//width: 24px;
height: 24px; height: 24px;
} }
} }
.rotate-d {
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
} }
.xstz, .xstz,
.xszyqy { .xszyqy {
...@@ -2065,7 +2176,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2065,7 +2176,7 @@ $directionRotate: var(--directionRotate, 0deg);
border-radius: 4px; border-radius: 4px;
.mask { .mask {
position: absolute; position: absolute;
z-index: 99; z-index: 10000;
opacity: 0.5; opacity: 0.5;
top: 0; top: 0;
left: 0; left: 0;
...@@ -2080,7 +2191,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2080,7 +2191,7 @@ $directionRotate: var(--directionRotate, 0deg);
width: 336px; width: 336px;
height: 32px; height: 32px;
background: #e9f3fd; background: #e9f3fd;
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.39); box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.39);
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
line-height: 32px; line-height: 32px;
} }
...@@ -2130,11 +2241,11 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2130,11 +2241,11 @@ $directionRotate: var(--directionRotate, 0deg);
} }
.blend, .blend,
.multiply { .multiply {
z-index: 100; z-index: 10000;
background: #ffffff; background: #ffffff;
position: absolute; position: absolute;
top: 128px; top: 100px;
right: 47px; right: 35px;
} }
/deep/ .el-slider__runway { /deep/ .el-slider__runway {
width: 142px; width: 142px;
...@@ -2153,8 +2264,9 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2153,8 +2264,9 @@ $directionRotate: var(--directionRotate, 0deg);
margin-bottom: 2px; margin-bottom: 2px;
} }
.remove-white { .remove-white {
z-index: 10000;
position: absolute; position: absolute;
top: 150px; top: 130px;
left: 16px; left: 16px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -2169,14 +2281,33 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2169,14 +2281,33 @@ $directionRotate: var(--directionRotate, 0deg);
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #666666; color: #666666;
margin-right: 10px;
} }
.range-narrow { .range-narrow {
width: 200px; width: 200px;
height: 3px; height: 3px;
} }
.qb_v { .qb_v {
width: 20px; width: 30px;
height: 20px; height: 20px;
text-align: center;
margin-left: 10px;
}
/deep/ .el-slider__runway {
width: 200px;
height: 3px;
margin: 0;
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #ffffff;
border: 2px solid #055fe7;
margin-bottom: 2px;
} }
} }
} }
...@@ -2209,12 +2340,29 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2209,12 +2340,29 @@ $directionRotate: var(--directionRotate, 0deg);
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px solid #e6e9ec; border: 1px solid #e6e9ec;
text-align: center;
} }
.range-narrow { .range-narrow {
margin-right: 10px; margin-right: 10px;
width: 200px; width: 200px;
height: 3px; height: 3px;
} }
/deep/ .el-slider__runway {
width: 200px;
height: 3px;
margin: 0;
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #ffffff;
border: 2px solid #055fe7;
margin-bottom: 2px;
}
} }
} }
.brightness { .brightness {
...@@ -2230,9 +2378,10 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2230,9 +2378,10 @@ $directionRotate: var(--directionRotate, 0deg);
} }
.color-filter { .color-filter {
position: absolute; position: absolute;
top: 150px; top: 180px;
left: 0; left: 0;
background-color: #fff; background-color: #fff;
padding: 5px 10px;
} }
} }
} }
......
src/views/Editor/modules/imageEdAJ.vue
...@@ -11,31 +11,31 @@ ...@@ -11,31 +11,31 @@
<div class="imageEd"> <div class="imageEd">
<div class="imageEd_header"> <div class="imageEd_header">
<div class="center"> <div class="center">
<el-tooltip class="item" effect="dark" content="撤销"> <el-tooltip class="item" effect="dark" content="撤销" :open-delay="500">
<div class="icon back disabled disabled2" id="btn-undo" @mousedown="mouseDownBack" @mouseup="mouseUpBack"> <div class="icon back disabled disabled2" id="btn-undo" @mousedown="mouseDownBack" @mouseup="mouseUpBack">
<img src="@/assets/img/zcedit/back.png" alt="" v-show="!back_active"> <img src="@/assets/img/zcedit/back.png" alt="" v-show="!back_active">
<img src="@/assets/img/zcedit/back_a.png" alt="" v-show="back_active"> <img src="@/assets/img/zcedit/back_a.png" alt="" v-show="back_active">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="恢复"> <el-tooltip class="item" effect="dark" content="恢复" :open-delay="500">
<div class="icon go disabled disabled2" id="btn-redo" @mousedown="mouseDownGo" @mouseup="mouseUpGo"> <div class="icon go disabled disabled2" id="btn-redo" @mousedown="mouseDownGo" @mouseup="mouseUpGo">
<img src="@/assets/img/zcedit/go.png" alt="" v-show="!go_active"> <img src="@/assets/img/zcedit/go.png" alt="" v-show="!go_active">
<img src="@/assets/img/zcedit/go_a.png" alt="" v-show="go_active"> <img src="@/assets/img/zcedit/go_a.png" alt="" v-show="go_active">
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="移动"> <el-tooltip class="item" effect="dark" content="移动" :open-delay="500">
<div class="icon drag" @click="hand"> <div class="icon drag" @click="hand">
<img v-if="!isHand" src="@/assets/img/zcedit/drag.png" alt="" /> <img v-if="!isHand" src="@/assets/img/zcedit/drag.png" alt="" />
<img v-else src="@/assets/img/zcedit/drag_a.png" alt="" /> <img v-else src="@/assets/img/zcedit/drag_a.png" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="放大"> <el-tooltip class="item" effect="dark" content="放大" :open-delay="500">
<div class="icon enlarge" @click="enlarge"> <div class="icon enlarge" @click="enlarge">
<img v-if="!isEnlarge" src="@/assets/img/zcedit/enlarge.png" alt="" /> <img v-if="!isEnlarge" src="@/assets/img/zcedit/enlarge.png" alt="" />
<img v-else src="@/assets/img/zcedit/enlarge_a.png" alt="" /> <img v-else src="@/assets/img/zcedit/enlarge_a.png" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="原尺寸显示"> <el-tooltip class="item" effect="dark" content="原尺寸显示" :open-delay="500">
<div class="size_mix"> <div class="size_mix">
<div class="icon_size" @click="sizeChange"> <div class="icon_size" @click="sizeChange">
<img class="size" v-if="!isActive" src="@/assets/img/zcedit/size.png" alt="" /> <img class="size" v-if="!isActive" src="@/assets/img/zcedit/size.png" alt="" />
...@@ -58,12 +58,12 @@ ...@@ -58,12 +58,12 @@
<div class="item-name">适中</div> <div class="item-name">适中</div>
</div> </div>
</div> </div>
<el-tooltip class="item" effect="dark" content="下载"> <el-tooltip class="item" effect="dark" content="下载" :open-delay="500">
<div class="icon download" id="btn-download"> <div class="icon download" id="btn-download">
<img src="@/assets/img/zcedit/download.png" alt="" /> <img src="@/assets/img/zcedit/download.png" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="缩略图"> <el-tooltip class="item" effect="dark" content="缩略图" :open-delay="500">
<div class="icon bzd" @click="onchangePreview" v-if="zwType == '掌纹'"> <div class="icon bzd" @click="onchangePreview" v-if="zwType == '掌纹'">
<img src="@/assets/img/zcedit/bzd.png" alt="" /> <img src="@/assets/img/zcedit/bzd.png" alt="" />
</div> </div>
...@@ -164,9 +164,12 @@ ...@@ -164,9 +164,12 @@
</div> </div>
<div class="line2"></div> <div class="line2"></div>
<div class="btn2"> <div class="btn2">
<div class="blcbtn" @click="addRule"> <div class="blcbtn" @click="addRule" v-if="rule">
<img src="@/assets/img/rybj/rule.png" alt="" /> <img src="@/assets/img/rybj/rule.png" alt="" />
</div> </div>
<div class="blcbtn-d" @click="addRule" v-else>
<img src="@/assets/img/rybj/rule_d.png" alt="" />
</div>
<div class="blcbtn-options" v-show="rule"> <div class="blcbtn-options" v-show="rule">
<div class="blcbtn-head"> <div class="blcbtn-head">
<div class="head-title">比例尺</div> <div class="head-title">比例尺</div>
...@@ -251,10 +254,14 @@ ...@@ -251,10 +254,14 @@
</div> </div>
<div class="center-content"> <div class="center-content">
<div class="options-btns"> <div class="options-btns">
<div class="zyhz" @click.stop="zyhzOptionsChange"> <div class="zyhz" @click.stop="zyhzOptionsChange" v-if="isShowzyhzOptions">
<img src="@/assets/img/rybj/zyhz.png" class="zyhz-left" alt="" /> <img src="@/assets/img/rybj/zyhz.png" class="zyhz-left" alt="" />
<img src="@/assets/img/rybj/arrow_d.png" class="zyhz-right" alt="" /> <img src="@/assets/img/rybj/arrow_d.png" class="zyhz-right" alt="" />
</div> </div>
<div v-else @click.stop="zyhzOptionsChange" class="zyhz-d">
<img src="@/assets/img/rybj/zyhz_d.png" class="zyhz-left-d" alt="" />
<img src="@/assets/img/rybj/arrow_d.png" class="zyhz-right-d" alt="" />
</div>
<div class="zyhz-options" v-show="isShowzyhzOptions"> <div class="zyhz-options" v-show="isShowzyhzOptions">
<div class="zyhz-options-item" @click.stop="changezyhz"> <div class="zyhz-options-item" @click.stop="changezyhz">
<div class="item-selected"> <div class="item-selected">
...@@ -269,19 +276,28 @@ ...@@ -269,19 +276,28 @@
<div class="item-name">圆形绘制</div> <div class="item-name">圆形绘制</div>
</div> </div>
</div> </div>
<div class="tzd" @click="tzdChange"> <div class="tzd" @click="tzdChange" v-if="isHandTZD">
<img src="@/assets/img/rybj/tzd.png" alt="" /> <img src="@/assets/img/rybj/tzd.png" alt="" />
<div class="number">{{ tzdnumber }}</div> <div class="number">{{ tzdnumber }}</div>
</div> </div>
<div class="tzd-d" @click="tzdChange" v-else>
<img src="@/assets/img/rybj/tzd_d.png" alt="" />
</div>
<!-- <div class="bzd" @click="directionChange">--> <!-- <div class="bzd" @click="directionChange">-->
<!-- <img src="@/assets/img/rybj/bzd.png" alt="">--> <!-- <img src="@/assets/img/rybj/bzd.png" alt="">-->
<!-- </div>--> <!-- </div>-->
<div class="rule" @click="getAutoTzd(true)"> <div class="rule" v-if="isAutoTzd" @mouseup="isAutoTzd=false;">
<img src="@/assets/img/rybj/dp.png" alt="" /> <img src="@/assets/img/rybj/dp.png" alt="" />
</div> </div>
<div class="rotate" @click="rotateChange"> <div class="rule-d" @mousedown="getAutoTzd(true)" v-else>
<img src="@/assets/img/rybj/dp_d.png" alt="" />
</div>
<div class="rotate" @click="rotateChange" v-if="isRotateOptions">
<img src="@/assets/img/rybj/rotate.png" alt="" /> <img src="@/assets/img/rybj/rotate.png" alt="" />
</div> </div>
<div class="rotate-d" @click="rotateChange" v-else>
<img src="@/assets/img/rybj/rotate_d.png" alt="" />
</div>
<div class="rotateOptions" v-show="isRotateOptions"> <div class="rotateOptions" v-show="isRotateOptions">
<!-- <div class="rotateOptions" v-show="true"> --> <!-- <div class="rotateOptions" v-show="true"> -->
<div class="top"> <div class="top">
...@@ -329,11 +345,12 @@ ...@@ -329,11 +345,12 @@
</div> </div>
<div class="rotate_bottom"> <div class="rotate_bottom">
<div class="progress"> <div class="progress">
<input id="input-rotation-range" type="range" min="-360" :value="inputRotationRange" max="360" /> <!-- <input id="input-rotation-range" type="range" min="-360" :value="inputRotationRange" max="360" />-->
<el-slider v-model.number="inputRotationRange" :min="-360" :max="360" id="input-rotation-range"></el-slider>
</div> </div>
<div class="desc"> <div class="desc">
<div class="qj">区间</div> <div class="qj">区间</div>
<input class="qj_v" type="text" v-model="inputRotationRange" /> <input class="qj_v" type="text" v-model.number="inputRotationRange" />
</div> </div>
</div> </div>
</div> </div>
...@@ -415,9 +432,10 @@ ...@@ -415,9 +432,10 @@
<div class="remove-white" v-show="optionsRemoveWhite"> <div class="remove-white" v-show="optionsRemoveWhite">
<div class="title">去白</div> <div class="title">去白</div>
<div class="content"> <div class="content">
<input class="range-narrow" id="input-range-remove-white-distance" type="range" min="0" <!-- <input class="range-narrow" id="input-range-remove-white-distance" type="range" min="0"
:value="inputRemoveWhiteRange" max="255" /> :value="inputRemoveWhiteRange" max="255" />-->
<input class="qb_v" type="text" v-model="inputRemoveWhiteRange" /> <el-slider v-model="inputRemoveWhiteRange" id="input-range-remove-white-distance" :min="0" :max="255"></el-slider>
<input class="qb_v" type="text" v-model.number="inputRemoveWhiteRange" />
</div> </div>
</div> </div>
<!-- 正片叠底弹框 --> <!-- 正片叠底弹框 -->
...@@ -437,9 +455,10 @@ ...@@ -437,9 +455,10 @@
<div class="color-filter" v-show="optionsColorFilter"> <div class="color-filter" v-show="optionsColorFilter">
<div class="title">滤色器</div> <div class="title">滤色器</div>
<div class="content"> <div class="content">
<input class="range-narrow" id="input-range-color-filter-value" type="range" min="0" <!-- <input class="range-narrow" id="input-range-color-filter-value" type="range" min="0"
:value="inputColorFilterRange" max="255" /> :value="inputColorFilterRange" max="255" />-->
<input class="qb_v" type="text" v-model="inputColorFilterRange" /> <el-slider v-model.number="inputColorFilterRange" id="input-range-color-filter-value" :min="0" :max="255"></el-slider>
<input class="qb_v" type="text" v-model.number="inputColorFilterRange" />
</div> </div>
</div> </div>
<!-- 滤色器 --> <!-- 滤色器 -->
...@@ -454,21 +473,24 @@ ...@@ -454,21 +473,24 @@
<div class="brightness"> <div class="brightness">
<div class="title">亮度</div> <div class="title">亮度</div>
<div class="content"> <div class="content">
<input class="range-narrow" id="input-range-brightness-value" type="range" min="-255" <!-- <input class="range-narrow" id="input-range-brightness-value" type="range" min="-255"
:value="inputBrightnessRange" max="255" /> :value="inputBrightnessRange" max="255" />-->
<input class="qb_v" type="text" v-model="inputBrightnessRange" /> <el-slider v-model.number="inputBrightnessRange" id="input-range-brightness-value" :min="-255" :max="255"></el-slider>
<input class="qb_v" type="text" v-model.number="inputBrightnessRange" />
</div> </div>
</div> </div>
<!-- 对比度 --> <!-- 对比度 -->
<div class="contrast-ratio"> <div class="contrast-ratio">
<div class="title">对比度</div> <div class="title">对比度</div>
<div class="content"> <div class="content">
<input class="range-narrow" id="input-range-contrast-value" type="range" min="0" <!-- <input class="range-narrow" id="input-range-contrast-value" type="range" min="0"
:value="inputContrastRange" max="255" /> :value="inputContrastRange" max="255" />-->
<input class="qb_v" type="text" v-model="inputContrastRange" /> <el-slider v-model.number="inputContrastRange" id="input-range-contrast-value" :min="0" :max="255"></el-slider>
<input class="qb_v" type="text" v-model.number="inputContrastRange" />
</div> </div>
</div> </div>
<div class="mask" v-show="startEditImage"></div> <!-- <div class="mask" v-show="startEditImage"></div>-->
<div class="mask" v-show="false"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -486,6 +508,8 @@ import MouseGesture from "./tzd_rotate.js"; ...@@ -486,6 +508,8 @@ import MouseGesture from "./tzd_rotate.js";
export default { export default {
data() { data() {
return { return {
// 是否点击了自动提取
isAutoTzd: false,
// 是否点击了返回 // 是否点击了返回
go_active: false, go_active: false,
// 是否点击了撤销 // 是否点击了撤销
...@@ -1542,6 +1566,11 @@ export default { ...@@ -1542,6 +1566,11 @@ export default {
"SampleImage" "SampleImage"
) )
.then(function(sizeValue) { .then(function(sizeValue) {
// 更新工具栏的优先级
setTimeout(() => {
$(".center").css('z-index', '99999')
$(".zzwswitch").css('z-index', '9999')
}, 1200)
// 更新newHeight和newWidth // 更新newHeight和newWidth
self.newHeight = sizeValue.newHeight; self.newHeight = sizeValue.newHeight;
self.newWidth = sizeValue.newWidth; self.newWidth = sizeValue.newWidth;
...@@ -2798,6 +2827,7 @@ export default { ...@@ -2798,6 +2827,7 @@ export default {
} }
// 从数据库中获取数据 // 从数据库中获取数据
if (flag) { if (flag) {
this.isAutoTzd = true
let res = await this.$axios({ let res = await this.$axios({
method: "get", method: "get",
url: "/api/export/trait/xml/case/" + this.barcode + "/" + this.seq, url: "/api/export/trait/xml/case/" + this.barcode + "/" + this.seq,
......
src/views/Editor/modules/ryzwbjLeft.scss
.ryzwbjLeft { .ryzwbjLeft {
width: 340px; width: 340px;
height: 100%; height: 100%;
padding: 24px; padding: 24px 20px 24px 24px;
box-sizing: border-box; box-sizing: border-box;
.title { .title {
font-size: 16px; font-size: 16px;
...@@ -9,6 +9,30 @@ ...@@ -9,6 +9,30 @@
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.rybh {
font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #282f3c;
display: flex;
align-items: center;
span {
margin-right: 10px;
}
img {
cursor: pointer;
width: 16px;
height: 16px;
margin-right: 5px;
}
.desc {
cursor: pointer;
cursor: pointer;
color: #055fe7;
font-weight: normal;
font-family: MicrosoftYaHei;
}
}
.ryzwbj-content { .ryzwbj-content {
margin-top: 20px; margin-top: 20px;
height: 100%; height: 100%;
...@@ -160,6 +184,24 @@ ...@@ -160,6 +184,24 @@
background: #ECEDF1; background: #ECEDF1;
color: #AEAFB4; color: #AEAFB4;
} }
.finger-total {
position: absolute;
bottom: 30px;
display: flex;
align-items: center;
justify-content: center;
width: 260px;
height: 40px;
background: #f6f8fa;
box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.06);
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
span {
color: #666666;
padding: 0 4px;
}
}
} }
} }
} }
src/views/Editor/modules/ryzwbjLeft.vue
...@@ -8,7 +8,12 @@ ...@@ -8,7 +8,12 @@
--> -->
<template> <template>
<div class="ryzwbjLeft"> <div class="ryzwbjLeft">
<div class="title">人员指纹编辑</div> <div class="title">人员编号：</div>
<div class="rybh">
<span>{{barcode}}</span>
<img src="@/assets/img/message.png" alt="">
<div class="desc">档案信息</div>
</div>
<div class="ryzwbj-content"> <div class="ryzwbj-content">
<div class="zzw"> <div class="zzw">
<div class="zzw-select" @click="zzwChange($event)"> <div class="zzw-select" @click="zzwChange($event)">
...@@ -17,6 +22,8 @@ ...@@ -17,6 +22,8 @@
<div class="select-item" :class="{active: zwSelect==='平面指纹', isHasData: !PainFingerFlag}">平面指纹</div> <div class="select-item" :class="{active: zwSelect==='平面指纹', isHasData: !PainFingerFlag}">平面指纹</div>
<div class="select-line"></div> <div class="select-line"></div>
<div class="select-item" :class="{active: zwSelect==='掌纹'}">掌纹</div> <div class="select-item" :class="{active: zwSelect==='掌纹'}">掌纹</div>
<div class="select-line"></div>
<div class="select-item" :class="{active: zwSelect==='人像'}">人像</div>
</div> </div>
<div class="left-right-hand" v-if="zwSelect==='滚动指纹'"> <div class="left-right-hand" v-if="zwSelect==='滚动指纹'">
<el-tabs v-model="activeRollHand" @tab-click="handleRollClick"> <el-tabs v-model="activeRollHand" @tab-click="handleRollClick">
...@@ -82,6 +89,9 @@ ...@@ -82,6 +89,9 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div class="finger-total">
共计<span>{{rollFingersLeft.length+rollFingersRight.length+painFingersLeft.length+painFingersRight.length}}枚</span>指纹
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/views/Home/Home.vue
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
<div class="todolist"> <div class="todolist">
<!-- 第一列 --> <!-- 第一列 -->
<div class="list l1"> <div class="list l1">
<div class="import_images"> <div class="import_images" @click="goQBAJK">
<img <img
src="../../assets/img/Home/import_images.svg" src="../../assets/img/Home/import_images.svg"
alt="" alt=""
/> />
<div>图片导入</div> <div>案件图片导入</div>
</div> </div>
<div <div
@click="godrFPTX" @click="godrFPTX"
...@@ -159,6 +159,14 @@ export default { ...@@ -159,6 +159,14 @@ export default {
}; };
}, },
methods: { methods: {
goQBAJK () {
this.$router.push({
path: '/qbalk',
query: {
xzaj: true
}
})
},
godrFPTX () { godrFPTX () {
this.$router.push("/drFPTX"); this.$router.push("/drFPTX");
}, },
......
src/views/SystemManage/GroupManage.vue
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<el-table-column> <el-table-column>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="set-btn" :width="btnwidth" @click="setUser(scope.row)"> <div class="set-btn" :width="btnwidth" @click="setUser(scope.row)">
用户设置 用户列表
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
>停用</el-checkbox >停用</el-checkbox
> >
<div class="btn" @click="delUserDatas">删除</div> <div class="btn" @click="delUserDatas">删除</div>
<div class="btn" @click="addUserDatas"> <div class="btn addBtn" @click="addUserDatas">
<svg-icon <svg-icon
style=" style="
width: 0.8125rem; width: 0.8125rem;
...@@ -488,6 +488,9 @@ ...@@ -488,6 +488,9 @@
<el-table-column prop="group" label="用户组"> </el-table-column> <el-table-column prop="group" label="用户组"> </el-table-column>
<el-table-column prop="unitname" label="所属单位"> <el-table-column prop="unitname" label="所属单位">
</el-table-column> </el-table-column>
<el-table-column prop="unitname" label="启用状态">
</el-table-column>
<el-table-column prop="unitname" label="操作"> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
......
src/views/SystemManage/PermissionManage.vue
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
prop="username" prop="username"
label="用户名" label="用户名"
:width="userWidths.width1" :width="userWidths.width1"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" :width="userWidths.width1"> <el-table-column prop="name" label="姓名" :width="userWidths.width1">
...@@ -253,6 +254,7 @@ ...@@ -253,6 +254,7 @@
prop="name" prop="name"
label="用户组" label="用户组"
:width="groupWidths.width1" :width="groupWidths.width1"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -274,7 +276,7 @@ ...@@ -274,7 +276,7 @@
<el-table-column <el-table-column
prop="userCount" prop="userCount"
label="组成员" label="组成员"
:width="groupWidths.width3" :width="groupWidths.btnwidth"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="group-item"> <div class="group-item">
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
</el-table-column> </el-table-column>
<el-table-column> <el-table-column>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="set-btn" :width="groupWidths.btnwidth">用户设置</div> <div class="set-btn" :width="groupWidths.btnwidth">用户列表</div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -319,7 +321,7 @@ ...@@ -319,7 +321,7 @@
<el-table-column <el-table-column
prop="status" prop="status"
label="启用状态" label="启用状态"
:width="groupWidths.width3" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.status === 0" class="circle-red"></div> <div v-if="scope.row.status === 0" class="circle-red"></div>
...@@ -333,7 +335,7 @@ ...@@ -333,7 +335,7 @@
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="active" label="操作"> <el-table-column prop="active" label="操作" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<img <img
style=" style="
...@@ -414,7 +416,7 @@ export default { ...@@ -414,7 +416,7 @@ export default {
width3: 200, width3: 200,
width2: 100, width2: 100,
width5: 220, width5: 220,
width1: 100, width1: 120,
height: 550, height: 550,
}, },
// 搜索用户 // 搜索用户
...@@ -439,7 +441,7 @@ export default { ...@@ -439,7 +441,7 @@ export default {
width2: 400, width2: 400,
width1: 200, width1: 200,
height: 480, height: 480,
btnwidth: 200, btnwidth: 90,
}, },
// 搜索用户组 // 搜索用户组
groupSearchParams: { groupSearchParams: {
......
src/views/SystemManage/RoleManage.vue
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
" "
icon-class="ic_add" icon-class="ic_add"
/> />
<span class="add-role-span">
新增角色 新增角色
</span>
</div> </div>
<div <div
class="img-btn" class="img-btn"
...@@ -21,29 +23,9 @@ ...@@ -21,29 +23,9 @@
@mouseenter="copybz = true" @mouseenter="copybz = true"
@mouseleave="copybz = false" @mouseleave="copybz = false"
> >
<img <img v-if="!copybz" src="../../assets/img/role/copy.png" />
v-if="!copybz"
src="../../assets/img/role/copy.png"
style="
height: 0.9375rem;
width: 0.9375rem;
margin-left: 0.0625rem;
margin-top: 0.25rem;
cursor: pointer;
"
/>
<!-- copy_xuan --> <!-- copy_xuan -->
<img <img v-else src="../../assets/img/copy_xuan.png" />
v-else
src="../../assets/img/copy_xuan.png"
style="
height: 0.9375rem;
width: 0.9375rem;
margin-left: 0.0625rem;
margin-top: 0.25rem;
cursor: pointer;
"
/>
</div> </div>
</div> </div>
<div class="default-role"> <div class="default-role">
...@@ -97,6 +79,7 @@ ...@@ -97,6 +79,7 @@
content="删除" content="删除"
v-if="delimgBoo" v-if="delimgBoo"
:hintBoo="true" :hintBoo="true"
:disaledToolTipe="true"
> >
<div slot="reference" class="delicon2"> <div slot="reference" class="delicon2">
<img <img
...@@ -118,7 +101,7 @@ ...@@ -118,7 +101,7 @@
:class="{ :class="{
'diy-role-item': true, 'diy-role-item': true,
active: item.id === diyRoleItemIndex, active: item.id === diyRoleItemIndex,
delWidth: delimgBoo, delWidth: delimgBoo
}" }"
> >
<div <div
...@@ -346,20 +329,20 @@ import Confirmation from "@/components/Confirmation.vue"; ...@@ -346,20 +329,20 @@ import Confirmation from "@/components/Confirmation.vue";
export default { export default {
name: "RoleManage", name: "RoleManage",
components: { components: {
Confirmation, Confirmation
}, },
watch: { watch: {
roleMenusSelection: function (val) { roleMenusSelection: function(val) {
console.info(val); console.info(val);
}, },
diyRoleItemIndex: { diyRoleItemIndex: {
handler(val, oldval) { handler(val, oldval) {
this.oldCurrtId = oldval; this.oldCurrtId = oldval;
let arr = [...this.diyRoleList, ...this.defaultRoleBtns]; let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == val); let obj = arr.find(i => i.id == val);
this.checkItem = JSON.parse(JSON.stringify(obj)); this.checkItem = JSON.parse(JSON.stringify(obj));
console.log(this.checkItem); console.log(this.checkItem);
}, }
}, },
// checkItem: null // checkItem: null
btnType: { btnType: {
...@@ -371,8 +354,8 @@ export default { ...@@ -371,8 +354,8 @@ export default {
} else { } else {
this.disabled = false; this.disabled = false;
} }
}, }
}, }
}, },
data() { data() {
return { return {
...@@ -413,13 +396,13 @@ export default { ...@@ -413,13 +396,13 @@ export default {
//复制标识出现 //复制标识出现
fuzhi: false, fuzhi: false,
//复制标记鼠标移入 //复制标记鼠标移入
copybz: false, copybz: false
}; };
}, },
methods: { methods: {
// 获取权限列表 // 获取权限列表
getPermissionDataLists() { getPermissionDataLists() {
this.$axios.get("/system/permissions").then((res) => { this.$axios.get("/system/permissions").then(res => {
if (res.data.length > 0) { if (res.data.length > 0) {
var arr = []; var arr = [];
for (let i = 0; i < res.data.length; i++) { for (let i = 0; i < res.data.length; i++) {
...@@ -447,9 +430,9 @@ export default { ...@@ -447,9 +430,9 @@ export default {
addrole() { addrole() {
var role = { var role = {
name: "测试角色", name: "测试角色",
permissionIds: [11, 12], permissionIds: [11, 12]
}; };
this.$axios.post("/system/roles", role).then((res) => { this.$axios.post("/system/roles", role).then(res => {
console.info(res); console.info(res);
}); });
}, },
...@@ -466,7 +449,7 @@ export default { ...@@ -466,7 +449,7 @@ export default {
this.fuzhi = false; this.fuzhi = false;
this.resetEdit(); this.resetEdit();
let arr = [...this.defaultRoleBtns, ...this.diyRoleList]; let arr = [...this.defaultRoleBtns, ...this.diyRoleList];
let item = arr.find((i) => i.id == diyRoleItemIndex); let item = arr.find(i => i.id == diyRoleItemIndex);
if (item) { if (item) {
let id = this.diyRoleList.length + 20 + "copy"; let id = this.diyRoleList.length + 20 + "copy";
var roleitem = { var roleitem = {
...@@ -475,7 +458,7 @@ export default { ...@@ -475,7 +458,7 @@ export default {
code: this.diyRoleList.length, code: this.diyRoleList.length,
edit: true, edit: true,
id, id,
permissions: item.permissions, permissions: item.permissions
}; };
this.diyRoleItemIndex = id; this.diyRoleItemIndex = id;
//加列表 //加列表
...@@ -483,7 +466,7 @@ export default { ...@@ -483,7 +466,7 @@ export default {
//加添加的人员 //加添加的人员
this.customAddUser.push(roleitem); this.customAddUser.push(roleitem);
//加权限 //加权限
this.checkList = item?.permissions?.map((i) => i.id) || []; this.checkList = item?.permissions?.map(i => i.id) || [];
this.btnType = "custom"; this.btnType = "custom";
setTimeout(() => { setTimeout(() => {
this.$refs.diyRoles.scrollTop = this.$refs.diyRoles.scrollHeight; this.$refs.diyRoles.scrollTop = this.$refs.diyRoles.scrollHeight;
...@@ -499,13 +482,13 @@ export default { ...@@ -499,13 +482,13 @@ export default {
let checkArr = this.checkList; let checkArr = this.checkList;
let params = { let params = {
name, name,
permissionIds: checkArr, permissionIds: checkArr
}; };
let index = this.diyRoleList.findIndex((i) => i.name == name); let index = this.diyRoleList.findIndex(i => i.name == name);
if (checkArr.length > 0) { if (checkArr.length > 0) {
let diyRolePermissions = checkArr.map((i) => { let diyRolePermissions = checkArr.map(i => {
return { return {
id: i, id: i
}; };
}); });
this.$set(this.diyRoleList[index], "permissions", diyRolePermissions); this.$set(this.diyRoleList[index], "permissions", diyRolePermissions);
...@@ -514,10 +497,10 @@ export default { ...@@ -514,10 +497,10 @@ export default {
method: "post", method: "post",
url: "/system/roles", url: "/system/roles",
headers: { headers: {
"Content-Type": "application/json;charset=UTF-8", "Content-Type": "application/json;charset=UTF-8"
}, },
data: JSON.stringify(params), data: JSON.stringify(params)
}).then((res) => { }).then(res => {
if (res.data) { if (res.data) {
self.customAddUser = []; self.customAddUser = [];
self.resetEdit(); self.resetEdit();
...@@ -539,7 +522,7 @@ export default { ...@@ -539,7 +522,7 @@ export default {
search() { search() {
this.$axios this.$axios
.get("/system/roles") .get("/system/roles")
.then((res) => { .then(res => {
if (res.data !== null) { if (res.data !== null) {
res.data.forEach((item, index) => { res.data.forEach((item, index) => {
var arr = []; var arr = [];
...@@ -565,13 +548,13 @@ export default { ...@@ -565,13 +548,13 @@ export default {
} }
if (res.data.length > 0) { if (res.data.length > 0) {
this.checkList = res.data[0].permissions.map((i) => i.id); this.checkList = res.data[0].permissions.map(i => i.id);
} else { } else {
this.checkList = []; this.checkList = [];
} }
}); });
let arr = [...this.diyRoleList, ...this.defaultRoleBtns]; let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == this.diyRoleItemIndex); let obj = arr.find(i => i.id == this.diyRoleItemIndex);
this.checkItem = JSON.parse(JSON.stringify(obj)); this.checkItem = JSON.parse(JSON.stringify(obj));
console.info("角色权限===》", this.defaultRoleBtns); console.info("角色权限===》", this.defaultRoleBtns);
console.info("角色权限===》", this.diyRoleList); console.info("角色权限===》", this.diyRoleList);
...@@ -580,7 +563,7 @@ export default { ...@@ -580,7 +563,7 @@ export default {
this.$message.error("获取角色信息失败！"); this.$message.error("获取角色信息失败！");
} }
}) })
.catch((failResponse) => {}); .catch(failResponse => {});
}, },
// 删除 // 删除
del(id) { del(id) {
...@@ -601,7 +584,7 @@ export default { ...@@ -601,7 +584,7 @@ export default {
flag: false, flag: false,
code: this.diyRoleList.length, code: this.diyRoleList.length,
edit: true, edit: true,
id, id
}; };
this.diyRoleItemIndex = id; this.diyRoleItemIndex = id;
this.diyRoleList.push(roleitem); this.diyRoleList.push(roleitem);
...@@ -615,7 +598,7 @@ export default { ...@@ -615,7 +598,7 @@ export default {
//查看用户组的信息 //查看用户组的信息
viewGroupItem(id) { viewGroupItem(id) {
let arr = [...this.diyRoleList, ...this.defaultRoleBtns]; let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == id); let obj = arr.find(i => i.id == id);
return JSON.parse(JSON.stringify(obj)); return JSON.parse(JSON.stringify(obj));
}, },
//修改名 //修改名
...@@ -634,7 +617,7 @@ export default { ...@@ -634,7 +617,7 @@ export default {
}, },
viewSelect(item) { viewSelect(item) {
this.checkList = this.checkList =
(item.permissions && item.permissions.map((i) => i.id)) || []; (item.permissions && item.permissions.map(i => i.id)) || [];
}, },
// 选中自定义某个权限 // 选中自定义某个权限
chooseDiyRoleItem(item) { chooseDiyRoleItem(item) {
...@@ -648,7 +631,7 @@ export default { ...@@ -648,7 +631,7 @@ export default {
// 编辑 // 编辑
editDiyRoleItem(item) { editDiyRoleItem(item) {
let edit = item.edit; let edit = item.edit;
let index = this.diyRoleList.findIndex((i) => i.id == item.id); let index = this.diyRoleList.findIndex(i => i.id == item.id);
if (!edit && typeof edit != Boolean) edit = false; if (!edit && typeof edit != Boolean) edit = false;
edit = !edit; edit = !edit;
this.$set(this.diyRoleList[index], "edit", edit); this.$set(this.diyRoleList[index], "edit", edit);
...@@ -664,7 +647,7 @@ export default { ...@@ -664,7 +647,7 @@ export default {
if (type == "screen") { if (type == "screen") {
} }
let newArr = this.diyRoleList.map((i) => { let newArr = this.diyRoleList.map(i => {
i.edit = false; i.edit = false;
return i; return i;
}); });
...@@ -679,7 +662,7 @@ export default { ...@@ -679,7 +662,7 @@ export default {
this.funFlag = false; this.funFlag = false;
this.dataFlag = true; this.dataFlag = true;
console.info("数据权限"); console.info("数据权限");
}, }
}, },
created() { created() {
this.search(); this.search();
...@@ -687,12 +670,61 @@ export default { ...@@ -687,12 +670,61 @@ export default {
}, },
mounted() { mounted() {
this.funFlag = true; this.funFlag = true;
}, }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "scss/role"; @import "scss/role";
.manage-page /deep/ {
.sider {
.btns {
padding-top: 1px;
height: 56px;
.img-btn {
margin-left: 16px;
> img {
height: 16.04px;
width: 16.04px;
margin-left: 1.6px;
margin-top: 1.6px;
cursor: pointer;
}
}
}
.add-role-span {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
}
.diy-roles {
.delbtns {
padding-right: 1.75rem;
.delicon {
padding-right: 1.25rem;
}
}
.autoPlay {
.el-checkbox-group {
.chooseItem {
.diy-role-item {
.el-input__inner {
border: none;
text-align: center;
}
.diy-edit-btn {
box-shadow: -1px 1px 5px #aeb5c2;
.img {
margin-left: 8px;
}
}
}
}
}
}
}
}
}
.delicon { .delicon {
font-size: 10px; font-size: 10px;
display: flex !important; display: flex !important;
......
src/views/SystemManage/scss/group.scss
...@@ -502,6 +502,10 @@ ...@@ -502,6 +502,10 @@
//border: 1px solid darkblue; //border: 1px solid darkblue;
position: absolute; position: absolute;
right: 24px; right: 24px;
.addBtn{
border-color: #055fe7!important;
color: #055fe7!important;
}
.btn { .btn {
width: 96px; width: 96px;
height: 32px; height: 32px;
...@@ -546,6 +550,9 @@ ...@@ -546,6 +550,9 @@
.addbtns { .addbtns {
width: 100%; width: 100%;
text-align: center; text-align: center;
position: absolute;
bottom: 30px;
left: 0;
.btn1 { .btn1 {
width: 72px; width: 72px;
height: 40px; height: 40px;
...@@ -555,7 +562,7 @@ ...@@ -555,7 +562,7 @@
font-size: 14px; font-size: 14px;
color: #2e3846; color: #2e3846;
line-height: 40px; line-height: 40px;
margin-right: 15px; margin-right: 30px;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
......
src/views/SystemManage/scss/permission.scss
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
height: 750px; height: 750px;
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
border-top: 1px solid #EEEEEE;
.tags{ .tags{
width: 100px; width: 100px;
height: 24px; height: 24px;
...@@ -205,6 +206,7 @@ ...@@ -205,6 +206,7 @@
height: 750px; height: 750px;
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
border-top: 1px solid #EEEEEE;
.tags{ .tags{
width: 100px; width: 100px;
height: 24px; height: 24px;
......
src/views/SystemManage/scss/userpermission.scss
...@@ -237,27 +237,37 @@ ...@@ -237,27 +237,37 @@
padding-left: 30px; padding-left: 30px;
padding-top: 8px; padding-top: 8px;
.line { .line {
width: 190px;
height: 30px; height: 30px;
} }
} }
.div2 { .div2 {
width: 100%; width: 100%;
height: 85px; height: 85px;
padding-left: 30px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 10px 20px 0 25px; margin: 10px 20px 0 25px;
} }
.line { .line {
width: 190px;
height: 30px; height: 30px;
} }
} }
.div1 { .div1 {
width: 100%; width: 100%;
height: 65px; height: 65px;
padding-left: 30px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 25px 20px 0 25px; margin: 25px 20px 0 25px;
} }
.line /deep/{
width: 190px;
> .el-checkbox{
/////////////////////////////////////////
}
}
} }
// 未选中字体颜色 // 未选中字体颜色
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -1226,9 +1226,10 @@ const candidates = [ ...@@ -1226,9 +1226,10 @@ const candidates = [
<style lang="scss"> <style lang="scss">
.lt_candidate { .lt_candidate {
position: relative;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100% - 20px); height: calc(100% - 40px);
background: #f6f8fa; background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
div { div {
...@@ -1240,18 +1241,18 @@ const candidates = [ ...@@ -1240,18 +1241,18 @@ const candidates = [
// height: 60px; // height: 60px;
background: #ffffff; background: #ffffff;
.label { .label {
width: 60px; width: 32px;
height: 24px; height: 24px;
font-size: 16px; font-size: 16px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #1a1a1a; color: #1A1A1A;
line-height: 24px; line-height: 24px;
i { i {
margin: 0; margin: 0;
} }
} }
.input { .input {
width: 270px; width: 292px;
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
border-top-left-radius: 4px; border-top-left-radius: 4px;
...@@ -1281,6 +1282,9 @@ const candidates = [ ...@@ -1281,6 +1282,9 @@ const candidates = [
.slide-fade-enter, .slide-fade-leave-to{transform: translateX(5px);opacity: 0;} .slide-fade-enter, .slide-fade-leave-to{transform: translateX(5px);opacity: 0;}
.fingerName { .fingerName {
margin-right: 15px; margin-right: 15px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #1A1A1A;
} }
.dropdown-options { .dropdown-options {
height: 64px; height: 64px;
...@@ -1323,13 +1327,14 @@ const candidates = [ ...@@ -1323,13 +1327,14 @@ const candidates = [
width: 100%; width: 100%;
} }
.lt_candidate_bottom { .lt_candidate_bottom {
position: fixed; position: absolute;
bottom: 0; bottom: 12px;
right: 40px; left: 20px;
text-align: center; text-align: center;
height: 40px;
width: 352px; width: 352px;
color: #999; font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
span { span {
span { span {
color: #666; color: #666;
...@@ -1483,4 +1488,8 @@ const candidates = [ ...@@ -1483,4 +1488,8 @@ const candidates = [
font-weight: normal; font-weight: normal;
} }
} }
// 在表格显示暂无数据时，去掉白色背景
/deep/.el-table, /deep/.el-table__expanded-cell {
background: none;
}
</style> </style>
src/views/cxyrd/modules/LTSrc.vue
...@@ -8,15 +8,17 @@ ...@@ -8,15 +8,17 @@
<div class="lt_middle"> <div class="lt_middle">
<!-- 源数据区 --> <!-- 源数据区 -->
<div class="lt_middle_src_data"> <div class="lt_middle_src_data">
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName"> <el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList"
class="lt_candidate_table border_radius tableHeight" @row-click="getFirgerPrintDetail"
:row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" :width="width1"></el-table-column> <el-table-column prop="qqid" label="查询ID" :width="width1"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column> <el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" :width="width2"></el-table-column> <el-table-column prop="fingerCount" label="枚数" :width="width2"></el-table-column>
</el-table> </el-table>
<div class="lt_middle_bottom"> <div class="lt_middle_bottom">
<span>该任务共计<span>{{total}}条</span>查询</span> <span>该任务共计<span>{{ total }}条</span>查询</span>
<div class="btn" @click="changeTableHeight"> <div class="btn" @click="changeTableHeight">
<span>{{options}}</span> <span>{{ options }}</span>
<div class="ico"><img src="@/assets/img/bottom.png" alt=""></div> <div class="ico"><img src="@/assets/img/bottom.png" alt=""></div>
</div> </div>
<!-- <el-button type="text" @click="changeTableHeight">{{options}}</el-button> --> <!-- <el-button type="text" @click="changeTableHeight">{{options}}</el-button> -->
...@@ -24,13 +26,23 @@ ...@@ -24,13 +26,23 @@
</div> </div>
<!-- 源指纹区 --> <!-- 源指纹区 -->
<div class="lt_middle_finger_print" v-show="isShowPrint"> <div class="lt_middle_finger_print" v-show="isShowPrint">
<!-- 指纹/掌纹切换 -->
<div class="btns-switch">
<div class="btn" @click="switchZhiWen" :class="{active: fingerShowType == '指纹'}">指纹</div>
<div class="btn" @click="switchZhangWen" :class="{active: fingerShowType == '掌纹'}">掌纹
</div>
</div>
<!--指纹图--> <!--指纹图-->
<div class="lt_middle_finger_prints"> <div class="lt_middle_finger_prints">
<div class="finger_print" :class="{ finger_print_active: index === isActive, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3 }" v-for="(item, index) in enumerate" @click="changeStyle(index, item)" :key="index"> <!-- 指纹 -->
<div class="finger_print_number" :class="{ finger_print_number_active: index === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }"> <div v-if="fingerShowType==='指纹'">
{{ Number(index+1) &lt; 9 ? ('0'+Number(index+1)) : Number(index+1) }} <div class="finger_print"
:class="{ finger_print_active: index === isActive, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3 }"
v-for="(item, index) in enumerate" @click="changeStyle(index, item)" :key="index">
<div class="finger_print_number"
:class="{ finger_print_number_active: index === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }">
{{ Number(index + 1) &lt; 9 ? ("0" + Number(index + 1)) : Number(index + 1) }}
</div> </div>
<br />
<img :src="'data:image/jpeg;base64,'+item.image" /> <img :src="'data:image/jpeg;base64,'+item.image" />
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
...@@ -66,9 +78,54 @@ ...@@ -66,9 +78,54 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 掌纹 -->
<div v-else>
<div class="finger_print_zw"
:class="{ finger_print_active_zw: index === isActive, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3 }"
v-for="(item, index) in enumerate" @click="changeStyle(index, item)" :key="index">
<div class="finger_print_number"
:class="{ finger_print_number_active: index === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }">
{{ 100+Number(index + 1) }}
</div>
<img :src="'data:image/jpeg;base64,'+item.image" />
<div class="finger-tips">
<!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1">
<div class="affirmstatusbg"></div>
<div class="dot"></div>
<span class="txt">认定完成</span>
</div>
<!-- 比中 -->
<div class="affirmstatus2" v-else-if="item.affirmstatus==2">
<div class="affirmstatusbg"></div>
<div class="dot"></div>
<span class="txt">比中</span>
</div>
<div class="affirmstatus2" v-else-if="item.affirmstatus==3">
<div class="affirmstatusbg"></div>
<div class="dot"></div>
<span class="txt">比中</span>
</div>
<!-- 认定完成+比中 -->
<!-- <div class="affirmstatus3" v-else-if="item.affirmstatus==3">
<div class="affirmstatus3bg"></div>
<div class="icon">
<img class="rb" src="../../../assets/img/LT/rb.png" alt="">
</div>
</div> -->
<!-- 浏览过 -->
<div class="clickLog" v-if="item.affirmstatus==='' && item.clickLog==1">
<div class="clickLogbg"></div>
<div class="dot"></div>
<span class="txt">已查看</span>
</div>
</div>
</div>
</div>
</div>
<!--指纹个数提示--> <!--指纹个数提示-->
<div class="lt_middle_bottom"> <div class="lt_middle_bottom">
<span>该查询ID共计<span>{{fingerTotal}}枚</span>指纹</span> <span>该查询ID共计<span>{{ fingerTotal }}枚</span>{{fingerShowType}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -76,8 +133,8 @@ ...@@ -76,8 +133,8 @@
</template> </template>
<script> <script>
import axios from 'axios'; import { Loading } from "element-ui";
import { Loading } from 'element-ui';
export default { export default {
name: "LTSrc", name: "LTSrc",
props: ["srcData"], props: ["srcData"],
...@@ -90,15 +147,17 @@ export default { ...@@ -90,15 +147,17 @@ export default {
// } // }
// } // }
// }, // },
created () { created() {
let w1 = 1920 let w1 = 1920;
let w2 = window.innerWidth let w2 = window.innerWidth;
this.width1 = this.width1 * w2 / w1 this.width1 = this.width1 * w2 / w1;
this.width2 = this.width2 * w2 / w1 this.width2 = this.width2 * w2 / w1;
}, },
data () { data() {
return { return {
// 指纹/掌纹切换
fingerShowType: "指纹",
width2: 70, width2: 70,
width1: 90, width1: 90,
rwh: null, rwh: null,
...@@ -114,15 +173,27 @@ export default { ...@@ -114,15 +173,27 @@ export default {
total: 0, total: 0,
fingerTotal: 0, fingerTotal: 0,
currentRow: null, currentRow: null,
options: '展开', options: "展开",
qqid: null, qqid: null,
// 加载动画 // 加载动画
loading: null, loading: null,
timer: null, timer: null
}; };
}, },
methods: { methods: {
/** /**
* 切换位掌纹
*/
switchZhangWen() {
this.fingerShowType = "掌纹";
},
/**
* 切换为指纹
*/
switchZhiWen() {
this.fingerShowType = "指纹";
},
/**
* @description: 比中与认定完成添加样式 * @description: 比中与认定完成添加样式
* @param {*} row * @param {*} row
* @param {*} column * @param {*} column
...@@ -130,19 +201,19 @@ export default { ...@@ -130,19 +201,19 @@ export default {
* @param {*} columnIndex * @param {*} columnIndex
* @return {*} * @return {*}
*/ */
tableRowClassName ({ row, column, rowIndex, columnIndex }) { tableRowClassName({ row, column, rowIndex, columnIndex }) {
// 比中的行 // 比中的行
if (row.affirmStatus == 2 || row.affirmStatus == 3) { if (row.affirmStatus == 2 || row.affirmStatus == 3) {
console.log(row); console.log(row);
return "Bizhong" return "Bizhong";
} else if (row.affirmStatus == 1) { } else if (row.affirmStatus == 1) {
// 认定完成的行 // 认定完成的行
console.log(row); console.log(row);
return "Identification" return "Identification";
} }
// 浏览过的 // 浏览过的
if (row.clickLog == 1) { if (row.clickLog == 1) {
return "looked" return "looked";
} }
}, },
/** /**
...@@ -151,61 +222,61 @@ export default { ...@@ -151,61 +222,61 @@ export default {
* @param {*} old * @param {*} old
* @return {*} * @return {*}
*/ */
handleCurrentChange (val, old) { handleCurrentChange(val, old) {
let self = this let self = this;
// 发送请求 // 发送请求
this.loading = Loading.service({ fullscreen: true, text: '正在加载...' }); this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
console.log(val); console.log(val);
// 查看该条目是否被删除 // 查看该条目是否被删除
this.$axios({ this.$axios({
method: 'post', method: "post",
url: `/api/casestore/deletestatus?ysxtAsjbh=${val.barcode}` url: `/api/casestore/deletestatus?ysxtAsjbh=${val.barcode}`
}).then(isDelete => { }).then(isDelete => {
if(isDelete.data.code === 0) { if (isDelete.data.code === 0) {
if(isDelete.data.ret.deleteflag === '0') { if (isDelete.data.ret.deleteflag === "0") {
// 未删除 // 未删除
if (val == null) return; if (val == null) return;
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(val, 'clickLog', '1') self.$set(val, "clickLog", "1");
self.currentRow = val; self.currentRow = val;
console.log(val); console.log(val);
self.qqid = val.qqid self.qqid = val.qqid;
self.qid = val.qid self.qid = val.qid;
// 保存qqid和qid // 保存qqid和qid
sessionStorage.setItem('qqid', self.qqid) sessionStorage.setItem("qqid", self.qqid);
sessionStorage.setItem('qid', self.qid) sessionStorage.setItem("qid", self.qid);
let barcode = val.barcode let barcode = val.barcode;
// 存储原条码号 // 存储原条码号
sessionStorage.setItem('srcbarcode', barcode) sessionStorage.setItem("srcbarcode", barcode);
console.log(barcode); console.log(barcode);
self.$axios.post('/api/png/caseBybarcode/barcode', { self.$axios.post("/api/png/caseBybarcode/barcode", {
querytype: '2', querytype: "2",
barcode: barcode, barcode: barcode,
qqid: self.qqid, qqid: self.qqid
}).then(response => { }).then(response => {
console.log(response); console.log(response);
self.enumerate = response.data.ret self.enumerate = response.data.ret;
self.fingerTotal = response.data.ret.length self.fingerTotal = response.data.ret.length;
// 默认选中第一个指纹预览图片 // 默认选中第一个指纹预览图片
self.changeStyle(0, self.enumerate[0]) self.changeStyle(0, self.enumerate[0]);
}) });
self.isActive = ""; self.isActive = "";
} else { } else {
// 已删除 // 已删除
self.$message.error("该人员已经删除，删除时间是" + isDelete.data.ret.deleteTime) self.$message.error("该人员已经删除，删除时间是" + isDelete.data.ret.deleteTime);
self.enumerate = [] self.enumerate = [];
self.fingerTotal = 0 self.fingerTotal = 0;
return; return;
} }
} else { } else {
self.$message.error('获取数据错误！') self.$message.error("获取数据错误！");
} }
}) });
clearTimeout(self.timer) clearTimeout(self.timer);
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.loading && self.loading.close(); self.loading && self.loading.close();
self.loading = null self.loading = null;
}, 1200); }, 1200);
}, },
/** /**
...@@ -213,46 +284,46 @@ export default { ...@@ -213,46 +284,46 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
getDetailData () { getDetailData() {
// 发送请求 // 发送请求
this.loading = Loading.service({ fullscreen: true, text: '正在加载...' }); this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
let self = this let self = this;
if (this.type == 'father') { if (this.type == "father") {
this.$axios this.$axios
.post("/api/queryque/standardAll", { contrastCustomSearchReq: { qid: Number(self.qid) } }) .post("/api/queryque/standardAll", { contrastCustomSearchReq: { qid: Number(self.qid) } })
.then(response => { .then(response => {
console.log(response); console.log(response);
self.sourceDataList = response.data.ret self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList self.dataList = self.sourceDataList;
self.total = self.dataList.length self.total = self.dataList.length;
console.log(self.dataList); console.log(self.dataList);
// 默认选中第一行 // 默认选中第一行
self.$nextTick(() => { self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]); self.$refs.singleTable.setCurrentRow(self.dataList[0]);
}) });
}); });
} else { } else {
this.$axios this.$axios
.post("/api/queryque/standardAll", { contrastCustomSearchReq: { qqid: Number(self.qqid) } }) .post("/api/queryque/standardAll", { contrastCustomSearchReq: { qqid: Number(self.qqid) } })
.then(response => { .then(response => {
console.log(response); console.log(response);
self.sourceDataList = response.data.ret self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList self.dataList = self.sourceDataList;
self.total = self.dataList.length self.total = self.dataList.length;
console.log(self.dataList); console.log(self.dataList);
// 默认选中第一行 // 默认选中第一行
self.$nextTick(() => { self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]); self.$refs.singleTable.setCurrentRow(self.dataList[0]);
}) });
}); });
} }
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.loading && self.loading.close(); self.loading && self.loading.close();
self.loading = null self.loading = null;
}, 1200); }, 1200);
}, },
// 获取选择的任务详情 // 获取选择的任务详情
getFirgerPrintDetail (row) { getFirgerPrintDetail(row) {
// this.enumerate = row.enumerate; // this.enumerate = row.enumerate;
// 选择新的指纹数据时 清空前一个指纹样式 // 选择新的指纹数据时 清空前一个指纹样式
// let self = this // let self = this
...@@ -268,28 +339,28 @@ export default { ...@@ -268,28 +339,28 @@ export default {
// this.isActive = ""; // this.isActive = "";
}, },
// 指纹部分 增加边框 // 指纹部分 增加边框
changeStyle (index, imageInfo) { changeStyle(index, imageInfo) {
console.log(imageInfo); console.log(imageInfo);
let self = this let self = this;
this.isActive = index; this.isActive = index;
console.log(this.isActive); console.log(this.isActive);
// 存储源数据序号 // 存储源数据序号
if (imageInfo) { if (imageInfo) {
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, 'clickLog', '1') self.$set(imageInfo, "clickLog", "1");
sessionStorage.setItem('srcseqno', imageInfo.seq) sessionStorage.setItem("srcseqno", imageInfo.seq);
sessionStorage.setItem('zcseq', imageInfo.seq) sessionStorage.setItem("zcseq", imageInfo.seq);
this.$bus.emit('changImageEdit', imageInfo.image) this.$bus.emit("changImageEdit", imageInfo.image);
// 发送请求 // 发送请求
this.loading = Loading.service({ fullscreen: true, text: '正在加载...' }); this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem('srcbarcode') }) this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
.then(response => { .then(response => {
console.log(response); console.log(response);
self.$bus.emit('initCandidate', response.data.ret) self.$bus.emit("initCandidate", response.data.ret);
}) });
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.loading && self.loading.close(); self.loading && self.loading.close();
self.loading = null self.loading = null;
}, 1200); }, 1200);
} }
}, },
...@@ -298,18 +369,18 @@ export default { ...@@ -298,18 +369,18 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeTableHeight () { changeTableHeight() {
this.isShowPrint = !this.isShowPrint this.isShowPrint = !this.isShowPrint;
if (!this.isShowPrint) { if (!this.isShowPrint) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '48.75rem'); document.getElementsByTagName("body")[0].style.setProperty("--tableHeight", "48.75rem");
// this.tableHeight = 810 // this.tableHeight = 810
this.options = '折叠' this.options = "折叠";
$('.ico').css('transform', 'rotate(180deg)') $(".ico").css("transform", "rotate(180deg)");
} else { } else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '20rem'); document.getElementsByTagName("body")[0].style.setProperty("--tableHeight", "20rem");
// this.tableHeight = 368 // this.tableHeight = 368
this.options = '展开' this.options = "展开";
$('.ico').css('transform', 'rotate(0deg)') $(".ico").css("transform", "rotate(0deg)");
} }
} }
}, },
...@@ -320,40 +391,40 @@ export default { ...@@ -320,40 +391,40 @@ export default {
* @param {*} oldValue * @param {*} oldValue
* @return {*} * @return {*}
*/ */
checked (newValue, oldValue) { checked(newValue, oldValue) {
console.log(newValue); console.log(newValue);
if (newValue) { if (newValue) {
this.dataList = this.sourceDataList this.dataList = this.sourceDataList;
} else { } else {
this.dataList = this.sourceDataList.filter(item => { this.dataList = this.sourceDataList.filter(item => {
return item.affirmStatus != 1 return item.affirmStatus != 1;
}) });
console.log(this.dataList); console.log(this.dataList);
} }
this.total = this.dataList.length this.total = this.dataList.length;
} }
}, },
mounted () { mounted() {
console.log(this.$route); console.log(this.$route);
this.rwh = this.$route.query.qid this.rwh = this.$route.query.qid;
this.qqid = this.$route.query.qqid this.qqid = this.$route.query.qqid;
this.qid = this.$route.query.qid this.qid = this.$route.query.qid;
this.type = this.$route.query.type this.type = this.$route.query.type;
sessionStorage.setItem('zctype', this.type) sessionStorage.setItem("zctype", this.type);
console.log(this.rwh); console.log(this.rwh);
let self = this let self = this;
// 初始状态下 展示当前任务的第一条指纹信息（指纹个数） // 初始状态下 展示当前任务的第一条指纹信息（指纹个数）
// this.enumerate = datas[0].enumerate; // this.enumerate = datas[0].enumerate;
this.getDetailData() this.getDetailData();
// 更新列表数据 // 更新列表数据
this.$bus.on('updateFinderSource', () => { this.$bus.on("updateFinderSource", () => {
self.getDetailData() self.getDetailData();
}) });
}, },
beforeDestroy () { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off('updateFinderSource'); this.$bus.$off("updateFinderSource");
}, }
}; };
// 某任务下查询的所有信息 // 某任务下查询的所有信息
const datas = [ const datas = [
...@@ -382,12 +453,15 @@ const datas = [ ...@@ -382,12 +453,15 @@ const datas = [
.lt_src { .lt_src {
width: 100%; width: 100%;
height: 100%; height: 100%;
div { div {
display: inline-block; display: inline-block;
} }
label { label {
margin-right: 67px; margin-right: 67px;
} }
.el-button { .el-button {
cursor: pointer; cursor: pointer;
margin-left: 32px; margin-left: 32px;
...@@ -399,9 +473,11 @@ const datas = [ ...@@ -399,9 +473,11 @@ const datas = [
line-height: 16px; line-height: 16px;
font-weight: 350; font-weight: 350;
} }
.lt_top { .lt_top {
width: 100%; width: 100%;
margin: 0 0 10px 0; margin: 0 0 10px 0;
.rwh { .rwh {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei; font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
...@@ -409,48 +485,87 @@ const datas = [ ...@@ -409,48 +485,87 @@ const datas = [
color: #282F3C; color: #282F3C;
} }
} }
.lt_middle { .lt_middle {
width: 100%; width: 100%;
// height: 100%; // height: 100%;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
} }
.lt_middle_src_data { .lt_middle_src_data {
border-radius: 8px; border-radius: 8px;
width: 100%; width: 100%;
height: 320px; height: 320px;
.Bizhong { .Bizhong {
.cell { .cell {
color: #FF0039; color: #FF0039;
} }
} }
.Identification { .Identification {
.cell { .cell {
color: #055FE7; color: #055FE7;
} }
} }
.looked { .looked {
.cell { .cell {
color: #999; color: #999;
} }
} }
.finger_print_number { .finger_print_number {
width: 100%; width: 100%;
height: 40px; height: 40px;
} }
} }
.lt_middle_finger_print { .lt_middle_finger_print {
background-color: #F6F8FA; background-color: #F6F8FA;
width: 100%; width: 100%;
.btns-switch {
display: flex;
align-items: center;
margin-top: 13px;
margin-left: 47px;
.btn {
cursor: pointer;
width: 129px;
height: 32px;
background: #FFFFFF;
border-radius: 2px 0px 0px 2px;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #282F3C;
}
.active {
width: 129px;
height: 32px;
background: #055FE7;
border-radius: 2px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
}
}
.lt_middle_finger_prints { .lt_middle_finger_prints {
border-top: 1px solid #cccccc;
background: #f6f8fa; background: #f6f8fa;
margin-top: 12px; margin-top: 12px;
overflow-y: auto; overflow-y: auto;
width: 100%; width: 100%;
height: 400px; height: 360px;
} }
} }
/*底部的统计数据*/ /*底部的统计数据*/
.lt_middle_bottom { .lt_middle_bottom {
text-align: center; text-align: center;
...@@ -461,17 +576,20 @@ const datas = [ ...@@ -461,17 +576,20 @@ const datas = [
font-size: 12px; font-size: 12px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #999; color: #999;
span { span {
span { span {
color: #666; color: #666;
} }
} }
} }
.lt_middle_src_data { .lt_middle_src_data {
.lt_middle_bottom { .lt_middle_bottom {
margin-top: -10px; margin-top: -10px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.btn { .btn {
margin-left: 32px; margin-left: 32px;
cursor: pointer; cursor: pointer;
...@@ -480,12 +598,14 @@ const datas = [ ...@@ -480,12 +598,14 @@ const datas = [
font-size: 12px; font-size: 12px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #055FE7; color: #055FE7;
.ico { .ico {
transform: rotate(0deg); transform: rotate(0deg);
margin-left: 5px; margin-left: 5px;
width: 10px; width: 10px;
height: 6px; height: 6px;
display: flex; display: flex;
img { img {
object-fit: cover; object-fit: cover;
width: 100%; width: 100%;
...@@ -495,6 +615,7 @@ const datas = [ ...@@ -495,6 +615,7 @@ const datas = [
} }
} }
} }
/* 单个指纹*/ /* 单个指纹*/
.finger_print { .finger_print {
position: relative; position: relative;
...@@ -506,14 +627,17 @@ const datas = [ ...@@ -506,14 +627,17 @@ const datas = [
margin: 8px 4px 8px 4px; margin: 8px 4px 8px 4px;
overflow: hidden; overflow: hidden;
object-fit: contain; object-fit: contain;
&:hover { &:hover {
border: 1px solid #999; border: 1px solid #999;
} }
img { img {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
} }
.finger_print_number { .finger_print_number {
font-size: 12px; font-size: 12px;
width: 24px; width: 24px;
...@@ -528,6 +652,7 @@ const datas = [ ...@@ -528,6 +652,7 @@ const datas = [
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.finger_print_number_active { .finger_print_number_active {
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -537,6 +662,7 @@ const datas = [ ...@@ -537,6 +662,7 @@ const datas = [
background: #055fe7; background: #055fe7;
border-radius: 0px 0px 7px 0px; border-radius: 0px 0px 7px 0px;
} }
.finger-tips { .finger-tips {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
...@@ -545,6 +671,7 @@ const datas = [ ...@@ -545,6 +671,7 @@ const datas = [
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
.affirmstatus1, .affirmstatus2 { .affirmstatus1, .affirmstatus2 {
width: 100%; width: 100%;
height: 20px; height: 20px;
...@@ -553,6 +680,7 @@ const datas = [ ...@@ -553,6 +680,7 @@ const datas = [
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.affirmstatusbg { .affirmstatusbg {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -560,6 +688,7 @@ const datas = [ ...@@ -560,6 +688,7 @@ const datas = [
background: linear-gradient(180deg, rgba(255, 255, 255, 0) -30%, #000000 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0) -30%, #000000 100%);
opacity: 0.66; opacity: 0.66;
} }
.dot { .dot {
z-index: 10; z-index: 10;
width: 7px; width: 7px;
...@@ -569,6 +698,7 @@ const datas = [ ...@@ -569,6 +698,7 @@ const datas = [
border-radius: 50%; border-radius: 50%;
margin-right: 8px; margin-right: 8px;
} }
.txt { .txt {
z-index: 10; z-index: 10;
font-size: 12px; font-size: 12px;
...@@ -576,11 +706,13 @@ const datas = [ ...@@ -576,11 +706,13 @@ const datas = [
color: #FFFFFF; color: #FFFFFF;
} }
} }
.affirmstatus2 { .affirmstatus2 {
.dot { .dot {
background: #FF0039; background: #FF0039;
} }
} }
.affirmstatus3 { .affirmstatus3 {
width: 100%; width: 100%;
height: 20px; height: 20px;
...@@ -589,6 +721,7 @@ const datas = [ ...@@ -589,6 +721,7 @@ const datas = [
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: relative; position: relative;
.affirmstatus3bg { .affirmstatus3bg {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -596,10 +729,12 @@ const datas = [ ...@@ -596,10 +729,12 @@ const datas = [
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%);
opacity: 0.66; opacity: 0.66;
} }
.icon { .icon {
width: 14px; width: 14px;
height: 14px; height: 14px;
display: flex; display: flex;
.rb { .rb {
position: relative; position: relative;
width: 14px; width: 14px;
...@@ -608,6 +743,7 @@ const datas = [ ...@@ -608,6 +743,7 @@ const datas = [
} }
} }
} }
.clickLog { .clickLog {
width: 100%; width: 100%;
height: 20px; height: 20px;
...@@ -616,6 +752,7 @@ const datas = [ ...@@ -616,6 +752,7 @@ const datas = [
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: relative; position: relative;
.clickLogbg { .clickLogbg {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -623,6 +760,7 @@ const datas = [ ...@@ -623,6 +760,7 @@ const datas = [
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%); background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%);
opacity: 0.66; opacity: 0.66;
} }
.dot { .dot {
z-index: 10; z-index: 10;
width: 7px; width: 7px;
...@@ -632,6 +770,7 @@ const datas = [ ...@@ -632,6 +770,7 @@ const datas = [
border-radius: 50%; border-radius: 50%;
margin-right: 8px; margin-right: 8px;
} }
.txt { .txt {
z-index: 10; z-index: 10;
font-size: 12px; font-size: 12px;
...@@ -641,6 +780,172 @@ const datas = [ ...@@ -641,6 +780,172 @@ const datas = [
} }
} }
} }
// 单个掌纹
.finger_print_zw {
position: relative;
width: 164px;
height: 164px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
margin: 8px 4px 8px 4px;
overflow: hidden;
object-fit: contain;
&:hover {
border: 1px solid #999;
}
img {
position: absolute;
top: 0;
left: 0;
}
.finger_print_number {
font-size: 12px;
width: 24px;
height: 24px;
background: #ddebff;
border-radius: 0px 0px 7px 0px;
z-index: 20;
position: absolute;
top: 0;
left: 0;
display: flex;
justify-content: center;
align-items: center;
}
.finger_print_number_active {
position: absolute;
top: 0;
left: 0;
width: 24px;
height: 24px;
background: #055fe7;
border-radius: 0px 0px 7px 0px;
}
.finger-tips {
position: absolute;
bottom: 0;
left: 0;
display: flex;
justify-content: center;
align-items: center;
width: 100%;
.affirmstatus1, .affirmstatus2 {
width: 100%;
height: 20px;
position: relative;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
.affirmstatusbg {
width: 100%;
height: 100%;
position: absolute;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) -30%, #000000 100%);
opacity: 0.66;
}
.dot {
z-index: 10;
width: 7px;
height: 7px;
background: #055FE7;
border: 1px solid #FFFFFF;
border-radius: 50%;
margin-right: 8px;
}
.txt {
z-index: 10;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
}
}
.affirmstatus2 {
.dot {
background: #FF0039;
}
}
.affirmstatus3 {
width: 100%;
height: 20px;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
position: relative;
.affirmstatus3bg {
width: 100%;
height: 100%;
position: absolute;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%);
opacity: 0.66;
}
.icon {
width: 14px;
height: 14px;
display: flex;
.rb {
position: relative;
width: 14px;
height: 14px;
object-fit: contain;
}
}
}
.clickLog {
width: 100%;
height: 20px;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
position: relative;
.clickLogbg {
width: 100%;
height: 100%;
position: absolute;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%);
opacity: 0.66;
}
.dot {
z-index: 10;
width: 7px;
height: 7px;
background: #999999;
border: 1px solid #FFFFFF;
border-radius: 50%;
margin-right: 8px;
}
.txt {
z-index: 10;
font-size: 12px;
font-family: Microsoft YaHei;
color: #FFFFFF;
}
}
}
}
// .fingerLook { // .fingerLook {
// border: 1px solid #333; // border: 1px solid #333;
// } // }
...@@ -676,10 +981,30 @@ const datas = [ ...@@ -676,10 +981,30 @@ const datas = [
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px solid #055fe7; border: 1px solid #055fe7;
.finger_print_number {
color: #ffffff;
font-size: 12px;
}
&:hover {
border: 1px solid #999;
}
}
.finger_print_active_zw {
position: relative;
width: 164px;
height: 164px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #055fe7;
.finger_print_number { .finger_print_number {
color: #ffffff; color: #ffffff;
font-size: 12px; font-size: 12px;
} }
&:hover { &:hover {
border: 1px solid #999; border: 1px solid #999;
} }
...@@ -691,23 +1016,27 @@ $tableHeight: var(--tableHeight, 320px); ...@@ -691,23 +1016,27 @@ $tableHeight: var(--tableHeight, 320px);
.tableHeight { .tableHeight {
height: $tableHeight; height: $tableHeight;
} }
/* 设置滚动条的样式 */ /* 设置滚动条的样式 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width:6px; width: 6px;
} }
/* 滚动槽 */ /* 滚动槽 */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
-webkit-box-shadow:inset006pxrgba(0,0,0,0.3); -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius:10px; border-radius: 10px;
} }
/* 滚动条滑块 */ /* 滚动条滑块 */
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius:3px; border-radius: 3px;
background:rgba(0,0,0,0.1); background: rgba(0, 0, 0, 0.1);
-webkit-box-shadow:inset006pxrgba(0,0,0,0.5); -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
} }
::-webkit-scrollbar-thumb:window-inactive { ::-webkit-scrollbar-thumb:window-inactive {
background:#DADDE0; background: #DADDE0;
} }
// 滚动条的宽度 // 滚动条的宽度
...@@ -715,16 +1044,19 @@ $tableHeight: var(--tableHeight, 320px); ...@@ -715,16 +1044,19 @@ $tableHeight: var(--tableHeight, 320px);
width: 6px; // 横向滚动条 width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写 height: 6px; // 纵向滚动条 必写
} }
// 滚动条的滑块 // 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #DADDE0; background-color: #DADDE0;
border-radius: 3px; border-radius: 3px;
} }
// 修改多选框样式 // 修改多选框样式
/deep/.el-checkbox.is-checked { /deep/ .el-checkbox.is-checked {
.el-checkbox__label { .el-checkbox__label {
color: #333333; color: #333333;
} }
.el-checkbox__input.is-checked { .el-checkbox__input.is-checked {
.el-checkbox__inner { .el-checkbox__inner {
background: #055fe7; background: #055fe7;
...@@ -732,15 +1064,19 @@ $tableHeight: var(--tableHeight, 320px); ...@@ -732,15 +1064,19 @@ $tableHeight: var(--tableHeight, 320px);
} }
} }
} }
/deep/.el-checkbox {
/deep/ .el-checkbox {
color: #666; color: #666;
} }
/deep/ .el-dropdown-menu__item { /deep/ .el-dropdown-menu__item {
padding: 0 1.25rem !important; padding: 0 1.25rem !important;
} }
// 表头 // 表头
/deep/ .has-gutter { /deep/ .has-gutter {
font-weight: normal; font-weight: normal;
th { th {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<el-table-column label="序号" prop="destseqno" :width="width1"></el-table-column> <el-table-column label="序号" prop="destseqno" :width="width1"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto"></el-table-column> <el-table-column prop="destbarcode" label="目标条码号" width="auto"></el-table-column>
</el-table> </el-table>
<div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span>
</div>
</div> </div>
</template> </template>
...@@ -166,9 +169,10 @@ export default { ...@@ -166,9 +169,10 @@ export default {
<style lang="scss"> <style lang="scss">
.tl-candidate { .tl-candidate {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 40px);
background: #f6f8fa; background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
position: relative;
//div { //div {
// display: inline-block; // display: inline-block;
...@@ -177,7 +181,7 @@ export default { ...@@ -177,7 +181,7 @@ export default {
.tl-search { .tl-search {
// width: 352px; // width: 352px;
width: 100%; width: 100%;
height: 60px; //height: 60px;
background: #ffffff; background: #ffffff;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -186,7 +190,7 @@ export default { ...@@ -186,7 +190,7 @@ export default {
height: 24px; height: 24px;
font-size: 16px; font-size: 16px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #1a1a1a; color: #1A1A1A;
line-height: 24px; line-height: 24px;
} }
...@@ -203,7 +207,7 @@ export default { ...@@ -203,7 +207,7 @@ export default {
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 44px; width: 44px;
height: 32px; height: 34px;
background: #006aff; background: #006aff;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
line-height: 32px; line-height: 32px;
...@@ -215,6 +219,22 @@ export default { ...@@ -215,6 +219,22 @@ export default {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 5px 0;
}
.lt_candidate_bottom {
position: absolute;
bottom: 12px;
left: 20px;
text-align: center;
width: 352px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
span {
span {
color: #666;
}
}
} }
} }
...@@ -287,4 +307,9 @@ export default { ...@@ -287,4 +307,9 @@ export default {
font-weight: normal; font-weight: normal;
} }
} }
// 在表格显示暂无数据时，去掉白色背景
/deep/.el-table, /deep/.el-table__expanded-cell {
background: none;
}
</style> </style>
src/views/cxyrd/modules/TLSrc.vue
...@@ -25,8 +25,12 @@ ...@@ -25,8 +25,12 @@
<div class="finger-print" v-show="isShowPrint"> <div class="finger-print" v-show="isShowPrint">
<div class="btns"> <div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div> <div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
<div class="line"></div>
<div class="btn" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面 <div class="btn" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面
</div> </div>
<div class="line"></div>
<div class="btn" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹
</div>
</div> </div>
<!-- 滚动 --> <!-- 滚动 -->
<div class="fingers" v-if="fingerShowType=='roll'"> <div class="fingers" v-if="fingerShowType=='roll'">
...@@ -142,7 +146,7 @@ ...@@ -142,7 +146,7 @@
</div> </div>
</div> </div>
<!-- 平面 --> <!-- 平面 -->
<div class="fingers" v-else> <div class="fingers" v-else-if="fingerShowType=='pain'">
<div class="outside"> <div class="outside">
<label>右手</label><br /> <label>右手</label><br />
<div class="fingersImg"> <div class="fingersImg">
...@@ -255,6 +259,10 @@ ...@@ -255,6 +259,10 @@
</div> </div>
</div> </div>
<!-- 掌纹-->
<div class="fingers" v-else>
掌纹
</div>
<div class="bottom"> <div class="bottom">
<span>该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span> <span>该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span>
</div> </div>
...@@ -389,6 +397,12 @@ export default { ...@@ -389,6 +397,12 @@ export default {
} }
}, },
/** /**
* 切换到掌纹
*/
switchZw() {
this.fingerShowType = "zhangwen";
},
/**
* @description: 切换到平面 * @description: 切换到平面
* @param {*} * @param {*}
* @return {*} * @return {*}
...@@ -1081,17 +1095,20 @@ label { ...@@ -1081,17 +1095,20 @@ label {
.finger-print { .finger-print {
width: 352px; width: 352px;
height: 621px; height: 600px;
background: #f6f8fa; background: #f6f8fa;
.btns { .btns {
width: 260px; width: 272px;
height: 32px; height: 32px;
margin: 12px 0 12px 46px; margin: 12px 0 12px 41px;
background-color: #FFFFFF;
display: flex;
align-items: center;
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 129px; width: 90px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
background: #ffffff; background: #ffffff;
...@@ -1108,6 +1125,11 @@ label { ...@@ -1108,6 +1125,11 @@ label {
color: #ffffff; color: #ffffff;
} }
} }
.line {
width: 1px;
height: 16px;
background-color: #EEEEEE;
}
.isHasData { .isHasData {
background-color: #ECEDF1; background-color: #ECEDF1;
...@@ -1121,6 +1143,7 @@ label { ...@@ -1121,6 +1143,7 @@ label {
overflow-y: auto; overflow-y: auto;
width: 100%; width: 100%;
height: 500px; height: 500px;
padding-left: 8px;
.outside { .outside {
bottom: 6px; bottom: 6px;
...@@ -1337,7 +1360,7 @@ label { ...@@ -1337,7 +1360,7 @@ label {
.bottom { .bottom {
text-align: center; text-align: center;
background: #f6f8fa; background: #f6f8fa;
height: 40px; //height: 40px;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
......
src/views/login/Login1.vue
<template> <template>
<el-container class="manage-page" direction="vertical"> <el-container class="manage-page" direction="vertical">
<!-- <div id="homepage_hero_module" class="homepage_hero_module">--> <div id="homepage_hero_module" class="homepage_hero_module">
<!-- <div class="video_container">--> <div class="video_container">
<!-- <div :style="fixStyle" class="filter"></div>--> <video
<!-- autoplay 自动播放 loop 循环播放 muted 静音播放--> id="myVideo"
<!-- <video autoplay loop muted class="fillWidth" v-on:canplay="canplay">--> width="100wh"
<!-- <source :src="barcgroundUrl" type="video/mp4" />--> height="100vh"
<!-- 浏览器不支持 video 标签，建议升级浏览器。--> class="fillWidth video-js video"
<!-- </video>--> style="object-fit: fill;"
<!-- &lt;!&ndash; todo 视频加载切换为图片加载 &ndash;&gt;--> >
<!-- &lt;!&ndash; 考虑视频加载失败 图片背景效果 &ndash;&gt;--> <source :src="barcgroundUrl" type="video/mp4" />
<!-- <div class="poster hidden" v-if="!vedioCanPlay">--> <img :style="fixStyle" :src="barcgroundImgUrl" alt="" />
<!-- <img :style="fixStyle" :src="barcgroundImgUrl" alt="" />--> </video>
<!-- </div>--> </div>
<!-- </div>--> </div>
<!-- <img class="bg" src="@/assets/img/login/login.gif" />--> <!-- <img class="bg" src="@/assets/img/login/login.gif" />-->
<!-- <transition name="slide_fade">--> <transition name="right-slide">
<div :style="drawerStyle" class="login_main_layer" v-if="isShow"> <div :style="drawerStyle" class="login_main_layer" v-if="loginShow">
<!-- <transition name="login_fade">--> <!-- <transition name="login_fade">-->
<div> <div>
<div class=" login_top_layer middle"> <div class=" login_top_layer middle">
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
</el-button> </el-button>
</div> </div>
<div> <div>
<accountsLogin :login-type="loginType.accountStatus"></accountsLogin> <accountsLogin
:login-type="loginType.accountStatus"
></accountsLogin>
</div> </div>
<div> <div>
<keyLogin :login-type="loginType.keyStatus"></keyLogin> <keyLogin :login-type="loginType.keyStatus"></keyLogin>
...@@ -52,10 +54,12 @@ ...@@ -52,10 +54,12 @@
</div> </div>
<!-- </transition>--> <!-- </transition>-->
<div class="login_bottom_layer "> <div class="login_bottom_layer ">
<span class=" font_color">Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span> <span class=" font_color"
>Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span
>
</div> </div>
</div> </div>
<!-- </transition>--> </transition>
</el-container> </el-container>
</template> </template>
...@@ -72,7 +76,6 @@ export default { ...@@ -72,7 +76,6 @@ export default {
data() { data() {
return { return {
isShow: false,
loginShow: false, loginShow: false,
// drawerHeight: null, // drawerHeight: null,
barcgroundUrl: require("../../assets/video/login.mp4"), barcgroundUrl: require("../../assets/video/login.mp4"),
...@@ -104,23 +107,41 @@ export default { ...@@ -104,23 +107,41 @@ export default {
}, },
//初始化方法调用 //初始化方法调用
init() {} init() {},
/**
* @description: 初始化视频方法
* @author: 林永鑫
*/
initVideo() {
this.$video(
"myVideo",
{
//确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
controls: false,
loop: true,
//自动播放属性,muted:静音播放
autoplay: true,
muted: true,
//建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
preload: "auto"
//设置视频播放器的显示宽度（以像素为单位）
}, },
created() { () => {
var me = this;
// 动画加载时间
setTimeout(() => { setTimeout(() => {
me.isShow = true; this.loginShow = true;
}, 1000); }, 1000);
// setTimeout(() => { }
// me.loginShow = true; );
// }, 3000); }
}, },
created() {},
mounted() { mounted() {
this.loginType.accountStatus = true; this.loginType.accountStatus = true;
if (localStorage.getItem("token") !== null) { if (localStorage.getItem("token") !== null) {
this.$router.push("/Home/Home"); this.$router.push("/Home/Home");
} }
this.initVideo();
// todo 初始登录 帐号密码登录选中状态 // todo 初始登录 帐号密码登录选中状态
// this.init(); // this.init();
// 视频自动适应高度 // 视频自动适应高度
...@@ -175,7 +196,7 @@ export default { ...@@ -175,7 +196,7 @@ export default {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
background-image: url("../../assets/img/login/login.gif"); /* background-image: url("../../assets/img/login/login.gif"); */
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
...@@ -225,6 +246,14 @@ div { ...@@ -225,6 +246,14 @@ div {
.video_container video { .video_container video {
z-index: 0; z-index: 0;
position: absolute; position: absolute;
height: 100vh;
width: 100vw;
}
.video_container video source {
min-width: 100%;
min-height: 100%;
height: auto;
width: auto;
} }
.video_container .filter { .video_container .filter {
...@@ -235,34 +264,14 @@ div { ...@@ -235,34 +264,14 @@ div {
} }
/*滑动进入*/ /*滑动进入*/
/* 可以设置不同的进入和离开动画 */ .right-slide-enter,
/* 设置动画持续时间和动画函数 */ .right-slide-leave-active {
.slide_fade-enter-active { transform: translateX(430px);
transition: all 2s ease;
} }
.slide_fade-leave-active { .right-slide-leave-active,
transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1); .right-slide-enter-active {
} transition: all 0.8s;
.slide_fade-enter, .slide_fade-leave-to
/* .slide-fade-leave-active for below version 2.1.8 */
{
transform: translateX(1000px);
opacity: 0;
}
/*淡入淡出*/
.login_fade-enter-active,
.login_-leave-active {
/* opacity 透明度 */
transition: opacity 2s;
}
/* .fade-leave-active, 2.1.8 版本以下 */
.login_fade-enter,
.login_fade-leave-to {
opacity: 0;
} }
@keyframes fade-in { @keyframes fade-in {
...@@ -302,7 +311,7 @@ div { ...@@ -302,7 +311,7 @@ div {
.login_main_layer { .login_main_layer {
height: 100%; height: 100%;
width: 600px; width: 600px;
position: absolute; position: fixed;
right: 0; right: 0;
top: 0; top: 0;
z-index: 4; z-index: 4;
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-18 14:54:43 * @LastEditTime: 2021-11-22 09:51:27
* @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
...@@ -91,13 +91,13 @@ module.exports = { ...@@ -91,13 +91,13 @@ module.exports = {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定 // target: "http://172.18.108.2:8099/", // 张 认定
target: "http://192.168.128.110:8099", // 湖南-张 // target: "http://192.168.128.110: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://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,
...@@ -115,11 +115,11 @@ module.exports = { ...@@ -115,11 +115,11 @@ module.exports = {
} }
}, },
"/system": { "/system": {
target: "http://192.168.128.104:8765", // 湖南-王 target: "http://www.meetfood.cn:2390/system", // 湖南-王
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/system": "/security" "^/system": ""
} }
} }
// 阿里 // 阿里
......
yarn.lock deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
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