vue2-client 1.5.21 → 1.5.23

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/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi

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/logininfor/index.js

@@ -1,6 +1,6 @@
-const loginforApi = {
-  // 查询：获取系统访问记录
-  query: '/api/af-system/logic/getLogininfor'
-}
-
-export { loginforApi }
+const loginforApi = {
+  // 查询：获取系统访问记录
+  query: '/api/af-system/logic/getLogininfor'
+}
+
+export { loginforApi }

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

@@ -1,13 +1,14 @@
-// 跨域代理前缀
-// const API_PROXY_PREFIX='/api'
-// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-
-module.exports = {
-  LOGIN: `/rs/logic/getLogin`,
-  V4_LOGIN: '/auth/login',
-  V4_LOGOUT: '/auth/logout',
-  ROUTES: `/rs/user/userLogin`,
-  SEARCH: `/rs/search`,
-  GOODS: `/goods`,
-  GOODS_COLUMNS: `/columns`
-}
+// 跨域代理前缀
+// const API_PROXY_PREFIX='/api'
+// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+
+module.exports = {
+  LOGIN: `/rs/logic/getLogin`,
+  MODIFY_PASSWORD: '/rs/user/modifypwd',
+  V4_LOGIN: '/auth/login',
+  V4_LOGOUT: '/auth/logout',
+  ROUTES: `/rs/user/userLogin`,
+  SEARCH: `/rs/search`,
+  GOODS: `/goods`,
+  GOODS_COLUMNS: `/columns`
+}

package/src/services/user.js

@@ -1,53 +1,64 @@
-import { LOGIN, ROUTES, V4_GET_INFO, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  return request(LOGIN, METHOD.POST, {
-    name: name,
-    password: password
-  })
-}
-
-export async function V4Login (name, password) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value, routeName = '智慧燃气') {
-  return request(ROUTES + '/' + routeName, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  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,
-  logout,
-  getRoutesConfig
-}
+import { LOGIN, MODIFY_PASSWORD, ROUTES, V4_GET_INFO, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  return request(LOGIN, METHOD.POST, {
+    name: name,
+    password: password
+  })
+}
+
+export async function modifyPassword (name, password, newPassword) {
+  return request(MODIFY_PASSWORD, METHOD.POST, {
+    data: {
+      ename: name,
+      password: password,
+      newpassword: newPassword,
+      affirmpassword: newPassword
+    }
+  })
+}
+
+export async function V4Login (name, password) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value, routeName = '智慧燃气') {
+  return request(ROUTES + '/' + routeName, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  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,
+  logout,
+  getRoutesConfig
+}

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 }