Commit 6620a84a by 李金轩

ljx

1 parent 4cf0b018
...@@ -13,7 +13,7 @@ html, body, #app { ...@@ -13,7 +13,7 @@ html, body, #app {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 10px; padding-top: 10px;
max-width: 1200px; max-width: 1700px;
margin: 0 auto; margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;
} }
......
...@@ -1065,58 +1065,120 @@ ...@@ -1065,58 +1065,120 @@
</el-menu> </el-menu>
<div v-if="currentIndex6 === '1'"> <div v-if="currentIndex6 === '1'">
<el-form :inline="true" size="small"> <el-form :inline="true" size="small">
<el-form-item label="平台:">
<el-select>
<el-option :label="'Store'"></el-option>
<el-option :label="'Mall'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="集团:"> <el-form-item label="集团:">
<el-select> <el-select
<el-option :label="'Store'"></el-option> v-model="accountVal"
<el-option :label="'Mall'"></el-option> filterable
</el-select> multiple
</el-form-item> collapse-tags
<el-form-item label="广场:"> :clearable="false"
<el-select> placeholder="请选择集团"
<el-option :label="'Store'"></el-option> class="query-select mall-sel-box"
<el-option :label="'Mall'"></el-option> @change="accountchange"
>
<div
:class="isAccoutSelAll ? 'sel-all-box selected' : 'sel-all-box'"
@click="selAllHandle('accout')"
>
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">全选</span>
</div>
<el-option
v-for="item in accoutOpts"
:key="item.id"
:label="item.name"
:value="item.id"
>
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="广场:">-->
<!-- <el-select>-->
<!-- <el-option :label="'Store'"></el-option>-->
<!-- <el-option :label="'Mall'"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="出入类型:"> <el-form-item label="出入类型:">
<el-select> <el-select v-model="type6">
<el-option :label="'Store'"></el-option> <el-option :label="'广场出入口'" :value="1"></el-option>
<el-option :label="'Mall'"></el-option> <el-option :label="'楼层出入口'" :value="2"></el-option>
<el-option :label="'店铺出入口'" :value="3"></el-option>
<el-option :label="'其他'" :value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="门店:"> <el-form-item label="门店:">
<el-select> <el-select
<el-option :label="'Store'"></el-option> v-model="mallVal"
<el-option :label="'Mall'"></el-option> filterable
multiple
collapse-tags
:clearable="false"
placeholder="请选择商场"
class="query-select mall-sel-box"
@change="mallchange"
>
<div
:class="isMallSelAll ? 'sel-all-box selected' : 'sel-all-box'"
@click="selAllHandle()"
>
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">全选</span>
</div>
<el-option
v-for="item in mallOpts"
:key="item.id"
:label="item.name"
:value="item.id"
>
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="监控点:"> <el-form-item label="监控点名称:">
<el-select> <el-select
<el-option :label="'Store'"></el-option> v-model="gateVal"
<el-option :label="'Mall'"></el-option> filterable
clearable
placeholder="请选择监控点"
@change="getChannel"
>
<el-option
v-for="(item, index) in gateOpt"
:key="item.index"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="方向:"> <el-form-item label="方向:">
<el-select> <el-select v-model="direction6">
<el-option :label="'Store'"></el-option> <el-option :label="'进'" :value="1"></el-option>
<el-option :label="'Mall'"></el-option> <el-option :label="'出'" :value="0"></el-option>
<el-option :label="'横穿'" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="抓拍类型:"> <el-form-item label="抓拍类型:">
<el-select> <el-select v-model="picType6">
<el-option :label="'Store'"></el-option> <el-option :label="'半身照'" :value="1"></el-option>
<el-option :label="'Mall'"></el-option> <el-option :label="'全身照'" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="人员类型:"> <el-form-item label="人员类型:">
<el-select> <el-select v-model="personType6">
<el-option :label="'Store'"></el-option> <el-option :label="'店员'" :value="1"></el-option>
<el-option :label="'Mall'"></el-option> <el-option :label="'顾客'" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选择日期:"> <el-form-item label="选择日期:">
...@@ -1125,8 +1187,23 @@ ...@@ -1125,8 +1187,23 @@
<el-option :label="'Mall'"></el-option> <el-option :label="'Mall'"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="confirmSearch" type="primary">搜索</el-button>
</el-form-item>
</el-form> </el-form>
<el-button type="primary">搜索</el-button>
<el-row>
<el-col :span="6">
<div class="folder-cover-image">
<img :src="'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'"
style="width: 100%; height: auto">
<div>时间:</div>
<div>方向:</div>
<div>地点:</div>
</div>
</el-col>
</el-row>
</div> </div>
<div v-if="currentIndex6 === '2'"> <div v-if="currentIndex6 === '2'">
<el-form :inline="true" size="small"> <el-form :inline="true" size="small">
......
...@@ -19,6 +19,10 @@ new Vue({ ...@@ -19,6 +19,10 @@ new Vue({
data: function() { data: function() {
return { return {
currentIndex6: '1', currentIndex6: '1',
type6: '',
direction6: '',
picType6: '',
personType6: '',
pickerOpts: { pickerOpts: {
disabledDate(time) { disabledDate(time) {
return Date.parse(time) > Date.parse(new Date()) return Date.parse(time) > Date.parse(new Date())
...@@ -278,6 +282,42 @@ new Vue({ ...@@ -278,6 +282,42 @@ new Vue({
this.endTime = this.createDate() this.endTime = this.createDate()
}, },
methods: { methods: {
//////////////////////////////////////////////////////
dateLevel: function() {
if (this.dateFormat == "repair")
{
this.getGate()
}
else if (this.dateFormat == "snapGatherClass")
{
this.getGate()
get('http://36.112.68.214:9999' + '/faceRecognitions/faceRecord', {}).then(
function(r) {
log(r)
}
)
}
else
{
// this.getMall();
}
},
onMenuSelect: function(value) {
this.currentIndex6 = value
},
confirmSearch: function() {
log(
// this.accountVal,
this.type6,
// this.mallVal,
// this.gateVal,
this.direction6,
this.picType6,
this.personType6,
)
},
//////////////////////////////////////////////////////
createDate() { createDate() {
var nowDate = new Date() var nowDate = new Date()
var day = nowDate.getDate() var day = nowDate.getDate()
...@@ -485,29 +525,7 @@ new Vue({ ...@@ -485,29 +525,7 @@ new Vue({
_this.deviceVal = _this.deviceOpt[0].value _this.deviceVal = _this.deviceOpt[0].value
}) })
}, },
//////////////////////////////////////////////////////
dateLevel: function() {
if (this.dateFormat == "repair")
{
this.getGate()
}
else if (this.dateFormat == "snapGatherClass")
{
get(window._CONF_.apiUrl + '/faceRecognitions/faceRecord', {}).then(
function(r) {
log(r)
}
)
}
else
{
// this.getMall();
}
},
onMenuSelect: function(v) {
this.currentIndex6 = v
},
//////////////////////////////////////////////////////
getLevel: function() { getLevel: function() {
}, },
getNumber() { getNumber() {
......
...@@ -12,7 +12,7 @@ Axios.interceptors.request.use( ...@@ -12,7 +12,7 @@ Axios.interceptors.request.use(
const atoken = Cookies.get('atoken') const atoken = Cookies.get('atoken')
// console.log('atoken', atoken) // console.log('atoken', atoken)
// atoken && (config.headers.Authorization = atoken) // atoken && (config.headers.Authorization = atoken)
config.headers.Authorization = '648bb26c-4167-44c8-98f9-e2276cf184ad' config.headers.Authorization = '3a9b4412-12c8-473c-8216-8c9b6db00ea3'
return config return config
}, },
error => { error => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!