From d4d2b06e1d001fcaa5c3520fe31639b643c24ed5 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Nov 2022 16:52:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/i18n/zh-CN.js | 6 +- back/src/i18n/zh-TW.js | 8 +- back/src/views/main-navbar.vue | 2 +- .../src/views/modules/ability/bsabilityai.vue | 44 +++++---- .../modules/ability/bsabilityservice.vue | 91 ++++++------------- .../modules/ability/businessComponents.vue | 54 ++++++----- .../modules/ability/commonCapabilities.vue | 43 +++++---- 7 files changed, 116 insertions(+), 132 deletions(-) diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js index acefdd06..8901b962 100644 --- a/back/src/i18n/zh-CN.js +++ b/back/src/i18n/zh-CN.js @@ -3,8 +3,8 @@ const t = {} t.loading = '加载中...' t.brand = {} -t.brand.lg = '能力管理中心' -t.brand.mini = '一体化综合指挥' +t.brand.lg = '生态运营平台' +t.brand.mini = '政务信息系统' t.add = '新增' t.delete = '删除' @@ -576,4 +576,4 @@ t.infrastructure.street = '所在街道' t.infrastructure.department = '所属部门' t.infrastructure.associatedApplication = '关联应用' -export default t +export default t \ No newline at end of file diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js index 3e6f2cd5..ab7786c5 100644 --- a/back/src/i18n/zh-TW.js +++ b/back/src/i18n/zh-TW.js @@ -3,8 +3,8 @@ const t = {} t.loading = '加載中...' t.brand = {} -t.brand.lg = '能力管理中心' -t.brand.mini = '一体化综合指挥' +t.brand.lg = '生态运营平台' +t.brand.mini = '政务信息系统' t.add = '新增' t.delete = '刪除' @@ -25,7 +25,7 @@ t.choose = '請選擇' t.fileName = '文件名' t.design = '在線設計' t.preview = '預覽' -t.reset='重置' +t.reset = '重置' t.prompt = {} t.prompt.title = '提示' @@ -544,4 +544,4 @@ t.notice.new = '有新通知' t.notice.disconnect = '連接斷開' t.notice.disconnectMessage = 'WebSocket連接已斷開,請檢查網絡' -export default t +export default t \ No newline at end of file diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue index 0836b83d..7be568af 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -12,7 +12,7 @@ $t("brand.lg") }} —— - 后台管理系统 + 能力知识库
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 5c408fe9..571373df 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -29,7 +29,7 @@ --> 上架盘点入库 @@ -48,7 +48,6 @@ v-loading="dataListLoading" :data="dataList" border - style="width: 100%" height="650px" @selection-change="handleSelectionChange" > @@ -60,7 +59,6 @@ > - + + @@ -294,7 +302,7 @@ export default { orderField: 'total', orderType: 'DESC', pageNum: this.currentPage, - pageSize: 15, + pageSize: 10, type: '组件服务', }; this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index dc2ec6a9..5df46152 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -31,7 +31,7 @@ 上架盘点入库 @@ -51,7 +51,6 @@ :data="dataList" border @selection-change="dataListSelectionChangeHandle" - style="width: 100%" height="650px" > - - + + + - + - - + diff --git a/back/src/views/modules/ability/businessComponents.vue b/back/src/views/modules/ability/businessComponents.vue index 690ff7d5..3680f180 100644 --- a/back/src/views/modules/ability/businessComponents.vue +++ b/back/src/views/modules/ability/businessComponents.vue @@ -29,7 +29,7 @@ --> 上架盘点入库 @@ -48,7 +48,6 @@ v-loading="dataListLoading" :data="dataList" border - style="width: 100%" height="650px" @selection-change="handleSelectionChange" > @@ -60,37 +59,47 @@ > - + + @@ -294,7 +302,7 @@ export default { orderField: 'total', orderType: 'DESC', pageNum: this.currentPage, - pageSize: 15, + pageSize: 10, type: '组件服务', }; this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { @@ -302,13 +310,12 @@ export default { this.total = parseInt(res.data.data.total); }) }, - //翻页 handleCurrentChange (val) { console.log('val------------>', val) this.currentPage = val; this.getDataList(); }, - //删除,可以批量删除 + //删除,可以批量删除 deleteHandle2 (id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] @@ -326,7 +333,7 @@ export default { this.getDataList() }) }, - //多选多选 + //多选多选 handleSelectionChange(val){ this.dataListSelections = val; }, @@ -348,7 +355,7 @@ export default { }) }, reset () { - this.getDataList(); + this.getDataList(); }, findValue (list, type) { const found = list.find((item) => item.attrType === type) @@ -513,6 +520,7 @@ export default { this.$message.error('查询信息不能为空') } }, + // fullScreen () { // if (window.outerHeight === screen.availHeight) { // if (window.outerWidth === screen.availWidth) { // this.qp = false diff --git a/back/src/views/modules/ability/commonCapabilities.vue b/back/src/views/modules/ability/commonCapabilities.vue index 7b11f9e0..28c1e7dc 100644 --- a/back/src/views/modules/ability/commonCapabilities.vue +++ b/back/src/views/modules/ability/commonCapabilities.vue @@ -5,7 +5,7 @@ @@ -29,7 +29,7 @@ --> 上架盘点入库 @@ -48,7 +48,6 @@ v-loading="dataListLoading" :data="dataList" border - style="width: 100%" height="650px" @selection-change="handleSelectionChange" > @@ -60,37 +59,36 @@ > - + > --> @@ -294,7 +292,7 @@ export default { orderField: 'total', orderType: 'DESC', pageNum: this.currentPage, - pageSize: 15, + pageSize: 10, type: '组件服务', }; this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { @@ -307,7 +305,7 @@ export default { this.currentPage = val; this.getDataList(); }, - //删除,可以批量删除 + //删除,可以批量删除 deleteHandle2 (id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] @@ -325,7 +323,7 @@ export default { this.getDataList() }) }, - //多选多选 + //多选多选 handleSelectionChange(val){ this.dataListSelections = val; }, @@ -347,7 +345,7 @@ export default { }) }, reset () { - this.getDataList(); + this.getDataList(); }, findValue (list, type) { const found = list.find((item) => item.attrType === type) @@ -512,6 +510,7 @@ export default { this.$message.error('查询信息不能为空') } }, + // fullScreen () { // if (window.outerHeight === screen.availHeight) { // if (window.outerWidth === screen.availWidth) { // this.qp = false From 14813c1f4dbfdf1a0cb1bb96c0dc7ab554b29132 Mon Sep 17 00:00:00 2001 From: guoyue Date: Tue, 1 Nov 2022 18:06:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ability/components/tag-directory.vue | 144 ++++++++++++++++++ .../ability/components/tag-sys-build-life.vue | 62 ++++++++ .../ability/components/tag-sys-build.vue | 103 +++++++++++++ back/src/views/modules/ability/tag.vue | 105 ++++++------- 4 files changed, 356 insertions(+), 58 deletions(-) create mode 100644 back/src/views/modules/ability/components/tag-directory.vue create mode 100644 back/src/views/modules/ability/components/tag-sys-build-life.vue create mode 100644 back/src/views/modules/ability/components/tag-sys-build.vue diff --git a/back/src/views/modules/ability/components/tag-directory.vue b/back/src/views/modules/ability/components/tag-directory.vue new file mode 100644 index 00000000..e2d17b0d --- /dev/null +++ b/back/src/views/modules/ability/components/tag-directory.vue @@ -0,0 +1,144 @@ + + + + + \ No newline at end of file diff --git a/back/src/views/modules/ability/components/tag-sys-build-life.vue b/back/src/views/modules/ability/components/tag-sys-build-life.vue new file mode 100644 index 00000000..d99f7649 --- /dev/null +++ b/back/src/views/modules/ability/components/tag-sys-build-life.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/back/src/views/modules/ability/components/tag-sys-build.vue b/back/src/views/modules/ability/components/tag-sys-build.vue new file mode 100644 index 00000000..0fec5d68 --- /dev/null +++ b/back/src/views/modules/ability/components/tag-sys-build.vue @@ -0,0 +1,103 @@ + + + + \ No newline at end of file diff --git a/back/src/views/modules/ability/tag.vue b/back/src/views/modules/ability/tag.vue index 35eb9f1e..96e56d4d 100644 --- a/back/src/views/modules/ability/tag.vue +++ b/back/src/views/modules/ability/tag.vue @@ -1,75 +1,40 @@ + \ No newline at end of file