ljx

push.bat

-git status
-git add *
-git commit -m %1%
-git pull
-git push
-git status
\ No newline at end of file

static/js/home.js

@@ -81,7 +81,7 @@ new Vue({
             deviceVal: "",
             gateVal: "",
             gateVal2: "",
-            gate_id: '',
+            gate_id: [],
             channelVal: "",
             showDiv: true,
             loading: "",
@@ -350,6 +350,7 @@ new Vue({
             this.getGateList()
         },
         getMallList: function() {
+            this.plaza_id = []
             this.plaza_id_list = []
             get(
                 window._CONF_.apiUrl2 + '/malls',
@@ -367,6 +368,7 @@ new Vue({
             this.getGateList()
         },
         getZoneList: function() {
+            this.zone_id = []
             this.zone_idList = []
             get(
                 window._CONF_.apiUrl2 + '/zones/zoneList',
@@ -384,6 +386,7 @@ new Vue({
             this.getGateList()
         },
         getGateList: function() {
+            this.gate_id = []
             this.gate_idList = []
             get(
                 window._CONF_.apiUrl2 + '/gates/gateByInfo',
@@ -726,17 +729,6 @@ new Vue({
                 _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() {
             var _this = this
             get(window._CONF_.apiUrl + API.Devices, {

static/js/request.js

@@ -24,16 +24,17 @@ const getUrlQueryByName = function(name) {
 
 Axios.interceptors.request.use(
     config => {
-        // const atoken = Cookies.get('atoken')
-        // console.log('atoken', atoken)
-        // atoken && (config.headers.Authorization = atoken)
+
         if (window.location.hostname === 'localhost')
         {
             config.headers.Authorization = 'a054367f-717d-47fb-b870-7c599e030e16'
         }
         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
     },