vue2-client 1.2.6 → 1.2.9

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

@@ -1,57 +1,59 @@
-// 视图组件
-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.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'),
+  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.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/services/api/EmployeeDetailsViewApi.js

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

package/src/utils/util.js

@@ -1,5 +1,29 @@
 import enquireJs from 'enquire.js'
 
+const timeList = [
+  {
+    CN: '早上好',
+    HK: '早晨啊',
+    US: 'Good morning'
+  }, {
+    CN: '上午好',
+    HK: '上午好',
+    US: 'Good morning'
+  }, {
+    CN: '中午好',
+    HK: '中午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '下午好',
+    HK: '下午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '晚上好',
+    HK: '晚上好',
+    US: 'Good evening'
+  }
+]
+
 export function isDef (v) {
   return v !== undefined && v !== null
 }
@@ -43,6 +67,13 @@ export function timeCompare (date1, date2) {
   return date11.time > date22.time ? 1 : -1
 }
 
+export function timeFix () {
+  const time = new Date()
+  const hour = time.getHours()
+  return hour < 9
+    ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+}
+
 /**
  * Remove an item from an array.
  */
@@ -81,16 +112,15 @@ export function showXml (str) {
 
   // 把注释编码
   text = text.replace(/\n/g, '\r').replace(/<!--(.+?)-->/g, function ($0, text) {
-    var ret = '<!--' + escape(text) + '-->'
-    return ret
+    return '<!--' + escape(text) + '-->'
   }).replace(/\r/g, '\n')
 
   // 调整格式
-  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(?:(\/)>)|(?:<(\/)\2>)))?)/mg
+  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(\/)>|<(\/)\2>))?)/mg
   const nodeStack = []
   const output = text.replace(rgx, function ($0, all, name, isBegin, isCloseFull1, isCloseFull2, isFull1, isFull2) {
     const isClosed = (isCloseFull1 === '/') || (isCloseFull2 === '/') || (isFull1 === '/') || (isFull2 === '/')
-    let prefix = ''
+    let prefix
     if (isBegin === '!') {
       prefix = getPrefix(nodeStack.length)
     } else {

package/vue.config.js

@@ -59,11 +59,6 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
-      'iot/webmeterapi': {
-        pathRewrite: { '^/iot/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
       '/webmeterapi': {
         pathRewrite: { '^/webmeterapi': '/rs/logic' },
         target: local,
@@ -73,11 +68,6 @@ module.exports = {
         pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
         target: local,
         changeOrigin: true
-      },
-      '/webmetersql': {
-        pathRewrite: { '^/webmetersql': '/rs/sql' },
-        target: local,
-        changeOrigin: true
       }
     }
   },