From 330f8de5e43234b1dee971864dff93fa4c559870 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 26 Oct 2022 10:39:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2=20=20?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/home.js | 13 ++- front/src/views/home/DetailsPageconetent.vue | 100 ++++++++++++++++++- 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/front/src/api/home.js b/front/src/api/home.js index 6c9b4b4a..b3043eec 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-25 09:51:56 + * @LastEditTime: 2022-10-26 10:35:36 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -419,11 +419,14 @@ export function updateIntegrationServices(data) { } // 全局搜索 -export function getCountByFuzzyQuery(params) { +export function getCountByFuzzyQuery(params, flag) { return request({ - url: '/resource/getCountByFuzzyQuery?keyWorld=' + params, + url: + '/resource/getCountByFuzzyQuery?keyWorld=' + + params + + '&nonChinese=' + + flag, method: 'get', - params, }) } @@ -513,6 +516,6 @@ export function getGisByArea(data) { return request({ url: '/resource/getSquareList', method: 'post', - data + data, }) } diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 05a181d9..1a6b2752 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1140,7 +1140,25 @@ const globalSearch = () => { if (searchValue.value) { globalFlag.value = true - getCountByFuzzyQuery(searchValue.value || '').then((res) => { + let flag = true + let str = '' + let r = null + if ( + searchValue.value.length >= 2 && + paramsGetResources.type !== '基础设施' + ) { + str = searchValue.value.substring(0, 2) + r = re.test(str) + } + if ( + (searchValue.value.length > 1 && r) || + paramsGetResources.type === '基础设施' + ) { + flag = false + } else { + flag = true + } + getCountByFuzzyQuery(searchValue.value || '', flag).then((res) => { console.log('全局搜索==========》', res.data.data) globalData.data = res.data.data let mapFlag = true @@ -1240,6 +1258,7 @@ (searchValue.value.length > 1 && r) || paramsGetResources.type === '基础设施' ) { + paramsGetResources.nonChinese = false paramsGetResources.name = searchValue.value paramsGetResources.type = Cardsname.value if ( @@ -1317,7 +1336,84 @@ paramsGetResources2.value.name = paramsGetResources.name } } else { - message.error('请以两位以上汉字或数字开头') + paramsGetResources.nonChinese = true + paramsGetResources.name = searchValue.value + paramsGetResources.type = Cardsname.value + if ( + !whoShow1.value.itShowBaoTou && + paramsGetResources.type === '数据资源' + ) { + if (switchIndex != '分页查询') { + paramsGetResources.pageNum = 1 + } + let dataResourceParams = { + serviceName: paramsGetResources.name || '', //资源名称 + orderField: whoShow1.value.itShowQingDao + ? paramsGetResources.orderField == 'applyCount' + ? 'syqk' + : 'fbrq' + : paramsGetResources.orderField == 'applyCount' + ? 'requestCount' + : 'createTime', //排序字段 + orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc + pageNum: paramsGetResources.pageNum, //页码 + pageSize: paramsGetResources.pageSize, //分页大小 + } + getDataResource(dataResourceParams).then((res) => { + loading.value = false + console.log('res.data.data----874-------->', res.data.data) + if (whoShow1.value.itShowQingDao) { + if (whoShow1.value.itShowZhanTingDev) { + // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样 + console.log('999----->', res.data.data.list) + getXiHaiAn(res) + } else { + getQingDao(res) + } + } else if (whoShow1.value.itShowXiHaiAn) { + getXiHaiAn(res) + } + }) + } else if ( + paramsGetResources.type !== '数据资源' && + (paramsGetResources.type !== '基础设施' || + !whoShow1.value.itShowXiHaiAn) + ) { + if (switchIndex != '分页查询') { + paramsGetResources.pageNum = 1 + } + pageWithAttrs(paramsGetResources).then((res) => { + if (res.data.code != 0) { + return message.error(res.data.msg) + } + console.log( + '查询列表====22========>', + resourceList, + res.data.data + ) + resourceList.data = [] + videoList.data = [] + if (Cardsname.value === '基础设施') { + resourceList.data = res.data.data.records || [] + resourceTotal.value = res.data.data.total || '' + loading.value = false + } else { + resourceTotal.value = res.data.data.total || '' + resourceList.data = res.data.data.records || [] + } + }) + } else if ( + paramsGetResources.type === '基础设施' && + whoShow1.value.itShowXiHaiAn + ) { + if (switchIndex != '分页查询') { + paramsGetResources.pageNum = 1 + } + paramsGetResources2.value.pageNum = paramsGetResources.pageNum + paramsGetResources2.value.pageSize = paramsGetResources.pageSize + paramsGetResources2.value.name = paramsGetResources.name + } + // message.error('请以两位以上汉字或数字开头') } } else { //switchIndex这个参数是下面的分页传过来的参数 From 42b7ec11291c71a97f4d323494b489f05abd3949 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 26 Oct 2022 14:35:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ren-process-detail.vue | 6 +- .../components/abilityDetails.vue | 140 +++++++++--------- .../components/frequency-top5-view.vue | 8 +- 3 files changed, 79 insertions(+), 75 deletions(-) diff --git a/back/src/components/ren-process-detail/src/ren-process-detail.vue b/back/src/components/ren-process-detail/src/ren-process-detail.vue index 89bc0d45..e7a04977 100644 --- a/back/src/components/ren-process-detail/src/ren-process-detail.vue +++ b/back/src/components/ren-process-detail/src/ren-process-detail.vue @@ -1,8 +1,8 @@ --> - + + --> - + - \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/frequency-top5-view.vue b/back/src/views/modules/workBench/components/frequency-top5-view.vue index b691ec4a..246708b7 100644 --- a/back/src/views/modules/workBench/components/frequency-top5-view.vue +++ b/back/src/views/modules/workBench/components/frequency-top5-view.vue @@ -4,19 +4,19 @@
- +
{{ no2Obj.name || '--' }}
{{ formatCount(no2Obj.count) }}
- +
{{ no1Obj.name || '--' }}
{{ formatCount(no1Obj.count) }}
- +
{{ no3Obj.name || '--' }}
 @@ -26,7 +26,7 @@
{{ i + 4 }}
- +
{{ data.name || '--' }}
From c6313796bbdcd01be28d7b89f4b6d470750617d8 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Wed, 26 Oct 2022 14:47:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/abilityStatistics/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index bc35e440..3fc5fa7a 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -812,6 +812,8 @@ export default { handleChose (index) { this.checked = false this.departmentId = index + this.currentPage=1 + this.pageSize=10 if (index === 1) { if (this.choseId === 0) { if (!this.detailFlag) { @@ -871,6 +873,8 @@ export default { }, // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数 goToDetail () { + this.currentPage=1 + this.pageSize=10 this.detailFlag = !this.detailFlag if (this.departmentId === 1) { this.handleChose(3) @@ -884,6 +888,8 @@ export default { // 返回按钮 goToBack () { this.checked = false + this.currentPage=1, + this.pageSize=10, // departmentId 1，3 2，4 两个值共同判断 this.detailFlag = !this.detailFlag if (this.departmentId === 3) { From 94a940a1abc063c3501863b680510d03602ce47b Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 26 Oct 2022 14:48:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=91=E5=AE=8F=E7=BD=91-=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=EF=BC=9A=E8=B5=84=E6=BA=90=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=87=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=9A=84=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8sheet?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 8 ++++---- front/public/static/config/basicConfig.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 913ffc94..2428c227 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 16:46:41 + * @LastEditors: Light + * @LastEditTime: 2022-10-26 10:48:52 * @Description: 告诉大家这是什么 */ var _global = {} @@ -43,8 +43,8 @@ var CONFIGITEM = { }, dev: { previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.233:8888/renren-admin', - websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket' + apiURL: 'http://192.168.124.243:8888/renren-admin', + websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket' } } } diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 82af318a..796563a2 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -87,7 +87,7 @@ var CONFIGITEM = { }, backUrl: 'http://localhost:8001', previewUrl: 'http://192.168.124.243:9796/', - websocketURL: '192.168.124.254:8888/renren-admin', + websocketURL: '192.168.124.243:8888/renren-admin', // websocketURL: '10.18.1.99:8889/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', From 3ef7da2d6c0372c22132a75fa8295b9b1e8a1ca6 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Wed, 26 Oct 2022 14:49:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=87=91=E5=AE=8F=E7=BD=91-=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=EF=BC=9A=E8=B5=84=E6=BA=90=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=87=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=9A=84=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8sheet?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 19 ++++++++++++------- .../components/AbilityTotal.vue | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index bc35e440..1175ca5b 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -353,12 +353,12 @@ export default { { name: '应用资源', value: 5 }, { name: '会议室', value: 6 } ], // 类型备选列表 - typeOptions1: [//能力上架隐藏会议室 + typeOptions1: [// 能力上架隐藏会议室 { name: '智能算法', value: 1 }, { name: '图层服务', value: 2 }, { name: '开发组件', value: 3 }, { name: '业务组件', value: 4 }, - { name: '应用资源', value: 5 }, + { name: '应用资源', value: 5 } ], // 类型备选列表 detailFlag: false, // 明细返回按钮显示标志位 @@ -389,13 +389,18 @@ export default { }, mounted () { // this.getFirstTree() - if (this.departmentId === 1) { - this.handleChose(3) - // this.departmentId = 1; - } else if (this.departmentId === 2) { + console.log('this.$route.query.Id;', this.$route.query.type) + if (this.$route.query.type === 'use') { this.handleChose(4) - // this.departmentId = 2; } else { + if (this.departmentId === 1) { + this.handleChose(3) + // this.departmentId = 1; + } else if (this.departmentId === 2) { + this.handleChose(4) + // this.departmentId = 2; + } else { + } } }, computed: { diff --git a/front/src/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue index 66dfc5bd..1fa7e036 100644 --- a/front/src/views/abilityStatistics/components/AbilityTotal.vue +++ b/front/src/views/abilityStatistics/components/AbilityTotal.vue @@ -109,7 +109,7 @@ break case '资源申请量': window.open( - window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index', + window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index?type=use', '_blank' ) break