vue2-client 1.2.84 → 1.2.88

package/src/services/api/iot/DeviceDetailsView/DeviceDetailsCountApi.js

@@ -1,18 +1,18 @@
-const DeviceDetailsCountApi = {
-  // 获取设备使用天数
-  getDeviceUsedDaySum: '/webmeterapi/getDeviceUsedDaySum',
-  // 获取设备累计上报次数和近七天上报情况
-  getDeviceUploadTimesCount: '/webmeterapi/getDeviceUploadTimesCount',
-  // 获取设备累计失联次数和近三个月失联情况
-  getDeviceLostContactCount: '/webmeterapi/getDeviceLostContactCount',
-  // 获取设备指令下发成功率
-  getInstructRateOfSuccess: '/webmeterapi/getInstructRateOfSuccess',
-  // 获取设备上报情况
-  getDeviceUploadCountData: '/webmeterapi/getDeviceUploadCountData',
-  // 获取设备失联情况
-  getDeviceLostContactCountData: '/webmeterapi/getDeviceLostContactCountData',
-  // 获取设备失联排行榜
-  getDeviceLostContactRankData: '/webmeterapi/getDeviceLostContactRankData'
-}
-
-export { DeviceDetailsCountApi }
+const DeviceDetailsCountApi = {
+  // 获取设备使用天数
+  getDeviceUsedDaySum: '/webmeterapi/getDeviceUsedDaySum',
+  // 获取设备累计上报次数和近七天上报情况
+  getDeviceUploadTimesCount: '/webmeterapi/getDeviceUploadTimesCount',
+  // 获取设备累计失联次数和近三个月失联情况
+  getDeviceLostContactCount: '/webmeterapi/getDeviceLostContactCount',
+  // 获取设备指令下发成功率
+  getInstructRateOfSuccess: '/webmeterapi/getInstructRateOfSuccess',
+  // 获取设备上报情况
+  getDeviceUploadCountData: '/webmeterapi/getDeviceUploadCountData',
+  // 获取设备失联情况
+  getDeviceLostContactCountData: '/webmeterapi/getDeviceLostContactCountData',
+  // 获取设备失联排行榜
+  getDeviceLostContactRankData: '/webmeterapi/getDeviceLostContactRankData'
+}
+
+export { DeviceDetailsCountApi }

package/src/theme/default/style.less

@@ -1,47 +1,47 @@
-.week-mode{
-  overflow: hidden;
-  filter: invert(80%);
-}
-.beauty-scroll{
-  scrollbar-color: @primary-color @primary-2;
-  scrollbar-width: thin;
-  -ms-overflow-style:none;
-  position: relative;
-  &::-webkit-scrollbar{
-    width: 3px;
-    height: 1px;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 3px;
-    background: @primary-color;
-  }
-  &::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-    border-radius: 3px;
-    background: @primary-3;
-  }
-}
-.split-right{
-  &:not(:last-child) {
-    border-right: 1px solid rgba(98, 98, 98, 0.2);
-  }
-}
-.disabled{
-  cursor: not-allowed;
-  color: @disabled-color;
-  pointer-events: none;
-}
-
-::-webkit-scrollbar{
-  width: 5px;
-  height: 5px;
-}
-::-webkit-scrollbar-thumb {
-  border-radius: 3px;
-  background: @primary-3;
-}
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-  border-radius: 3px;
-  background: @primary-1;
-}
+.week-mode{
+  overflow: hidden;
+  filter: invert(80%);
+}
+.beauty-scroll{
+  scrollbar-color: @primary-color @primary-2;
+  scrollbar-width: thin;
+  -ms-overflow-style:none;
+  position: relative;
+  &::-webkit-scrollbar{
+    width: 3px;
+    height: 1px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: @primary-color;
+  }
+  &::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+    border-radius: 3px;
+    background: @primary-3;
+  }
+}
+.split-right{
+  &:not(:last-child) {
+    border-right: 1px solid rgba(98, 98, 98, 0.2);
+  }
+}
+.disabled{
+  cursor: not-allowed;
+  color: @disabled-color;
+  pointer-events: none;
+}
+
+::-webkit-scrollbar{
+  width: 5px;
+  height: 5px;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: @primary-3;
+}
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+  border-radius: 3px;
+  background: @primary-1;
+}

package/src/utils/map-utils.js

@@ -1,31 +1,31 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap () {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode:'275e59edb26ab1f917cfe7f05bea7979'
-    }
-    Amap = await AMapLoader.load({
-      key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '1.4.2', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.ToolBar', 'AMap.Geolocation', 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.Autocomplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-    })
-  }
-  return Amap
-}
-async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap () {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: '275e59edb26ab1f917cfe7f05bea7979'
+    }
+    Amap = await AMapLoader.load({
+      key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '1.4.2', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.ToolBar', 'AMap.Geolocation', 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.Autocomplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    })
+  }
+  return Amap
+}
+async function GetLocation (address) {
+  return new Promise(async (resolve, reject) => {
+    new (await GetGDMap()).Geocoder({
+      radius: 500 // 范围，默认：500
+    }).getLocation(address, function (status, result) {
+      console.log(result)
+      if (status === 'complete' && result.geocodes.length) {
+        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+      } else {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject('根据经纬度查询地址失败')
+      }
+    })
+  })
+}
+export { GetGDMap, GetLocation }

package/src/utils/request.js

@@ -4,7 +4,7 @@ import Vue from 'vue'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import notification from 'ant-design-vue/es/notification'
 
-const setting = require('../config/default/setting.config')
+let compatible
 
 // 跨域认证信息 header 名
 const xsrfHeaderName = 'Authorization'
@@ -151,12 +151,16 @@ function checkAuthorization (authType = AUTH_TYPE.BEARER) {
 function loadInterceptors () {
   // 加载请求拦截器
   axios.interceptors.request.use(config => {
-    const token = localStorage.getItem(ACCESS_TOKEN)
+    const token = localStorage.getItem('ACCESS_TOKEN')
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
+      // 如果是首次使用系统LocalStorage需要初始化，在登陆之后重新获取一次compatible
+      if (compatible === null) {
+        compatible = localStorage.getItem('compatible')
+      }
       // 判断是否为V4环境
-      if (setting.compatible === 'V4') {
+      if (compatible === 'V4') {
         // V4 环境则添加 V4请求头
         config.headers['ACCESS_TOKEN'] = localStorage.getItem('ACCESS_TOKEN')
         config.headers['ACCESS_TOKEN_EXPIRES'] = localStorage.getItem('ACCESS_TOKEN_EXPIRES')
@@ -171,7 +175,20 @@ function loadInterceptors () {
   }, errorHandler)
   // 加载响应拦截器
   axios.interceptors.response.use((response) => {
-    return response.data
+    // 判断是否为V4环境，不为compatible赋初始值
+    // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
+    if (compatible === null || compatible === undefined) {
+      compatible = localStorage.getItem('compatible')
+    }
+    if (compatible === 'V4') {
+      if (response.data.data) {
+        return response.data.data
+      } else {
+        return response.data
+      }
+    } else {
+      return response.data
+    }
   }, errorHandler)
 }
 
@@ -181,12 +198,12 @@ const errorHandler = (error) => {
     const data = error.response.data
     // 从 localstorage 获取 token
     const token = localStorage.getItem(ACCESS_TOKEN)
-    if (error.response.status === 403) {
+    if (error.response.status === 403 || data.code === 403) {
       notification.error({
         message: '禁止访问',
         description: data
       })
-    } else if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
+    } else if ((error.response.status === 401 || data.code === 401) && !(data.result && data.result.isLogin)) {
       notification.error({
         message: '鉴权失败',
         description: data
@@ -198,7 +215,7 @@ const errorHandler = (error) => {
           }, 1500)
         })
       }
-    } else if (error.response.status === 500) {
+    } else if (error.response.status === 500 || data.code === 500) {
       notification.error({
         message: '系统异常',
         description: data