From 5d0a02a364eb266a90a106f730f594f1623160be Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Thu, 20 Oct 2022 19:56:43 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index cffebf5e..04a4e9b6 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -27,7 +27,7 @@ 日期： + end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> @@ -43,7 +43,8 @@ - 部门名称： + 上架部门： + 申请部门： - + @@ -155,7 +156,7 @@ - + @@ -357,7 +358,7 @@ export default { console.log('获取部门=========>', res) this.departmentSelects = [] res.data.data.map(val => { - this.departmentSelects.push({ label: val.name, value: val.name }) + this.departmentSelects.push({ label: val.name, value: val.id }) }) }) // 当前设定的日期时间 @@ -462,6 +463,7 @@ export default { this.$http .get('/census/center/selectDeptDetailTypeCountList/', { params: { + type: this.abilityType, page: page || 1, limit: 5, approveStatus: this.status, @@ -527,6 +529,7 @@ export default { this.$http .get('/census/center/selectApplyDeptDetailTypeCountList', { params: { + type: this.abilityType, page: page || 1, limit: this.pageSize, approveStatus: this.status, @@ -702,6 +705,7 @@ export default { limit: 5, // page: page || 1, approveStatus: '', + type: '', deptId: '', params: '', startDate: '' @@ -881,8 +885,8 @@ export default { // 点击查询按钮查询数据 getDataList () { if (this.value1 && this.value1.length > 0) { - this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss') - this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss') + this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd') + this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd') } else { this.startDate = '' this.endDate = '' From 82f007aa40986d8486462b5eb374f3d20e996cdc Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Fri, 21 Oct 2022 09:31:00 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/myAgent/demo/competency-application.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index f4404006..153a38ef 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: Light - * @LastEditTime: 2022-10-20 15:03:33 + * @LastEditTime: 2022-10-20 17:18:58 * @Description: 告诉大家这是什么 --> @@ -94,7 +94,7 @@ 退回 --> - {{ $t('process.entrustTask') }} + {{ $t('process.entrustTask') }} 同意 驳回 类型： - + + + + + + - {{ $t('query') }} @@ -348,6 +352,14 @@ export default { { name: '应用资源', value: 5 }, { name: '会议室', value: 6 } ], // 类型备选列表 + typeOptions1: [//能力上架隐藏会议室 + { name: '智能算法', value: 1 }, + { name: '图层服务', value: 2 }, + { name: '通用开发组件', value: 3 }, + { name: '页面开发组件', value: 4 }, + { name: '应用资源', value: 5 }, + + ], // 类型备选列表 detailFlag: false, // 明细返回按钮显示标志位 startDate: '', // 开始时间 endDate: '' // 结束时间 From ec1f832617a0ac5af9609f1cff600f4292e65c20 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 21 Oct 2022 10:08:50 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 3d07f6d4..bc35e440 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -70,6 +70,7 @@ + {{ $t('query') }} @@ -134,9 +135,9 @@ - + - + @@ -153,9 +154,9 @@ - + - + @@ -347,16 +348,16 @@ export default { typeOptions: [ { name: '智能算法', value: 1 }, { name: '图层服务', value: 2 }, - { name: '通用开发组件', value: 3 }, - { name: '页面开发组件', value: 4 }, + { name: '开发组件', value: 3 }, + { name: '业务组件', value: 4 }, { name: '应用资源', value: 5 }, { name: '会议室', value: 6 } ], // 类型备选列表 typeOptions1: [//能力上架隐藏会议室 { name: '智能算法', value: 1 }, { name: '图层服务', value: 2 }, - { name: '通用开发组件', value: 3 }, - { name: '页面开发组件', value: 4 }, + { name: '开发组件', value: 3 }, + { name: '业务组件', value: 4 }, { name: '应用资源', value: 5 }, ], // 类型备选列表 From 672e6164ba204ec325c3b5a6bcac5fb95da9a145 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Fri, 21 Oct 2022 10:09:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=88=86=E6=94=B9?= =?UTF-8?q?=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/abilityStatistics/components/AbilityRanking.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue index 2f731501..12197f78 100644 --- a/front/src/views/abilityStatistics/components/AbilityRanking.vue +++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue @@ -69,7 +69,7 @@
{{ index + 1 }}
{{ item.resourceName }}
- 平均分：{{ item.score }} + 评分：{{ item.score }}
Date: Fri, 21 Oct 2022 11:47:28 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=EF=BC=9A=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mynoticeView/components/NoticeList.vue | 66 ++++++++++++------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue index a129075a..642e49df 100644 --- a/front/src/views/mynoticeView/components/NoticeList.vue +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -232,35 +232,53 @@ const tabTypeObj = { // 会议室后台 const goPage = (item) => { - let typeText = typeObj[item.type]; - if (typeText) { + if (item.jumpUrl && item.type !== 12) { + let typeText = typeObj[item.type]; + console.log('item------------>', item); console.log('typeText类型------------>', typeText); - // 是后台，跳转到后台相关页面 - if (typeText.indexOf('后台') !== -1) { - let _applyState = item.applyState - let _page = pageObj[typeText][_applyState] - window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`) - } else if (typeText.indexOf('前台') !== -1) { - if (typeText == '会议室前台') { - router.push({ - path: '/DetailsPageconetent', - query: { - select: '基础设施', - formPage: 'noticePage' - }, - }) - } else { + // "http://192.168.124.236:9796/#/personalCenter?tabTypeName=能力申请" + let _url = item.jumpUrl && item.jumpUrl.split('#') + let openType = '_self'; + // 如果是跳转到后台管理，重新打开页面 + if (typeText && typeText.indexOf('后台') !== -1) { + openType = '_blank' + } else { + if (_url[1] && _url[1].indexOf('personalCenter') !== -1) { window.sessionStorage.setItem('type', JSON.stringify('apply')) - router.push({ - path: '/personalCenter', - query: { - tabTypeName: tabTypeObj[typeText] || '能力申请', - } - }) } - } + window.open(item.jumpUrl, openType) + } + return; + // if (typeText) { + // console.log('typeText类型------------>', typeText); + // // 是后台，跳转到后台相关页面 + // if (typeText.indexOf('后台') !== -1) { + // let _applyState = item.applyState + // let _page = pageObj[typeText][_applyState] + // window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`) + // } else if (typeText.indexOf('前台') !== -1) { + // if (typeText == '会议室前台') { + // router.push({ + // path: '/DetailsPageconetent', + // query: { + // select: '基础设施', + // formPage: 'noticePage' + // }, + // }) + // } else { + // window.sessionStorage.setItem('type', JSON.stringify('apply')) + // router.push({ + // path: '/personalCenter', + // query: { + // tabTypeName: tabTypeObj[typeText] || '能力申请', + // } + // }) + // } + + // } + // } } // 更改消息状态 From bd036feee2d0b8e1bdca9e135e19046408ad7b3e Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Fri, 21 Oct 2022 16:13:01 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myAgent/demo/competency-application.vue | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 6ba8a0dd..873a10ec 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: Light - * @LastEditTime: 2022-10-21 09:31:25 + * @LastEditTime: 2022-10-21 16:11:46 * @Description: 告诉大家这是什么 --> @@ -94,7 +94,7 @@ 退回 --> - {{ $t('process.entrustTask') }} + 转办 同意 驳回