Commit fb77ab44 by mr.wang

feat: 人像比对详情页面调试

parent cbd0b90b
......@@ -1825,6 +1825,37 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://r.cnpmjs.org/ansi-styles/download/ansi-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://r.cnpmjs.org/chalk/download/chalk-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://r.cnpmjs.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"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",
......@@ -1834,11 +1865,35 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://r.cnpmjs.org/loader-utils/download/loader-utils-2.0.2.tgz",
"integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
"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.3",
"resolved": "https://r.cnpmjs.org/vue-loader/download/vue-loader-16.8.3.tgz",
"integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -12221,63 +12276,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"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.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"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"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",
......
<template>
<div class="rightContent" id="IdentityInfor">
<div class="Content paneDiv paneDiv2">
<div class="header">
<span class="title">{{ title }}</span>
</div>
<div class="Boxcontent">
<div class="content">
<div>
<div
class="itemBox"
v-for="item in cxQueryField"
:key="item.id" >
<div class="module">
<div class="title">{{ item.title }}</div>
<div class="rows">
<div :class="'col' + i.col" v-for="i in item.data" :key="i.prop" >
<span class="label" :style="{ width: labelWidth }">{{ i.label }}</span>
<div v-if="item.objStr" class="cont" :style="{ width: `calc(100% - ${labelWidth})` }"> {{ (pageData[item.objStr] && pageData[item.objStr][i.prop]) || "-" }}
</div>
<div v-else class="cont" :style="{ width: `calc(100% - ${labelWidth})` }">
<span v-if="isBase64(pageData[i.prop] + '')"><img :src="'data:image/jpeg;base64,' + pageData[i.prop]" alt="" /></span>
<span v-else>{{ pageData[i.prop] || "-" }}</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//页面信息对象
pageData: this.pageObject,
col: 0
}
},
props: {
//详情配置
cxQueryField: {
type: Array,
default: () => [],
},
//接口请求的对象所有信息都包含的
pageObject: {
type: Object,
default: () => ({}),
},
//label的宽度默认80
labelWidth: String,
//页面标题
title: String
},
methods: {
// 判断字段返回值是否为base64字符串
isBase64(str) {
if (str ==='' || str.trim() ===''){ return false; }
try {
return btoa(atob(str)) == str
} catch (err) {
return false
}
}
},
mounted() {
},
watch: {
pageObject: {
handler: function (val) {
this.pageData = val;
},
deep: true,
},
},
};
</script>
<style lang="scss" scoped>
@mixin pageStyle() {
padding: 13px 50px;
}
@mixin photoStyle() {
display: flex;
align-items: center;
background-color: #fcfcfd;
border: 1px solid rgba(0, 0, 0, 0.18);
}
.rightContent {
flex: 1;
height: 100%;
overflow-y: auto;
.paneDiv {
background: #ffffff;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.18);
opacity: 1;
border-radius: 4px;
margin: 16px 20px 50px;
position: relative;
}
.paneDiv2 {
background: #ffffff;
border: 1px solid #eaeaea;
box-shadow: none;
opacity: 1;
border-radius: 8px;
}
.header {
padding: 13px 20px;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #e4e4e4;
.title {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 600;
color: #363636;
}
.iconBox {
i {
font-size: 18px;
color: #808591;
&:not(:last-of-type) {
margin-right: 15px;
}
}
}
}
.Boxcontent {
@include pageStyle();
.content {
height: auto;
display: block;
}
}
.col3,
.col6,
.col10,
.col5,
.col13 {
display: inline-block;
vertical-align: top;
padding: 5px 0;
.label {
font-size: 15px;
color: #363636;
font-weight: bold;
display: inline-block;
width: 80px;
text-align: left;
vertical-align: top;
}
.cont {
color: #808591;
font-size: 15px;
display: inline-block;
width: calc(100% - 80px);
box-sizing: border-box;
padding-right: 15px;
padding-left: 10px;
> span{
word-wrap: break-word;
}
}
}
.itemBox {
.title {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 600;
color: #ff8d1e;
border-bottom: 1px solid #e4e4e4;
padding-bottom: 10px;
}
}
.col3 {
width: 33%;
}
.col6 {
width: 66%;
}
.col10 {
width: 100%;
}
.col5 {
width: 50%;
}
.col13 {
width: 33%;
margin-right: 33%;
}
}
</style>
......@@ -12,7 +12,7 @@
</template>
<script>
import rightContent from "@c/PersonInfor.vue";
import rightContent from "@c/IdentityInfor.vue";
import { rxdbDetail } from "@/api/ajxscxbd.js";
import axios from "@/utils/http.js";
export default {
......@@ -26,7 +26,6 @@ export default {
{
title: "现场人像比中", //如果不分小模块就删除title
id: 1,
objStr: "", //对象中的对应字段
data: [
{
label: "信息主键编号:",
......@@ -35,7 +34,7 @@ export default {
},
{
label: "比中时间:",
prop: "bzsjStr",
prop: "",
col: "3",
},
{
......@@ -113,12 +112,12 @@ export default {
{
label: "发案地详址:",
prop: "fxasjddDzmc",
col: "3",
col: "10",
},
{
label: "简要案情:",
prop: "jyaq",
col: "3",
col: "10",
},
],
},
......@@ -220,7 +219,7 @@ export default {
{
label: "现住址详址:",
prop: "xzzDzmc",
col: "3",
col: "10",
},
],
},
......
......@@ -249,6 +249,7 @@ export default {
loading.close();
var result = res.data.rows;
this.pageObject = result;
console.log('this.pageObject', this.pageObject)
}
});
},
......
......@@ -58,7 +58,7 @@ module.exports = {
},
proxy: {
"/apialy": {
target: "http://39.99.155.173:8001/", //西藏: https://155.1.33.10:20010/ 阿里云:http://39.99.155.173:9022
target: "http://39.99.155.173:9022/", //西藏: https://155.1.33.10:20010/ 阿里云:http://39.99.155.173:9022
// ws: true,
changeOrigin: true,
// secure: false,
......
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