vue2-client 1.4.11 → 1.4.12

package/src/pages/system/queryParams/index.vue

@@ -1,43 +1,43 @@
-<template>
-  <a-card :bordered="false">
-    <query-params-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      :queryParamsName="queryParamsName"
-      title="查询配置"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-
-  export default {
-    name: 'QueryParams',
-    components: {
-      XFormTable,
-      QueryParamsDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'queryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <query-params-details-view
+      v-if="selectId"
+      :id="selectId"
+      :visible.sync="detailVisible"
+    />
+    <x-form-table
+      :queryParamsName="queryParamsName"
+      title="查询配置"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
+
+  export default {
+    name: 'QueryParams',
+    components: {
+      XFormTable,
+      QueryParamsDetailsView
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'queryParams',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/router/async/config.async.js

@@ -1,27 +1,27 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  routes: parseRoutes(routesConfig, routerMap),
-  config: routesConfig
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  routes: parseRoutes(routesConfig, routerMap),
+  config: routesConfig
+}
+
+export default options

package/src/router/async/router.map.js

@@ -11,6 +11,11 @@ const routerResource = {}
 routerResource.blank = view.blank
 // 单页面视图
 routerResource.singlePage = view.blank
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
 // --------------------------------------系统配置--------------------------------------
 routerResource.system = view.blank
 // 字典管理

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/services/api/DictionaryDetailsViewApi.js

@@ -1,6 +1,6 @@
-const DictionaryDetailsViewApi = {
-  // 查询：获取字典详情
-  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
-}
-
-export { DictionaryDetailsViewApi }
+const DictionaryDetailsViewApi = {
+  // 查询：获取字典详情
+  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
+}
+
+export { DictionaryDetailsViewApi }

package/src/services/api/LogDetailsViewApi.js

@@ -1,10 +1,10 @@
-const LogDetailsViewApi = {
-  // 查询：获取日志详情
-  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
-  // 查询：获取日志维护记录
-  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
-  // 操作：更新日志状态
-  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
-}
-
-export { LogDetailsViewApi }
+const LogDetailsViewApi = {
+  // 查询：获取日志详情
+  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
+  // 查询：获取日志维护记录
+  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
+  // 操作：更新日志状态
+  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
+}
+
+export { LogDetailsViewApi }

package/src/services/api/QueryParamsDetailsViewApi.js

@@ -1,6 +1,6 @@
-const QueryParamsDetailsViewApi = {
-  // 查询：获取查询配置详情
-  getQueryParamsDetails: '/api/af-system/logic/getQueryParamsDetails'
-}
-
-export { QueryParamsDetailsViewApi }
+const QueryParamsDetailsViewApi = {
+  // 查询：获取查询配置详情
+  getQueryParamsDetails: '/api/af-system/logic/getQueryParamsDetails'
+}
+
+export { QueryParamsDetailsViewApi }

package/src/services/api/TicketDetailsViewApi.js

@@ -1,34 +1,34 @@
-const TicketDetailsViewApi = {
-  // 查询：获取工单流转详情
-  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
-  // 查询：获取工单详情
-  getTicketDetails: '/api/af-system/logic/getTicketDetails',
-  // 手动关闭工单
-  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
-  // 转交工单给其他人
-  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
-  // 确认工单，开始处理
-  confirmTicket: '/api/af-system/logic/confirmTicket',
-  // 查询：获取订单详情用于订单追踪
-  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
-  // 更新：将工单优先级增加
-  rushTicket: '/api/af-system/logic/rushTicket',
-  // 客户手动关闭工单
-  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
-  // 在工单提交页面删除照片
-  revocationImage: '/api/af-system/logic/revocationImage',
-  // 在工单提交页面删除照片
-  getTicketImages: '/api/af-system/logic/getTicketImages',
-  // 用户填写附加信息时取消了操作，将已上传的照片清空
-  removeAllImages: '/api/af-system/logic/removeAllImages',
-  // 提交用户填写附加信息
-  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
-  // 获取用户填写附加信息
-  getAddonDescription: '/api/af-system/logic/getAddonDescription',
-  // 发起售后工单流程
-  createTicket: '/api/af-system/logic/createTicket',
-  // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName'
-}
-
-export { TicketDetailsViewApi }
+const TicketDetailsViewApi = {
+  // 查询：获取工单流转详情
+  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
+  // 查询：获取工单详情
+  getTicketDetails: '/api/af-system/logic/getTicketDetails',
+  // 手动关闭工单
+  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
+  // 转交工单给其他人
+  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
+  // 确认工单，开始处理
+  confirmTicket: '/api/af-system/logic/confirmTicket',
+  // 查询：获取订单详情用于订单追踪
+  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
+  // 更新：将工单优先级增加
+  rushTicket: '/api/af-system/logic/rushTicket',
+  // 客户手动关闭工单
+  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
+  // 在工单提交页面删除照片
+  revocationImage: '/api/af-system/logic/revocationImage',
+  // 在工单提交页面删除照片
+  getTicketImages: '/api/af-system/logic/getTicketImages',
+  // 用户填写附加信息时取消了操作，将已上传的照片清空
+  removeAllImages: '/api/af-system/logic/removeAllImages',
+  // 提交用户填写附加信息
+  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
+  // 获取用户填写附加信息
+  getAddonDescription: '/api/af-system/logic/getAddonDescription',
+  // 发起售后工单流程
+  createTicket: '/api/af-system/logic/createTicket',
+  // 查询：获取所有员工名，供前端展示备选项
+  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName'
+}
+
+export { TicketDetailsViewApi }

package/src/services/api/commonTempTable.js

@@ -1,10 +1,10 @@
-const CommonTempTable = {
-  // 初始化子表
-  initApplySubTable: '/api/af-system/logic/initApplySubTable',
-  // 创建临时表，根据配置文件动态生成
-  createTempTable: '/api/af-system/logic/createTempTable',
-  // 向临时表中插入数据
-  insertDataToTempTable: '/api/af-system/logic/insertDataToTempTable'
-}
-
-export { CommonTempTable }
+const CommonTempTable = {
+  // 初始化子表
+  initApplySubTable: '/api/af-system/logic/initApplySubTable',
+  // 创建临时表，根据配置文件动态生成
+  createTempTable: '/api/af-system/logic/createTempTable',
+  // 向临时表中插入数据
+  insertDataToTempTable: '/api/af-system/logic/insertDataToTempTable'
+}
+
+export { CommonTempTable }

package/src/services/api/index.js

@@ -1,17 +1,17 @@
-import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
-import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
-import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
-import { manageApi } from '@vue2-client/services/api/manage'
-import { get, post } from '@vue2-client/services/api/restTools'
-import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
-
-export {
-  commonApi, getColumnsJson, query, addOrModify, remove,
-  DictionaryDetailsViewApi,
-  LogDetailsViewApi,
-  manageApi,
-  QueryParamsDetailsViewApi,
-  get, post,
-  TicketDetailsViewApi
-}
+import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
+import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
+import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { get, post } from '@vue2-client/services/api/restTools'
+import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
+
+export {
+  commonApi, getColumnsJson, query, addOrModify, remove,
+  DictionaryDetailsViewApi,
+  LogDetailsViewApi,
+  manageApi,
+  QueryParamsDetailsViewApi,
+  get, post,
+  TicketDetailsViewApi
+}

package/src/services/api/manage.js

@@ -1,8 +1,8 @@
-const manageApi = {
-  // 查询：获取字典键列表
-  getDictionaryValue: '/api/af-system/logic/getDictionaryValue',
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/api/af-system/logic/getDivisionsOhChina'
-}
-
-export { manageApi }
+const manageApi = {
+  // 查询：获取字典键列表
+  getDictionaryValue: '/api/af-system/logic/getDictionaryValue',
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/api/af-system/logic/getDivisionsOhChina'
+}
+
+export { manageApi }

package/src/services/apiService.js

@@ -5,6 +5,7 @@
 module.exports = {
   LOGIN: `/rs/logic/getLogin`,
   V4_LOGIN: '/auth/login',
+  V4_LOGOUT: '/auth/logout',
   ROUTES: `/rs/user/userLogin/智慧燃气`,
   SEARCH: `/rs/search`,
   GOODS: `/goods`,

package/src/services/user.js

@@ -1,4 +1,4 @@
-import { LOGIN, ROUTES, V4_LOGIN } from '@vue2-client/services/apiService'
+import { LOGIN, ROUTES, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
 import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
 
 /**
@@ -29,10 +29,18 @@ export async function V4Login (name, password) {
  * 退出登录
  */
 export function logout () {
-  localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-  localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-  localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-  removeAuthorization()
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      removeAuthorization()
+    })
+  })
 }
 export default {
   login,

package/src/store/modules/index.js

@@ -1,4 +1,4 @@
-import account from './account'
-import setting from './setting'
-
-export default { account, setting }
+import account from './account'
+import setting from './setting'
+
+export default { account, setting }

package/src/store/mutation-types.js

@@ -1,2 +1,3 @@
 export const ACCESS_TOKEN = 'Access-Token'
 export const V4_ACCESS_TOKEN = 'Authorization'
+export const SYSTEM_VERSION = 'systemVersion'

package/src/theme/default/nprogress.less

@@ -1,76 +1,76 @@
-@import '~ant-design-vue/lib/style/themes/default';
-
-/* Make clicks pass-through */
-#nprogress {
-  pointer-events: none;
-}
-
-#nprogress .bar {
-  background: @primary-color;
-
-  position: fixed;
-  z-index: 1031;
-  top: 0;
-  left: 0;
-
-  width: 100%;
-  height: 2px;
-}
-
-/* Fancy blur effect */
-#nprogress .peg {
-  display: block;
-  position: absolute;
-  right: 0;
-  width: 100px;
-  height: 100%;
-  box-shadow: 0 0 10px @primary-color, 0 0 5px @primary-color;
-  opacity: 1.0;
-
-  -webkit-transform: rotate(3deg) translate(0px, -4px);
-  -ms-transform: rotate(3deg) translate(0px, -4px);
-  transform: rotate(3deg) translate(0px, -4px);
-}
-
-/* Remove these to get rid of the spinner */
-#nprogress .spinner {
-  display: block;
-  position: fixed;
-  z-index: 1031;
-  top: 15px;
-  right: 15px;
-}
-
-#nprogress .spinner-icon {
-  width: 18px;
-  height: 18px;
-  box-sizing: border-box;
-
-  border: solid 2px transparent;
-  border-top-color: @primary-color;
-  border-left-color: @primary-color;
-  border-radius: 50%;
-
-  -webkit-animation: nprogress-spinner 400ms linear infinite;
-  animation: nprogress-spinner 400ms linear infinite;
-}
-
-.nprogress-custom-parent {
-  overflow: hidden;
-  position: relative;
-}
-
-.nprogress-custom-parent #nprogress .spinner,
-.nprogress-custom-parent #nprogress .bar {
-  position: absolute;
-}
-
-@-webkit-keyframes nprogress-spinner {
-  0%   { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(360deg); }
-}
-@keyframes nprogress-spinner {
-  0%   { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
+@import '~ant-design-vue/lib/style/themes/default';
+
+/* Make clicks pass-through */
+#nprogress {
+  pointer-events: none;
+}
+
+#nprogress .bar {
+  background: @primary-color;
+
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 2px;
+}
+
+/* Fancy blur effect */
+#nprogress .peg {
+  display: block;
+  position: absolute;
+  right: 0;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px @primary-color, 0 0 5px @primary-color;
+  opacity: 1.0;
+
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px);
+}
+
+/* Remove these to get rid of the spinner */
+#nprogress .spinner {
+  display: block;
+  position: fixed;
+  z-index: 1031;
+  top: 15px;
+  right: 15px;
+}
+
+#nprogress .spinner-icon {
+  width: 18px;
+  height: 18px;
+  box-sizing: border-box;
+
+  border: solid 2px transparent;
+  border-top-color: @primary-color;
+  border-left-color: @primary-color;
+  border-radius: 50%;
+
+  -webkit-animation: nprogress-spinner 400ms linear infinite;
+  animation: nprogress-spinner 400ms linear infinite;
+}
+
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
+@-webkit-keyframes nprogress-spinner {
+  0%   { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); }
+}
+@keyframes nprogress-spinner {
+  0%   { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+