diff --git a/.env.development b/.env.development index eec3e74..ca75af5 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,6 @@ ENV='development' # base api -VUE_APP_BASE_API=http://starter.ali251.langye.net -VUE_APP_UPLOAD_API=http://starter.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API=http://suzhoukeji-test.ali251.langye.net +VUE_APP_UPLOAD_API=http://suzhoukeji-test.ali251.langye.net/api/admin/upload-file VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview diff --git a/.env.production b/.env.production index aaeb0c2..28d6e46 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = http://starter.ali251.langye.net -VUE_APP_UPLOAD_API =http://starter.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API = http://suzhoukeji-test.ali251.langye.net +VUE_APP_UPLOAD_API = http://suzhoukeji-test.ali251.langye.net/api/admin/upload-file VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview diff --git a/.env.staging b/.env.staging index abeafcc..5677c52 100644 --- a/.env.staging +++ b/.env.staging @@ -4,6 +4,6 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API=http://starter.ali251.langye.net -VUE_APP_UPLOAD_API=http://starter.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API=http://suzhoukeji-test.ali251.langye.net/ +VUE_APP_UPLOAD_API=http://suzhoukeji-test.ali251.langye.net/api/admin/upload-file diff --git a/public/favicon.ico b/public/favicon.ico index c48d62c..9125b5b 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png index 8ecb6ba..9125b5b 100644 Binary files a/src/assets/logo-mini.png and b/src/assets/logo-mini.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 6405818..01091ad 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue index 32bda2d..9c46b13 100644 --- a/src/components/XyDialog/index.vue +++ b/src/components/XyDialog/index.vue @@ -144,7 +144,8 @@ export default { if(form.hasOwnProperty(key) && $scopedSlots[key]){ formItems.push( + prop={key} + class={key}> {eval(`{$scopedSlots.${key} ? $scopedSlots.${key}() : ''}`)} ) diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 99ed9de..2caf54b 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -163,7 +163,11 @@ export default { type: Number, default: 220, }, - + // 显示序号 + showIndex:{ + type: Boolean, + default: true, + }, // 分页相关 isPage: { type: Boolean, @@ -862,10 +866,19 @@ export default { ["expand-change"]: this.expandChange, }} > + { + (this.showIndex? + :"" + ) + + } {this.tableFormat.map((item, index) => { if ($scopedSlots[item.prop]) { return $scopedSlots[item.prop](item, index); } + return ( + {item.multiHd ? item.multiHd.map((item1, index1) => { return ( diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 5f7632d..57e0bb3 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -37,7 +37,7 @@ } .sidebar-name-logo { width: 120px; - height: 22px; + // height: 22px; } .sidebarLogoFade-enter, diff --git a/src/settings.js b/src/settings.js index 8c81eae..eb57ba3 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,7 +1,7 @@ module.exports = { - title: '朗业基础平台', - TOKEN_KEY: 'starter_token', + title: '苏州科技商学院', + TOKEN_KEY: 'kjsxy_token', /** * @type {boolean} true | false * @description Whether fix the header diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 1f62d31..bd34a06 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,7 +1,8 @@ /* 改变主题色变量 */ $--color-primary: #0077CC; +// $--color-primary:#010296; /* 改变 icon 字体路径变量,必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; -@import "~element-ui/packages/theme-chalk/src/index"; \ No newline at end of file +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 0968334..5199ff7 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -11,7 +11,7 @@ transition: width 0.28s; width: $sideBarWidth !important; //background-color: $menuBg; - background: linear-gradient(180deg, #0284cd, #0077CC); + background: linear-gradient(to bottom, #010296, #0077CC); box-shadow: 1px 1px 15px 0px rgba(17, 76, 157, 0.2); height: 100%; position: fixed; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 03544c7..87bf399 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -14,6 +14,7 @@ $submenuActiveBg:rgba(242, 242, 242, .4); $sideBarWidth: 210px; $primaryColor: #0077CC; +// $primaryColor:#010296; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index 9d4c218..341458b 100644 --- a/src/styles/viewui-mine.less +++ b/src/styles/viewui-mine.less @@ -2,3 +2,4 @@ // Here are the variables to cover, such as: @primary-color: #0077CC; +// @primary-color:#010296; diff --git a/src/utils/table.js b/src/utils/table.js index 3dcc7f9..7e60458 100644 --- a/src/utils/table.js +++ b/src/utils/table.js @@ -74,6 +74,9 @@ export function getRenderTable (ctx, fields, replaces) { throw new Error("replaces参数错误,需要Map类型"); } return fields.map((field, index) => { + console.log("fields",fields) + // + //自定义替换 if (replaces instanceof Map && replaces.get(field.field)) { return replaces.get(field.field) @@ -232,11 +235,16 @@ export function getRenderTable (ctx, fields, replaces) { } } - return { - prop: field.field, - label: field.name, - width: field.width, - fixed: field.is_fixed + if(field.list_show===0){ + + }else{ + return { + prop: field.field, + label: field.name, + width: field.width, + fixed: field.is_fixed + } } + }) } diff --git a/src/views/component/table.vue b/src/views/component/table.vue index 0d68895..979440f 100644 --- a/src/views/component/table.vue +++ b/src/views/component/table.vue @@ -420,7 +420,7 @@ export default { const data = this.$refs['xyTable'].getListData(); if (data.length < 2) return; try { - this.form.filter(i => i.list_show).forEach((i) => { + this.form.filter(i => i.list_show===1).forEach((i) => { let maxLength = -Infinity; let minLength = Infinity; let numberLength = 0; diff --git a/src/views/course/apply.vue b/src/views/course/apply.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/src/views/course/apply.vue @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/src/views/course/class.vue b/src/views/course/class.vue new file mode 100644 index 0000000..c6cdfe4 --- /dev/null +++ b/src/views/course/class.vue @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + 排课 + 考勤 + 设定班主任 + + + + + + + + + + + + + + diff --git a/src/views/course/components/addClass.vue b/src/views/course/components/addClass.vue new file mode 100644 index 0000000..8083b08 --- /dev/null +++ b/src/views/course/components/addClass.vue @@ -0,0 +1,264 @@ + + + + + 课程名称:第六期高级科创人才研修班 + 开课日期:2024.3.1--2024.9.1 + 类别:正常课程 + + + 班主任:李老师 + 课表状态:未发布 + + + + 新增一行 + + + 导入 + + + 发布课表 + + + 下载并打印课表 + + + + + + + + + {{ formatTime(scope.row[column.prop]) }} + + + X + + + + + + + + 删除 + + + + + + + 确认 + 取消 + + + + + + + + + + + + diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue new file mode 100644 index 0000000..ab878ea --- /dev/null +++ b/src/views/course/components/addCourse.vue @@ -0,0 +1,276 @@ + + + + + + + *课程名称: + + + + + + + + + + *课程类别: + + + + + + + + + + + + + *课程简介: + + + + + + + + + + *开课日期: + + + + + + + + + + + + *开课人数: + + + + + + + + + + *所在班级(地点): + + + + + + + + + + 面向学员的企业性质: + + + + + + + + + + + + + 所属行业: + + + + + + + + + + + + + 状态: + + + + + + + + + + + + + 课程设置: + + + 新增 + + + + + 删除 + + + + + + + + + + + 确认 + 取消 + + + + + + + + + + diff --git a/src/views/course/components/changeSubject.vue b/src/views/course/components/changeSubject.vue new file mode 100644 index 0000000..31e8fbb --- /dev/null +++ b/src/views/course/components/changeSubject.vue @@ -0,0 +1,161 @@ + + + + + + + *课时名称: + + + + + + + + + + + + + *授课老师: + + + + + + + + + + + + + *授课教室: + + + + + + + + + + 确认 + 取消 + + + + + + + + + + diff --git a/src/views/course/components/changeTime.vue b/src/views/course/components/changeTime.vue new file mode 100644 index 0000000..1a46400 --- /dev/null +++ b/src/views/course/components/changeTime.vue @@ -0,0 +1,85 @@ + + + + + + + *上课时间: + + + + + + + + + + + 确认 + 取消 + + + + + + + + + + diff --git a/src/views/course/components/setMainTeacher.vue b/src/views/course/components/setMainTeacher.vue new file mode 100644 index 0000000..789911b --- /dev/null +++ b/src/views/course/components/setMainTeacher.vue @@ -0,0 +1,113 @@ + + + + + + + *班主任: + + + + + + + + + + + + 确认 + 取消 + + + + + + + + + + diff --git a/src/views/course/components/showCode.vue b/src/views/course/components/showCode.vue new file mode 100644 index 0000000..83d78d1 --- /dev/null +++ b/src/views/course/components/showCode.vue @@ -0,0 +1,100 @@ + + + + + + + + + + + + 课程名称:第六期高级科创人才研修班 + 开课日期:2024.3.1-----2024.9.1 + 类别:正常课程 + + + + + + + + + + + + + 关闭 + + + + + + + + + + diff --git a/src/views/course/history.vue b/src/views/course/history.vue new file mode 100644 index 0000000..b835c7b --- /dev/null +++ b/src/views/course/history.vue @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + 新增课程 + + + + + + + + + + + + + + 编辑 + 删除 + 通讯录 + 二维码 + + + + + + + + + + + + + diff --git a/src/views/course/index.vue b/src/views/course/index.vue new file mode 100644 index 0000000..c7a40b0 --- /dev/null +++ b/src/views/course/index.vue @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + 新增课程 + + + + + + + + + + + + + + 编辑 + 删除 + 通讯录 + 二维码 + + + + + + + + + + + + + + diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue new file mode 100644 index 0000000..ccf71d7 --- /dev/null +++ b/src/views/course/txl.vue @@ -0,0 +1,198 @@ + + + + + + + + + 课程名称:第六期高级科创人才研修班 + 开课日期:2024.3.1-----2024.9.1 + 类别:正常课程 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + 导出 + + + + + + + + + + + + + + 查看 + + + + + + + + + + + + +