vue2-client 1.6.49 → 1.7.0

package/src/services/api/common.js

@@ -1,132 +1,137 @@
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-import notification from 'ant-design-vue/lib/notification'
-import message from 'ant-design-vue/lib/message'
-import { blobValidate } from '@vue2-client/utils/common'
-import errorCode from '@vue2-client/utils/errorCode'
-import { saveAs } from 'file-saver'
-import { post } from '@vue2-client/services/api/restTools'
-
-const commonApi = {
-  // 获取表格列配置
-  getColumnsJson: '/api/af-system/logic/getColumns',
-  // 通用查询
-  query: 'logic/commonQuery',
-  // 表单查询
-  queryWithResource: 'logic/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: 'logic/commonAddOrModify',
-  // 通用删除
-  delete: 'logic/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/api/af-system/logic/getDictionaryParam',
-  // 获取所有员工及其部门的级联菜单数据
-  getEmpTree: '/api/af-system/logic/getEmpTree',
-  // 导入数据
-  importData: 'logic/importData',
-  // 导出数据
-  exportData: 'logic/commonExport',
-  // 下载数据
-  download: 'resource/download',
-  // 通用上传
-  upload: '/resource/upload'
-}
-
-/**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
- * @param callback 回调函数
- */
-export function getColumnsJson (queryParamsName, callback) {
-  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
-}
-
-/**
- * 通用查询
- */
-export function query (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
-}
-
-/**
- * 通用表单查询
- */
-export function queryWithResource (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
-}
-
-/**
- * 通用导入
- */
-export function importData (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
-}
-
-/**
- * 通用导出
- */
-export function exportData (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
-}
-
-/**
- * 通用上传
- */
-export function upload (parameter, serviceName = 'af-system', config) {
-  return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
-}
-
-// 通用下载
-export function download (parameter, filename, serviceName = 'af-system') {
-  const notificationKey = 'download'
-  notification.open({
-    key: notificationKey,
-    message: '正在下载数据，请稍候',
-    duration: null,
-    icon: h => {
-      return h(
-        'a-icon',
-        {
-          props: {
-            type: 'loading'
-          }
-        }
-      )
-    }
-  })
-  return post('/api/' + serviceName + '/' + commonApi.download, parameter, {
-    responseType: 'blob'
-  }).then(async (data) => {
-    const isLogin = await blobValidate(data)
-    if (isLogin) {
-      const blob = new Blob([data])
-      saveAs(blob, filename)
-      message.success('下载成功')
-    } else {
-      const resText = await data.text()
-      const rspObj = JSON.parse(resText)
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
-      message.error(errMsg)
-    }
-    notification.close(notificationKey)
-  }).catch((r) => {
-    message.error('功能尚未实现，敬请期待！')
-    // message.error('下载文件出现错误，请联系管理员！')
-    notification.close(notificationKey)
-  })
-}
-
-export { commonApi }
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+import notification from 'ant-design-vue/lib/notification'
+import message from 'ant-design-vue/lib/message'
+import { blobValidate } from '@vue2-client/utils/common'
+import errorCode from '@vue2-client/utils/errorCode'
+import { saveAs } from 'file-saver'
+import { post } from '@vue2-client/services/api/restTools'
+
+const commonApi = {
+  // 获取表格列配置
+  getConfig: 'logic/getLiuliConfiguration',
+  // 通用查询
+  query: 'logic/commonQuery',
+  // 表单查询
+  queryWithResource: 'logic/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'logic/commonAddOrModify',
+  // 通用删除
+  delete: 'logic/commonDelete',
+  // 获取字典键列表
+  getDictionaryParam: '/api/system/logic/getDictionaryParam',
+  // 获取所有员工及其部门的级联菜单数据
+  getEmpTree: '/api/system/logic/getEmpTree',
+  // 导入数据
+  importData: 'logic/importData',
+  // 导出数据
+  exportData: 'logic/commonExport',
+  // 下载数据
+  download: 'resource/download',
+  // 通用上传
+  upload: '/resource/upload'
+}
+
+export function getConfigUrl (serviceName = 'system') {
+  return '/api/' + serviceName + '/' + commonApi.getConfig
+}
+
+/**
+ * 带缓存查询的表格配置文件查询
+ * @param queryParamsName 配置名称
+ * @param serviceName 命名空间名称
+ * @param callback 回调函数
+ */
+export function getColumnsJson (queryParamsName, serviceName = 'system', callback) {
+  indexedDB.getByWeb(queryParamsName, getConfigUrl(serviceName), { configName: queryParamsName }, callback)
+}
+
+/**
+ * 通用查询
+ */
+export function query (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
+}
+
+/**
+ * 通用表单查询
+ */
+export function queryWithResource (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
+}
+
+/**
+ * 通用删除
+ */
+export function remove (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
+}
+
+/**
+ * 通用导入
+ */
+export function importData (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
+}
+
+/**
+ * 通用导出
+ */
+export function exportData (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
+}
+
+/**
+ * 通用上传
+ */
+export function upload (parameter, serviceName = 'system', config) {
+  return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
+}
+
+// 通用下载
+export function download (parameter, filename, serviceName = 'system') {
+  const notificationKey = 'download'
+  notification.open({
+    key: notificationKey,
+    message: '正在下载数据，请稍候',
+    duration: null,
+    icon: h => {
+      return h(
+        'a-icon',
+        {
+          props: {
+            type: 'loading'
+          }
+        }
+      )
+    }
+  })
+  return post('/api/' + serviceName + '/' + commonApi.download, parameter, {
+    responseType: 'blob'
+  }).then(async (data) => {
+    const isLogin = await blobValidate(data)
+    if (isLogin) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+      message.success('下载成功')
+    } else {
+      const resText = await data.text()
+      const rspObj = JSON.parse(resText)
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+      message.error(errMsg)
+    }
+    notification.close(notificationKey)
+  }).catch((r) => {
+    message.error('功能尚未实现，敬请期待！')
+    // message.error('下载文件出现错误，请联系管理员！')
+    notification.close(notificationKey)
+  })
+}
+
+export { commonApi }

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/system/logic/initApplySubTable',
+  // 创建临时表，根据配置文件动态生成
+  createTempTable: '/api/system/logic/createTempTable',
+  // 向临时表中插入数据
+  insertDataToTempTable: '/api/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/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/system/logic/getDictionaryValue',
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/api/system/logic/getDivisionsOhChina'
+}
+
+export { manageApi }

package/src/services/apiService.js

@@ -1,14 +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`,
-  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`
-}
+// 跨域代理前缀
+// 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,67 +1,67 @@
-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'
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  let data = {
-    name: name,
-    password: password
-  }
-  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
-  return request(LOGIN, METHOD.POST, data)
-}
-
-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
-}
+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'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  let data = {
+    name: name,
+    password: password
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
+}
+
+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 }