diff --git a/orange-demo-multi-web/.eslintignore b/orange-demo-multi-web/.eslintignore new file mode 100644 index 00000000..9c420b5a --- /dev/null +++ b/orange-demo-multi-web/.eslintignore @@ -0,0 +1 @@ +/src/views/workflow/package/* \ No newline at end of file diff --git a/orange-demo-multi-web/.eslintrc.js b/orange-demo-multi-web/.eslintrc.js index f62621ce..81d92950 100644 --- a/orange-demo-multi-web/.eslintrc.js +++ b/orange-demo-multi-web/.eslintrc.js @@ -11,7 +11,7 @@ module.exports = { parser: 'babel-eslint' }, rules: { - 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-console': 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'semi': ['off', 'always'], 'prefer-promise-reject-errors': ['error', { 'allowEmptyReject': true }], @@ -23,8 +23,7 @@ module.exports = { 'lines-between-class-members': ['off'], // 'no-undef': ['off', 'always'], // 'no-unused-vars': ['off', 'always'], - 'no-new-func': ['off', 'always'], - 'no-console': ['off'] + 'no-new-func': ['off', 'always'] }, overrides: [ { diff --git a/orange-demo-multi-web/package.json b/orange-demo-multi-web/package.json index 0c996ed5..db304a7c 100644 --- a/orange-demo-multi-web/package.json +++ b/orange-demo-multi-web/package.json @@ -26,7 +26,13 @@ "vue": "^2.6.11", "vue-router": "^3.1.5", "vuex": "^3.1.2", - "wangeditor": "^3.1.1" + "wangeditor": "^3.1.1", + "vue-json-viewer": "^2.2.18", + "min-dash": "^3.5.2", + "vuedraggable": "^2.24.3", + "xml-js": "^1.6.11", + "highlight.js": "^10.5.0", + "bpmn-js-token-simulation": "^0.10.0" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.2.0", @@ -39,6 +45,9 @@ "@vue/eslint-config-standard": "^5.1.0", "@vue/test-utils": "1.0.0-beta.31", "babel-eslint": "^10.0.3", + "bpmn-js": "^7.4.0", + "bpmn-js-properties-panel": "^0.37.2", + "camunda-bpmn-moddle": "^4.4.1", "eslint": "^6.7.2", "eslint-plugin-import": "^2.20.1", "eslint-plugin-node": "^11.0.0", diff --git a/orange-demo-multi-web/public/index.html b/orange-demo-multi-web/public/index.html index 37e411e8..011aade2 100644 --- a/orange-demo-multi-web/public/index.html +++ b/orange-demo-multi-web/public/index.html @@ -4,12 +4,11 @@ - - 橙单工程 + 橙单代码生成平台 - +
diff --git a/orange-demo-multi-web/src/api/Controller/DictionaryController.js b/orange-demo-multi-web/src/api/Controller/DictionaryController.js index 8cc5da6f..bdb065e5 100644 --- a/orange-demo-multi-web/src/api/Controller/DictionaryController.js +++ b/orange-demo-multi-web/src/api/Controller/DictionaryController.js @@ -59,7 +59,7 @@ export default class DictionaryController { static dictAreaCode (sender, params, axiosOption, httpOption) { return new Promise((resolve, reject) => { sender.doUrl('/admin/CourseClass/areaCode/listDict', 'get', params, axiosOption, httpOption).then(res => { - let dictData = new staticDict.DictionaryBase(); + let dictData = new staticDict.DictionaryBase('行政区划'); dictData.setList(res.data); resolve(dictData); }).catch(err => { @@ -79,7 +79,7 @@ export default class DictionaryController { static dictAreaCodeByParentId (sender, params, axiosOption, httpOption) { return new Promise((resolve, reject) => { sender.doUrl('/admin/CourseClass/areaCode/listDictByParentId', 'get', params, axiosOption, httpOption).then(res => { - let dictData = new staticDict.DictionaryBase(); + let dictData = new staticDict.DictionaryBase('行政区划'); dictData.setList(res.data); resolve(dictData); }).catch(err => { @@ -102,7 +102,7 @@ export default class DictionaryController { static dictCourse (sender, params, axiosOption, httpOption) { return new Promise((resolve, reject) => { sender.doUrl('/admin/CourseClass/course/listDict', 'get', params, axiosOption, httpOption).then(res => { - let dictData = new staticDict.DictionaryBase(); + let dictData = new staticDict.DictionaryBase('课程'); dictData.setList(res.data); resolve(dictData); }).catch(err => { @@ -113,7 +113,7 @@ export default class DictionaryController { static dictGrade (sender, params, axiosOption, httpOption) { return new Promise((resolve, reject) => { sender.doUrl('/admin/CourseClass/grade/listDict', 'get', params, axiosOption, httpOption).then(res => { - let dictData = new staticDict.DictionaryBase(); + let dictData = new staticDict.DictionaryBase('年级'); dictData.setList(res.data); resolve(dictData); }).catch(err => { @@ -145,7 +145,7 @@ export default class DictionaryController { static dictSchoolInfo (sender, params, axiosOption, httpOption) { return new Promise((resolve, reject) => { sender.doUrl('/admin/CourseClass/schoolInfo/listDict', 'get', params, axiosOption, httpOption).then(res => { - let dictData = new staticDict.DictionaryBase(); + let dictData = new staticDict.DictionaryBase('校区'); dictData.setList(res.data); resolve(dictData); }).catch(err => { @@ -156,7 +156,7 @@ export default class DictionaryController { static dictStudent (sender, params, axiosOption, httpOption) { return new Promise((resolve, reject) => { sender.doUrl('/admin/CourseClass/student/listDict', 'get', params, axiosOption, httpOption).then(res => { - let dictData = new staticDict.DictionaryBase(); + let dictData = new staticDict.DictionaryBase('学生'); dictData.setList(res.data); resolve(dictData); }).catch(err => { diff --git a/orange-demo-multi-web/src/api/Controller/SystemController.js b/orange-demo-multi-web/src/api/Controller/SystemController.js index 2081ab40..a17ae123 100644 --- a/orange-demo-multi-web/src/api/Controller/SystemController.js +++ b/orange-demo-multi-web/src/api/Controller/SystemController.js @@ -225,4 +225,12 @@ export default class SystemController { static listSysMenuByPermIdWithDetail (sender, params, axiosOption, httpOption) { return sender.doUrl('admin/upms/sysPerm/listSysMenuWithDetail', 'get', params, axiosOption, httpOption); } + // 在线用户 + static listSysLoginUser (sender, params, axiosOption, httpOption) { + return sender.doUrl('admin/upms/loginUser/list', 'post', params, axiosOption, httpOption); + } + + static deleteSysLoginUser (sender, params, axiosOption, httpOption) { + return sender.doUrl('admin/upms/loginUser/delete', 'post', params, axiosOption, httpOption); + } } diff --git a/orange-demo-multi-web/src/api/index.js b/orange-demo-multi-web/src/api/index.js index 5b8d6648..369b02b2 100644 --- a/orange-demo-multi-web/src/api/index.js +++ b/orange-demo-multi-web/src/api/index.js @@ -1,13 +1,13 @@ import SystemController from './Controller/SystemController' import DictionaryController from './Controller/DictionaryController' -import CourseController from './Controller/CourseController.js' -import SchoolInfoController from './Controller/SchoolInfoController.js' -import StudentController from './Controller/StudentController.js' -import SysUserController from './Controller/SysUserController.js' -import StudentClassController from './Controller/StudentClassController.js' -import CourseTransStatsController from './Controller/CourseTransStatsController.js' -import StudentActionStatsController from './Controller/StudentActionStatsController.js' -import StudentActionTransController from './Controller/StudentActionTransController.js' +import CourseController from './Controller/CourseController.js'; +import SchoolInfoController from './Controller/SchoolInfoController.js'; +import StudentController from './Controller/StudentController.js'; +import SysUserController from './Controller/SysUserController.js'; +import StudentClassController from './Controller/StudentClassController.js'; +import CourseTransStatsController from './Controller/CourseTransStatsController.js'; +import StudentActionStatsController from './Controller/StudentActionStatsController.js'; +import StudentActionTransController from './Controller/StudentActionTransController.js'; export { SystemController, diff --git a/orange-demo-multi-web/src/assets/element-variables-orange.scss b/orange-demo-multi-web/src/assets/element-variables-orange.scss index 76a919dc..26da27c0 100644 --- a/orange-demo-multi-web/src/assets/element-variables-orange.scss +++ b/orange-demo-multi-web/src/assets/element-variables-orange.scss @@ -16,7 +16,7 @@ $--color-transition-base: color .2s cubic-bezier(.645,.045,.355,1) !default; /* Color -------------------------- */ /// color|1|Brand Color|0 -$--color-primary: #FFA424 !default; +$--color-primary: #FCA834 !default; /// color|1|Background Color|4 $--color-white: #FFFFFF !default; /// color|1|Background Color|4 @@ -31,7 +31,7 @@ $--color-primary-light-7: mix($--color-white, $--color-primary, 70%) !default; / $--color-primary-light-8: mix($--color-white, $--color-primary, 80%) !default; /* d9ecff */ $--color-primary-light-9: mix($--color-white, $--color-primary, 90%) !default; /* ecf5ff */ /// color|1|Functional Color|1 -$--color-success: #67C23A !default; +$--color-success: #6DC741 !default; /// color|1|Functional Color|1 $--color-warning: #E6A23C !default; /// color|1|Functional Color|1 @@ -72,11 +72,10 @@ $--background-color-base: #F5F7FA !default; // color for left sidebar title $--color-sidebar-title-text: #FFFFFF; // color for left sidebar background -$--color-menu-background: #FF7746; +$--color-menu-background: #042345; $--color-menu-item-active-text-color: #FFFFFF; -$--color-menu-item-active-background: rgba(255, 255, 255, 0.01); -$--color-menu-item-active-background-to: rgba(255, 255, 255, 0.3); - +$--color-menu-item-active-background: $--color-primary; +$--color-submenu-background: #021F3B; /* Link -------------------------- */ $--link-color: $--color-primary-light-2 !default; @@ -738,7 +737,7 @@ $--tree-expand-icon-color: $--color-text-placeholder !default; /* Dropdown -------------------------- */ $--dropdown-menu-box-shadow: $--box-shadow-light !default; -$--dropdown-menuItem-hover-fill: $--color-menu-background !default; +$--dropdown-menuItem-hover-fill: $--color-primary !default; $--dropdown-menuItem-hover-color: $--color-white !default; /* Badge diff --git a/orange-demo-multi-web/src/assets/img/login.png b/orange-demo-multi-web/src/assets/img/login.png new file mode 100644 index 00000000..87130950 Binary files /dev/null and b/orange-demo-multi-web/src/assets/img/login.png differ diff --git a/orange-demo-multi-web/src/assets/img/login_logo.png b/orange-demo-multi-web/src/assets/img/login_logo.png new file mode 100644 index 00000000..03712478 Binary files /dev/null and b/orange-demo-multi-web/src/assets/img/login_logo.png differ diff --git a/orange-demo-multi-web/src/assets/img/logo.png b/orange-demo-multi-web/src/assets/img/logo.png new file mode 100644 index 00000000..f2df5bb8 Binary files /dev/null and b/orange-demo-multi-web/src/assets/img/logo.png differ diff --git a/orange-demo-multi-web/src/assets/package.json b/orange-demo-multi-web/src/assets/package.json index a328e1d6..a0912945 100644 --- a/orange-demo-multi-web/src/assets/package.json +++ b/orange-demo-multi-web/src/assets/package.json @@ -7,7 +7,7 @@ "theme-blue": "et -c element-variables-blue.scss" }, "devDependencies": { - "element-theme": "^2.0.1", - "element-theme-chalk": "^2.14.1" + "element-theme": "2.0.1", + "element-theme-chalk": "2.14.1" } } diff --git a/orange-demo-multi-web/src/assets/style/base.scss b/orange-demo-multi-web/src/assets/style/base.scss index 19641796..76177f49 100644 --- a/orange-demo-multi-web/src/assets/style/base.scss +++ b/orange-demo-multi-web/src/assets/style/base.scss @@ -51,8 +51,25 @@ body .layer-dialog { body .layer-dialog .layui-layer-content { padding: $box-padding-size; } +/** + * 左树右表弹窗样式 + */ +body .layer-advance-dialog { + border-radius: 4px; + border:1px solid #01000000; + background-color: #F8F8F8; +} -.demo-project { +body .layer-advance-dialog .layui-layer-title{ + border-radius: 4px 4px 0px 0px; + border:1px solid #01000000; +} + +body .layer-advance-dialog .layui-layer-content { + padding: 5px 15px; +} + +.orange-project { .el-main { padding: 0px; } @@ -98,18 +115,18 @@ body .layer-dialog .layui-layer-content { .page-close-box { position: absolute; - background: #13ce66; + background: #0092FF; transform: rotate(45deg); - height: 60px; - width: 60px; - right: -30px; - top:-30px; + height: 50px; + width: 50px; + right: -25px; + top:-25px; text-align: center; .el-button { transform: rotate(-45deg); color: white; - margin-top: 30px; + margin-top: 20px; } } @@ -264,6 +281,12 @@ body .layer-dialog .layui-layer-content { } } } + + @if global-variable-exists(--color-submenu-background) { + .left-menu .el-submenu .el-menu { + background-color: $--color-submenu-background; + } + } /** * 多tab页表单，tab样式 @@ -277,6 +300,45 @@ body .layer-dialog .layui-layer-content { .table-header-gray, .has-gutter .gutter { background-color: $tab-header-background-color; } + + /** + * 操作按钮颜色 + **/ + .table-btn.delete { + color: #F56C6C; + } + + .table-btn.delete:hover { + color: #F78989; + } + + .table-btn.delete:disabled { + color: #DCDFE6; + } + + .table-btn.success { + color: #67C23A; + } + + .table-btn.success:hover { + color: #85CE61; + } + + .table-btn.success:disabled { + color: #DCDFE6; + } + + .table-btn.warning { + color: #E6A23C; + } + + .table-btn.warning:hover { + color: #EBB563; + } + + .table-btn.success:disabled { + color: #DCDFE6; + } /** * 图片上传以及显示样式 diff --git a/orange-demo-multi-web/src/assets/style/form-style.scss b/orange-demo-multi-web/src/assets/style/form-style.scss index 1abfc7ef..027631f9 100644 --- a/orange-demo-multi-web/src/assets/style/form-style.scss +++ b/orange-demo-multi-web/src/assets/style/form-style.scss @@ -109,4 +109,9 @@ .form-single-fragment { // +} + +.advance-query-form { + padding: 0px!important; + background-color: transparent!important;; } \ No newline at end of file diff --git a/orange-demo-multi-web/src/assets/theme/cascader-panel.css b/orange-demo-multi-web/src/assets/theme/cascader-panel.css index 47e26012..ac054909 100644 --- a/orange-demo-multi-web/src/assets/theme/cascader-panel.css +++ b/orange-demo-multi-web/src/assets/theme/cascader-panel.css @@ -1705,7 +1705,7 @@ min-width: 180px; -webkit-box-sizing: border-box; box-sizing: border-box; - color: #FFFFFF; + color: #606266; border-right: solid 1px #E4E7ED; } .el-cascader-menu:last-child { border-right: none; } @@ -1750,9 +1750,9 @@ line-height: 34px; outline: none; } .el-cascader-node.is-selectable.in-active-path { - color: #FFFFFF; } + color: #606266; } .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { - color: #FFFFFF; + color: #409EFF; font-weight: bold; } .el-cascader-node:not(.is-disabled) { cursor: pointer; } diff --git a/orange-demo-multi-web/src/assets/theme/cascader.css b/orange-demo-multi-web/src/assets/theme/cascader.css index 8e51e473..64058d7d 100644 --- a/orange-demo-multi-web/src/assets/theme/cascader.css +++ b/orange-demo-multi-web/src/assets/theme/cascader.css @@ -3282,7 +3282,7 @@ min-width: 180px; -webkit-box-sizing: border-box; box-sizing: border-box; - color: #FFFFFF; + color: #606266; border-right: solid 1px #E4E7ED; } .el-cascader-menu:last-child { border-right: none; } @@ -3327,9 +3327,9 @@ line-height: 34px; outline: none; } .el-cascader-node.is-selectable.in-active-path { - color: #FFFFFF; } + color: #606266; } .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { - color: #FFFFFF; + color: #409EFF; font-weight: bold; } .el-cascader-node:not(.is-disabled) { cursor: pointer; } @@ -3454,7 +3454,7 @@ margin: 0; padding: 6px 0; font-size: 14px; - color: #FFFFFF; + color: #606266; text-align: center; } .el-cascader__suggestion-item { display: -webkit-box; @@ -3474,7 +3474,7 @@ .el-cascader__suggestion-item:hover, .el-cascader__suggestion-item:focus { background: #F5F7FA; } .el-cascader__suggestion-item.is-checked { - color: #FFFFFF; + color: #409EFF; font-weight: bold; } .el-cascader__suggestion-item > span { margin-right: 10px; } @@ -3489,7 +3489,7 @@ min-width: 60px; margin: 2px 0 2px 15px; padding: 0; - color: #FFFFFF; + color: #606266; border: none; outline: none; -webkit-box-sizing: border-box; diff --git a/orange-demo-multi-web/src/assets/theme/index.css b/orange-demo-multi-web/src/assets/theme/index.css index 2dd6063a..b34f94c4 100644 --- a/orange-demo-multi-web/src/assets/theme/index.css +++ b/orange-demo-multi-web/src/assets/theme/index.css @@ -46757,7 +46757,7 @@ min-width: 180px; -webkit-box-sizing: border-box; box-sizing: border-box; - color: #FFFFFF; + color: #606266; border-right: solid 1px #E4E7ED; } .el-cascader-menu:last-child { border-right: none; } @@ -46802,9 +46802,9 @@ line-height: 34px; outline: none; } .el-cascader-node.is-selectable.in-active-path { - color: #FFFFFF; } + color: #606266; } .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { - color: #FFFFFF; + color: #409EFF; font-weight: bold; } .el-cascader-node:not(.is-disabled) { cursor: pointer; } @@ -46929,7 +46929,7 @@ margin: 0; padding: 6px 0; font-size: 14px; - color: #FFFFFF; + color: #606266; text-align: center; } .el-cascader__suggestion-item { display: -webkit-box; @@ -46949,7 +46949,7 @@ .el-cascader__suggestion-item:hover, .el-cascader__suggestion-item:focus { background: #F5F7FA; } .el-cascader__suggestion-item.is-checked { - color: #FFFFFF; + color: #409EFF; font-weight: bold; } .el-cascader__suggestion-item > span { margin-right: 10px; } @@ -46964,7 +46964,7 @@ min-width: 60px; margin: 2px 0 2px 15px; padding: 0; - color: #FFFFFF; + color: #606266; border: none; outline: none; -webkit-box-sizing: border-box; @@ -55916,7 +55916,7 @@ min-width: 180px; -webkit-box-sizing: border-box; box-sizing: border-box; - color: #FFFFFF; + color: #606266; border-right: solid 1px #E4E7ED; } .el-cascader-menu:last-child { border-right: none; } @@ -55961,9 +55961,9 @@ line-height: 34px; outline: none; } .el-cascader-node.is-selectable.in-active-path { - color: #FFFFFF; } + color: #606266; } .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { - color: #FFFFFF; + color: #409EFF; font-weight: bold; } .el-cascader-node:not(.is-disabled) { cursor: pointer; } diff --git a/orange-demo-multi-web/src/components/Dialog/index.js b/orange-demo-multi-web/src/components/Dialog/index.js index 0e5c545f..5118d7a6 100644 --- a/orange-demo-multi-web/src/components/Dialog/index.js +++ b/orange-demo-multi-web/src/components/Dialog/index.js @@ -46,10 +46,10 @@ class Dialog { } let observer = { - cancel: function (isSuccess = false) { + cancel: function (isSuccess = false, data = undefined) { layer.close(this.index); if (isSuccess) { - resolve(); + resolve(data); } else { reject(); } diff --git a/orange-demo-multi-web/src/components/RichEditor/index.vue b/orange-demo-multi-web/src/components/RichEditor/index.vue index c80bdb1b..fea000a9 100644 --- a/orange-demo-multi-web/src/components/RichEditor/index.vue +++ b/orange-demo-multi-web/src/components/RichEditor/index.vue @@ -99,7 +99,6 @@ export default { return content; } this.editor.customConfig.linkImgCallback = (url) => { - console.log(url) // url 即插入图片的地址 } this.editor.customConfig.linkCheck = (text, link) => { return true // 返回 true 表示校验成功 @@ -112,7 +111,6 @@ export default { } // 失去焦点后更新数据 this.editor.customConfig.onblur = (html) => { - console.log(html) this.$emit('input', html); } diff --git a/orange-demo-multi-web/src/core/config/development.js b/orange-demo-multi-web/src/core/config/development.js index 1f34bb53..883e8c0e 100644 --- a/orange-demo-multi-web/src/core/config/development.js +++ b/orange-demo-multi-web/src/core/config/development.js @@ -1,4 +1,4 @@ module.exports = { baseUrl: 'http://localhost:8082/', - projectName: '橙单项目' + projectName: '橙单代码生成平台' } diff --git a/orange-demo-multi-web/src/core/config/index.js b/orange-demo-multi-web/src/core/config/index.js index be8f130e..35003bc1 100644 --- a/orange-demo-multi-web/src/core/config/index.js +++ b/orange-demo-multi-web/src/core/config/index.js @@ -2,8 +2,14 @@ const projectConfig = require('../config/' + process.env.NODE_ENV); export const globalConfig = { httpOption: { + // 调用的时候是否显示蒙版 showMask: true, - showError: true + // 是否显示公共的错误提示 + showError: true, + // 是否开启节流功能，同一个url不能频繁重复调用 + throttleFlag: false, + // 节流间隔 + throttleTimeout: 50 }, axiosOption: { } diff --git a/orange-demo-multi-web/src/core/http/index.js b/orange-demo-multi-web/src/core/http/index.js index dcd75ad0..8e17cff6 100644 --- a/orange-demo-multi-web/src/core/http/index.js +++ b/orange-demo-multi-web/src/core/http/index.js @@ -135,13 +135,15 @@ const doUrl = function (url, type, params, axiosOption, options) { options = merge(globalConfig.httpOption, options); axiosOption = merge(globalConfig.axiosOption, axiosOption); if (type == null || type === '') type = 'post'; - if (ajaxThrottleSet.has(url)) { + if (ajaxThrottleSet.has(url) && options.throttleFlag) { return Promise.resolve(); } else { - ajaxThrottleSet.add(url); - setTimeout(() => { - ajaxThrottleSet.delete(url); - }, 50); + if (options.throttleFlag) { + ajaxThrottleSet.add(url); + setTimeout(() => { + ajaxThrottleSet.delete(url); + }, options.throttleTimeout || 50); + } return new Promise((resolve, reject) => { if (options.showMask) loadingManager.showMask(); let ajaxCall = null; diff --git a/orange-demo-multi-web/src/core/http/request.js b/orange-demo-multi-web/src/core/http/request.js index 243b19d1..13210938 100644 --- a/orange-demo-multi-web/src/core/http/request.js +++ b/orange-demo-multi-web/src/core/http/request.js @@ -10,7 +10,8 @@ const service = axios.create({ withCredentials: true, headers: { // 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8' - 'Content-Type': 'application/json; charset=utf-8' + 'Content-Type': 'application/json; charset=utf-8', + 'deviceType': '4' }, transformResponse: [ function (data) { diff --git a/orange-demo-multi-web/src/main.js b/orange-demo-multi-web/src/main.js index fcdd3963..25828f8f 100644 --- a/orange-demo-multi-web/src/main.js +++ b/orange-demo-multi-web/src/main.js @@ -1,4 +1,5 @@ import '@/core/http'; +import JSONbig from 'json-bigint'; import '@/components/Dialog'; import Vue from 'vue'; import ElementUI from 'element-ui'; @@ -16,6 +17,8 @@ import FilterBox from '@/components/FilterBox'; import TableProgressColumn from '@/components/TableProgressColumn'; import VCharts from 'v-charts'; +window.JSON = new JSONbig({storeAsString: true}); + Vue.component('tree-select', TreeSelect); Vue.component('rich-editor', RichEditor); Vue.component('input-number-range', InputNumberRange); diff --git a/orange-demo-multi-web/src/router/systemRouters.js b/orange-demo-multi-web/src/router/systemRouters.js index 83a043d2..6a48eaf8 100644 --- a/orange-demo-multi-web/src/router/systemRouters.js +++ b/orange-demo-multi-web/src/router/systemRouters.js @@ -33,16 +33,17 @@ const routers = [ {path: 'formSysDict', component: _import('upms/formDictManagement/index'), name: 'formSysDict', meta: {title: '字典管理'}}, {path: 'formSysPermCode', component: _import('upms/formSysPermCode/index'), name: 'formSysPermCode', meta: {title: '权限字管理'}}, {path: 'formSysPerm', component: _import('upms/formSysPerm/index'), name: 'formSysPerm', meta: {title: '权限资源管理'}}, + {path: 'formSysLoginUser', component: _import('upms/formSysLoginUser/index'), name: 'formSysLoginUser', meta: {title: '在线用户'}}, {path: 'welcome', component: _import('welcome/index'), name: 'welcome', meta: {title: '欢迎'}}, - {path: 'formSchool', component: _import('generated/formSchool/index'), name: 'formSchool', props: getProps, meta: {title: '校区管理'}}, - {path: 'formStudent', component: _import('generated/formStudent/index'), name: 'formStudent', props: getProps, meta: {title: '学生管理'}}, - {path: 'formCourse', component: _import('generated/formCourse/index'), name: 'formCourse', props: getProps, meta: {title: '课程管理'}}, - {path: 'formCourseStats', component: _import('generated/formCourseStats/index'), name: 'formCourseStats', props: getProps, meta: {title: '课程统计'}}, - {path: 'formStudentActionStats', component: _import('generated/formStudentActionStats/index'), name: 'formStudentActionStats', props: getProps, meta: {title: '学生行为统计'}}, - {path: 'formStudentActionDetail', component: _import('generated/formStudentActionDetail/index'), name: 'formStudentActionDetail', props: getProps, meta: {title: '学生行为详情'}}, - {path: 'formSetClassStudent', component: _import('generated/formSetClassStudent/index'), name: 'formSetClassStudent', props: getProps, meta: {title: '设置班级学生'}}, - {path: 'formSetClassCourse', component: _import('generated/formSetClassCourse/index'), name: 'formSetClassCourse', props: getProps, meta: {title: '设置班级课程'}}, - {path: 'formClass', component: _import('generated/formClass/index'), name: 'formClass', props: getProps, meta: {title: '班级管理'}} + {path: 'formSchool', component: _import('generated/formSchool'), name: 'formSchool', props: getProps, meta: {title: '校区管理'}}, + {path: 'formStudent', component: _import('generated/formStudent'), name: 'formStudent', props: getProps, meta: {title: '学生管理'}}, + {path: 'formCourse', component: _import('generated/formCourse'), name: 'formCourse', props: getProps, meta: {title: '课程管理'}}, + {path: 'formCourseStats', component: _import('generated/formCourseStats'), name: 'formCourseStats', props: getProps, meta: {title: '课程统计'}}, + {path: 'formStudentActionStats', component: _import('generated/formStudentActionStats'), name: 'formStudentActionStats', props: getProps, meta: {title: '学生行为统计'}}, + {path: 'formStudentActionDetail', component: _import('generated/formStudentActionDetail'), name: 'formStudentActionDetail', props: getProps, meta: {title: '学生行为详情'}}, + {path: 'formSetClassStudent', component: _import('generated/formSetClassStudent'), name: 'formSetClassStudent', props: getProps, meta: {title: '设置班级学生'}}, + {path: 'formSetClassCourse', component: _import('generated/formSetClassCourse'), name: 'formSetClassCourse', props: getProps, meta: {title: '设置班级课程'}}, + {path: 'formClass', component: _import('generated/formClass'), name: 'formClass', props: getProps, meta: {title: '班级管理'}} ] } ]; diff --git a/orange-demo-multi-web/src/staticDict/index.js b/orange-demo-multi-web/src/staticDict/index.js index ccee538e..8b77fa34 100644 --- a/orange-demo-multi-web/src/staticDict/index.js +++ b/orange-demo-multi-web/src/staticDict/index.js @@ -4,8 +4,9 @@ import Vue from 'vue'; class DictionaryBase extends Map { - constructor (dataList, keyId = 'id', symbolId = 'symbol') { + constructor (name, dataList, keyId = 'id', symbolId = 'symbol') { super(); + this.showName = name; this.setList(dataList, keyId, symbolId); } @@ -50,7 +51,7 @@ class DictionaryBase extends Map { } } -const SysUserStatus = new DictionaryBase([ +const SysUserStatus = new DictionaryBase('用户状态', [ { id: 0, name: '正常状态', @@ -64,7 +65,7 @@ const SysUserStatus = new DictionaryBase([ ]); Vue.prototype.SysUserStatus = SysUserStatus; -const SysUserType = new DictionaryBase([ +const SysUserType = new DictionaryBase('用户类型', [ { id: 0, name: '管理员', @@ -83,7 +84,7 @@ const SysUserType = new DictionaryBase([ ]); Vue.prototype.SysUserType = SysUserType; -const ClassStatus = new DictionaryBase([ +const ClassStatus = new DictionaryBase('班级状态', [ { id: 1, name: '正常', @@ -97,7 +98,7 @@ const ClassStatus = new DictionaryBase([ ]); Vue.prototype.ClassStatus = ClassStatus; -const ClassLevel = new DictionaryBase([ +const ClassLevel = new DictionaryBase('班级级别', [ { id: 0, name: '初级班', @@ -116,7 +117,7 @@ const ClassLevel = new DictionaryBase([ ]); Vue.prototype.ClassLevel = ClassLevel; -const CourseDifficult = new DictionaryBase([ +const CourseDifficult = new DictionaryBase('课程难度', [ { id: 0, name: '容易', @@ -135,7 +136,7 @@ const CourseDifficult = new DictionaryBase([ ]); Vue.prototype.CourseDifficult = CourseDifficult; -const Subject = new DictionaryBase([ +const Subject = new DictionaryBase('学科', [ { id: 0, name: '语文', @@ -154,7 +155,7 @@ const Subject = new DictionaryBase([ ]); Vue.prototype.Subject = Subject; -const StudentActionType = new DictionaryBase([ +const StudentActionType = new DictionaryBase('学生行为', [ { id: 0, name: '充值', @@ -213,7 +214,7 @@ const StudentActionType = new DictionaryBase([ ]); Vue.prototype.StudentActionType = StudentActionType; -const DeviceType = new DictionaryBase([ +const DeviceType = new DictionaryBase('设备类型', [ { id: 0, name: 'iOS', @@ -232,7 +233,7 @@ const DeviceType = new DictionaryBase([ ]); Vue.prototype.DeviceType = DeviceType; -const Gender = new DictionaryBase([ +const Gender = new DictionaryBase('性别', [ { id: 1, name: '男', @@ -246,7 +247,7 @@ const Gender = new DictionaryBase([ ]); Vue.prototype.Gender = Gender; -const ExpLevel = new DictionaryBase([ +const ExpLevel = new DictionaryBase('经验等级', [ { id: 0, name: '初级学员', @@ -265,7 +266,7 @@ const ExpLevel = new DictionaryBase([ ]); Vue.prototype.ExpLevel = ExpLevel; -const StudentStatus = new DictionaryBase([ +const StudentStatus = new DictionaryBase('学生状态', [ { id: 0, name: '正常', @@ -284,7 +285,7 @@ const StudentStatus = new DictionaryBase([ ]); Vue.prototype.StudentStatus = StudentStatus; -const SysPermModuleType = new DictionaryBase([ +const SysPermModuleType = new DictionaryBase('权限分组类型', [ { id: 0, name: '分组模块', @@ -297,7 +298,7 @@ const SysPermModuleType = new DictionaryBase([ ]); Vue.prototype.SysPermModuleType = SysPermModuleType; -const SysPermCodeType = new DictionaryBase([{ +const SysPermCodeType = new DictionaryBase('权限字类型', [{ id: 0, name: '表单', symbol: 'FORM' @@ -312,7 +313,7 @@ const SysPermCodeType = new DictionaryBase([{ }]); Vue.prototype.SysPermCodeType = SysPermCodeType; -const SysMenuType = new DictionaryBase([ +const SysMenuType = new DictionaryBase('菜单类型', [ { id: 0, name: '目录', @@ -335,7 +336,6 @@ const SysMenuType = new DictionaryBase([ } ]); Vue.prototype.SysMenuType = SysMenuType; - export { DictionaryBase, SysUserStatus, diff --git a/orange-demo-multi-web/src/store/getters.js b/orange-demo-multi-web/src/store/getters.js index 7cf7bd2c..6c458e3b 100644 --- a/orange-demo-multi-web/src/store/getters.js +++ b/orange-demo-multi-web/src/store/getters.js @@ -11,8 +11,14 @@ export default { getClientHeight: (state) => { return state.documentClientHeight; }, + getClientWidth: (state) => { + return state.documentClienWidth; + }, getMainContextHeight: (state) => { - return state.documentClientHeight - (state.supportTags ? 140 : 100); + return state.documentClientHeight - (state.supportTags ? 130 : 90); + }, + getOnlineFormCache: (state) => { + return state.onlineFormCache; }, getUserInfo: (state) => { return state.userInfo; diff --git a/orange-demo-multi-web/src/store/mutations.js b/orange-demo-multi-web/src/store/mutations.js index f515d558..5d755609 100644 --- a/orange-demo-multi-web/src/store/mutations.js +++ b/orange-demo-multi-web/src/store/mutations.js @@ -8,6 +8,18 @@ export default { setClientHeight: (state, height) => { state.documentClientHeight = height; }, + setClientWidth: (state, width) => { + state.documentClienWidth = width; + }, + addOnlineFormCache: (state, data) => { + state.onlineFormCache[data.key] = data.value; + }, + removeOnlineFormCache: (state, key) => { + delete state.onlineFormCache[key]; + }, + clearOnlineFormCache: (state) => { + state.onlineFormCache = {}; + }, setUserInfo: (state, info) => { setObjectToSessionStorage('userInfo', info); state.userInfo = initUserInfo(info); @@ -97,7 +109,8 @@ export default { } let menuObject = state.tagList[0]; - if (menuObject && menuObject.formRouterName && menuObject.formRouterName !== '') { + if (menuObject && (menuObject.onlineFormId == null || menuObject.onlineFormId === '') && + menuObject.formRouterName && menuObject.formRouterName !== '') { state.cachePages = [menuObject.formRouterName]; if (setObjectToSessionStorage('currentMenuId', menuObject.menuId)) state.currentMenuId = menuObject.menuId; } @@ -131,7 +144,9 @@ export default { } // 添加新缓存 if (Array.isArray(state.cachePages) && state.cachePages.indexOf(menuItem.formRouterName) === -1) { - state.cachePages = [...state.cachePages, menuItem.formRouterName]; + if (menuItem.onlineFormId == null || menuItem.onlineFormId === '') { + state.cachePages = [...state.cachePages, menuItem.formRouterName]; + } setObjectToSessionStorage('cachePages', state.cachePages); } break; diff --git a/orange-demo-multi-web/src/store/state.js b/orange-demo-multi-web/src/store/state.js index ebde637f..ec9597f0 100644 --- a/orange-demo-multi-web/src/store/state.js +++ b/orange-demo-multi-web/src/store/state.js @@ -10,6 +10,10 @@ export default { supportTags: false, // 浏览器客户区高度 documentClientHeight: 100, + // 浏览器客户区宽度 + documentClientWidth: undefined, + // 在线表单查询页面缓存 + onlineFormCache: {}, // 用户登录信息 userInfo: initUserInfo(), // 缓存页面 diff --git a/orange-demo-multi-web/src/utils/index.js b/orange-demo-multi-web/src/utils/index.js index 744fb37b..6b8a54a6 100644 --- a/orange-demo-multi-web/src/utils/index.js +++ b/orange-demo-multi-web/src/utils/index.js @@ -346,7 +346,7 @@ export class TreeTableImpl { calcPermCodeTreeAttribute(item, checkedRows); }); } - console.log(treeData, checkedRows); + return treeData; } diff --git a/orange-demo-multi-web/src/utils/widget.js b/orange-demo-multi-web/src/utils/widget.js index bcb8881e..057f328b 100644 --- a/orange-demo-multi-web/src/utils/widget.js +++ b/orange-demo-multi-web/src/utils/widget.js @@ -133,7 +133,6 @@ export class TableWidget { this.oldPage = this.currentPage; this.oldPageSize = this.pageSize; }).catch(e => { - console.log(e); this.currentPage = this.oldPage; this.pageSize = this.oldPageSize; }); @@ -161,7 +160,6 @@ export class TableWidget { * @param {Object} oldRow 老的选中行 */ currentRowChange (currentRow, oldRow) { - console.log(currentRow, oldRow); this.currentRow = currentRow; } clearTable () { diff --git a/orange-demo-multi-web/src/views/generated/formClass/index.vue b/orange-demo-multi-web/src/views/generated/formClass.vue similarity index 98% rename from orange-demo-multi-web/src/views/generated/formClass/index.vue rename to orange-demo-multi-web/src/views/generated/formClass.vue index f170405c..7ca98f4e 100644 --- a/orange-demo-multi-web/src/views/generated/formClass/index.vue +++ b/orange-demo-multi-web/src/views/generated/formClass.vue @@ -190,9 +190,9 @@ import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/ import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins'; /* eslint-disable-next-line */ import { StudentClassController, DictionaryController } from '@/api'; -import formEditClassCourseOrder from '@/views/generated/formEditClassCourseOrder'; -import formEditClass from '@/views/generated/formEditClass'; -import formCreateClass from '@/views/generated/formCreateClass'; +import formCreateClass from '@/views/generated/formCreateClass.vue'; +import formEditClass from '@/views/generated/formEditClass.vue'; +import formEditClassCourseOrder from '@/views/generated/formEditClassCourseOrder.vue'; export default { name: 'formClass', @@ -239,14 +239,14 @@ export default { classCourseCard: { isInit: false }, - Student: { - impl: new TableWidget(this.loadStudentWidgetData, this.loadStudentVerify, true, false) + StudentClass: { + impl: new TableWidget(this.loadStudentClassWidgetData, this.loadStudentClassVerify, true, true, 'createTime', 1) }, Course: { impl: new TableWidget(this.loadCourseWidgetData, this.loadCourseVerify, true, false) }, - StudentClass: { - impl: new TableWidget(this.loadStudentClassWidgetData, this.loadStudentClassVerify, true, true, 'createTime', 1) + Student: { + impl: new TableWidget(this.loadStudentWidgetData, this.loadStudentVerify, true, false) }, classStudentCard: { isInit: false @@ -263,35 +263,41 @@ export default { }, methods: { /** - * 班级学生数据获取函数，返回Promise + * 班级数据数据获取函数，返回Promise */ - loadStudentWidgetData (params) { - if ( - (this.formClass.StudentClass.impl.currentRow || {}).classId == null - ) { - this.formClass.Student.impl.clearTable(); - return Promise.reject(); - } + loadStudentClassWidgetData (params) { if (params == null) params = {}; params = { ...params, - classId: (this.formClass.StudentClass.impl.currentRow || {}).classId + studentClassDtoFilter: { + className: this.formClass.formFilterCopy.className, + schoolId: this.formClass.formFilterCopy.schoolId + } } return new Promise((resolve, reject) => { - StudentClassController.listClassStudent(this, params).then(res => { + StudentClassController.list(this, params).then(res => { resolve({ dataList: res.data.dataList, totalCount: res.data.totalCount }); + // 恢复当前选择行 + if (this.formClass.StudentClass.impl.currentRow !== null) { + this.$nextTick(() => { + let currentRow = findItemFromList(res.data.dataList, this.formClass.StudentClass.impl.currentRow.classId, 'classId'); + this.$refs.studentClass.setCurrentRow(currentRow); + }); + } }).catch(e => { reject(e); }); }); }, /** - * 班级学生数据获取检测函数，返回true正常获取数据，返回false停止获取数据 + * 班级数据数据获取检测函数，返回true正常获取数据，返回false停止获取数据 */ - loadStudentVerify () { + loadStudentClassVerify () { + this.formClass.formFilterCopy.className = this.formClass.formFilter.className; + this.formClass.formFilterCopy.schoolId = this.formClass.formFilter.schoolId; return true; }, /** @@ -327,41 +333,35 @@ export default { return true; }, /** - * 班级数据数据获取函数，返回Promise + * 班级学生数据获取函数，返回Promise */ - loadStudentClassWidgetData (params) { + loadStudentWidgetData (params) { + if ( + (this.formClass.StudentClass.impl.currentRow || {}).classId == null + ) { + this.formClass.Student.impl.clearTable(); + return Promise.reject(); + } if (params == null) params = {}; params = { ...params, - studentClassFilter: { - className: this.formClass.formFilterCopy.className, - schoolId: this.formClass.formFilterCopy.schoolId - } + classId: (this.formClass.StudentClass.impl.currentRow || {}).classId } return new Promise((resolve, reject) => { - StudentClassController.list(this, params).then(res => { + StudentClassController.listClassStudent(this, params).then(res => { resolve({ dataList: res.data.dataList, totalCount: res.data.totalCount }); - // 恢复当前选择行 - if (this.formClass.StudentClass.impl.currentRow !== null) { - this.$nextTick(() => { - let currentRow = findItemFromList(res.data.dataList, this.formClass.StudentClass.impl.currentRow.classId, 'classId'); - this.$refs.studentClass.setCurrentRow(currentRow); - }); - } }).catch(e => { reject(e); }); }); }, /** - * 班级数据数据获取检测函数，返回true正常获取数据，返回false停止获取数据 + * 班级学生数据获取检测函数，返回true正常获取数据，返回false停止获取数据 */ - loadStudentClassVerify () { - this.formClass.formFilterCopy.className = this.formClass.formFilter.className; - this.formClass.formFilterCopy.schoolId = this.formClass.formFilter.schoolId; + loadStudentVerify () { return true; }, /** @@ -385,7 +385,7 @@ export default { /** * 更新班级课程 */ - refreshClassCourseCard (reloadData = false) { + refreshClassCourseCardWidget (reloadData = false) { // 更新容器下所有的数据组件 if (reloadData) { this.formClass.Course.impl.refreshTable(true, 1); @@ -397,7 +397,7 @@ export default { /** * 更新班级学生 */ - refreshClassStudentCard (reloadData = false) { + refreshClassStudentCardWidget (reloadData = false) { // 更新容器下所有的数据组件 if (reloadData) { this.formClass.Student.impl.refreshTable(true, 1); @@ -409,7 +409,7 @@ export default { /** * 更新班级列表 */ - refreshClassCard (reloadData = false) { + refreshClassCardWidget (reloadData = false) { // 更新容器下所有的数据组件 if (reloadData) { this.formClass.StudentClass.impl.refreshTable(true, 1); @@ -423,9 +423,9 @@ export default { */ refreshFormClass (reloadData = false) { if (reloadData) { - this.formClass.Student.impl.refreshTable(true, 1); + this.formClass.StudentClass.impl.refreshTable(true, 1); } else { - this.formClass.Student.impl.refreshTable(); + this.formClass.StudentClass.impl.refreshTable(); } if (reloadData) { this.formClass.Course.impl.refreshTable(true, 1); @@ -433,9 +433,9 @@ export default { this.formClass.Course.impl.refreshTable(); } if (reloadData) { - this.formClass.StudentClass.impl.refreshTable(true, 1); + this.formClass.Student.impl.refreshTable(true, 1); } else { - this.formClass.StudentClass.impl.refreshTable(); + this.formClass.Student.impl.refreshTable(); } if (!this.formClass.isInit) { // 初始化下拉数据 @@ -449,9 +449,9 @@ export default { let params = {}; this.$dialog.show('新建', formCreateClass, { - area: ['800px'] + area: '800px' }, params).then(res => { - this.refreshClassCard(); + this.refreshClassCardWidget(); }).catch(e => {}); }, /** @@ -509,7 +509,7 @@ export default { }; this.$dialog.show('课程顺序', formEditClassCourseOrder, { - area: ['400px'] + area: '400px' }, params).then(res => { this.formClass.Course.impl.refreshTable(); }).catch(e => {}); @@ -546,7 +546,7 @@ export default { }; this.$dialog.show('编辑', formEditClass, { - area: ['800px'] + area: '800px' }, params).then(res => { this.formClass.StudentClass.impl.refreshTable(); }).catch(e => {}); @@ -634,8 +634,8 @@ export default { // 班级数据选择行数据变化 'formClass.StudentClass.impl.currentRow': { handler (newValue) { - this.formClass.Student.impl.refreshTable(true, 1); this.formClass.Course.impl.refreshTable(true, 1); + this.formClass.Student.impl.refreshTable(true, 1); }, immediate: true } diff --git a/orange-demo-single-web/src/views/generated/formCourse/index.vue b/orange-demo-multi-web/src/views/generated/formCourse.vue similarity index 98% rename from orange-demo-single-web/src/views/generated/formCourse/index.vue rename to orange-demo-multi-web/src/views/generated/formCourse.vue index 81daadc7..745ff754 100644 --- a/orange-demo-single-web/src/views/generated/formCourse/index.vue +++ b/orange-demo-multi-web/src/views/generated/formCourse.vue @@ -108,8 +108,8 @@ import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/ import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins'; /* eslint-disable-next-line */ import { CourseController, DictionaryController } from '@/api'; -import formCreateCourse from '@/views/generated/formCreateCourse'; -import formEditCourse from '@/views/generated/formEditCourse'; +import formEditCourse from '@/views/generated/formEditCourse.vue'; +import formCreateCourse from '@/views/generated/formCreateCourse.vue'; export default { name: 'formCourse', @@ -155,7 +155,7 @@ export default { if (params == null) params = {}; params = { ...params, - courseFilter: { + courseDtoFilter: { courseName: this.formCourse.formFilterCopy.courseName, difficulty: this.formCourse.formFilterCopy.difficulty, gradeId: this.formCourse.formFilterCopy.gradeId, @@ -258,7 +258,7 @@ export default { let params = {}; this.$dialog.show('新建', formCreateCourse, { - area: ['800px'] + area: '800px' }, params).then(res => { this.refreshFormCourse(); }).catch(e => {}); @@ -272,7 +272,7 @@ export default { }; this.$dialog.show('编辑', formEditCourse, { - area: ['800px'] + area: '800px' }, params).then(res => { this.formCourse.Course.impl.refreshTable(); }).catch(e => {}); diff --git a/orange-demo-single-web/src/views/generated/formCourseStats/index.vue b/orange-demo-multi-web/src/views/generated/formCourseStats.vue similarity index 96% rename from orange-demo-single-web/src/views/generated/formCourseStats/index.vue rename to orange-demo-multi-web/src/views/generated/formCourseStats.vue index f6bc6c8f..af151e8a 100644 --- a/orange-demo-single-web/src/views/generated/formCourseStats/index.vue +++ b/orange-demo-multi-web/src/views/generated/formCourseStats.vue @@ -13,8 +13,8 @@ - - + +
课程统计（年级）
@@ -31,8 +31,8 @@
- - + +
课程统计（学科）
@@ -168,7 +168,7 @@ export default { fieldName: 'gradeId' } ], - courseTransStatsFilter: { + courseTransStatsDtoFilter: { statsDateStart: Array.isArray(this.formCourseStats.formFilterCopy.statsDate) ? this.formCourseStats.formFilterCopy.statsDate[0] : undefined, statsDateEnd: Array.isArray(this.formCourseStats.formFilterCopy.statsDate) ? this.formCourseStats.formFilterCopy.statsDate[1] : undefined } @@ -210,7 +210,7 @@ export default { fieldName: 'subjectId' } ], - courseTransStatsFilter: { + courseTransStatsDtoFilter: { statsDateStart: Array.isArray(this.formCourseStats.formFilterCopy.statsDate) ? this.formCourseStats.formFilterCopy.statsDate[0] : undefined, statsDateEnd: Array.isArray(this.formCourseStats.formFilterCopy.statsDate) ? this.formCourseStats.formFilterCopy.statsDate[1] : undefined } @@ -252,7 +252,7 @@ export default { fieldName: 'statsDate' } ], - courseTransStatsFilter: { + courseTransStatsDtoFilter: { statsDateStart: Array.isArray(this.formCourseStats.formFilterCopy.statsDate) ? this.formCourseStats.formFilterCopy.statsDate[0] : undefined, statsDateEnd: Array.isArray(this.formCourseStats.formFilterCopy.statsDate) ? this.formCourseStats.formFilterCopy.statsDate[1] : undefined } diff --git a/orange-demo-multi-web/src/views/generated/formCreateClass/index.vue b/orange-demo-multi-web/src/views/generated/formCreateClass.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formCreateClass/index.vue rename to orange-demo-multi-web/src/views/generated/formCreateClass.vue index aa28ce7c..0729a2f9 100644 --- a/orange-demo-multi-web/src/views/generated/formCreateClass/index.vue +++ b/orange-demo-multi-web/src/views/generated/formCreateClass.vue @@ -234,7 +234,7 @@ export default { return; } let params = { - studentClass: { + studentClassDto: { className: this.formData.StudentClass.className, schoolId: this.formData.StudentClass.schoolId, leaderId: this.formData.StudentClass.leaderId, diff --git a/orange-demo-multi-web/src/views/generated/formCreateCourse/index.vue b/orange-demo-multi-web/src/views/generated/formCreateCourse.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formCreateCourse/index.vue rename to orange-demo-multi-web/src/views/generated/formCreateCourse.vue index 15dd1866..964d344d 100644 --- a/orange-demo-multi-web/src/views/generated/formCreateCourse/index.vue +++ b/orange-demo-multi-web/src/views/generated/formCreateCourse.vue @@ -262,7 +262,7 @@ export default { return; } let params = { - course: { + courseDto: { courseName: this.formData.Course.courseName, price: this.formData.Course.price, description: this.formData.Course.description, diff --git a/orange-demo-multi-web/src/views/generated/formCreateSchool/index.vue b/orange-demo-multi-web/src/views/generated/formCreateSchool.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formCreateSchool/index.vue rename to orange-demo-multi-web/src/views/generated/formCreateSchool.vue index 77fbc117..9dc199ed 100644 --- a/orange-demo-multi-web/src/views/generated/formCreateSchool/index.vue +++ b/orange-demo-multi-web/src/views/generated/formCreateSchool.vue @@ -177,7 +177,7 @@ export default { return; } let params = { - schoolInfo: { + schoolInfoDto: { schoolName: this.formData.SchoolInfo.schoolName, provinceId: this.formData.SchoolInfo.provinceId, cityId: this.formData.SchoolInfo.cityId diff --git a/orange-demo-multi-web/src/views/generated/formCreateStudent/index.vue b/orange-demo-multi-web/src/views/generated/formCreateStudent.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formCreateStudent/index.vue rename to orange-demo-multi-web/src/views/generated/formCreateStudent.vue index 242e4db8..f8b48b2f 100644 --- a/orange-demo-multi-web/src/views/generated/formCreateStudent/index.vue +++ b/orange-demo-multi-web/src/views/generated/formCreateStudent.vue @@ -406,7 +406,7 @@ export default { return; } let params = { - student: { + studentDto: { loginMobile: this.formData.Student.loginMobile, studentName: this.formData.Student.studentName, provinceId: this.formData.Student.provinceId, diff --git a/orange-demo-multi-web/src/views/generated/formEditClass/index.vue b/orange-demo-multi-web/src/views/generated/formEditClass.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formEditClass/index.vue rename to orange-demo-multi-web/src/views/generated/formEditClass.vue index 1d5bb9d2..dad7d7f4 100644 --- a/orange-demo-multi-web/src/views/generated/formEditClass/index.vue +++ b/orange-demo-multi-web/src/views/generated/formEditClass.vue @@ -240,7 +240,7 @@ export default { return; } let params = { - studentClass: { + studentClassDto: { classId: this.classId, className: this.formData.StudentClass.className, schoolId: this.formData.StudentClass.schoolId, diff --git a/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder/index.vue b/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formEditClassCourseOrder/index.vue rename to orange-demo-multi-web/src/views/generated/formEditClassCourseOrder.vue index 46d53c2d..61f4a93d 100644 --- a/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder/index.vue +++ b/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder.vue @@ -116,7 +116,7 @@ export default { return; } let params = { - classCourse: { + classCourseDto: { classId: this.classId, courseId: this.courseId, courseOrder: this.formData.StudentClass.course.classCourse.courseOrder diff --git a/orange-demo-multi-web/src/views/generated/formEditCourse/index.vue b/orange-demo-multi-web/src/views/generated/formEditCourse.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formEditCourse/index.vue rename to orange-demo-multi-web/src/views/generated/formEditCourse.vue index a37a8836..2ceaf00d 100644 --- a/orange-demo-multi-web/src/views/generated/formEditCourse/index.vue +++ b/orange-demo-multi-web/src/views/generated/formEditCourse.vue @@ -268,7 +268,7 @@ export default { return; } let params = { - course: { + courseDto: { courseId: this.courseId, courseName: this.formData.Course.courseName, price: this.formData.Course.price, diff --git a/orange-demo-multi-web/src/views/generated/formEditSchool/index.vue b/orange-demo-multi-web/src/views/generated/formEditSchool.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formEditSchool/index.vue rename to orange-demo-multi-web/src/views/generated/formEditSchool.vue index 8c358c5c..e6748a5c 100644 --- a/orange-demo-multi-web/src/views/generated/formEditSchool/index.vue +++ b/orange-demo-multi-web/src/views/generated/formEditSchool.vue @@ -183,7 +183,7 @@ export default { return; } let params = { - schoolInfo: { + schoolInfoDto: { schoolId: this.schoolId, schoolName: this.formData.SchoolInfo.schoolName, provinceId: this.formData.SchoolInfo.provinceId, diff --git a/orange-demo-multi-web/src/views/generated/formEditStudent/index.vue b/orange-demo-multi-web/src/views/generated/formEditStudent.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formEditStudent/index.vue rename to orange-demo-multi-web/src/views/generated/formEditStudent.vue index 5c55f3d4..8d7c58f3 100644 --- a/orange-demo-multi-web/src/views/generated/formEditStudent/index.vue +++ b/orange-demo-multi-web/src/views/generated/formEditStudent.vue @@ -468,7 +468,7 @@ export default { return; } let params = { - student: { + studentDto: { studentId: this.studentId, loginMobile: this.formData.Student.loginMobile, studentName: this.formData.Student.studentName, diff --git a/orange-demo-multi-web/src/views/generated/formSchool/index.vue b/orange-demo-multi-web/src/views/generated/formSchool.vue similarity index 98% rename from orange-demo-multi-web/src/views/generated/formSchool/index.vue rename to orange-demo-multi-web/src/views/generated/formSchool.vue index 66f91ae5..c2c6d52a 100644 --- a/orange-demo-multi-web/src/views/generated/formSchool/index.vue +++ b/orange-demo-multi-web/src/views/generated/formSchool.vue @@ -78,8 +78,8 @@ import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/ import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins'; /* eslint-disable-next-line */ import { SchoolInfoController, DictionaryController } from '@/api'; -import formCreateSchool from '@/views/generated/formCreateSchool'; -import formEditSchool from '@/views/generated/formEditSchool'; +import formEditSchool from '@/views/generated/formEditSchool.vue'; +import formCreateSchool from '@/views/generated/formCreateSchool.vue'; export default { name: 'formSchool', @@ -120,7 +120,7 @@ export default { if (params == null) params = {}; params = { ...params, - schoolInfoFilter: { + schoolInfoDtoFilter: { schoolName: this.formSchool.formFilterCopy.schoolName, provinceId: this.formSchool.formFilterCopy.provinceId, cityId: this.formSchool.formFilterCopy.cityId @@ -213,7 +213,7 @@ export default { let params = {}; this.$dialog.show('新建', formCreateSchool, { - area: ['600px'] + area: '600px' }, params).then(res => { this.refreshFormSchool(); }).catch(e => {}); @@ -227,7 +227,7 @@ export default { }; this.$dialog.show('编辑', formEditSchool, { - area: ['600px'] + area: '600px' }, params).then(res => { this.formSchool.SchoolInfo.impl.refreshTable(); }).catch(e => {}); diff --git a/orange-demo-multi-web/src/views/generated/formSetClassCourse/index.vue b/orange-demo-multi-web/src/views/generated/formSetClassCourse.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formSetClassCourse/index.vue rename to orange-demo-multi-web/src/views/generated/formSetClassCourse.vue index c20ab02d..c876d6d8 100644 --- a/orange-demo-multi-web/src/views/generated/formSetClassCourse/index.vue +++ b/orange-demo-multi-web/src/views/generated/formSetClassCourse.vue @@ -156,7 +156,7 @@ export default { if (params == null) params = {}; params = { ...params, - courseFilter: { + courseDtoFilter: { courseName: this.formSetClassCourse.formFilterCopy.courseName, difficulty: this.formSetClassCourse.formFilterCopy.difficulty, gradeId: this.formSetClassCourse.formFilterCopy.gradeId, @@ -265,7 +265,7 @@ export default { } let params = { classId: this.classId, - classCourseList: this.tableSelectRowList.map((item) => { + classCourseDtoList: this.tableSelectRowList.map((item) => { return { courseId: item.courseId }; diff --git a/orange-demo-multi-web/src/views/generated/formSetClassStudent/index.vue b/orange-demo-multi-web/src/views/generated/formSetClassStudent.vue similarity index 98% rename from orange-demo-multi-web/src/views/generated/formSetClassStudent/index.vue rename to orange-demo-multi-web/src/views/generated/formSetClassStudent.vue index f20f600c..83679522 100644 --- a/orange-demo-multi-web/src/views/generated/formSetClassStudent/index.vue +++ b/orange-demo-multi-web/src/views/generated/formSetClassStudent.vue @@ -124,7 +124,7 @@ export default { if (params == null) params = {}; params = { ...params, - studentFilter: { + studentDtoFilter: { schoolId: this.formSetClassStudent.formFilterCopy.schoolId }, classId: this.classId @@ -191,7 +191,7 @@ export default { } let params = { classId: this.classId, - classStudentList: this.tableSelectRowList.map((item) => { + classStudentDtoList: this.tableSelectRowList.map((item) => { return { studentId: item.studentId }; diff --git a/orange-demo-multi-web/src/views/generated/formStudent/index.vue b/orange-demo-multi-web/src/views/generated/formStudent.vue similarity index 98% rename from orange-demo-multi-web/src/views/generated/formStudent/index.vue rename to orange-demo-multi-web/src/views/generated/formStudent.vue index 908d9daf..9842abbe 100644 --- a/orange-demo-multi-web/src/views/generated/formStudent/index.vue +++ b/orange-demo-multi-web/src/views/generated/formStudent.vue @@ -103,8 +103,8 @@ import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/ import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins'; /* eslint-disable-next-line */ import { StudentController, DictionaryController } from '@/api'; -import formEditStudent from '@/views/generated/formEditStudent'; -import formCreateStudent from '@/views/generated/formCreateStudent'; +import formCreateStudent from '@/views/generated/formCreateStudent.vue'; +import formEditStudent from '@/views/generated/formEditStudent.vue'; export default { name: 'formStudent', @@ -147,7 +147,7 @@ export default { if (params == null) params = {}; params = { ...params, - studentFilter: { + studentDtoFilter: { gradeId: this.formStudent.formFilterCopy.gradeId, schoolId: this.formStudent.formFilterCopy.schoolId, registerTimeStart: Array.isArray(this.formStudent.formFilterCopy.registerDate) ? this.formStudent.formFilterCopy.registerDate[0] : undefined, @@ -243,7 +243,7 @@ export default { let params = {}; this.$dialog.show('新建', formCreateStudent, { - area: ['800px'] + area: '800px' }, params).then(res => { this.refreshFormStudent(); }).catch(e => {}); @@ -257,7 +257,7 @@ export default { }; this.$dialog.show('编辑', formEditStudent, { - area: ['800px'] + area: '800px' }, params).then(res => { this.formStudent.Student.impl.refreshTable(); }).catch(e => {}); diff --git a/orange-demo-multi-web/src/views/generated/formStudentActionDetail/index.vue b/orange-demo-multi-web/src/views/generated/formStudentActionDetail.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formStudentActionDetail/index.vue rename to orange-demo-multi-web/src/views/generated/formStudentActionDetail.vue index 05bf1222..e83d98fe 100644 --- a/orange-demo-multi-web/src/views/generated/formStudentActionDetail/index.vue +++ b/orange-demo-multi-web/src/views/generated/formStudentActionDetail.vue @@ -145,7 +145,7 @@ export default { if (params == null) params = {}; params = { ...params, - studentActionTransFilter: { + studentActionTransDtoFilter: { gradeId: this.formStudentActionDetail.formFilterCopy.gradeId, actionType: this.formStudentActionDetail.formFilterCopy.actionType, createTimeStart: Array.isArray(this.formStudentActionDetail.formFilterCopy.statsDate) ? this.formStudentActionDetail.formFilterCopy.statsDate[0] : undefined, diff --git a/orange-demo-multi-web/src/views/generated/formStudentActionStats/index.vue b/orange-demo-multi-web/src/views/generated/formStudentActionStats.vue similarity index 99% rename from orange-demo-multi-web/src/views/generated/formStudentActionStats/index.vue rename to orange-demo-multi-web/src/views/generated/formStudentActionStats.vue index e3be565c..515c8593 100644 --- a/orange-demo-multi-web/src/views/generated/formStudentActionStats/index.vue +++ b/orange-demo-multi-web/src/views/generated/formStudentActionStats.vue @@ -138,7 +138,7 @@ export default { fieldName: 'gradeId' } ], - studentActionStatsFilter: { + studentActionStatsDtoFilter: { statsDateStart: Array.isArray(this.formStudentActionStats.formFilterCopy.statsDate) ? this.formStudentActionStats.formFilterCopy.statsDate[0] : undefined, statsDateEnd: Array.isArray(this.formStudentActionStats.formFilterCopy.statsDate) ? this.formStudentActionStats.formFilterCopy.statsDate[1] : undefined, gradeId: this.formStudentActionStats.formFilterCopy.gradeId diff --git a/orange-demo-multi-web/src/views/layout/components/sidebar/sidebar.vue b/orange-demo-multi-web/src/views/layout/components/sidebar/sidebar.vue index be17fbf5..0971c0ee 100644 --- a/orange-demo-multi-web/src/views/layout/components/sidebar/sidebar.vue +++ b/orange-demo-multi-web/src/views/layout/components/sidebar/sidebar.vue @@ -1,10 +1,10 @@