vue2-client 1.16.59 → 1.16.61

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

@@ -1,129 +1,129 @@
-const { homePage } = require('../../config')
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView'),
-  // his-web$ceshiGrid?type=GridView&configName=RxPreparedMed
-  gridView: () => import('@vue2-client/layouts/GridView'),
-  login: () => import('@vue2-client/pages/login/Login'),
-  loginv3: () => import('@vue2-client/pages/login/LoginV3')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-// 栅格配置视图
-routerResource.gridView = () => import('@vue2-client/layouts/GridView')
-// 测试
-routerResource.businessQuery = view.blank
-// 业务查询 - 收费查询
-routerResource.chargeQuery = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () =>
-  import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 通用服务评价
-routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// 页面编辑器
-routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
-// 数据检索
-routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
-// 数据检索(新)
-routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
-// 示例页面
-routerResource.example = {
-path: 'example',
-  name: '示例主页面',
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
-  // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
-  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
-  // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
-  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
-}
-// routerResource.example = () =>
-//    import('@vue2-client/pages/Example')
-routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
-
-routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
-
-routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
-routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
-      ? view.loginv3 : view.login
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
-    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
-    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : 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 { homePage } = require('../../config')
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView'),
+  // his-web$ceshiGrid?type=GridView&configName=RxPreparedMed
+  gridView: () => import('@vue2-client/layouts/GridView'),
+  login: () => import('@vue2-client/pages/login/Login'),
+  loginv3: () => import('@vue2-client/pages/login/LoginV3')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+// 栅格配置视图
+routerResource.gridView = () => import('@vue2-client/layouts/GridView')
+// 测试
+routerResource.businessQuery = view.blank
+// 业务查询 - 收费查询
+routerResource.chargeQuery = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () =>
+  import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 通用服务评价
+routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
+// 系统设置
+routerResource.settings = () => import('@vue2-client/pages/system/settings')
+// 页面编辑器
+routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
+// 数据检索
+routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
+// 数据检索(新)
+routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
+// 示例页面
+routerResource.example = {
+path: 'example',
+  name: '示例主页面',
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
+  // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
+  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
+  // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
+  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
+}
+// routerResource.example = () =>
+//    import('@vue2-client/pages/Example')
+routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
+
+routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
+
+routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
+routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
+      ? view.loginv3 : view.login
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
+    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
+    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : 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/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/vue.config.js

@@ -42,12 +42,6 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
-      '/socket/af-system': {
-        target: 'http://127.0.0.1:9002',
-        ws: true,
-        changeOrigin: true,
-        pathRewrite: { '^/socket/af-system': '/concept-websocket' },
-      },
       '/revenue-web/api/af-revenue': {
         pathRewrite: { '^/revenue-web/': '/' },
         target: v3Server,
@@ -89,10 +83,6 @@ module.exports = {
         target: revenue,
         changeOrigin: true
       },
-      '/api/af-linepatrol': {
-        target: revenue,
-        changeOrigin: true
-      },
       '/api/af-gaslink': {
         // pathRewrite: { '^/api/af-gaslink/': '/' },
         // target: 'http://127.0.0.1:9036',