vue2-client 1.1.0 → 1.2.2

package/src/pages/report/ReportTableHome.vue

@@ -1,28 +1,28 @@
-<template>
-  <report-table :tableData="tableData"></report-table>
-</template>
-
-<script>
-  import { post } from '@/services/api/restTools'
-  import ReportTable from '@/pages/report/ReportTable'
-  export default {
-    name: 'ReportTableHome',
-    components: { ReportTable },
-    data () {
-      return {
-        tableData: null
-      }
-    },
-    created () {
-    },
-    mounted () {
-      this.getData()
-    },
-    methods: {
-      async getData () {
-        this.tableData = await post('webmeterapi/reportTest', {})
-        console.log('数据=>', JSON.stringify(this.tableData))
-      }
-    }
-  }
-</script>
+<template>
+  <report-table :tableData="tableData"></report-table>
+</template>
+
+<script>
+  import { post } from '@vue2-client/services/api/restTools'
+  import ReportTable from '@vue2-client/pages/report/ReportTable'
+  export default {
+    name: 'ReportTableHome',
+    components: { ReportTable },
+    data () {
+      return {
+        tableData: null
+      }
+    },
+    created () {
+    },
+    mounted () {
+      this.getData()
+    },
+    methods: {
+      async getData () {
+        this.tableData = await post('webmeterapi/reportTest', {})
+        console.log('数据=>', JSON.stringify(this.tableData))
+      }
+    }
+  }
+</script>

package/src/pages/resourceManage/resourceManageMain.vue

@@ -1,55 +1,55 @@
-<!--<template>-->
-  <!--<div id="resourceManageMain">-->
-    <!--<a-tabs>-->
-      <!--<a-tab-pane key="1" force-render>-->
-        <!--<span slot="tab"><a-icon type="apartment" />资源管理</span>-->
-        <!--Content of Tab Pane 1-->
-      <!--</a-tab-pane>-->
-      <!--<a-tab-pane key="2" tab="功能管理" force-render>-->
-        <!--Content of Tab Pane 2-->
-      <!--</a-tab-pane>-->
-      <!--<a-tab-pane key="3" tab="部门管理" force-render>-->
-        <!--Content of Tab Pane 3-->
-      <!--</a-tab-pane>-->
-    <!--</a-tabs>-->
-  <!--</div>-->
-<!--</template>-->
-
-<script>
-  import { mapState } from 'vuex'
-  import { getResourceFunction } from '@/base-client/plugins/GetLoginInfoService'
-
-  export default {
-    name: 'resourceManageMain',
-    computed: {
-      ...mapState('account', ['login'])
-    },
-    data () {
-      return {
-        resFun: []
-      }
-    },
-    created () {
-    },
-    async mounted () {
-      const fun = await getResourceFunction()
-      console.log('->', fun)
-      this.resFun = this.searchFun(fun, '资源功能')
-    },
-    methods: {
-      searchFun (fun, name) {
-        if (fun.length > 0) {
-          if (fun[0].name == name) {
-            return fun[0].children
-          } else {
-            return this.searchFun(fun[0].children, name)
-          }
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-
-</style>
+<!--<template>-->
+  <!--<div id="resourceManageMain">-->
+    <!--<a-tabs>-->
+      <!--<a-tab-pane key="1" force-render>-->
+        <!--<span slot="tab"><a-icon type="apartment" />资源管理</span>-->
+        <!--Content of Tab Pane 1-->
+      <!--</a-tab-pane>-->
+      <!--<a-tab-pane key="2" tab="功能管理" force-render>-->
+        <!--Content of Tab Pane 2-->
+      <!--</a-tab-pane>-->
+      <!--<a-tab-pane key="3" tab="部门管理" force-render>-->
+        <!--Content of Tab Pane 3-->
+      <!--</a-tab-pane>-->
+    <!--</a-tabs>-->
+  <!--</div>-->
+<!--</template>-->
+
+<script>
+  import { mapState } from 'vuex'
+  import { getResourceFunction } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+
+  export default {
+    name: 'resourceManageMain',
+    computed: {
+      ...mapState('account', ['login'])
+    },
+    data () {
+      return {
+        resFun: []
+      }
+    },
+    created () {
+    },
+    async mounted () {
+      const fun = await getResourceFunction()
+      console.log('->', fun)
+      this.resFun = this.searchFun(fun, '资源功能')
+    },
+    methods: {
+      searchFun (fun, name) {
+        if (fun.length > 0) {
+          if (fun[0].name == name) {
+            return fun[0].children
+          } else {
+            return this.searchFun(fun[0].children, name)
+          }
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/pages/system/applyInstallView/Core.vue

@@ -92,7 +92,7 @@ import Control from './LFComponents/Control'
 import PropertyDialog from './PropertySetting/PropertyDialog'
 import DataDialog from './LFComponents/DataDialog'
 import { nodeList } from './config'
-import { showXml } from '@/utils/util'
+import { showXml } from '@vue2-client/utils/util'
 import FileSaver from 'file-saver'
 import JsonViewer from 'vue-json-viewer'
 

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

@@ -5,7 +5,7 @@
 </template>
 <script>
 
-import Core from '@/pages/system/applyInstallView/Core'
+import Core from '@vue2-client/pages/system/applyInstallView/Core'
 
 export default {
   name: 'Test',

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

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-  import XFormTable from '@/base-client/components/common/XFormTable/XFormTable'
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 
   export default {
     name: 'Dictionary',

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

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-  import XFormTable from '@/base-client/components/common/XFormTable/XFormTable'
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 
   export default {
     name: 'QueryParams',

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

@@ -1,5 +1,5 @@
 import routerMap from './router.map'
-import { parseRoutes } from '@/utils/routerUtil'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
 
 // 异步路由配置
 const routesConfig = [

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

@@ -1,59 +1,59 @@
-// 视图组件
-const view = {
-  tabs: () => import('@/layouts/tabs'),
-  blank: () => import('@/layouts/BlankView'),
-  page: () => import('@/layouts/PageView'),
-  singlePage: () => import('@/layouts/SinglePageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.singlePage
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@/pages/system/queryParams')
-// 报装可视化
-routerResource.applyInstallView = () => import(/* webpackChunkName: "applyInstallView" */ '@/pages/system/applyInstallView')
-// --------------------------------------报表组件--------------------------------------
-routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@/pages/report/ReportTableHome')
-// --------------------------------------资源管理--------------------------------------
-routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@/pages/resourceManage/resourceManageMain')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: '/login',
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView'),
+  singlePage: () => import('@vue2-client/layouts/SinglePageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.singlePage
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 报装可视化
+routerResource.applyInstallView = () => import(/* webpackChunkName: "applyInstallView" */ '@vue2-client/pages/system/applyInstallView')
+// --------------------------------------报表组件--------------------------------------
+routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
+// --------------------------------------资源管理--------------------------------------
+routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: '/login',
+    component: view.tabs
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/router/guards.js

@@ -1,6 +1,6 @@
-import { hasAuthority } from '@/utils/authority-utils'
-import { loginIgnore } from '@/router/index'
-import { checkAuthorization } from '@/utils/request'
+import { hasAuthority } from '@vue2-client/utils/authority-utils'
+import { loginIgnore } from '@vue2-client/router/index'
+import { checkAuthorization } from '@vue2-client/utils/request'
 import NProgress from 'nprogress'
 
 NProgress.configure({ showSpinner: false })

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login'], // 根据路由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 = isAsync ? require('./async/config.async').default : require('./config').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login'], // 根据路由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/EmployeeDetailsViewApi.js

@@ -10,7 +10,9 @@ const EmployeeDetailsViewApi = {
   // 查询：获取部门名字典
   getDepartmentDictionary: '/webmeterapi/getDepartmentDictionary',
   // 查询：获取模块名字典
-  getModelDictionary: '/webmeterapi/getModelDictionary'
+  getModelDictionary: '/webmeterapi/getModelDictionary',
+  // 查询：获取所有员工名，供前端展示备选项
+  getAllEmployeeName: '/webmeterapi/getAllEmployeeName'
 }
 
 export { EmployeeDetailsViewApi }

package/src/services/api/TicketDetailsViewApi.js

@@ -24,7 +24,15 @@ const TicketDetailsViewApi = {
   // 获取工单类别字典
   getTicketCategoryDictionary: '/webmeterapi/getTicketCategoryDictionary',
   // 在工单提交页面删除照片
-  revocationImage: '/webmeterapi/revocationImage'
+  revocationImage: '/webmeterapi/revocationImage',
+  // 在工单提交页面删除照片
+  getTicketImages: '/webmeterapi/getTicketImages',
+  // 用户填写附加信息时取消了操作，将已上传的照片清空
+  removeAllImages: '/webmeterapi/removeAllImages',
+  // 提交用户填写附加信息
+  AddonDescriptionToTicket: '/webmeterapi/AddonDescriptionToTicket',
+  // 获取用户填写附加信息
+  getAddonDescription: '/webmeterapi/getAddonDescription'
 }
 
 export { TicketDetailsViewApi }

package/src/services/api/common.js

@@ -1,39 +1,37 @@
-import { METHOD, request } from '@/utils/request'
-
-const commonApi = {
-  // 获取表格列配置
-  getColumnsJson: '/webmeterapi/getColumns',
-  // 通用查询
-  query: '/webmeterapi/commonQuery',
-  // 通用新增/修改
-  addOrModify: '/webmeterapi/commonAddOrModify',
-  // 通用删除
-  delete: '/webmeterapi/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/webmeterapi/getDictionaryParam',
-  // 根据字典键获取值
-  getDictionaryValue: '/webmeterapi/getDictionaryValue'
-}
-
-/**
- * 通用表单查询
- */
-export function query (parameter) {
-  return request(commonApi.query, METHOD.POST, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter) {
-  return request(commonApi.addOrModify, METHOD.POST, parameter)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter) {
-  return request(commonApi.delete, METHOD.POST, parameter)
-}
-
-export { commonApi }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+const commonApi = {
+  // 获取表格列配置
+  getColumnsJson: '/webmeterapi/getColumns',
+  // 通用查询
+  query: '/webmeterapi/commonQuery',
+  // 通用新增/修改
+  addOrModify: '/webmeterapi/commonAddOrModify',
+  // 通用删除
+  delete: '/webmeterapi/commonDelete',
+  // 获取字典键列表
+  getDictionaryParam: '/webmeterapi/getDictionaryParam'
+}
+
+/**
+ * 通用表单查询
+ */
+export function query (parameter) {
+  return request(commonApi.query, METHOD.POST, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify (parameter) {
+  return request(commonApi.addOrModify, METHOD.POST, parameter)
+}
+
+/**
+ * 通用删除
+ */
+export function remove (parameter) {
+  return request(commonApi.delete, METHOD.POST, parameter)
+}
+
+export { commonApi }

package/src/services/api/restTools.js

@@ -1,23 +1,23 @@
-import { METHOD, request } from '@/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter) {
-  return request(url, METHOD.POST, parameter)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter) {
+  return request(url, METHOD.POST, parameter)
+}
+
+export { get, post }

package/src/services/dataSource.js

@@ -1,5 +1,5 @@
 import { GOODS, GOODS_COLUMNS } from './api'
-import { METHOD, request } from '@/utils/request'
+import { METHOD, request } from '@vue2-client/utils/request'
 
 export async function goodsList (params) {
   return request(GOODS, METHOD.GET, params)

package/src/services/user.js

@@ -1,5 +1,5 @@
-import { LOGIN, ROUTES } from '@/services/api'
-import { request, METHOD, removeAuthorization } from '@/utils/request'
+import { LOGIN, ROUTES } from '@vue2-client/services/api'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
 
 /**
  * 登录服务

package/src/store/index.js

@@ -1,5 +1,5 @@
-import modules from './modules'
-
-export {
-  modules
-}
+import modules from './modules'
+
+export {
+  modules
+}

package/src/store/modules/setting.js

@@ -1,8 +1,8 @@
-import config from '@/config'
-import { ADMIN } from '@/config/default'
-import { formatFullPath } from '@/utils/i18n'
-import { filterMenu } from '@/utils/authority-utils'
-import { getLocalSetting } from '@/utils/themeUtil'
+import config from '@vue2-client/config'
+import { ADMIN } from '@vue2-client/config/default'
+import { formatFullPath } from '@vue2-client/utils/i18n'
+import { filterMenu } from '@vue2-client/utils/authority-utils'
+import { getLocalSetting } from '@vue2-client/utils/themeUtil'
 import deepClone from 'lodash.clonedeep'
 
 const localSetting = getLocalSetting(true)

package/src/theme/index.less

@@ -1,5 +1,5 @@
-@import '~ant-design-vue/dist/antd.less';
-@import "default/index";
-@import "antd/index";
-@import "global.less";
-@import "reportTable.less";
+@import '~ant-design-vue/dist/antd.less';
+@import "default/index";
+@import "antd/index";
+@import "global.less";
+@import "reportTable.less";