diff --git a/package.json b/package.json index 8825fcb..ab71d57 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "pdfdist-mergeofd": "^2.2.228", "pdfjs-dist": "^2.12.313", "print-js": "^1.6.0", + "qrcodejs2": "^0.0.2", "qs": "^6.10.1", "quill": "^1.3.7", "quill-image-resize-module": "^3.0.0", diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index 9cfcfe3..bc8a99a 100644 --- a/src/assets/iconfonts/light/iconfont.css +++ b/src/assets/iconfonts/light/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3966148 */ - src: url('iconfont.woff2?t=1756345950057') format('woff2'), - url('iconfont.woff?t=1756345950057') format('woff'), - url('iconfont.ttf?t=1756345950057') format('truetype'); + src: url('iconfont.woff2?t=1757381540478') format('woff2'), + url('iconfont.woff?t=1757381540478') format('woff'), + url('iconfont.ttf?t=1757381540478') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-yooxi:before { + content: "\e69d"; +} + +.icon-heimingdan:before { + content: "\e69f"; +} + .icon-caidan:before { content: "\e69c"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index cce0bd2..dccca42 100644 --- a/src/assets/iconfonts/light/iconfont.js +++ b/src/assets/iconfonts/light/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3966148='',(l=>{var c=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,z,v=function(c,a){a.parentNode.insertBefore(c,a)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}h=function(){var c,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_3966148,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?v(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,z=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,s())})}function s(){z||(z=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(c){return void setTimeout(p,50)}s()}})(window); \ No newline at end of file +window._iconfont_svg_string_3966148='',(l=>{var c=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,z,v=function(c,a){a.parentNode.insertBefore(c,a)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}h=function(){var c,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_3966148,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?v(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,z=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,s())})}function s(){z||(z=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(c){return void setTimeout(p,50)}s()}})(window); \ No newline at end of file diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json index 31570bc..3ac700a 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "778898", + "name": "vip", + "font_class": "yooxi", + "unicode": "e69d", + "unicode_decimal": 59037 + }, + { + "icon_id": "9826652", + "name": "黑名单", + "font_class": "heimingdan", + "unicode": "e69f", + "unicode_decimal": 59039 + }, { "icon_id": "4438260", "name": "菜单", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index d7b4a18..fe57211 100644 Binary files a/src/assets/iconfonts/light/iconfont.ttf and b/src/assets/iconfonts/light/iconfont.ttf differ diff --git a/src/assets/iconfonts/light/iconfont.woff b/src/assets/iconfonts/light/iconfont.woff index ebdcba7..fa16613 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff and b/src/assets/iconfonts/light/iconfont.woff differ diff --git a/src/assets/iconfonts/light/iconfont.woff2 b/src/assets/iconfonts/light/iconfont.woff2 index a49fddb..a7b4a93 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/assets/images/user.jpg b/src/assets/images/user.jpg new file mode 100644 index 0000000..de47123 Binary files /dev/null and b/src/assets/images/user.jpg differ diff --git a/src/views/digitalScreen/module/areaSetting.vue b/src/views/digitalScreen/module/areaSetting.vue index 15646ed..c62695a 100644 --- a/src/views/digitalScreen/module/areaSetting.vue +++ b/src/views/digitalScreen/module/areaSetting.vue @@ -127,7 +127,7 @@ > {{ link }} - +

2.在地图上找到并选择正确的区域(区域最小单位是:区/县)

diff --git a/src/views/faceRecognition/faceRecLog.vue b/src/views/faceRecognition/faceRecLog.vue index 7412b1b..45ac316 100644 --- a/src/views/faceRecognition/faceRecLog.vue +++ b/src/views/faceRecognition/faceRecLog.vue @@ -4,9 +4,9 @@
@@ -46,6 +50,7 @@ + @@ -56,7 +61,7 @@ - +
@@ -94,6 +99,11 @@ export default { edit: ['admin', 'column:edit'], del: ['admin', 'column:del'] }, + userTypeOptions: [ + { key: '1', display_name: '普通用户' }, + { key: '2', display_name: 'VIP用户' }, + { key: '3', display_name: '黑名单用户' } + ], enabledTypeOptions: [ { key: '1', display_name: '借书登录' }, { key: '2', display_name: '信息绑定登录' }, diff --git a/src/views/faceRecognition/module/batchImport.vue b/src/views/faceRecognition/module/batchImport.vue new file mode 100644 index 0000000..18313c2 --- /dev/null +++ b/src/views/faceRecognition/module/batchImport.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/views/faceRecognition/module/faceSearch.vue b/src/views/faceRecognition/module/faceSearch.vue new file mode 100644 index 0000000..996a208 --- /dev/null +++ b/src/views/faceRecognition/module/faceSearch.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/src/views/faceRecognition/module/selfRegister.vue b/src/views/faceRecognition/module/selfRegister.vue new file mode 100644 index 0000000..6511d9b --- /dev/null +++ b/src/views/faceRecognition/module/selfRegister.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/views/faceRecognition/personInfoManage.vue b/src/views/faceRecognition/personInfoManage.vue index 6c229ed..de00fcf 100644 --- a/src/views/faceRecognition/personInfoManage.vue +++ b/src/views/faceRecognition/personInfoManage.vue @@ -1,20 +1,18 @@