Skip to content

F
founder_vue
Commit d0e26d39 by 米嘉伟
Options

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

parents 886ded45 1bd74a6e
Showing with 656 additions and 190 deletions
package-lock.json
......@@ -1875,37 +1875,6 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1915,35 +1884,11 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
"integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -6810,7 +6755,7 @@
},
"image-size": {
"version": "0.5.5",
"resolved": "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz?cache=0&sync_timestamp=1618422657851&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimage-size%2Fdownload%2Fimage-size-0.5.5.tgz",
"resolved": "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true
},
......@@ -7902,7 +7847,7 @@
},
"merge-options": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/merge-options/download/merge-options-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/merge-options/download/merge-options-1.0.1.tgz?cache=0&sync_timestamp=1606147071422&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmerge-options%2Fdownload%2Fmerge-options-1.0.1.tgz",
"integrity": "sha1-KmSyRFe+zU5NxggoMkfpTOWJqjI=",
"dev": true,
"requires": {
......@@ -8537,6 +8482,11 @@
"set-blocking": "~2.0.0"
}
},
"nprogress": {
"version": "0.2.0",
"resolved": "https://registry.nlark.com/nprogress/download/nprogress-0.2.0.tgz",
"integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
},
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/nth-check/download/nth-check-1.0.2.tgz",
......@@ -9827,7 +9777,7 @@
},
"posthtml-parser": {
"version": "0.2.1",
"resolved": "https://registry.nlark.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz",
"resolved": "https://registry.nlark.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz?cache=0&sync_timestamp=1630307510188&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fposthtml-parser%2Fdownload%2Fposthtml-parser-0.2.1.tgz",
"integrity": "sha1-NdUw3jhnQMK6JP8usvrznM3ycd0=",
"dev": true,
"requires": {
......@@ -9848,7 +9798,7 @@
},
"posthtml-rename-id": {
"version": "1.0.12",
"resolved": "https://registry.npm.taobao.org/posthtml-rename-id/download/posthtml-rename-id-1.0.12.tgz",
"resolved": "https://registry.nlark.com/posthtml-rename-id/download/posthtml-rename-id-1.0.12.tgz",
"integrity": "sha1-z39us3FGvxr6wx5o8YxswZrmFDM=",
"dev": true,
"requires": {
......@@ -9857,7 +9807,7 @@
},
"posthtml-render": {
"version": "1.4.0",
"resolved": "https://registry.nlark.com/posthtml-render/download/posthtml-render-1.4.0.tgz?cache=0&sync_timestamp=1627374552910&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fposthtml-render%2Fdownload%2Fposthtml-render-1.4.0.tgz",
"resolved": "https://registry.nlark.com/posthtml-render/download/posthtml-render-1.4.0.tgz?cache=0&sync_timestamp=1627374519063&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fposthtml-render%2Fdownload%2Fposthtml-render-1.4.0.tgz",
"integrity": "sha1-QBFAcMRYgcrLkzR9rj7/U6+8/xM=",
"dev": true
},
......@@ -11864,13 +11814,13 @@
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz",
"resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
......@@ -11883,7 +11833,7 @@
"dependencies": {
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1626703414084&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true
}
......@@ -11891,7 +11841,7 @@
},
"clone": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz",
"resolved": "https://registry.nlark.com/clone/download/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
"dev": true
},
......@@ -11906,7 +11856,7 @@
},
"extend-shallow": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
"resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
......@@ -11915,7 +11865,7 @@
},
"has-flag": {
"version": "1.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-1.0.0.tgz",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-1.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-1.0.0.tgz",
"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
"dev": true
},
......@@ -11955,7 +11905,7 @@
},
"is-descriptor": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
"resolved": "https://registry.nlark.com/is-descriptor/download/is-descriptor-1.0.2.tgz",
"integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
"dev": true,
"requires": {
......@@ -12001,7 +11951,7 @@
},
"postcss": {
"version": "5.2.18",
"resolved": "https://registry.npmmirror.com/postcss/download/postcss-5.2.18.tgz",
"resolved": "https://registry.nlark.com/postcss/download/postcss-5.2.18.tgz?cache=0&sync_timestamp=1626882960231&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-5.2.18.tgz",
"integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
"dev": true,
"requires": {
......@@ -12019,7 +11969,7 @@
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-3.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
......@@ -12028,7 +11978,7 @@
},
"supports-color": {
"version": "3.2.3",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-3.2.3.tgz?cache=0&sync_timestamp=1626703414084&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-3.2.3.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
......@@ -12050,7 +12000,7 @@
"dependencies": {
"deepmerge": {
"version": "1.3.2",
"resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz?cache=0&sync_timestamp=1606805746825&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.3.2.tgz",
"resolved": "https://registry.nlark.com/deepmerge/download/deepmerge-1.3.2.tgz",
"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
"dev": true
}
......@@ -12058,7 +12008,7 @@
},
"svg-sprite-loader": {
"version": "6.0.9",
"resolved": "https://registry.nlark.com/svg-sprite-loader/download/svg-sprite-loader-6.0.9.tgz?cache=0&sync_timestamp=1624440852954&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsvg-sprite-loader%2Fdownload%2Fsvg-sprite-loader-6.0.9.tgz",
"resolved": "https://registry.nlark.com/svg-sprite-loader/download/svg-sprite-loader-6.0.9.tgz",
"integrity": "sha1-8aEInDhgDr1fuNCd+jyDqkQ0orQ=",
"dev": true,
"requires": {
......@@ -12074,7 +12024,7 @@
"dependencies": {
"deepmerge": {
"version": "1.3.2",
"resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz?cache=0&sync_timestamp=1606805746825&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.3.2.tgz",
"resolved": "https://registry.nlark.com/deepmerge/download/deepmerge-1.3.2.tgz",
"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
"dev": true
}
......@@ -12655,7 +12605,7 @@
},
"unidecode": {
"version": "0.1.8",
"resolved": "https://registry.npm.taobao.org/unidecode/download/unidecode-0.1.8.tgz",
"resolved": "https://registry.nlark.com/unidecode/download/unidecode-0.1.8.tgz",
"integrity": "sha1-77swFTi8RSRqmsjFWdcvAVMFBT4=",
"dev": true
},
......@@ -13066,6 +13016,63 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632349895587&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
"integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
package.json
......@@ -18,6 +18,7 @@
"html2canvas": "^1.3.2",
"js-cookie": "^2.2.1",
"moment": "^2.29.1",
"nprogress": "^0.2.0",
"qs": "^6.9.4",
"sass-resources-loader": "^2.1.1",
"serve": "^12.0.0",
......
src/assets/img/Home/quit_d.svg
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>退出 (1)</title>
<title>登出</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="方正指掌纹-案件指纹" transform="translate(-1881.000000, -44.000000)" fill-rule="nonzero">
......
src/assets/styles/main.scss
// 参考文档：https://element.faas.ele.me/#/zh-CN/component/color#fu-zhu-se
//主色调，红色：#FF0036，绿色 #4CAF50，蓝色：#03A9F4，黄色：#FF9800，粉色：#FF547B，棕色：#C3A769，浅绿色：#65C4AA，黑色：#333333，紫色：#B323B4，淡粉色：#FF8B8B,element UI：#409eff
$base-color: #ff547b;
$base-color: #03A9F4;
$base-color-success: #4caf50;
$base-color-warning: #e6a23c;
$base-color-danger: #f56c6c;
......
src/components/ImageEd.scss
......@@ -1148,3 +1148,44 @@ div {
width: 20px;
height: 20px;
}
// 修改滑动条样式
// input[type="range"] {
// -webkit-appearance: none;
// overflow: hidden;
// width: 200px;
// height: 20px;
// outline: none;
// background: #eeeeee;
// }
// input[type="range"]::-webkit-slider-thumb {
// -webkit-appearance: none;
// position: relative;
// width: 10px;
// height: 10px;
// background: #f22;
// border-radius: 50%;
// transition: 0.2s;
// }
// input[type="range"]::-webkit-slider-thumb:before,
// input[type="range"]::-webkit-slider-thumb:after {
// position: absolute;
// top: 3px;
// width: 2000px; /* 长度很长没关系，因为刚刚有用 overflow:hidden 了 */
// height: 4px;
// content: "";
// pointer-events: none; /* 让鼠标可以点击穿透伪元素，不然会点不到下面 */
// transition: 0.2s;
// }
// input[type="range"]::-webkit-slider-thumb:before {
// left: -1997px;
// background: #f22;
// }
// input[type="range"]::-webkit-slider-thumb:after {
// left: 10px;
// background: #edc;
// }
src/icons/logout_a.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>登出</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="方正指掌纹-案件指纹" transform="translate(-1881.000000, -24.000000)" fill="#000000" fill-rule="nonzero">
<g id="登出" transform="translate(280.000000, 0.000000)">
<g id="退出-2" transform="translate(1600.000000, 23.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M11.8592593,2.1589054 C13.8539124,3.47150844 15.0385065,5.71335327 14.9990441,8.10094918 C14.942048,11.9259774 11.8122625,15 7.99952375,15 L7.89953061,15 C6.04192998,14.9778668 4.27039922,14.2133861 2.97986775,12.8769844 C1.68204585,11.5488708 0.969476392,9.75668919 1.00100335,7.89994769 C1.02540115,5.71940013 2.07117018,3.6765713 3.82580978,2.38190705 C4.04782363,2.20197713 4.3506053,2.15825962 4.61444288,2.26803927 C4.87828046,2.37781893 5.06069764,2.62342185 5.08957146,2.90774312 C5.11844528,3.19206439 4.98912722,3.46932993 4.75274625,3.62991624 C3.38756563,4.63700888 2.57417911,6.22650974 2.5558968,7.92294787 C2.53141389,9.3675181 3.08592603,10.7618259 4.09579127,11.7949764 C5.09911431,12.8338639 6.4764055,13.4280346 7.92052917,13.4449885 C9.36371183,13.4619634 10.7553378,12.9089361 11.7932638,11.9059772 C12.8319434,10.9020765 13.4260193,9.52443586 13.4431507,8.07994903 C13.4742959,6.22172408 12.5521338,4.47687912 10.9993182,3.45591496 C10.6703397,3.20821883 10.5909714,2.74723676 10.8181677,2.40376822 C11.045364,2.06029967 11.5006262,1.95301676 11.8572594,2.1589054 L11.8592593,2.1589054 Z M7.99952375,8.77795417 C7.56987566,8.77795417 7.22157707,8.42962913 7.22157707,7.99994843 L7.22157707,1.7779026 C7.22163402,1.34826218 7.56991594,1 7.99952376,1 C8.42913158,1 8.77741349,1.34826218 8.77747044,1.7779026 L8.77747044,7.99994843 C8.77747044,8.42995161 8.42849436,8.77795417 7.99952375,8.77795417 L7.99952375,8.77795417 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/icons/logout_d.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>登出</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="方正指掌纹-案件指纹" transform="translate(-1881.000000, -44.000000)" fill-rule="nonzero">
<g id="编组-8" transform="translate(280.000000, 0.000000)">
<g id="登出" transform="translate(1600.000000, 43.000000)">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M11.8592593,2.1589054 C13.8539124,3.47150844 15.0385065,5.71335327 14.9990441,8.10094918 C14.942048,11.9259774 11.8122625,15 7.99952375,15 L7.89953061,15 C6.04192998,14.9778668 4.27039922,14.2133861 2.97986775,12.8769844 C1.68204585,11.5488708 0.969476392,9.75668919 1.00100335,7.89994769 C1.02540115,5.71940013 2.07117018,3.6765713 3.82580978,2.38190705 C4.04782363,2.20197713 4.3506053,2.15825962 4.61444288,2.26803927 C4.87828046,2.37781893 5.06069764,2.62342185 5.08957146,2.90774312 C5.11844528,3.19206439 4.98912722,3.46932993 4.75274625,3.62991624 C3.38756563,4.63700888 2.57417911,6.22650974 2.5558968,7.92294787 C2.53141389,9.3675181 3.08592603,10.7618259 4.09579127,11.7949764 C5.09911431,12.8338639 6.4764055,13.4280346 7.92052917,13.4449885 C9.36371183,13.4619634 10.7553378,12.9089361 11.7932638,11.9059772 C12.8319434,10.9020765 13.4260193,9.52443586 13.4431507,8.07994903 C13.4742959,6.22172408 12.5521338,4.47687912 10.9993182,3.45591496 C10.6703397,3.20821883 10.5909714,2.74723676 10.8181677,2.40376822 C11.045364,2.06029967 11.5006262,1.95301676 11.8572594,2.1589054 L11.8592593,2.1589054 Z M7.99952375,8.77795417 C7.56987566,8.77795417 7.22157707,8.42962913 7.22157707,7.99994843 L7.22157707,1.7779026 C7.22163402,1.34826218 7.56991594,1 7.99952376,1 C8.42913158,1 8.77741349,1.34826218 8.77747044,1.7779026 L8.77747044,7.99994843 C8.77747044,8.42995161 8.42849436,8.77795417 7.99952375,8.77795417 L7.99952375,8.77795417 Z" id="形状" fill="#595959"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-10-16 14:11:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
*/
"use strict";
import Vue from "vue";
import axios from "axios";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css'
// Full config: https://github.com/axios/axios#request-config
// axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
......@@ -18,10 +28,13 @@ const _axios = axios.create(config);
_axios.interceptors.request.use(
function(config) {
console.log('开始');
NProgress.start();
// Do something before request is sent
return config;
},
function(error) {
NProgress.start();
// Do something with request error
return Promise.reject(error);
}
......@@ -30,10 +43,13 @@ _axios.interceptors.request.use(
// Add a response interceptor
_axios.interceptors.response.use(
function(response) {
console.log('结束');
NProgress.done();
// Do something with response data
return response;
},
function(error) {
NProgress.done();
// Do something with response error
return Promise.reject(error);
}
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -65,7 +65,7 @@
<div
class="btn"
@click="isShowDcftpxBtn"
>导出FPTX</div>
>导出FTPX</div>
<div
class="btn"
@click="isShowGzBtn"
......
src/views/Home.vue
......@@ -3,7 +3,7 @@
<el-container class="layout-container">
<transition name="slide">
<el-aside :width="isCollapse ? '64px' : '280px'" class="aside">
<div class="logo" :class="{'minLogo': isCollapse}">
<div class="logo" :class="{'minLogo': isCollapse}" @click="$router.push('/Home/Home')">
<img class="jh" src="../assets/img/Home/jh.png" alt="">
<img v-show="!isCollapse" class="title" src="../assets/img/Home/title.png" alt="">
</div>
......@@ -49,7 +49,11 @@
<div class="message">
<div class="circle"></div>
</div>
<div class="quit" @click="goLogin"></div>
<div class="quit" @click="$router.push('/Home/Home')"></div>
<div class="logout" @click="logout">
<svg-icon v-show="!isHoverLogout" icon-class="logout_d" class="icon" @mouseover="isHoverLogout=true" @mouseleave="isHoverLogout=false"/>
<svg-icon v-show="isHoverLogout" icon-class="logout_a" class="icon"/>
</div>
</div>
</el-header>
<el-main class='main'>
......@@ -79,6 +83,8 @@
</template>
<script>
import "@/icons/logout_d.svg";
import "@/icons/logout_a.svg";
import indexRoutes from "@/router/modules/index";
import { mapGetters } from "vuex";
export default {
......@@ -94,6 +100,7 @@ export default {
],
menuActive: '',
isHoverLogout: false
};
},
created () {
......@@ -108,21 +115,22 @@ export default {
},
methods: {
/**
* @description: 开始搜索
* @description: 退出登录
* @param {*}
* @return {*}
*/
goSearch() {
this.searchTxt = ''
console.log(this.searchTxt);
logout() {
console.log('退出登录');
this.$router.replace('/login1')
},
/**
* @description: 退回登录页
* @description: 开始搜索
* @param {*}
* @return {*}
*/
goLogin() {
this.$router.push('Login')
goSearch() {
this.searchTxt = ''
console.log(this.searchTxt);
},
/**
* @description: 调回任务管理
......@@ -424,6 +432,19 @@ export default {
}
margin-left: 25px;
}
.logout {
cursor: pointer;
width: 14px;
height: 12px;
display: flex;
justify-content: center;
align-items: center;
margin-left: 25px;
.icon {
width: 100%;
height: 100%;
}
}
}
}
......
src/views/Home/Home.vue
......@@ -61,7 +61,7 @@
</div>
<div class="import_FTP">
<img src="../../assets/img/Home/import_FTP.svg" alt="" />
<div>导入FTP</div>
<div>导入FTPX</div>
</div>
</div>
<!-- 第二列 -->
......
src/views/cxyrd/QueryConfirm.vue
......@@ -1118,7 +1118,7 @@ const setQueryClass = [
}
}
/deep/ .btn-prev,
/deep/.btn-next {
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
......@@ -1145,7 +1145,7 @@ const setQueryClass = [
}
}
</style>
<style scoped>
<style scoped lang="scss">
div {
margin: 0;
padding: 0;
......@@ -1361,14 +1361,14 @@ b {
}
</style>
<!--table树-->
<style scoped>
<style scoped lang="scss">
.el-tree /deep/ .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
/*有子节点 且未展开*/
.el-table/deep/ .el-icon-arrow-right:before {
background: url("../../icons/tree_f.svg") no-repeat 0 3px;
.el-table /deep/ .el-icon-arrow-right:before {
// background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
......@@ -1377,9 +1377,9 @@ b {
background-size: 16px;
}
/*有子节点 且已展开*/
.el-table/deep/ .el-table__expand-icon--expanded {
.el-table /deep/ .el-table__expand-icon--expanded {
.el-icon-arrow-right:before {
background: url("../../icons/tree_c.svg") no-repeat 0 3px;
// background: url("../../icons/tree_c.svg") no-repeat 0 3px;
content: "";
display: block;
width: 15px;
......@@ -1390,9 +1390,9 @@ b {
}
/*没有子节点*/
.el-tree
/deep/.el-tree-node__expand-icon.is-leaf::before
.el-table/deep/.el-table__placeholder::before {
background: url("../../icons/tree_f.svg") no-repeat 0 3px;
/deep/ .el-tree-node__expand-icon.is-leaf::before
.el-table /deep/ .el-table__placeholder::before {
// background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
......
src/views/cxyrd/TL.vue
......@@ -83,7 +83,7 @@
<el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
<div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> -->
<svg-icon icon-class="error" class="icon"/>
<svg-icon icon-class="error" class="icon" />
</div>
<div class="error-desc" v-show="isPhoneError">联系电话不应低于7位数！</div>
</div>
......@@ -100,62 +100,6 @@
</div>
</div>
</div>
<!-- <el-dialog class="bz-dialog" title="比中" :visible.sync="isDialogShow" :modal-append-to-body="false">
<div class="tl">
<div class="type">
<div class="outside">
<div class="label">查询类型：</div>
<div class="content">倒查</div>
<div class="label">人员编号：</div>
<div class="content">{{rybh}}</div>
<div class="label">指位：</div>
<div class="content">平面-右拇</div>
</div>
<div class="outside">
<div class="label">现场勘验编号：</div>
<div class="content">K1231231231231231231232</div>
<div class="label">案事件编号：</div>
<div class="content">{{ajbh}}</div>
<div class="label">序号：</div>
<div class="content">
<el-radio-group v-model="radio">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
</div>
</div>
</div>
<div class="other">
<div class="outside">
<div class="label">比中单位：</div>
<div class="content">北京市朝阳区公安局分局</div>
<div class="label">单位代码：</div>
<div class="content">123123123123</div>
<div class="label">比中时间：</div>
<div class="content">{{bzData}}</div>
</div>
<div class="outside">
<div class="label">比中人：</div>
<div class="content">{{userdesc}}</div>
<div class="label">比中人身份证号：</div>
<div class="content">412************016</div>
<div class="label">比中人联系电话：</div>
<div class="content">110</div>
</div>
</div>
<div class="remark">
<div class="label">备注</div>
<el-input class="remark-input" type="textarea" placeholder="在此输入备注信息" :rows="4" v-model="text">
</el-input>
</div>
<div class="btns">
<div class="ok-btn" @click="confirmBz">确认</div>
<div class="close-btn" @click="isDialogShow = false">取消</div>
</div>
</div>
</el-dialog> -->
<!-- <div v-show="dialog" class="popContainer" @click="hideDialog"></div>-->
</div>
</template>
......@@ -249,6 +193,9 @@ export default {
self.$bus.emit("updateTLSourceData");
console.log(response);
this.$message.success('比中成功！')
// 关闭弹窗
this.isShowbzDialog = false
this.isShowbzDialogBg = false
}).catch(err => {
this.$message.error('比中失败！')
})
......@@ -269,7 +216,7 @@ export default {
barcode: destbarcode
}
}).then(res => {
if(res.data.code == 0) {
if (res.data.code == 0) {
self.xckybh = res.data.ret.kybh
}
})
......
src/views/cxyrd/TT.vue
......@@ -6,7 +6,6 @@
<div class="bz-btn" @click="Bz">比中</div>
<div class="rd-btn" @click="Rdwc">认定完成</div>
</div>
e
</div>
<div class="tt_main">
<div class="tt_main_top">
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -1065,7 +1065,7 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
this.$axios
.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destseqno}/`)
.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destseqno}`)
.then(response => {
console.log(response);
self.$bus.emit("changImageEditTarget", response.data.ret.image);
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -28,6 +28,33 @@
</div>
<br />
<img :src="'data:image/jpeg;base64,'+item.image" style="width: 106px;height: 106px;" />
<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="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>
<!--指纹个数提示-->
......@@ -373,35 +400,138 @@ const datas = [
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) 0%, #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: Microsoft YaHei;
color: #FFFFFF;
}
.fingerLook {
border: 1px solid #333;
}
.fingerRD {
border: 1px solid #055fe7;
.affirmstatus2 {
.dot {
background: #FF0039;
}
.fingerBZ {
border: 1px solid #FF0039;
}
.fingerRB {
border: 1px solid #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;
}
.fingerLookNum {
background:#ddebff !important;
color: #303133 !important;
.icon {
width: 14px;
height: 14px;
display: flex;
.rb {
position: relative;
width: 14px;
height: 14px;
object-fit: contain;
}
.fingerRDNum {
background:#055fe7 !important;
color: #ffffff !important;
}
.fingerBZNum {
background: #FF0039 !important;
color: #ffffff !important;
}
.fingerRBNum {
background: #FF0039 !important;
color: #ffffff !important;
.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 {
// border: 1px solid #333;
// }
// .fingerRD {
// border: 1px solid #055fe7;
// }
// .fingerBZ {
// border: 1px solid #FF0039;
// }
// .fingerRB {
// border: 1px solid #FF0039;
// }
// .fingerLookNum {
// background:#ddebff !important;
// color: #303133 !important;
// }
// .fingerRDNum {
// background:#055fe7 !important;
// color: #ffffff !important;
// }
// .fingerBZNum {
// background: #FF0039 !important;
// color: #ffffff !important;
// }
// .fingerRBNum {
// background: #FF0039 !important;
// color: #ffffff !important;
// }
.finger_print_active {
position: relative;
width: 106px;
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -60,7 +60,7 @@ export default {
sessionStorage.setItem("backcheckXh", val.destseqno)
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
this.$axios
.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}/`)
.get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}`)
.then(response => {
console.log(response);
self.$bus.emit("changImageEditTarget", response.data.ret.image);
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -19,7 +19,7 @@
}}</el-button>
</div>
</div>
<!-- 指纹图-->
<!-- 指纹图 -->
<div class="finger-print" v-show="isShowPrint">
<div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
......@@ -31,12 +31,41 @@
<label>左手</label>
<br />
<div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersLeftR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, finger_print_active: item.code === isActive}" @click="changeStyleLeftR(index, item)">
<div class="finger" v-for="(item, index) in fingersLeftR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLeftR(index, item)">
<svg-icon v-if="fingerLoading" icon-class="loading" class="icon" />
<div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 -->
<img v-if="item.image" :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<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="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 v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -49,12 +78,41 @@
<div class="outside">
<label>右手</label><br />
<div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersRightR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, finger_print_active: item.code === isActive}" @click="changeStyleRightR(index, item)">
<div class="finger" v-for="(item, index) in fingersRightR" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRightR(index, item)">
<svg-icon v-if="fingerLoading" icon-class="loading" class="icon" />
<div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 -->
<img v-if="item.image" :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<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="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 v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -70,12 +128,41 @@
<label>左手</label>
<br />
<div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersLeftL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, finger_print_active: item.code === isActive}" @click="changeStyleLeftL(index, item)">
<div class="finger" v-for="(item, index) in fingersLeftL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLeftL(index, item)">
<svg-icon v-if="fingerLoading" icon-class="loading" class="icon" />
<div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 -->
<img v-if="item.image" :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<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="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 v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -88,12 +175,41 @@
<div class="outside">
<label>右手</label><br />
<div class="fingersImg">
<div class="finger" v-for="(item, index) in fingersRightL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, finger_print_active: item.code === isActive}" @click="changeStyleRightL(index, item)">
<div class="finger" v-for="(item, index) in fingersRightL" :key="index" :class="{noFinger: !item.image, fingerLoading: !item.image && fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRightL(index, item)">
<svg-icon v-if="fingerLoading" icon-class="loading" class="icon" />
<div v-else>
<div class="num" :class="{noFinger: !item.image}">{{item.name}}</div>
<!-- 有指纹图片 -->
<img v-if="item.image" :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<div v-if="item.image">
<img :src="'data:image/jpeg;base64,' + item.image" style="width: 100px;height: 100px;" />
<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="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 v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -112,6 +228,8 @@
</template>
<script>
import 'nprogress/nprogress.css'
import NProgress from 'nprogress';
import "@/icons/loading.svg";
import IconSvg from '../../../utils/IconSvg.vue';
export default {
......@@ -245,22 +363,31 @@ export default {
// 获取接口数据前先初始化
self.fingersLeftR.forEach(itemR => {
self.$set(itemR, 'image', null)
self.$set(itemR, 'clickLog', '')
self.$set(itemR, 'affirmstatus', '')
})
self.fingersRightR.forEach(itemR => {
self.$set(itemR, 'image', null)
self.$set(itemR, 'clickLog', '')
self.$set(itemR, 'affirmstatus', '')
})
self.fingersLeftL.forEach(itemL => {
self.$set(itemL, 'image', null)
self.$set(itemL, 'clickLog', '')
self.$set(itemL, 'affirmstatus', '')
})
self.fingersRightL.forEach(itemL => {
self.$set(itemL, 'image', null)
self.$set(itemL, 'clickLog', '')
self.$set(itemL, 'affirmstatus', '')
})
NProgress.start();
// 平面
let fingerPain = await this.$axios
.post(`/api/org/plainByBarcode/barcode`, {
barcode: barcode,
qqid: self.qqid,
querytype: '2'
querytype: '1'
})
console.log(fingerPain);
if (fingerPain.data.ret && fingerPain.data.ret.length > 0) {
......@@ -271,6 +398,8 @@ export default {
if (itemL.code == element.seq) {
// itemL.img = element.image
self.$set(itemL, 'image', element.image)
self.$set(itemL, 'clickLog', element.clickLog)
self.$set(itemL, 'affirmstatus', element.clickLog)
} else {
// itemL.img = null
// self.$set(itemL, 'image', null)
......@@ -280,6 +409,8 @@ export default {
if (itemL.code == element.seq) {
// itemL.img = element.image
self.$set(itemL, 'image', element.image)
self.$set(itemL, 'clickLog', element.clickLog)
self.$set(itemL, 'affirmstatus', element.clickLog)
} else {
// itemL.img = null
// self.$set(itemL, 'image', null)
......@@ -293,10 +424,14 @@ export default {
self.fingersLeftL.forEach(itemL => {
// itemL.img = null
self.$set(itemL, 'image', null)
self.$set(itemL, 'clickLog', '')
self.$set(itemL, 'affirmstatus', '')
})
self.fingersRightL.forEach(itemL => {
// itemL.img = null
self.$set(itemL, 'image', null)
self.$set(itemL, 'clickLog', '')
self.$set(itemL, 'affirmstatus', '')
})
}
......@@ -306,7 +441,7 @@ export default {
.post(`/api/org/rollByBarcode/barcode`, {
barcode: barcode,
qqid: self.qqid,
querytype: '2'
querytype: '1'
})
console.log(fingerRoll);
if (fingerRoll.data.ret && fingerRoll.data.ret.length > 0) {
......@@ -316,6 +451,8 @@ export default {
if (itemR.code == element.seq) {
// itemR.img = element.image
self.$set(itemR, 'image', element.image)
self.$set(itemR, 'clickLog', element.clickLog)
self.$set(itemR, 'affirmstatus', element.affirmstatus)
} else {
// itemR.img = null
// self.$set(itemR, 'image', null)
......@@ -325,6 +462,8 @@ export default {
if (itemR.code == element.seq) {
// self.$set(itemR, 'img', element.image)
self.$set(itemR, 'image', element.image)
self.$set(itemR, 'clickLog', element.clickLog)
self.$set(itemR, 'affirmstatus', element.affirmstatus)
// itemR.img = element.image
} else {
// itemR.img = null
......@@ -340,10 +479,14 @@ export default {
self.fingersLeftR.forEach(itemR => {
// itemR.img = null
self.$set(itemR, 'image', null)
self.$set(itemR, 'clickLog', '')
self.$set(itemR, 'affirmstatus', '')
})
self.fingersRightR.forEach(itemR => {
// itemR.img = null
self.$set(itemR, 'image', null)
self.$set(itemR, 'clickLog', '')
self.$set(itemR, 'affirmstatus', '')
})
}
self.fingerTotal = self.fingerTotalRoll + self.fingerTotalPain
......@@ -351,6 +494,7 @@ export default {
this.isActive = "";
// 去掉加载状态
this.fingerLoading = false
NProgress.done();
// 默认点击第一张图片，展示目标列表数据
await self.findFinger()
......@@ -372,6 +516,7 @@ export default {
// 获取列表数据
async getDetailData () {
// 发送请求
NProgress.start();
console.info(this.dataList);
let self = this
await this.$axios
......@@ -387,6 +532,7 @@ export default {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
})
});
NProgress.done();
},
/**
* @description: 找到第一个有图片的指纹用来初始化展示
......@@ -465,11 +611,13 @@ export default {
if (imageInfo.code) {
this.$bus.emit('changImageEdit', imageInfo.image)
}
NProgress.start();
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem('srcbarcode') })
.then(response => {
console.log(response);
self.$bus.emit('initTLCandidate', response.data.ret)
})
NProgress.done();
},
/**
* @description: 单击右手指纹事件-滚动
......@@ -487,11 +635,13 @@ export default {
if (imageInfo.code) {
this.$bus.emit('changImageEdit', imageInfo.image)
}
NProgress.start();
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem('srcbarcode') })
.then(response => {
console.log(response);
self.$bus.emit('initTLCandidate', response.data.ret)
})
NProgress.done();
},
/**
* @description: 单击左手指纹事件-平面
......@@ -509,11 +659,13 @@ export default {
if (imageInfo.code) {
this.$bus.emit('changImageEdit', imageInfo.image)
}
NProgress.start();
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem('srcbarcode') })
.then(response => {
console.log(response);
self.$bus.emit('initTLCandidate', response.data.ret)
})
NProgress.done();
},
/**
* @description: 单击右手指纹事件-平面
......@@ -531,11 +683,13 @@ export default {
if (imageInfo.code) {
this.$bus.emit('changImageEdit', imageInfo.image)
}
NProgress.start();
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { "matchcandReqTo": { "srcbarcode": sessionStorage.getItem('srcbarcode') } })
.then(response => {
console.log(response);
self.$bus.emit('initTLCandidate', response.data.ret)
})
NProgress.done();
},
},
watch: {
......@@ -655,6 +809,121 @@ label {
width: 36px;
height: 40px;
}
.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) 0%, #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: Microsoft YaHei;
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 {
// border: 1px solid #333;
// }
// &.fingerRD {
// border: 1px solid #055fe7;
// }
// &.fingerBZ {
// border: 1px solid #FF0039;
// }
// &.fingerRB {
// border: 1px solid #FF0039;
// }
&.finger_print_active {
border: 1px solid #055FE7 !important;
}
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-10-15 13:52:44
* @LastEditTime: 2021-10-15 20:34:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -87,6 +87,7 @@ module.exports = {
// target: "http://192.168.128.104:8099", // 湖南-马
target: "http://47.92.226.24:3004/", // 登录
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
ws: true,
changeOrigin: true,
pathRewrite: {
......
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