vue2-client 1.2.5 → 1.2.8

package/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+> 所有关于本项目的变化都在该文档里。
+
+**##1.2.8 -2022-03-24 @江超**
+- 问题修复：
+- [登录页面]：修复登录后欢迎提示出现undefined的问题
+- [查询配置生成]：修复修改表单查询方式下拉框报错的问题
+
+**##1.2.7 -2022-03-24 @江超**
+- 功能新增：
+- [系统设置]：新增 [工单提交] 功能（submitTicket），用户在操作业务时如发现系统异常，可使用该功能反馈问题
+- [登录页面]：登陆人部门为 [用户工单登记] 时会直接跳转到[工单提交]页面（在基于新架构的营收全面使用时，会取消该限制，并将[工单提交]作为常驻功能）
+
+**##1.0.0 - 1.2.6 -2022-03-23 @陈栋扬**
+- 初始化：
+- 公共组件和配置抽取完成

package/package.json

@@ -1,89 +1,89 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.5",
-  "private": false,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@antv/data-set": "^0.11.4",
-    "@antv/f2": "^3.6.4",
-    "@antv/g2plot": "^2.3.33",
-    "@logicflow/core": "^1.1.7",
-    "@logicflow/extension": "^1.1.7",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "animate.css": "^4.1.0",
-    "ant-design-vue": "1.7.8",
-    "axios": "^0.19.2",
-    "clipboard": "^2.0.6",
-    "core-js": "^3.6.5",
-    "date-fns": "^2.14.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^10.2.1",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.6.11",
-    "vue-i18n": "^8.18.2",
-    "vue-json-viewer": "^2.2.15",
-    "vue-router": "^3.3.4",
-    "vuedraggable": "^2.23.2",
-    "vuex": "^3.4.0",
-    "xlsx": "0.17.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^4.0.1",
-    "@vue/cli-plugin-babel": "^4.4.0",
-    "@vue/cli-plugin-eslint": "^4.4.0",
-    "@vue/cli-plugin-router": "^4.4.0",
-    "@vue/cli-plugin-unit-jest": "~5.0.0",
-    "@vue/cli-plugin-vuex": "^4.4.0",
-    "@vue/cli-service": "^4.4.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vue/test-utils": "^1.1.3",
-    "@vue/vue2-jest": "^27.0.0-alpha.2",
-    "@vuepress/plugin-back-to-top": "^1.5.2",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^2.0.0",
-    "deepmerge": "^4.2.2",
-    "echarts": "^4.9.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "fast-deep-equal": "^3.1.3",
-    "gh-pages": "^3.1.0",
-    "jest": "^27.0.5",
-    "less-loader": "^6.1.1",
-    "react-bmap": "^1.0.121",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.3.2",
-    "vue-amap": "^0.5.10",
-    "vue-baidu-map": "^0.21.22",
-    "vue-bmap-gl": "0.0.29",
-    "vue-cli-plugin-style-resources-loader": "^0.1.4",
-    "vue-mapvgl": "0.0.28",
-    "vue-template-compiler": "^2.6.11",
-    "vuepress": "^1.5.2",
-    "webpack-theme-color-replacer": "1.3.18",
-    "whatwg-fetch": "^3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.2.8",
+  "private": false,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@antv/data-set": "^0.11.4",
+    "@antv/f2": "^3.6.4",
+    "@antv/g2plot": "^2.3.33",
+    "@logicflow/core": "^1.1.7",
+    "@logicflow/extension": "^1.1.7",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "animate.css": "^4.1.0",
+    "ant-design-vue": "1.7.8",
+    "axios": "^0.19.2",
+    "clipboard": "^2.0.6",
+    "core-js": "^3.6.5",
+    "date-fns": "^2.14.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^10.2.1",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.6.11",
+    "vue-i18n": "^8.18.2",
+    "vue-json-viewer": "^2.2.15",
+    "vue-router": "^3.3.4",
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.4.0",
+    "xlsx": "0.17.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^4.0.1",
+    "@vue/cli-plugin-babel": "^4.4.0",
+    "@vue/cli-plugin-eslint": "^4.4.0",
+    "@vue/cli-plugin-router": "^4.4.0",
+    "@vue/cli-plugin-unit-jest": "~5.0.0",
+    "@vue/cli-plugin-vuex": "^4.4.0",
+    "@vue/cli-service": "^4.4.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "^1.1.3",
+    "@vue/vue2-jest": "^27.0.0-alpha.2",
+    "@vuepress/plugin-back-to-top": "^1.5.2",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^2.0.0",
+    "deepmerge": "^4.2.2",
+    "echarts": "^4.9.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "fast-deep-equal": "^3.1.3",
+    "gh-pages": "^3.1.0",
+    "jest": "^27.0.5",
+    "less-loader": "^6.1.1",
+    "react-bmap": "^1.0.121",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.3.2",
+    "vue-amap": "^0.5.10",
+    "vue-baidu-map": "^0.21.22",
+    "vue-bmap-gl": "0.0.29",
+    "vue-cli-plugin-style-resources-loader": "^0.1.4",
+    "vue-mapvgl": "0.0.28",
+    "vue-template-compiler": "^2.6.11",
+    "vuepress": "^1.5.2",
+    "webpack-theme-color-replacer": "1.3.18",
+    "whatwg-fetch": "^3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

package/src/base-client/components/ticket/TicketSubmitSuccessView/TicketSubmitSuccessView.vue

@@ -396,7 +396,7 @@ export default {
           return '由于您的工单等待时间过长，系统已为您自动加急工单，请保持电话畅通，感谢您的理解'
         } else {
           // 超过十分钟
-          return '很抱歉让您久等，029-88888888 您可以直接拨打此电话，与我们技术人员直接交谈！'
+          return '很抱歉让您久等，请电询：14709288966'
         }
       } else {
         // 高优先级
@@ -409,7 +409,7 @@ export default {
           return '您的工单已经被加急处理，我们的工作人员会马上与您取得联系'
         } else {
           // 超过十分钟
-          return '很抱歉让您久等，029-88888888 您可以直接拨打此电话，与我们技术人员直接交谈！'
+          return '很抱歉让您久等，请电询：14709288966'
         }
       }
     },

package/src/config/CreateQueryConfig.js

@@ -0,0 +1,40 @@
+module.exports = {
+  queryType: [
+    {
+      label: '相等(=)', key: '=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '不相等(!=)', key: '!=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '全模糊(like)', key: 'LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '左模糊(left like)', key: 'LEFT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '右模糊(right like)', key: 'RIGHT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '大于(>)', key: '>', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '大于等于(>=)', key: '>=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于(<)', key: '<', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于等于(<=)', key: '<=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '包含(in)', key: 'IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '不包含(not in)', key: 'NOT_IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '之间(between)', key: 'BETWEEN', match: 'rangePicker'
+    }
+  ]
+}

package/src/config/default/setting.config.js

@@ -18,6 +18,7 @@ module.exports = {
   cachePage: true, // 是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
   hideSetting: false, // 隐藏设置抽屉，true:隐藏，false:不隐藏
   homePage: '/system/dictionaryManage', // 首页路由, 登陆后默认打开
+  ticketPage: '/submitTicket', // 提交工单路由
   systemName: '物联网监控平台', // 系统名称
   copyright: '2021 Mr.Jiang', // copyright
   asyncRoutes: true, // 异步加载路由，true:开启，false:不开启

package/src/pages/login/Login.vue

@@ -61,9 +61,9 @@ import { mapMutations } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
-import Mock from 'mockjs'
 import { positions } from '@vue2-client/mock/common'
-const { homePage } = require('@vue2-client/config')
+import { timeFix } from '@/utils/util'
+const { homePage, ticketPage } = require('@vue2-client/config')
 // import { router } from '@vue2-client/mock/user/routes'
 
 export default {
@@ -123,8 +123,12 @@ export default {
             const dateAfter = new Date(timestamp)
             setAuthorization({ token: data, expireAt: dateAfter })
             loadRoutes(funcToRouter(user.functions))
-            this.$router.push(homePage).catch(() => {})
-            this.$message.success(Mock.mock('@TIMEFIX').CN + '，欢迎回来', 3)
+            if (result.deps === '用户工单登记') {
+              this.$router.push(ticketPage).catch(() => {})
+            } else {
+              this.$router.push(homePage).catch(() => {})
+            }
+            this.$message.success(timeFix().CN + '，欢迎回来', 3)
           })
         })
       } else {