Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 4984ccc0 by 李金轩
Options

ljx

1 parent b5ad41ab
Inline Side-by-side
Showing 4 changed files with 41 additions and 21 deletions
static/index.html
...@@ -1178,13 +1178,13 @@ ...@@ -1178,13 +1178,13 @@
</span> </span>
<span style="padding-left: 5px;">进</span> <span style="padding-left: 5px;">进</span>
</el-option> </el-option>
<el-option :label="'出'" :value="0"> <el-option :label="'出'" :value="-1">
<span class="custom-checkbox__input"> <span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span> <span class="custom-checkbox__inner"></span>
</span> </span>
<span style="padding-left: 5px;">出</span> <span style="padding-left: 5px;">出</span>
</el-option> </el-option>
<el-option :label="'横穿'" :value="2"> <el-option :label="'横穿'" :value="0">
<span class="custom-checkbox__input"> <span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span> <span class="custom-checkbox__inner"></span>
</span> </span>
...@@ -1243,6 +1243,12 @@ ...@@ -1243,6 +1243,12 @@
<el-row v-for="row in pagedTableDataList1"> <el-row v-for="row in pagedTableDataList1">
<el-col :span="3" v-for="item in row"> <el-col :span="3" v-for="item in row">
<div style="margin: 0 5px"> <div style="margin: 0 5px">
<div style="display:flex; justify-content: flex-end ">
<span @click="downloadFile(item.features_url)"
style="color: #409EFF;font-size: 15px;cursor: pointer;">
下载特征值文件
</span>
</div>
<img :src="item.picture_url" <img :src="item.picture_url"
style="width: 100%; height: auto;"> style="width: 100%; height: auto;">
<div>时间:{{item.counttime}}</div> <div>时间:{{item.counttime}}</div>
...@@ -1373,19 +1379,19 @@ ...@@ -1373,19 +1379,19 @@
collapse-tags collapse-tags
:clearable="false" :clearable="false"
class="query-select mall-sel-box"> class="query-select mall-sel-box">
<el-option :label="'出'" :value="0"> <el-option :label="'进'" :value="1">
<span class="custom-checkbox__input"> <span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span> <span class="custom-checkbox__inner"></span>
</span> </span>
<span style="padding-left: 5px;">出</span> <span style="padding-left: 5px;">进</span>
</el-option> </el-option>
<el-option :label="'进'" :value="1"> <el-option :label="'出'" :value="-1">
<span class="custom-checkbox__input"> <span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span> <span class="custom-checkbox__inner"></span>
</span> </span>
<span style="padding-left: 5px;">进</span> <span style="padding-left: 5px;">出</span>
</el-option> </el-option>
<el-option :label="'横穿'" :value="2"> <el-option :label="'横穿'" :value="0">
<span class="custom-checkbox__input"> <span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span> <span class="custom-checkbox__inner"></span>
</span> </span>
...@@ -1460,6 +1466,12 @@ ...@@ -1460,6 +1466,12 @@
<el-row v-for="row in getPagedList(person.perrsonList, 8)"> <el-row v-for="row in getPagedList(person.perrsonList, 8)">
<el-col :span="3" v-for="item in row"> <el-col :span="3" v-for="item in row">
<div style="margin: 0 5px"> <div style="margin: 0 5px">
<div style="display:flex; justify-content: flex-end ">
<span @click="downloadFile(item.features_url)"
style="color: #409EFF;font-size: 15px;cursor: pointer;">
下载特征值文件
</span>
</div>
<img :src="item.picture_url" <img :src="item.picture_url"
style="width: 100%; height: auto;"> style="width: 100%; height: auto;">
<div>时间:{{item.counttime}}</div> <div>时间:{{item.counttime}}</div>
...@@ -1475,7 +1487,7 @@ ...@@ -1475,7 +1487,7 @@
:current-page="pageNum2" :current-page="pageNum2"
:page-size="pageSize2" :page-size="pageSize2"
:total="total2" :total="total2"
:page-sizes="[24, 48, 96, 192]" :page-sizes="[10, 20, 40, 80]"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
style="text-align:center" style="text-align:center"
> >
......
static/js/common.js
window._CONF_ = { window._CONF_ = {
reportApiUrl: '', reportApiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
apiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '', apiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
apiUrl2: window.location.hostname === 'localhost' ? 'http://36.112.68.214:9999' : '', apiUrl2: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
webSockUrl: '' webSockUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
} }
const log = console.log.bind(console) const log = console.log.bind(console)
static/js/home.js
...@@ -20,18 +20,18 @@ new Vue({ ...@@ -20,18 +20,18 @@ new Vue({
return { return {
currentIndex6: '1', currentIndex6: '1',
type6: 0, type6: 0,
direction6: [0, 1, 2], direction6: [1, -1, 0],
picType6: 2, picType6: 2,
personType6: [0, 1], personType6: [0, 1],
time6_1: new Date(), time6_1: new Date(),
time6_2: [new Date(new Date(new Date().toLocaleDateString()).getTime()), new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1)], time6_2: [new Date(new Date().setHours(0, 0, 0, 0)), new Date(new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1)],
minPic: 0, minPic: 0,
maxPic: 100, maxPic: 100,
pageNum1: 1, pageNum1: 1,
pageSize1: 24, pageSize1: 24,
total1: 0, total1: 0,
pageNum2: 1, pageNum2: 1,
pageSize2: 24, pageSize2: 10,
total2: 0, total2: 0,
dataList1: [], dataList1: [],
dataList2: [], dataList2: [],
...@@ -437,6 +437,9 @@ new Vue({ ...@@ -437,6 +437,9 @@ new Vue({
} }
} }
}, },
downloadFile: function(url) {
window.open(url)
},
confirmSearch: function() { confirmSearch: function() {
const data = filterEmptyValueInObject( const data = filterEmptyValueInObject(
{ {
...@@ -456,7 +459,7 @@ new Vue({ ...@@ -456,7 +459,7 @@ new Vue({
// personType: 0, // personType: 0,
startTime: formatDate(this.time6_1, this.time6_2[0]), startTime: formatDate(this.time6_1, this.time6_2[0]),
endTime: formatDate(this.time6_1, this.time6_2[2]), endTime: formatDate(this.time6_1, this.time6_2[1]),
page: this.pageNum1 - 1, page: this.pageNum1 - 1,
pageSize: this.pageSize1, pageSize: this.pageSize1,
} }
...@@ -477,6 +480,13 @@ new Vue({ ...@@ -477,6 +480,13 @@ new Vue({
} }
) )
}, },
sortDataList: function(list) {
list.sort(
(a, b) => {
return (b.perrsonList.length - a.perrsonList.length)
}
)
},
confirmSearch2: function() { confirmSearch2: function() {
const data = filterEmptyValueInObject( const data = filterEmptyValueInObject(
{ {
...@@ -496,7 +506,7 @@ new Vue({ ...@@ -496,7 +506,7 @@ new Vue({
// personType: 0, // personType: 0,
startTime: formatDate(this.time6_1, this.time6_2[0]), startTime: formatDate(this.time6_1, this.time6_2[0]),
endTime: formatDate(this.time6_1, this.time6_2[2]), endTime: formatDate(this.time6_1, this.time6_2[1]),
page: this.pageNum2 - 1, page: this.pageNum2 - 1,
pageSize: this.pageSize2, pageSize: this.pageSize2,
minPic: this.minPic, minPic: this.minPic,
...@@ -510,6 +520,7 @@ new Vue({ ...@@ -510,6 +520,7 @@ new Vue({
data data
).then( ).then(
(r) => { (r) => {
this.sortDataList(r.data.persons)
this.isLoading2 = false this.isLoading2 = false
this.dataList2 = r.data.persons this.dataList2 = r.data.persons
this.total2 = r.data.pageNum this.total2 = r.data.pageNum
......
static/js/request.js
...@@ -27,14 +27,11 @@ Axios.interceptors.request.use( ...@@ -27,14 +27,11 @@ Axios.interceptors.request.use(
if (window.location.hostname === 'localhost') if (window.location.hostname === 'localhost')
{ {
config.headers.Authorization = 'a054367f-717d-47fb-b870-7c599e030e16' config.headers.Authorization = 'c3b85226-4301-45fb-a087-4caf3194fc90'
} }
else else
{ {
// config.headers.Authorization = getUrlQueryByName('authorization') config.headers.Authorization = Cookies.get('atoken')
const atoken = Cookies.get('atoken')
// console.log('atoken', atoken)
atoken && (config.headers.Authorization = atoken)
} }
return config return config
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!