vue2-client 1.2.25 → 1.2.28-test

package/src/pages/system/ticket/submitTicketSuccess.vue

@@ -51,8 +51,7 @@
 import Result from '@vue2-client/components/result/Result'
 import DetailList from '@vue2-client/components/tool/DetailList'
 import AStepItem from '@vue2-client/components/tool/AStepItem'
-import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { TicketDetailsViewApi, post } from '@vue2-client/services/api'
 import { formatDate } from '@vue2-client/utils/util'
 
 const AStepItemGroup = AStepItem.Group

package/src/services/api/EmployeeDetailsViewApi.js

@@ -1,16 +1,16 @@
-const EmployeeDetailsViewApi = {
-  // 查询：获取员工详细信息
-  getEmployeeDetails: '/webmeterapi/getEmployeeDetails',
-  // 查询：获取员工上一周应答工单数量
-  getConfirmTicketsCountWeekly: '/webmeterapi/getConfirmTicketsCountWeekly',
-  // 查询：获取员工上一周完成工单数量
-  getFinishedTicketsCountWeekly: '/webmeterapi/getFinishedTicketsCountWeekly',
-  // 查询：是否存在此员工
-  findEmpName: '/webmeterapi/findEmpName',
-  // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/webmeterapi/getAllEmployeeName',
-  // 查询：根据员工名，获取员工id
-  getEmployeeId: '/webmeterapi/getEmployeeId'
-}
-
-export { EmployeeDetailsViewApi }
+const EmployeeDetailsViewApi = {
+  // 查询：获取员工详细信息
+  getEmployeeDetails: '/webmeterapi/getEmployeeDetails',
+  // 查询：获取员工上一周应答工单数量
+  getConfirmTicketsCountWeekly: '/webmeterapi/getConfirmTicketsCountWeekly',
+  // 查询：获取员工上一周完成工单数量
+  getFinishedTicketsCountWeekly: '/webmeterapi/getFinishedTicketsCountWeekly',
+  // 查询：是否存在此员工
+  findEmpName: '/webmeterapi/findEmpName',
+  // 查询：获取所有员工名，供前端展示备选项
+  getAllEmployeeName: '/webmeterapi/getAllEmployeeName',
+  // 查询：根据员工名，获取员工id
+  getEmployeeId: '/webmeterapi/getEmployeeId'
+}
+
+export { EmployeeDetailsViewApi }

package/src/services/api/index.js

@@ -0,0 +1,39 @@
+import { commonApi, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { CustomerDetailsViewApi } from '@vue2-client/services/api/CustomerDetailsViewApi'
+import { DeviceBrandDetailsViewApi } from '@vue2-client/services/api/DeviceBrandDetailsViewApi'
+import { DeviceDetailsViewApi } from '@vue2-client/services/api/DeviceDetailsViewApi'
+import { DeviceTypeDetailsViewApi } from '@vue2-client/services/api/DeviceTypeDetailsViewApi'
+import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
+import { EmployeeDetailsViewApi } from '@vue2-client/services/api/EmployeeDetailsViewApi'
+import { FormGroupEditApi } from '@vue2-client/services/api/FormGroupEditApi'
+import { InstructDetailsViewApi } from '@vue2-client/services/api/InstructDetailsViewApi'
+import { iotApi } from '@vue2-client/services/api/iot'
+import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
+import { get, post } from '@vue2-client/services/api/restTools'
+import { serviceApi } from '@vue2-client/services/api/service'
+import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
+import { WebmeterAnalysisViewApi } from '@vue2-client/services/api/WebmeterAnalysisViewApi'
+
+export {
+  commonApi, query, addOrModify, remove,
+  CustomerDetailsViewApi,
+  DeviceBrandDetailsViewApi,
+  DeviceDetailsViewApi,
+  DeviceTypeDetailsViewApi,
+  DictionaryDetailsViewApi,
+  EmployeeDetailsViewApi,
+  FormGroupEditApi,
+  InstructDetailsViewApi,
+  iotApi,
+  LogDetailsViewApi,
+  manageApi,
+  MeterDetailsViewApi,
+  QueryParamsDetailsViewApi,
+  get, post,
+  serviceApi,
+  TicketDetailsViewApi,
+  WebmeterAnalysisViewApi
+}

package/src/services/user.js

@@ -1,4 +1,4 @@
-import { LOGIN, ROUTES } from '@vue2-client/services/api'
+import { LOGIN, ROUTES } from '@vue2-client/services/apiService'
 import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
 
 /**

package/src/store/modules/account.js

@@ -24,7 +24,7 @@ export default {
     login: state => {
       if (!state.login) {
         try {
-          const user = sessionStorage.getItem(process.env.VUE_APP_LOGIN_KEY)
+          const user = localStorage.getItem(process.env.VUE_APP_LOGIN_KEY)
           state.login = JSON.parse(user)
         } catch (e) {
           console.error(e)
@@ -85,7 +85,7 @@ export default {
     },
     setLogin (state, login) {
       state.login = login
-      sessionStorage.setItem(process.env.VUE_APP_LOGIN_KEY, JSON.stringify(login))
+      localStorage.setItem(process.env.VUE_APP_LOGIN_KEY, JSON.stringify(login))
     },
     setPermissions (state, permissions) {
       state.permissions = permissions

package/src/utils/indexedDB.js

@@ -1,5 +1,5 @@
 // indexDB 存储
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 
 export const indexedDB = {
   db: undefined,

package/src/utils/routerUtil.js

@@ -1,5 +1,7 @@
+import Vue from 'vue'
 import routerMap from '@vue2-client/router/async/router.map'
 import { mergeI18nFromRoutes } from '@vue2-client/utils/i18n'
+import { arrRemoveEmpty } from '@vue2-client/utils/util'
 import Router from 'vue-router'
 import deepMerge from 'deepmerge'
 import basicOptions from '@vue2-client/router/async/config.async'
@@ -135,6 +137,11 @@ function loadRoutes (routesConfig) {
   // 应用配置
   const { router, store, i18n } = appOptions
 
+  // 刷新页面时,有些全局状态丢失,在此处从本地缓存拿出来赋值
+  if (JSON.stringify(Vue.$login.f) == '{}') {
+    const login = store.getters['account/login']
+    Object.assign(Vue.$login, login)
+  }
   // 如果 routesConfig 有值，则更新到本地，否则从本地获取
   if (routesConfig) {
     store.commit('account/setRoutesConfig', routesConfig)
@@ -350,17 +357,4 @@ function positionRouter (r) {
   return router
 }
 
-/**
- * 数组去空值
- */
-function arrRemoveEmpty (arr) {
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i] == '' || typeof (arr[i]) == 'undefined') {
-      arr.splice(i, 1)
-      i--
-    }
-  }
-  return arr
-}
-
 export { parseRoutes, loadRoutes, formatAuthority, getI18nKey, loadGuards, deepMergeRoutes, formatRoutes, setAppOptions, funcToRouter, setAppRouterMap }

package/src/utils/util.js

@@ -23,6 +23,18 @@ const timeList = [
     US: 'Good evening'
   }
 ]
+/**
+ * 数组去空值
+ */
+export function arrRemoveEmpty (arr) {
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i] == '' || typeof (arr[i]) == 'undefined') {
+      arr.splice(i, 1)
+      i--
+    }
+  }
+  return arr
+}
 
 export function isDef (v) {
   return v !== undefined && v !== null