From 76a7be9f48c6e1421a0cd79859f01768c827d674 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 31 Oct 2022 14:56:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/sys/dept.vue | 69 ++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/back/src/views/modules/sys/dept.vue b/back/src/views/modules/sys/dept.vue index b2c3d076..56fe60cc 100644 --- a/back/src/views/modules/sys/dept.vue +++ b/back/src/views/modules/sys/dept.vue @@ -3,22 +3,36 @@
- {{ $t('add') }} + {{ $t('add') }} + - - + + + + + +
@@ -31,12 +45,16 @@ import AddOrUpdate from './dept-add-or-update' import qs from 'qs' export default { mixins: [mixinViewModule], - data () { + data() { return { mixinViewModuleOptions: { getDataListURL: '/sys/dept/list', deleteURL: '/sys/dept' - } + }, + total: 0, + limit: 10, + page: 1, + dataList: [] } }, components: { @@ -45,16 +63,35 @@ export default { watch: { dataList: { handler: function () { - this.init() + this.getData() } } }, methods: { - init () { - debugger - this.$http.get('/sys/dept/list').then((res) => { - res.data.data.map((item, index) => { - if (item.district != null || item.children.length > 0) { + // 分页, 每页条数 + pageSizeChangeHandle (val) { + this.page = 1 + this.limit = val + this.getData() + }, + // 分页, 当前页 + pageCurrentChangeHandle (val) { + this.page = val + this.getData() + }, + getData() { + // debugger + let _data = { + limt: this.limit, + page: this.page, + } + this.$http.get('sys/dept/page', { + params: _data + }).then((res) => { + this.total = res.data.data.total; + res.data.data.list.map((item, index) => { + console.log('item, index------------>', item, index); + if (item.district != null || item.children.length >= 0) { this.$http.get('/sys/region/' + item.district).then((data) => { this.dataList[index].district = data.data.data.name console.log('datafrom', this.dataList) @@ -72,10 +109,10 @@ export default { } }) }) - } + }, }, - created () { - this.init() + created() { + this.getData() } } From 15426bccdc2134994800437f26e9a0ed6de9f9a5 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 31 Oct 2022 16:03:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/home.js | 9 +- front/src/views/home/apply.vue | 247 ++++++++++++++++----------------- 2 files changed, 130 insertions(+), 126 deletions(-) diff --git a/front/src/api/home.js b/front/src/api/home.js index b3043eec..0b8269c3 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 * @LastEditors: Light - * @LastEditTime: 2022-10-26 10:35:36 + * @LastEditTime: 2022-10-31 15:52:57 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -63,6 +63,13 @@ export function pageWithAttrs(data) { data, }) } +// 筛选 +export function getAppListByDept() { + return request({ + url: '/resource/getAppListByDept', + method: 'get', + }) +} // 获取hls视频流 export function getHls(params) { return request({ diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 0f99b1cd..26e1fcf8 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -260,7 +260,11 @@ import { getCategoryTreePage, endProcess } from '@/api/personalCenter' import mybus from '@/myplugins/mybus' import { sgcDel, getApplyForm } from '@/api/personalCenter' - import { pageWithAttrs, updateIntegrationServices } from '@/api/home' + import { + pageWithAttrs, + updateIntegrationServices, + getAppListByDept, + } from '@/api/home' import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js' import { getIntegrationDetail, soldierApply } from '@/api/home' import { useStore } from 'vuex' @@ -782,25 +786,18 @@ }) } } - pageWithAttrs({ - pageNum: 1, - pageSize: 99999, - type: '应用资源', - name: '', - infoList: [], - }).then((res) => { + getAppListByDept().then((res) => { + console.log('res=====>', res.data.data) if (res.data.code == 0) { - if (res.data.data.records.length == 0) { + if (res.data.data.length == 0) { message.warning('该关键词，暂无应用资源！') } else { // 过滤本单位的应用系统 - res.data.data.records.map((val) => { - if (val.deptName === deptName) { - systemOptions2.value.push({ - value: val.name, - label: val.name, - }) - } + res.data.data.map((val) => { + systemOptions2.value.push({ + value: val.NAME, + label: val.NAME, + }) }) // console.log('第一次获取===================>', systemOptions2.value) } @@ -958,130 +955,130 @@ } From 1ad52d954c4cc507d92abc2c09848d3f3875f425 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Oct 2022 16:29:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=88=91?= =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/header.vue | 2 ++ front/src/views/personalCenter/components/MyApply.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index fe336352..bac92f97 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -587,6 +587,7 @@ :deep(.ant-list-item) { border-bottom: 0.01rem solid #ccc; padding: 0.1rem; + cursor: default; } :deep(.ant-list-item-meta-title) { @@ -602,6 +603,7 @@ -webkit-line-clamp: 2; word-break: break-all; -webkit-box-orient: vertical; + cursor: default; } button { diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 7654f29e..32306460 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -44,12 +44,12 @@
名称：{{ - item.cameraList ? item.system : item.title || item.name + item.cameraList ? item.system : (item.title || item.name) }}