vue2-client 1.2.73 → 1.2.74

package/src/pages/resourceManage/orgListManage.vue

@@ -1,98 +1,98 @@
-<template>
-  <div id="orgListManage">
-    <a-card :bordered="false">
-      <!--<a-row :gutter="48">-->
-      <!--<a-col>-->
-      <!--<a-space>-->
-      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
-      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
-      <!--</a-button>-->
-      <!--<a-button-->
-      <!--v-if="!buttonState || buttonState.edit"-->
-      <!--:loading="editDataLoading"-->
-      <!--:disabled="!isModify"-->
-      <!--class="btn-success"-->
-      <!--type="dashed"-->
-      <!--@click="editItem">-->
-      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
-      <!--</a-button>-->
-      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
-      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
-      <!--</a-button>-->
-      <!--</a-space>-->
-      <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
-      <!--<a-button-group>-->
-      <!--<a-button @click="toggleIsFormShow">-->
-      <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
-      <!--</a-button>-->
-      <!--<a-button @click="refresh(true)">-->
-      <!--<a-icon :style="iconStyle" type="reload" />-->
-      <!--</a-button>-->
-      <!--<a-button @click="showDrawer">-->
-      <!--<a-icon :style="iconStyle" type="table" />-->
-      <!--</a-button>-->
-      <!--<a-button @click="exports">-->
-      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
-      <!--</a-button>-->
-      <!--</a-button-group>-->
-      <!--</span>-->
-      <!--</a-col>-->
-      <!--</a-row>-->
-      <a-table
-        :columns="columns"
-        :data-source="funTree"
-        :pagination="false"
-        bordered
-        rowKey="id"
-        size="middle">
-      </a-table>
-    </a-card>
-  </div>
-</template>
-
-<script>
-  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
-  import { getColumnsJson } from '@vue2-client/services/api'
-  export default {
-    // 组织管理
-    name: 'orgListManage',
-    data () {
-      return {
-        columnsJson: [],
-        funTree: [],
-        columns: [
-          {
-            title: '组织名称',
-            dataIndex: 'name'
-          },
-          {
-            title: '排序',
-            dataIndex: 'position'
-          },
-          {
-            title: '组件目录',
-            dataIndex: 'f_dir'
-          },
-          {
-            title: '描述',
-            dataIndex: 'f_description'
-          }
-        ]
-      }
-    },
-    created () {
-    },
-    async mounted () {
-      getColumnsJson('orgListManage', (res) => {
-        this.columnsJson = res
-      })
-      const fun = await getOrganization()
-      this.funTree = searchFun(fun, '组织机构')
-    },
-    methods: {
-    }
-  }
-</script>
-
-<style lang="less">
-</style>
+<template>
+  <div id="orgListManage">
+    <a-card :bordered="false">
+      <!--<a-row :gutter="48">-->
+      <!--<a-col>-->
+      <!--<a-space>-->
+      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
+      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
+      <!--</a-button>-->
+      <!--<a-button-->
+      <!--v-if="!buttonState || buttonState.edit"-->
+      <!--:loading="editDataLoading"-->
+      <!--:disabled="!isModify"-->
+      <!--class="btn-success"-->
+      <!--type="dashed"-->
+      <!--@click="editItem">-->
+      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
+      <!--</a-button>-->
+      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
+      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
+      <!--</a-button>-->
+      <!--</a-space>-->
+      <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
+      <!--<a-button-group>-->
+      <!--<a-button @click="toggleIsFormShow">-->
+      <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
+      <!--</a-button>-->
+      <!--<a-button @click="refresh(true)">-->
+      <!--<a-icon :style="iconStyle" type="reload" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="showDrawer">-->
+      <!--<a-icon :style="iconStyle" type="table" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="exports">-->
+      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
+      <!--</a-button>-->
+      <!--</a-button-group>-->
+      <!--</span>-->
+      <!--</a-col>-->
+      <!--</a-row>-->
+      <a-table
+        :columns="columns"
+        :data-source="funTree"
+        :pagination="false"
+        bordered
+        rowKey="id"
+        size="middle">
+      </a-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+  import { getColumnsJson } from '@vue2-client/services/api'
+  export default {
+    // 组织管理
+    name: 'orgListManage',
+    data () {
+      return {
+        columnsJson: [],
+        funTree: [],
+        columns: [
+          {
+            title: '组织名称',
+            dataIndex: 'name'
+          },
+          {
+            title: '排序',
+            dataIndex: 'position'
+          },
+          {
+            title: '组件目录',
+            dataIndex: 'f_dir'
+          },
+          {
+            title: '描述',
+            dataIndex: 'f_description'
+          }
+        ]
+      }
+    },
+    created () {
+    },
+    async mounted () {
+      getColumnsJson('orgListManage', (res) => {
+        this.columnsJson = res
+      })
+      const fun = await getOrganization()
+      this.funTree = searchFun(fun, '组织机构')
+    },
+    methods: {
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

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

@@ -1,26 +1,26 @@
-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)
-}
-
-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)
+}
+
+export default options

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

@@ -1,60 +1,60 @@
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-// --------------------------------------系统配置--------------------------------------
-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.createQuery = () => import('@vue2-client/pages/CreateQueryPage.vue')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-// --------------------------------------报表组件--------------------------------------
-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
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+// --------------------------------------系统配置--------------------------------------
+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.createQuery = () => import('@vue2-client/pages/CreateQueryPage.vue')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+// --------------------------------------报表组件--------------------------------------
+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/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/common.js

@@ -1,56 +1,56 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-const commonApi = {
-  // 获取表格列配置
-  getColumnsJson: '/webmeterapi/getColumns',
-  // 通用查询
-  query: '/webmeterapi/commonQuery',
-  // 表单通用查询
-  queryWithResource: '/webmeterapi/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: '/webmeterapi/commonAddOrModify',
-  // 通用删除
-  delete: '/webmeterapi/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/webmeterapi/getDictionaryParam'
-}
-
-/**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
- * @param callback 回调函数
- */
-export function getColumnsJson (queryParamsName, callback) {
-  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
-}
-
-/**
- * 通用表单查询
- */
-export function query (parameter) {
-  return request(commonApi.query, METHOD.POST, parameter)
-}
-
-/**
- * 通用表单查询
- */
-export function queryWithResource (parameter) {
-  return request(commonApi.queryWithResource, 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'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+const commonApi = {
+  // 获取表格列配置
+  getColumnsJson: '/webmeterapi/getColumns',
+  // 通用查询
+  query: '/webmeterapi/commonQuery',
+  // 表单通用查询
+  queryWithResource: '/webmeterapi/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: '/webmeterapi/commonAddOrModify',
+  // 通用删除
+  delete: '/webmeterapi/commonDelete',
+  // 获取字典键列表
+  getDictionaryParam: '/webmeterapi/getDictionaryParam'
+}
+
+/**
+ * 带缓存查询的表格配置文件查询
+ * @param queryParamsName 配置名称
+ * @param callback 回调函数
+ */
+export function getColumnsJson (queryParamsName, callback) {
+  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
+}
+
+/**
+ * 通用表单查询
+ */
+export function query (parameter) {
+  return request(commonApi.query, METHOD.POST, parameter)
+}
+
+/**
+ * 通用表单查询
+ */
+export function queryWithResource (parameter) {
+  return request(commonApi.queryWithResource, 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/manage.js

@@ -1,16 +1,16 @@
-const manageApi = {
-  // 查询：获取燃气公司列表
-  orgList: '/webmeterapi/foreignaidGetOrgList',
-  // 查询：获取客户列表
-  customerList: '/webmeterapi/foreignaidGetCustomerList',
-  // 查询：检查链接有效性
-  checkUrlWork: '/webmeterapi/foreignaidCheckUrl',
-  // 操作：客户数据
-  doCustomerInfo: '/webmeterapi/foreignaidDoCustomerInfo',
-  // 查询：获取字典键列表
-  getDictionaryValue: '/webmeterapi/getDictionaryValue',
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/webmeterapi/getDivisionsOhChina'
-}
-
-export { manageApi }
+const manageApi = {
+  // 查询：获取燃气公司列表
+  orgList: '/webmeterapi/foreignaidGetOrgList',
+  // 查询：获取客户列表
+  customerList: '/webmeterapi/foreignaidGetCustomerList',
+  // 查询：检查链接有效性
+  checkUrlWork: '/webmeterapi/foreignaidCheckUrl',
+  // 操作：客户数据
+  doCustomerInfo: '/webmeterapi/foreignaidDoCustomerInfo',
+  // 查询：获取字典键列表
+  getDictionaryValue: '/webmeterapi/getDictionaryValue',
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/webmeterapi/getDivisionsOhChina'
+}
+
+export { manageApi }

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-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 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-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 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }