diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index 0045b9b..93b10b4 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=1755072475931') format('woff2'), - url('iconfont.woff?t=1755072475931') format('woff'), - url('iconfont.ttf?t=1755072475931') format('truetype'); + src: url('iconfont.woff2?t=1755595283030') format('woff2'), + url('iconfont.woff?t=1755595283030') format('woff'), + url('iconfont.ttf?t=1755595283030') format('truetype'); } .iconfont { @@ -13,6 +13,22 @@ -moz-osx-font-smoothing: grayscale; } +.icon-yuzhuceqiye:before { + content: "\e69a"; +} + +.icon-yonghuzhuce:before { + content: "\e69b"; +} + +.icon-shenfen:before { + content: "\e698"; +} + +.icon-shenfenshimingrenzheng:before { + content: "\e699"; +} + .icon-fuzhichenggong1:before { content: "\e696"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index 26ce132..49ec07d 100644 --- a/src/assets/iconfonts/light/iconfont.js +++ b/src/assets/iconfonts/light/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3966148='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,t,z,s=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?s(l,a.firstChild):a.appendChild(l))},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=c.document,z=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,v())})}function v(){z||(z=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}v()}})(window); \ No newline at end of file +window._iconfont_svg_string_3966148='',(l=>{var a=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var h,i,o,t,z,s=function(a,c){c.parentNode.insertBefore(a,c)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_3966148,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?s(c,a.firstChild):a.appendChild(c))},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,v())})}function v(){z||(z=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}v()}})(window); \ No newline at end of file diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json index 401c345..4359081 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,34 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "704557", + "name": "预注册企业", + "font_class": "yuzhuceqiye", + "unicode": "e69a", + "unicode_decimal": 59034 + }, + { + "icon_id": "5651535", + "name": "用户注册", + "font_class": "yonghuzhuce", + "unicode": "e69b", + "unicode_decimal": 59035 + }, + { + "icon_id": "6421901", + "name": "身份", + "font_class": "shenfen", + "unicode": "e698", + "unicode_decimal": 59032 + }, + { + "icon_id": "22785279", + "name": "身份实名认证", + "font_class": "shenfenshimingrenzheng", + "unicode": "e699", + "unicode_decimal": 59033 + }, { "icon_id": "40338657", "name": "复制成功-copy", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index f9c19bc..d271b5b 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 5575a06..ac24d3d 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 39ec7c0..cf2105b 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/views/digitalScreen/module/areaSetting.vue b/src/views/digitalScreen/module/areaSetting.vue index 57566c3..4b17139 100644 --- a/src/views/digitalScreen/module/areaSetting.vue +++ b/src/views/digitalScreen/module/areaSetting.vue @@ -223,10 +223,7 @@ export default { geoJsonVisible: false, link: 'https://datav.aliyun.com/portal/school/atlas/area_selector', copied: false, - tableData: [ - // { name: '总管', libcode: 'lib001', province: '114.133561,30.641408', number: '3' }, - // { name: '分管1', libcode: 'lib001', province: '114.133561,30.641408', number: '3' } - ], + tableData: [], page: { page: 0, size: 10, @@ -259,11 +256,7 @@ export default { { required: true, message: '馆代码不可为空', trigger: 'blur' } ] }, - libImgList: [ - // { url: require('@/assets/images/cover-bg.png') }, - // { url: require('@/assets/images/cover-bg.png') }, - // { url: require('@/assets/images/cover-bg.png') } - ] + libImgList: [] } }, computed: { @@ -588,18 +581,21 @@ export default { margin-bottom: 10px; .libImg-item{ position: relative; - height: 120px; + display: flex; + justify-content: flex-start; + height: 110px; margin-right: 10px; img{ display: block; height: 100%; } i{ - position: absolute; - left: 4px; - top: 0; + // position: absolute; + // left: 4px; + // top: 0; color: red; cursor: pointer; + margin: 76px 0 0 5px; } } } diff --git a/src/views/digitalScreen/module/mediaSetting.vue b/src/views/digitalScreen/module/mediaSetting.vue index 6211704..5a7d2ed 100644 --- a/src/views/digitalScreen/module/mediaSetting.vue +++ b/src/views/digitalScreen/module/mediaSetting.vue @@ -486,9 +486,11 @@ export default { handleVideoSizeChange(size) { this.videoPage.size = size this.videoPage.page = 0 + this.initScreenVideo() }, handleVideoCurrentPage(val) { this.videoPage.page = val + this.initScreenVideo() } } } diff --git a/src/views/faceRecognition/faceRecLog.vue b/src/views/faceRecognition/faceRecLog.vue new file mode 100644 index 0000000..7412b1b --- /dev/null +++ b/src/views/faceRecognition/faceRecLog.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/faceRecognition/personInfoManage.vue b/src/views/faceRecognition/personInfoManage.vue new file mode 100644 index 0000000..6c229ed --- /dev/null +++ b/src/views/faceRecognition/personInfoManage.vue @@ -0,0 +1,270 @@ + + + + +