Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 25d81ad1 by 李金轩
Options

ljx

1 parent f50e4225
Inline Side-by-side
Showing 3 changed files with 9 additions and 22 deletions
push.bat deleted 100644 → 0
git status
git add *
git commit -m %1%
git pull
git push
git status
\ No newline at end of file \ No newline at end of file
static/js/home.js
...@@ -81,7 +81,7 @@ new Vue({ ...@@ -81,7 +81,7 @@ new Vue({
deviceVal: "", deviceVal: "",
gateVal: "", gateVal: "",
gateVal2: "", gateVal2: "",
gate_id: '', gate_id: [],
channelVal: "", channelVal: "",
showDiv: true, showDiv: true,
loading: "", loading: "",
...@@ -350,6 +350,7 @@ new Vue({ ...@@ -350,6 +350,7 @@ new Vue({
this.getGateList() this.getGateList()
}, },
getMallList: function() { getMallList: function() {
this.plaza_id = []
this.plaza_id_list = [] this.plaza_id_list = []
get( get(
window._CONF_.apiUrl2 + '/malls', window._CONF_.apiUrl2 + '/malls',
...@@ -367,6 +368,7 @@ new Vue({ ...@@ -367,6 +368,7 @@ new Vue({
this.getGateList() this.getGateList()
}, },
getZoneList: function() { getZoneList: function() {
this.zone_id = []
this.zone_idList = [] this.zone_idList = []
get( get(
window._CONF_.apiUrl2 + '/zones/zoneList', window._CONF_.apiUrl2 + '/zones/zoneList',
...@@ -384,6 +386,7 @@ new Vue({ ...@@ -384,6 +386,7 @@ new Vue({
this.getGateList() this.getGateList()
}, },
getGateList: function() { getGateList: function() {
this.gate_id = []
this.gate_idList = [] this.gate_idList = []
get( get(
window._CONF_.apiUrl2 + '/gates/gateByInfo', window._CONF_.apiUrl2 + '/gates/gateByInfo',
...@@ -726,17 +729,6 @@ new Vue({ ...@@ -726,17 +729,6 @@ new Vue({
_this.getChannel() _this.getChannel()
}) })
}, },
getGate2: function() {
var _this = this
get(window._CONF_.apiUrl2 + '/gates/gateByInfo', {
account_id: _this.accountVal.toString(),
plaza_id: _this.mallVal.toString(),
zone_id: _this.zoneValue.toString(),
type: _this.type6,
}).then(function(data) {
log(data)
})
},
getDevice: function() { getDevice: function() {
var _this = this var _this = this
get(window._CONF_.apiUrl + API.Devices, { get(window._CONF_.apiUrl + API.Devices, {
......
static/js/request.js
...@@ -24,16 +24,17 @@ const getUrlQueryByName = function(name) { ...@@ -24,16 +24,17 @@ const getUrlQueryByName = function(name) {
Axios.interceptors.request.use( Axios.interceptors.request.use(
config => { config => {
// const atoken = Cookies.get('atoken')
// console.log('atoken', atoken)
// atoken && (config.headers.Authorization = atoken)
if (window.location.hostname === 'localhost') if (window.location.hostname === 'localhost')
{ {
config.headers.Authorization = 'a054367f-717d-47fb-b870-7c599e030e16' config.headers.Authorization = 'a054367f-717d-47fb-b870-7c599e030e16'
} }
else else
{ {
config.headers.Authorization = getUrlQueryByName('authorization') // config.headers.Authorization = getUrlQueryByName('authorization')
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!