From 684f1a5492c37eb7de2b20531b04813b02e321ed Mon Sep 17 00:00:00 2001 From: lucky Date: Thu, 4 Mar 2021 18:44:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/portrait.styl | 2 - src/components/Page/PageAdd.vue | 325 +-------------------- src/components/Page/PageDate.vue | 109 ++----- src/components/Page/PageEdit.vue | 181 +++--------- src/components/Page/PageSearch.vue | 32 +- src/components/QuillEditor/QuillEditor.vue | 213 ++++++++++++++ src/config/api.js | 21 +- src/store/state.js | 136 +++++++++ src/views/PageManage/PageManage.vue | 5 +- 9 files changed, 436 insertions(+), 588 deletions(-) create mode 100644 src/components/QuillEditor/QuillEditor.vue diff --git a/src/common/portrait.styl b/src/common/portrait.styl index c523727..8ed1191 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -183,8 +183,6 @@ .white--text{ color: #fff; - width: 200px; - margin: 0 auto } diff --git a/src/components/Page/PageAdd.vue b/src/components/Page/PageAdd.vue index b72caba..ae68240 100644 --- a/src/components/Page/PageAdd.vue +++ b/src/components/Page/PageAdd.vue @@ -11,7 +11,6 @@ > - - - - - - {{ item.text }} - - - - - - {{ type.text }} - - - - - - - - - - - - - - - - - - - - - - 配置内容 - 指定内容 - - - - + @@ -193,6 +43,7 @@ - diff --git a/src/components/QuillEditor/QuillEditor.vue b/src/components/QuillEditor/QuillEditor.vue new file mode 100644 index 0000000..ee2d1fc --- /dev/null +++ b/src/components/QuillEditor/QuillEditor.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/src/config/api.js b/src/config/api.js index f58afb9..2dc4433 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -13,6 +13,18 @@ const page = `${greenvalley}/page`; // 页面管理相关操作 // websocket基础地址 export const WS_BASE_URL = msgUrl; +// 页面列表查询 +export const getPageList = params => axios.post(`${page}/list`, params); + +// 页面配置添加 +export const addPage = params => axios.post(`${page}/add`, params); + +// 页面配置删除 +export const deletePage = params => axios.post(`${page}/delete`, params); + +// 页面配置修改 +export const updatePage = params => axios.post(`${page}/update`, params); + // 查询所有的研发团队相关信息 export const getAllTeam = () => axios.post(`${researchTeam}/selectAllTeam`); @@ -30,12 +42,3 @@ export const upTeam = params => axios.post(`${researchTeam}/upTeam`, params); // 根据团队名称搜索团队 export const selLikeTeam = params => axios.post(`${researchTeam}/selLikeTeam`, params); - -// 页面列表查询 -export const getPageList = params => axios.post(`${page}/list`, params); - -// 页面配置添加 -export const addPage = params => axios.post(`${page}/add`, params); - -// 页面配置删除 -export const deletePage = params => axios.post(`${page}/delete`, params); diff --git a/src/store/state.js b/src/store/state.js index 64ae81d..4609529 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -4,6 +4,142 @@ const state = { RDTeamLists: [], // 研发团队列表 pageLists: [], // 页面管理列表 + titles: [ + { + value: '关于我们', + label: '关于我们', + children: [ + { + value: '公司介绍', + label: '公司介绍', + }, + { + value: '组织机构', + label: '组织机构', + }, + { + value: '合作伙伴', + label: '合作伙伴', + }, + { + value: '衍生企业', + label: '衍生企业', + }, + ], + }, + { + value: '创新政策', + label: '创新政策', + }, + { + value: '创新平台', + label: '创新平台', + children: [ + { + value: '协同创新中心', + label: '协同创新中心', + }, + { + value: '组织机构', + label: '组织机构', + }, + { + value: '创新服务平台', + label: '创新服务平台', + }, + { + value: '科技创新服务', + label: '科技创新服务', + }, + ], + }, + { + value: '孵化平台', + label: '孵化平台', + children: [ + { + value: '众创空间', + label: '众创空间', + }, + { + value: '公共实验室', + label: '公共实验室', + }, + { + value: '中试基地', + label: '中试基地', + }, + { + value: '创业导师', + label: '创业导师', + }, + { + value: '合作伙伴', + label: '合作伙伴', + }, + { + value: '创业服务', + label: '创业服务', + }, + { + value: '产品展示', + label: '产品展示', + }, + ], + }, + { + value: '产业平台', + label: '产业平台', + children: [ + { + value: '产业创新联盟', + label: '产业创新联盟', + }, + { + value: '产业服务', + label: '产业服务', + }, + { + value: '衍生企业', + label: '衍生企业', + }, + ], + }, + { + value: '知识平台', + label: '知识平台', + }, + { + value: '活动公告', + label: '活动公告', + }, + { + value: '创新挑战', + label: '创新挑战', + children: [ + { + value: '需求征集', + label: '需求征集', + }, + { + value: '项目发布', + label: '项目发布', + }, + { + value: '结果公告', + label: '结果公告', + }, + ], + }, + { + value: '交流社区', + label: '交流社区', + }, + { + value: '联系我们', + label: '联系我们', + }, + ], }; export default state; diff --git a/src/views/PageManage/PageManage.vue b/src/views/PageManage/PageManage.vue index 5a70cf0..8ba6e71 100644 --- a/src/views/PageManage/PageManage.vue +++ b/src/views/PageManage/PageManage.vue @@ -33,15 +33,12 @@ export default { * @param { String } competeTimeId 第几届信息的id */ async getPageList(titleCode) { - console.log('titleCode: ', titleCode); try { - const titleCode = titleCode ? titleCode : ''; - const params = { param: { pageNum: 1, pageSize: 10, titleCode } }; + const params = { param: { pageNum: 1, pageSize: 10, titleCode: titleCode || '' } }; const res = await getPageList(params); const { code, msg, data } = res.data; if (code === 200) { this.lists = data.list; - console.log('this.lists: ', this.lists); } else { throw msg || '获取失败'; } From c00469dd9f4139e0c76abc44b38b427a6d08f85b Mon Sep 17 00:00:00 2001 From: lucky Date: Fri, 5 Mar 2021 15:23:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 13 +++++++ package.json | 1 + src/components/Page/PageAdd.vue | 3 +- src/components/Page/PageDate.vue | 23 ++++++++--- src/components/Page/PageEdit.vue | 45 +++++++++++++++++----- src/components/Page/PageSearch.vue | 3 +- src/components/QuillEditor/QuillEditor.vue | 6 +-- src/main.js | 3 ++ src/views/PageManage/PageManage.vue | 24 +++++++++--- 9 files changed, 94 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index dda0524..d12fd40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5113,6 +5113,11 @@ "domelementtype": "1" } }, + "dompurify": { + "version": "2.2.6", + "resolved": "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz", + "integrity": "sha1-VJRdxcC0XOWuIocFd36OWdey7cQ=" + }, "domready": { "version": "1.0.8", "resolved": "https://registry.npm.taobao.org/domready/download/domready-1.0.8.tgz", @@ -12508,6 +12513,14 @@ "integrity": "sha1-KdTrSCdcf+FbkuH9XZX74qlmQ28=", "dev": true }, + "vue-dompurify-html": { + "version": "2.3.0", + "resolved": "https://registry.npm.taobao.org/vue-dompurify-html/download/vue-dompurify-html-2.3.0.tgz", + "integrity": "sha1-sXXt2lc2LPewPShkRo+mROBaKtA=", + "requires": { + "dompurify": "^2.0.0" + } + }, "vue-eslint-parser": { "version": "7.1.1", "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.1.1.tgz?cache=0&sync_timestamp=1602498980660&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.1.1.tgz", diff --git a/package.json b/package.json index c60b05d..ce58909 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "register-service-worker": "^1.7.1", "stylus": "^0.54.8", "vue": "^2.6.11", + "vue-dompurify-html": "^2.3.0", "vue-quill-editor": "^3.0.6", "vue-router": "^3.2.0", "vuex": "^3.4.0" diff --git a/src/components/Page/PageAdd.vue b/src/components/Page/PageAdd.vue index ae68240..e790bac 100644 --- a/src/components/Page/PageAdd.vue +++ b/src/components/Page/PageAdd.vue @@ -99,10 +99,9 @@ export default { console.log('params: ', params); const res = await addPage(params); const { data, msg, code } = res.data; - this.$emit('closeModal'); if (code === 200) { this.$message.success('添加成功'); - // TODO: 填到列表中 + this.$emit('closeModal'); } else { throw msg; } diff --git a/src/components/Page/PageDate.vue b/src/components/Page/PageDate.vue index 2a89110..5a99afe 100644 --- a/src/components/Page/PageDate.vue +++ b/src/components/Page/PageDate.vue @@ -5,8 +5,10 @@ :columns="columns" :data-source="lists" :loading="loading" + :pagination="pagination" :row-key="record => record.id" :scroll="{ y: height }" + @change="handleTableChange" bordered class="white" > @@ -15,7 +17,7 @@ @@ -20,6 +20,7 @@ export default { data() { return { lists: [], + pagination: { current: 1, pageSize: 10 }, }; }, @@ -29,16 +30,29 @@ export default { methods: { /** - * 页面配置添加 - * @param { String } competeTimeId 第几届信息的id + * 页面列表查询 + * @param { String } pageNum 页码 + * @param { String } pageSize 每页多少条 + * @param { String } titleCode 模块 */ - async getPageList(titleCode) { + async getPageList(condition) { try { - const params = { param: { pageNum: 1, pageSize: 10, titleCode: titleCode || '' } }; + const params = { + param: { + pageNum: (condition && condition.current) || 1, + pageSize: (condition && condition.pageSize) || 10, + titleCode: (condition && condition.titleCode) || '', + }, + }; const res = await getPageList(params); const { code, msg, data } = res.data; if (code === 200) { this.lists = data.list; + const paper = { ...this.pagination }; + paper.current = data.pageNum; + paper.total = +data.total; + paper.pageSize = data.pageSize; + this.pagination = paper; } else { throw msg || '获取失败'; } From 386d1ca4b7accd42942b5fb4201a96651f829c51 Mon Sep 17 00:00:00 2001 From: lucky Date: Fri, 5 Mar 2021 17:56:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BtnCom/BtnCon.vue | 2 +- src/components/Page/PageDate.vue | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/components/BtnCom/BtnCon.vue b/src/components/BtnCom/BtnCon.vue index 78d046b..802a5c8 100644 --- a/src/components/BtnCom/BtnCon.vue +++ b/src/components/BtnCom/BtnCon.vue @@ -3,12 +3,12 @@
行政部
内容管理
行业资讯
-
人才招聘
用户管理
轮播图管理
交流社区
活动公告
创新政策
+
人才招聘
创新部
合作意向
diff --git a/src/components/Page/PageDate.vue b/src/components/Page/PageDate.vue index 5a99afe..2c5a94e 100644 --- a/src/components/Page/PageDate.vue +++ b/src/components/Page/PageDate.vue @@ -109,7 +109,6 @@ export default { async closeModal() { this.editVisible = false; await this.$emit('getPageList'); - console.log(555555555555); }, handleTableChange(pagination) { @@ -127,8 +126,6 @@ export default { if (code === 200) { this.$message.success('删除成功'); await this.$emit('getPageList'); - // const arr = [...this.lists]; - // this.lists = arr.filter(item => item.id !== pageId); } else { throw msg; } From 3258c906133e655c3165816edb7ec5e51a5b1f92 Mon Sep 17 00:00:00 2001 From: lucky Date: Fri, 5 Mar 2021 17:56:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Page/PageDate.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/Page/PageDate.vue b/src/components/Page/PageDate.vue index 2c5a94e..6e069af 100644 --- a/src/components/Page/PageDate.vue +++ b/src/components/Page/PageDate.vue @@ -26,6 +26,15 @@ + +