diff --git a/hb_client/package.json b/hb_client/package.json index 1c2f90c..7564ac1 100644 --- a/hb_client/package.json +++ b/hb_client/package.json @@ -25,6 +25,7 @@ "nprogress": "0.2.0", "path-to-regexp": "^6.2.0", "vue": "^2.6.14", + "vue-json-editor": "^1.4.3", "vue-router": "^3.5.2", "vuex": "^3.6.2", "xlsx": "^0.17.1" diff --git a/hb_client/src/layout/components/Navbar.vue b/hb_client/src/layout/components/Navbar.vue index d053e87..9d8cc17 100644 --- a/hb_client/src/layout/components/Navbar.vue +++ b/hb_client/src/layout/components/Navbar.vue @@ -45,6 +45,11 @@ import Breadcrumb from '@/components/Breadcrumb' import Hamburger from '@/components/Hamburger' export default { + data(){ + return{ + name:'' + } + }, components: { Breadcrumb, Hamburger diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index 924dfbc..795fef8 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -307,6 +307,27 @@ export const asyncRoutes = [ } ] }, + { + path: '/testModel', + component: Layout, + redirect: '/testModel/faceLogin/', + name: 'testModel', + meta: { title: '测试模块', icon: 'example' }, + children: [ + { + path: 'faceLogin', + name: 'faceLogin', + component: () => import('@/views/testModel/faceLogin'), + meta: { title: '人脸识别登录', icon: 'example' } + }, + { + path: 'markImage', + name: 'markImage', + component: () => import('@/views/testModel/markImage'), + meta: { title: '图片标记', icon: 'example' } + } + ] + }, // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } ] diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index 89377a9..9e606b4 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -4,7 +4,7 @@

航玻生产管理系统

- + @@ -38,10 +38,10 @@ tabindex="2" auto-complete="on" @keyup.enter.native="handleLogin" - > 登录登录 @@ -65,168 +65,168 @@ diff --git a/hb_client/src/views/testModel/faceLogin.vue b/hb_client/src/views/testModel/faceLogin.vue new file mode 100644 index 0000000..3e973e6 --- /dev/null +++ b/hb_client/src/views/testModel/faceLogin.vue @@ -0,0 +1,184 @@ + + + + + + diff --git a/hb_client/src/views/testModel/markImage.vue b/hb_client/src/views/testModel/markImage.vue new file mode 100644 index 0000000..4bbc7ec --- /dev/null +++ b/hb_client/src/views/testModel/markImage.vue @@ -0,0 +1,259 @@ + + + +