diff --git a/src/api/Violation/Violation.js b/src/api/Violation/Violation.js new file mode 100644 index 0000000..e69de29 diff --git a/src/assets/styles/updateFace.css b/src/assets/styles/updateFace.css index 0f7d488..ec5f703 100644 --- a/src/assets/styles/updateFace.css +++ b/src/assets/styles/updateFace.css @@ -1,5 +1,3 @@ - - body { background-image: url('../images/backimg.png'); background-size: 100% 100%; @@ -40,9 +38,10 @@ body { .midBoxLevelOne { flex: 5; position: relative; + display: flex; flex-direction: column; - - /* background-color: red; */ + border: .0625rem solid rgba(204, 252, 253, 0.3); + border-radius: 1.5rem; } @@ -73,11 +72,7 @@ body { border-radius: .6rem; } -.midBoxLevelOne { - border: .0625rem solid rgba(204, 252, 253, 0.3); - border-radius: 1.5rem; -} .boxLevelTwoFst { margin-bottom: 1rem; @@ -104,7 +99,7 @@ body { .faceContentTable { width: 100%; - + } @@ -165,264 +160,6 @@ tbody { flex: 1 } -.face3d { - - flex: 4; - /* background-color: #390b0b; */ -} - -.backImgCircle { - margin-left: 13.3rem; - /* width: 3rem; */ - height: 20rem; - -} - -.faceBackMain { - position: absolute; - top: 4.6875rem; - height: 14rem; - - left: 19.375rem -} - -.face3dSec { - position: relative; - flex: 2; - /* background-color: #af4d4d; */ -} - -.face3dTrd { - flex: 3; - display: flex; - /* flex-direction: column; */ - - /* background-color: #4d8d4d; */ -} - -.faceLeftTwoBox { - height: 12.3125rem; - width: 17.125rem; - position: absolute; - /* background-color: #ceb4b4; */ - top: -2.5rem; - left: 4.375rem; - -} - -.faceRightTwoBox { - height: 12.3125rem; - width: 17.125rem; - position: absolute; - /* background-color: #ceb4b4; */ - top: -2.5rem; - right: 4.375rem; - -} - -.faceLeftTwoBox { - position: absolute; - top: -2.5rem; - left: 4.375rem; -} - -.faceLeftTwoCircle { - width: 75%; - position: absolute; - top: 1.5rem; - right: 1.5625rem; - height: 10.0625rem; - /* width: 10.0625rem; */ -} - - -.faceLeftTwo { - position: absolute; - top: 3.125rem; - right: 5.625rem; - height: 4.9375rem; - width: 4.5625rem; - animation: moveandflash 4s infinite alternate; - transform: translateY(0) translateZ(0rem); -} - -.faceRightTwo { - position: absolute; - top: 3.125rem; - right: 5.625rem; - height: 4.9375rem; - width: 4.5625rem; - animation: moveandflash 4s infinite alternate; - transform: translateY(0) translateZ(0rem); -} - -@keyframes moveandflash { - 0% { - transform: translateY(0) translateZ(0rem); - } - - 10% { - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - - 20% { - transform: translateY(0rem) translateZ(0rem); - } - - 30% { - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 43% { - opacity: 1; - transform: translateY(-0.8125rem) translateZ(1.25rem); - } - 45% { - opacity: 0; - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 46% { - opacity: 1; - transform: translateY(-0.875rem) translateZ(1.25rem); - } - 47% { - opacity: .6; - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 48% { - opacity: .9; - transform: translateY(-0.75rem) translateZ(1.25rem); - } - 49% { - opacity: .2; - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 50% { - opacity: 1; - transform: translateY(-0.875rem) translateZ(1.25rem); - } - 51% { - opacity: .2; - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 52% { - opacity: .9; - transform: translateY(-0.75rem) translateZ(1.25rem); - } - 53% { - opacity: .6; - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 54% { - opacity: 1; - transform: translateY(-0.875rem) translateZ(1.25rem); - } - 55% { - opacity: 0; - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 57% { - opacity: 1; - transform: translateY(-0.8125rem) translateZ(1.25rem); - } - 70% { - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - 80% { - transform: translateY(0) translateZ(0rem); - } - - 90% { - transform: translateY(-0.9375rem) translateZ(1.25rem); - } - - 100% { - transform: translateY(0) translateZ(0rem); - } -} - -.faceLeftThreePic { - position: relative; - flex: 2; - /* background-color: #55636f; */ -} - -.faceLeftThreeCard { - flex: 5; - position: relative; - /* background-color: #1579d1; */ - -} - - -.text { - position: absolute; - margin-left: 1.875rem; - color: #ffffff; - z-index: 3; -} - -.faceThree { - - position: absolute; - left: 1.1875rem; - /* opacity: .5; */ - z-index: 1; - -} - -.smallImg2 { - position: absolute; - width: 40%; - height: 60%; - top: 3.125rem; - left: 3.125rem; - border: #51AEFE .0625rem solid; -} - -.smallImg1 { - position: absolute; - width: 40%; - height: 60%; - top: 3.125rem; - right: 3.125rem; - border: #51AEFE .0625rem solid; -} - -.nameBox { - top: 3.125rem; - left: 2.8125rem; - - position: absolute; - font-size: .875rem; - color: #ffffff; -} - -.SexBox { - top: 6.875rem; - left: 2.8125rem; - - position: absolute; - font-size: .875rem; - color: #ffffff; -} - -.nameBox2 { - top: 3.125rem; - right: 5rem; - - position: absolute; - font-size: .875rem; - color: #ffffff; -} - -.SexBox2 { - top: 6.875rem; - right: 5.625rem; - - position: absolute; - font-size: .875rem; - color: #ffffff; -} .myEcharts { width: 90%; @@ -434,4 +171,21 @@ tbody { .resultHeader { width: 100%; height: 3.0625rem; +} + +.el-upload-list__item-thumbnail, +.el-upload-list__item, +.el-upload-list__item-actions>li { + width: calc(var(--custom-size) *4.6) !important; + background-color: transparent; + border-radius: 0rem; +} + + +.el-upload-dragger, +.el-upload { + height: calc(var(--custom-size) *3.0) !important; + width: calc(var(--custom-size) *4.6) !important; + background-color: transparent !important; + border-radius: 0rem; } \ No newline at end of file diff --git a/src/views/Violation/pieVioResultCount.vue b/src/views/Violation/pieVioResultCount.vue new file mode 100644 index 0000000..b5022b8 --- /dev/null +++ b/src/views/Violation/pieVioResultCount.vue @@ -0,0 +1,150 @@ + + + + + \ No newline at end of file diff --git a/src/views/components/IDrecognition.vue b/src/views/components/IDrecognition.vue index 1721ad7..de4a83b 100644 --- a/src/views/components/IDrecognition.vue +++ b/src/views/components/IDrecognition.vue @@ -93,6 +93,7 @@ + + \ No newline at end of file diff --git a/src/views/updateFace/updateFace.vue b/src/views/updateFace/updateFace.vue index 9b3c86c..ad664ad 100644 --- a/src/views/updateFace/updateFace.vue +++ b/src/views/updateFace/updateFace.vue @@ -6,8 +6,8 @@
- error -
人脸库
+ +
@@ -24,8 +24,8 @@
- error -
识别结果统计
+ +
error @@ -52,61 +52,24 @@
- error -
人脸识别算法应用
-
- error - error -
-
-
- error - error -
-
- error - error -
-
-
+ -
-
人脸信息
- error -
-
- error -
-
姓名:
+ -
性别:
- -
-
-
识别结果
- error - -
-
- error -
-
姓名:
- -
性别:
-
-
+
- error -
服务调用统计
+ + +
- error -
服务响应监控
+ +
error
@@ -138,10 +101,15 @@ diff --git a/src/views/updateIDCard/updateIDCard.vue b/src/views/updateIDCard/updateIDCard.vue index bb43643..a52f918 100644 --- a/src/views/updateIDCard/updateIDCard.vue +++ b/src/views/updateIDCard/updateIDCard.vue @@ -5,27 +5,27 @@
- +
- +
- +
- +
- +
@@ -97,7 +97,15 @@ export default { } }, + methods: { + updateOtherData(data) { + this.$refs.pieData.getPieDataID(); + this.$refs.listResult.getListSearchData(); + this.$refs.rectData.getRectIDData(); + this.$refs.listWatch.getListWatchData(); + } +} } diff --git a/vue.config.js b/vue.config.js index 7c69175..2f3d946 100644 --- a/vue.config.js +++ b/vue.config.js @@ -34,20 +34,13 @@ module.exports = { open: true, proxy: { [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.2.35:18080`, + target: `http://192.168.2.33:18080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' } }, - // [process.env.VUE_APP_BASE_API_ID] : { - // target : "http://192.168.2.143:18080", - - // changeOrigin : true, - // pathRewrite : { - // "^/ocr" : "" - // } - // } + }, disableHostCheck: true },