From 7d969302d8df7c73fe00669f973099e873aec55c Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 22 Apr 2024 17:26:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=85=A8=E7=AB=99=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E7=BC=93=E5=AD=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 27d710a499f84705656ff798e0e403f08a71d3ec. --- public/index.html | 2 +- src/pages/achievement/info/course.vue | 11 +- src/pages/achievement/info/project.vue | 34 +- src/pages/achievement/list/course.vue | 31 +- src/pages/achievement/list/project.vue | 126 +++-- src/pages/activity/details/index.vue | 8 +- src/pages/activity/list/index.vue | 47 +- src/pages/activity/manage/add/index.vue | 8 +- src/pages/activity/manage/list/index.vue | 39 +- src/pages/activity/manage/manage/index.vue | 14 +- src/pages/activity/manage/manage/notice.vue | 20 +- src/pages/assessment/add/index.vue | 7 +- src/pages/assessment/list/index.vue | 53 +-- .../course/list/courseManagement/index.vue | 43 +- src/pages/expSystem/backstage/index.vue | 5 +- src/pages/expSystem/backstage/model.vue | 9 +- src/pages/expSystem/backstage/sourceModel.vue | 9 +- src/pages/expSystem/list/index.vue | 47 +- .../information/contentManage/contentList.vue | 432 ++++++++---------- src/pages/information/contentManage/index.vue | 1 + src/pages/match/add/index.vue | 4 +- src/pages/match/list/index.vue | 44 +- src/pages/match/manage/index.vue | 4 +- src/pages/match/manage/matchArch.vue | 2 - src/pages/match/manage/matchArchList.vue | 28 +- src/pages/match/manage/matchRank.vue | 28 +- src/pages/match/manage/matchSignup.vue | 32 +- src/pages/match/manage/notice.vue | 15 +- src/pages/product/list/index.vue | 22 +- src/pages/product/show/index.vue | 9 +- src/pages/project/add/index.vue | 15 +- src/pages/project/list/index.vue | 89 ++-- src/pages/station/list/index.vue | 8 +- src/pages/station/preview/index.vue | 2 +- src/setting.js | 2 +- src/store/modules/achievement.js | 2 +- src/store/modules/activity.js | 10 +- src/store/modules/assessment.js | 17 - src/store/modules/expSystem.js | 25 - src/store/modules/match.js | 12 +- src/store/modules/product.js | 17 - src/store/modules/project.js | 9 +- 42 files changed, 515 insertions(+), 827 deletions(-) delete mode 100644 src/store/modules/assessment.js delete mode 100644 src/store/modules/expSystem.js delete mode 100644 src/store/modules/product.js diff --git a/public/index.html b/public/index.html index 2a0608a..7b9845e 100644 --- a/public/index.html +++ b/public/index.html @@ -10,7 +10,7 @@ var _hmt = _hmt || []; (function() { var hm = document.createElement('script'); - hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654'; + hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(hm, s); })(); diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue index 9239b4e..3c7bcda 100644 --- a/src/pages/achievement/info/course.vue +++ b/src/pages/achievement/info/course.vue @@ -302,7 +302,7 @@ export default { listDataAll: [], listData: [], multipleSelection: [], - page: +this.$route.query.page || 1, + page: 1, pageSize: 10, total: 0, peopleNum: 0, // 总人数 @@ -501,13 +501,6 @@ export default { this.multipleSelection = val; }, handleCurrentChange (val) { // 切换分页 - this.$router.push({ - path: 'course', - query: { - ...this.$route.query, - page: this.val - } - }) this.page = val this.getData(); }, @@ -706,7 +699,7 @@ export default { echarts.init(document.querySelector(`#chart1`)).setOption(option) }, back () { - this.$router.push(this.$store.state.achievement.referrer) + location.href = this.$store.state.achievement.referrer }, } }; diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue index 2e23a81..add97b0 100644 --- a/src/pages/achievement/info/project.vue +++ b/src/pages/achievement/info/project.vue @@ -76,7 +76,7 @@
+ @tab-click="initData"> 筛选
    +
  • 筛选
      -
    • +
    • - +
    • - {{ item.name }}
      • -
    • +
    • -
    • - +
    @@ -95,7 +95,7 @@ {{ scope.$index + (page - 1) * pageSize + 1 }} - diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue index 7842a5d..bac9c62 100644 --- a/src/pages/project/list/index.vue +++ b/src/pages/project/list/index.vue @@ -12,7 +12,7 @@
    • -
    • - @@ -35,7 +35,7 @@
    • -
    @@ -216,22 +216,22 @@ export default { return { showBack: Boolean(this.$route.query.show), lc: [11, 12, 19], - cid: [this.$route.query.mallId ? +this.$route.query.mallId : '', this.$route.query.cid ? +this.$route.query.cid : ''], + cid: [], curs: [], + systemId: "", systemList: [], systemListAll: [], curriculumId: '', curriculumList: [], - form: { - projectName: this.$route.query.projectName || '', + queryData: { platformId: 1, // 平台：职站:1 中台:3 founder: +this.$route.query.founder || 2, // 创建人角色(0:系统 1:老师 2:全部) - state: this.$route.query.state ? +this.$route.query.state : '', // 状态(0:草稿箱 1:已发布) - permissions: this.$route.query.permissions ? +this.$route.query.permissions : '', // 项目用途(0:练习 1:考核 2:竞赛) - cid: this.$route.query.cid ? +this.$route.query.cid : '', - mallId: this.$route.query.mallId ? +this.$route.query.mallId : '', - systemId: this.$route.query.systemId ? +this.$route.query.systemId : '', + state: "", // 状态(0:草稿箱 1:已发布) + permissions: "", // 项目用途(0:练习 1:考核 2:竞赛) + cid: '', + mallId: '' }, + keyword: "", status: "", listData: [], total: 0, @@ -312,37 +312,46 @@ export default { ...mapState("project", [ "lastSystemId", "assFields", + "queryDataStatus", ]) }, watch: { - 'form.projectName': function (val) { + keyword: function (val) { clearTimeout(this.searchTimer); this.searchTimer = setTimeout(() => { this.initData(); }, 500); }, + queryData: { + handler: function (newVal) { + this.setQueryStatus({ ...newVal }) + }, + deep: true + } }, mounted () { - const { query } = this.$route - if (query.page) { - this.$store.commit('project/setParams', null) - this.$router.push('list').catch(() => { }) - } - this.getSystemData() this.getData() + if (this.queryDataStatus.platformId) { + this.queryData = this.queryDataStatus + } }, methods: { ...mapActions("project", [ "setSystemId" ]), + ...mapMutations({ + setQueryStatus: "project/SET_QUERYDATASTATUS" + }), getData () { - this.setSystemId(this.form.systemId); + this.setSystemId(this.systemId); if (this.isFirst) this.page = +this.$route.query.page || 1 let data = { - ...this.form, + ...this.queryData, + projectName: this.keyword, pageNum: this.page, pageSize: this.pageSize, + systemId: this.systemId, }; this.$post(this.api.queryProjectManage, data).then(res => { this.isFirst = false @@ -362,7 +371,7 @@ export default { getschoolCourse () { this.$get(this.api.getSchoolEffectiveCourse).then(({ data }) => { this.curriculumList = data - const { mallId } = this.form + const { mallId } = this.queryData if (data.length) { this.cid = [mallId || data[0].mallId] const all = this.systemListAll @@ -398,24 +407,22 @@ export default { }, handleCurrentChange (val) { // 切换页码 this.page = val; + // this.$router.push({ + // path: '/project/list', + // query: { + // ...this.$route.query, + // page: val + // } + // }) this.getData(); }, - // 缓存参数及分页 - setCache () { - this.$store.commit('project/setParams', { - form: this.form, - page: this.page, - }) - }, add () { // 新增项目 - this.setCache() - this.setSystemId(this.form.systemId); - this.$router.push(`/project/add?founder=${this.form.founder}`); + this.setSystemId(this.systemId); + this.$router.push(`/project/add?founder=${this.queryData.founder}`); }, edit (row, show) { // 编辑 - this.setCache() this.setSystemId(row.systemId); - this.$router.push(`/project/add?projectId=${row.projectId}&founder=${this.form.founder}${show ? `&show=1` : ''}`); + this.$router.push(`/project/add?projectId=${row.projectId}&founder=${this.queryData.founder}${show ? `&show=1` : ''}`); }, handleSelectionChange (val) { // 处理多选 this.multipleSelection = val; @@ -435,7 +442,7 @@ export default { this.$confirm("确定要删除吗？", "提示", { type: "warning" }).then(() => { - this.$post(`${this.api.deleteProjectManage}?projectIds=${ids}&platformId=${this.form.platformId}`).then(res => { + this.$post(`${this.api.deleteProjectManage}?projectIds=${ids}&platformId=${this.queryData.platformId}`).then(res => { util.successMsg("删除成功"); this.$refs.table.clearSelection() this.getData(); @@ -456,7 +463,7 @@ export default { }, // 项目禁用 switchOff (row) { - this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.form.platformId}`).then(res => { + this.$get(`${this.api.updateIsOpen}?isOpen=${row.ccupationlabOpen}&projectId=${row.projectId}&platformId=${this.queryData.platformId}`).then(res => { util.successMsg("更新启用状态成功"); this.getData(); }).catch(err => { @@ -470,9 +477,9 @@ export default { // 如果选择的是课程，则默认选中下面第一个系统 this.cid = [mallId, this.curs.find(e => e.id === mallId).children[0].id] } - this.form.mallId = mallId - this.form.cid = this.curs.find(e => e.id === mallId).cid - this.form.systemId = this.cid[1] + this.queryData.mallId = mallId + this.queryData.cid = this.curs.find(e => e.id === mallId).cid + this.systemId = this.cid[1] this.initData() }, copyData (projectId) { // 复制，根据项目id查询详情 @@ -487,10 +494,10 @@ export default { } }) this.copyCurs = curs - this.copyMallId = [this.form.mallId, this.form.systemId] + this.copyMallId = [this.queryData.mallId, this.systemId] this.copyForm = { projectName: res.projectManage.projectName, - mallId: this.form.mallId + mallId: this.queryData.mallId } this.curRow = { projectManage: JSON.parse(JSON.stringify(res.projectManage)), diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue index 87dc58c..add214a 100644 --- a/src/pages/station/list/index.vue +++ b/src/pages/station/list/index.vue @@ -63,7 +63,7 @@ export default { data () { return { isSq: Setting.isSq, - keyword: this.$route.query.keyword || '', + keyword: "", active: 0, tabs: [ { @@ -92,10 +92,12 @@ export default { }).catch(err => { }) : this.$get(this.api.schoolCourse).then(res => { this.curriculumList = res.data; - }).catch(err => { }); + }).catch(err => { + console.log(err); + }); }, goPreview (item) { - this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}`); + this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}`); }, // tab切换 tabChange (item) { diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index cce8abe..497e00e 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -562,7 +562,7 @@ export default { goBack () { this.fromAdmin ? this.$router.back() : - this.$router.push(`/station?keyword=${this.$route.query.keyword || ''}`) + this.$router.push('/station') }, init () { this.insertScript(); diff --git a/src/setting.js b/src/setting.js index fade122..9f67ee8 100644 --- a/src/setting.js +++ b/src/setting.js @@ -30,7 +30,7 @@ if (isPro) { sandPath = `http://${location.hostname}:9520` uploadURL = `http://121.37.12.51/` host = "http://121.37.12.51/"; // 中台测试服 - host = 'https://www.occupationlab.com/' // 正式服 + // host = 'https://www.occupationlab.com/' // 正式服 host = "http://192.168.31.51:9000/"; host = localStorage.getItem('localIp') == 1 ? 'http://192.168.31.51:9000/' : 'http://192.168.31.217:9000/' } else if (isSq) { diff --git a/src/store/modules/achievement.js b/src/store/modules/achievement.js index 0907470..b0c309d 100644 --- a/src/store/modules/achievement.js +++ b/src/store/modules/achievement.js @@ -1,5 +1,5 @@ /** - * 成绩相关 + * 赛事相关 * */ export default { namespaced: true, diff --git a/src/store/modules/activity.js b/src/store/modules/activity.js index 834c429..80d87ff 100644 --- a/src/store/modules/activity.js +++ b/src/store/modules/activity.js @@ -4,16 +4,12 @@ export default { namespaced: true, state: { - params: null, - referrer: '', + page: 1, cache: null }, mutations: { - setParams: (state, val) => { - state.params = val - }, - setReferrer: (state, val) => { - state.referrer = val + setPage: (state, page) => { + state.page = page }, setCache: (state, cache) => { state.cache = cache diff --git a/src/store/modules/assessment.js b/src/store/modules/assessment.js deleted file mode 100644 index cf9a70b..0000000 --- a/src/store/modules/assessment.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * 考核相关 - * */ -export default { - namespaced: true, - state: { - params: null - }, - mutations: { - setParams: (state, val) => { - state.params = val - } - }, - actions: { - - } -}; \ No newline at end of file diff --git a/src/store/modules/expSystem.js b/src/store/modules/expSystem.js deleted file mode 100644 index 834c429..0000000 --- a/src/store/modules/expSystem.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 赛事相关 - * */ -export default { - namespaced: true, - state: { - params: null, - referrer: '', - cache: null - }, - mutations: { - setParams: (state, val) => { - state.params = val - }, - setReferrer: (state, val) => { - state.referrer = val - }, - setCache: (state, cache) => { - state.cache = cache - } - }, - actions: { - - } -}; \ No newline at end of file diff --git a/src/store/modules/match.js b/src/store/modules/match.js index b216890..80d87ff 100644 --- a/src/store/modules/match.js +++ b/src/store/modules/match.js @@ -4,16 +4,12 @@ export default { namespaced: true, state: { - params: null, - cache: null, - referrer: '', + page: 1, + cache: null }, mutations: { - setParams: (state, val) => { - state.params = val - }, - setReferrer: (state, val) => { - state.referrer = val + setPage: (state, page) => { + state.page = page }, setCache: (state, cache) => { state.cache = cache diff --git a/src/store/modules/product.js b/src/store/modules/product.js deleted file mode 100644 index 85ad0a2..0000000 --- a/src/store/modules/product.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * 产品相关 - * */ -export default { - namespaced: true, - state: { - params: null - }, - mutations: { - setParams: (state, val) => { - state.params = val - } - }, - actions: { - - } -}; \ No newline at end of file diff --git a/src/store/modules/project.js b/src/store/modules/project.js index 5ec433e..b3d7bd6 100644 --- a/src/store/modules/project.js +++ b/src/store/modules/project.js @@ -4,16 +4,12 @@ export default { namespaced: true, state: { - params: null, lastSystemId: "", projectFields: {}, assFields: {}, - queryDataStatus: null + queryDataStatus: {} }, mutations: { - setParams: (state, val) => { - state.params = val - }, SET_SYSTEM_ID: (state, systemId) => { state.lastSystemId = systemId; }, @@ -23,6 +19,9 @@ export default { SET_ASS: (state, assFields) => { state.assFields = assFields; }, + SET_QUERYDATASTATUS: (state, newStatus) => { + state.queryDataStatus = newStatus + } }, actions: { setSystemId({ state, commit }, systemId) {