Skip to content

platform / social_ecurity_serv

Go to a project
Commit 57be26a7 by 周志凯
Options

fix: fixed name

1 parent 9d4fab04
Inline Side-by-side
Showing 10 changed files with 82 additions and 27 deletions
web/config/index.js
......@@ -13,7 +13,7 @@ module.exports = {
proxyTable: {},
// Various Dev Server settings
host: '192.168.9.161', // can be overwritten by process.env.HOST
host: '192.168.9.102', // can be overwritten by process.env.HOST
port: 8990, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
......
web/dist.zip
No preview for this file type
web/index.html
......@@ -4,6 +4,15 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>web</title>
<script>
!(function() {
var platformConf = document.createElement("script"),
s = document.getElementsByTagName("script")[0],
stamp = +new Date();
platformConf.src = './static/config.js?_s=' + stamp;
s.parentNode.insertBefore(platformConf, s);
})()
</script>
</head>
<body>
<div id="app"></div>
......
web/src/util/api.js
// export let url = 'http://192.168.9.208:20080/api/v1'
// export let url = 'http://52.1.113.109:20080/api/v1'
export let IP = location.host
if (IP.indexOf('9.161') > -1 ||IP.indexOf('localhost')) {
// IP = 'https://store.keliuyun.com/report'
// IP="/report"
const { urls = '', picUrls = '' } = window.SECURITY_CONF
export let IP = urls || location.host
if (IP.indexOf('9.102') > -1 || IP.indexOf('localhost') > -1) {
IP = 'https://store.keliuyun.com/report'
// IP="/report"
}
IP="/report"
// IP="/report"
export let url = `${IP}`
export let menus = `${url}/auth/api/auth/apps/23660e5593563b27832c2b8f490b458e/menus`
......@@ -68,5 +70,5 @@ export let org = {
}
export let faceweb = `${url}/face_web`
// export let picUrl ="https://vion-retail.oss-cn-beijing.aliyuncs.com/"
export let picUrl ="http://192.168.9.239/"
export let picUrl = picUrls || "https://vion-retail.oss-cn-beijing.aliyuncs.com/"
// export let picUrl ="http://192.168.9.239/"
web/src/util/http.js
......@@ -48,7 +48,6 @@ export function tryHideFullScreenLoading() {
* 请求前的拦截器
*/
service.interceptors.request.use(function (config) {
console.log('request interceptors', config)
//截取API添加时间戳防止请求缓存
if (config.method == "get") {
config.params = {
......
web/src/views/Activity/detail.vue
......@@ -49,11 +49,11 @@ export default {
this.show = true
this.titlename = '抓拍图片'
this.curshow = 'img'
this.axios.get(this.API.url + '/faceRecognitions/history',{
this.axios.get(this.API.url + '/faceRecognitions',{
params:{
mallId:2,
personUnid:data.personUnid,
countdate: this.common.formatDateFun(new Date(),"yyyy-MM-dd"),
// countdate: this.common.formatDateFun(new Date(),"yyyy-MM-dd"),
sortName: "counttime",
sortOrder: "DESC"
}
......
web/src/views/Activity/statusdetail.vue
......@@ -8,8 +8,8 @@
<el-table :data="gridData">
<el-table-column property="date" label="日期"></el-table-column>
<el-table-column property="name" label="姓名"></el-table-column>
<el-table-column property="address" label="抓怕地址"></el-table-column>
<el-table-column property="address" label="抓怕图片">
<el-table-column property="address" label="抓拍地址"></el-table-column>
<el-table-column property="address" label="抓拍图片">
<div class="img-box">
<img src="../videos/testimg/1.jpg" alt="">
</div>
......
web/src/views/Search/FilmedRecords.vue
......@@ -44,12 +44,16 @@
<el-table :data="tableData" height="690" v-loading="loading">
<el-table-column prop="counttime" label="日期">
</el-table-column>
<el-table-column prop="historyArrivalCount" label="出现次数" ></el-table-column>
<!-- <el-table-column prop="historyArrivalCount" label="出现次数" ></el-table-column> -->
<el-table-column prop="channelSerialnum" label="相机名称"></el-table-column>
<el-table-column prop="face.name" label="姓名"></el-table-column>
<el-table-column label="姓名">
<template slot-scope="scope">
{{ scope.row.personUnid | filterNameText }}
</template>
</el-table-column>
<el-table-column label="性别">
<template slot-scope="scope">
{{scope.row.gender |sexfn}}
{{scope.row.gender | sexfn}}
</template>
</el-table-column>
<el-table-column prop="age" label="年龄"></el-table-column>
......@@ -126,9 +130,16 @@ export default {
dialogVisible: false,
timer:'',
progress:0,
accountId:localStorage.getItem('accountId')
accountId:localStorage.getItem('accountId'),
cachePersons: JSON.parse(sessionStorage.getItem('staffsName'))
};
},
filters: {
filterNameText(val) {
const cachePersonName = JSON.parse(sessionStorage.getItem('staffsName')) || {}
return cachePersonName[val] || '--'
}
},
methods: {
handleClose() {
this.dialogVisible = false;
......@@ -147,6 +158,25 @@ export default {
this.getFaceData();
this.page.currentPage = 1;
},
fetchStaffName() {
if (this.cachePersons) return
this.axios.get(this.API.url + "/staffs",{
params:{
accountId:this.search.communityunid
}
}).then((response)=> {
console.log('response', response)
const { data, code } = response.data
if (code === 200) {
const cacheData = data.reduce((rest, curr) => {
rest[curr.personUnid] = curr.name
return rest
}, {})
this.cachePersons = cacheData
sessionStorage.setItem('staffsName', JSON.stringify(cacheData))
}
})
},
initDbData(){
this.axios.get(this.API.url + "/personTypes",{
params:{
......@@ -174,6 +204,7 @@ export default {
this.search.communityunid=response.data.data[0].id
}
this.fetchStaffName();
this.initDbData();
this.initGateData();
this.getFaceData();
......
web/src/views/Search/track.vue
......@@ -8,9 +8,13 @@
<el-table :data="trackData" height="400">
<el-table-column property="counttime" label="日期">
</el-table-column>
<el-table-column property="name" label="姓名"></el-table-column>
<el-table-column property="gateId" label="抓怕地址" :formatter="gateFormatter"></el-table-column>
<el-table-column property="pic_url" label="抓怕图片">
<el-table-column label="姓名">
<template slot-scope="scope">
{{ scope.row.personUnid | filterNameText }}
</template>
</el-table-column>
<el-table-column property="gateId" label="抓拍地址" :formatter="gateFormatter"></el-table-column>
<el-table-column property="pic_url" label="抓拍图片">
<template slot-scope="scope">
<div class="img-box">
<img :src="API.picUrl+'picture/'+scope.row.facePath+scope.row.facePic" alt="">
......@@ -46,13 +50,19 @@ export default {
trackData: [],
}
},
props: {
accunid: {},
faceunid: {},
gateData:{
type:Array
}
},
props: {
accunid: {},
faceunid: {},
gateData:{
type:Array
}
},
filters: {
filterNameText(val) {
const cachePersonName = JSON.parse(sessionStorage.getItem('staffsName')) || {}
return cachePersonName[val] || '--'
}
},
methods:{
init(data){
this.show = true;
......
web/static/config.js 0 → 100644
window.SECURITY_CONF = {
urls: 'https://store.keliuyun.com/report',
picUrls: 'https://vion-retail.oss-cn-beijing.aliyuncs.com/'
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!