From a12d0aa6ff3098a679078b43683641f987b02b73 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Oct 2022 17:32:01 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=80=89=E4=B8=ADbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/supermap/advance-init.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js index effa837d..d9cc00c5 100644 --- a/front/src/supermap/advance-init.js +++ b/front/src/supermap/advance-init.js @@ -1676,9 +1676,7 @@ export function MapFun(mapObj) { // } //_removeLayerByLayerName(layerName) - let clickReplaceIcon = true; let selectedLayerList = []; - let selectedLayerId = []; let layers = null; // 判断是否是聚合图层 layers = createMarkerClusterLayer() @@ -1755,7 +1753,8 @@ export function MapFun(mapObj) { }); } } - mybus.emit('pointMarkerClick', feature) + mybus.emit('pointMarkerClick', feature); + selectedLayerList = []; }) layers.addLayer(marker) } From c6429869a419c06d2a2e19ebc2a07093f7830c77 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 09:38:28 +0800 Subject: [PATCH 2/8] =?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 --- .../views/modules/abilityStatistics/index.vue | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index f2b086f6..cffebf5e 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -76,10 +76,7 @@ }} - 导出 - + 导出全部
@@ -376,7 +373,7 @@ export default { // const date2 = new Date(year2, month2, day2, 7) // this.value1.unshift(date2) }, - mounted() { + mounted () { // this.getFirstTree() if (this.departmentId === 1) { this.handleChose(3) @@ -397,30 +394,30 @@ export default { this.total = this.tableData.length } else { this.tableData = this.tableDataClone - this.total = this.tableData.length + this.total = this.tableData.length } }, closeModal () { this.detailsVisible = false }, - handleCurrentChange(val) { - console.log('val------------>', val); - this.currentPage = val; + handleCurrentChange (val) { + console.log('val------------>', val) + this.currentPage = val // todo - if(this.departmentId === 3) { + if (this.departmentId === 3) { this.getOneDetail(val) } - if(this.departmentId === 4) { + if (this.departmentId === 4) { this.getTwoDetail(val) } - + // if (this.choseId === 0) { // this.getFirstTree(val) // } else if (this.choseId === 1) { // this.getReleaseTree(val) // } }, - getTreeName(data) { + getTreeName (data) { this.$http .get('/census/center/v3/treeList/', { params: { @@ -450,7 +447,7 @@ export default { // }, // 组件服务部门发布情况--改为能力上架统计 - getFirstTree(page) { + getFirstTree (page) { if (this.examineStatus == '-1') { this.status = '' } else if (this.examineStatus == '0') { @@ -515,7 +512,7 @@ export default { }) }, // 组件服务部门使用情况列表-改为能力使用统计 - getSecondTree() { + getSecondTree (page) { if (this.examineStatus == '-1') { this.status = '' } else if (this.examineStatus == '0') { @@ -580,7 +577,7 @@ export default { }) }, // 点击查看详情 - detailClick(row) { + detailClick (row) { this.detailParamss = {} const applyNumber = row.applyNumber if (this.departmentId == 3) { // 能力上架 @@ -622,7 +619,7 @@ export default { } }, // 能力上架明细 能力上架统计 - getOneDetail(page) { + getOneDetail (page) { var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { this.status = '' @@ -661,7 +658,7 @@ export default { }) }, // 能力使用明细 能力使用统计 - getTwoDetail(page) { + getTwoDetail (page) { var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { this.status = '' @@ -698,7 +695,7 @@ export default { }) }) }, - getReleaseTree(page) { + getReleaseTree (page) { this.$http .get('/census/center/selectApplyDeptDetailTypeCountList/', { params: { @@ -744,7 +741,7 @@ export default { }) }, // 应用资源部门使用情况列表 - getUsedTree() { + getUsedTree () { this.$http .get('/census/center/v3/resourceReleaseDetails/', { params: { @@ -758,7 +755,7 @@ export default { this.tableData = res.data.data.list }) }, - handleClick(row) { + handleClick (row) { if (this.choseId === 0) { if (this.departmentId === 1) { this.homeIsShow = false @@ -779,7 +776,7 @@ export default { } }, // 选择组件 - choseBtn(index) { + choseBtn (index) { this.choseId = index this.handleChose(1) }, @@ -837,26 +834,26 @@ export default { } }, // 翻页 - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`) }, - closeChild() { + closeChild () { this.homeIsShow = true this.servicesIsShow = false this.handleCurrentChange(1) }, - closeChild2() { + closeChild2 () { this.homeIsShow = true this.UsedIsShow = false this.handleCurrentChange(1) }, - closeApplication() { + closeApplication () { this.homeIsShow = true this.resourcesIsShow = false this.handleCurrentChange(1) }, // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数 - goToDetail() { + goToDetail () { this.detailFlag = !this.detailFlag if (this.departmentId === 1) { this.handleChose(3) @@ -882,7 +879,7 @@ export default { } }, // 点击查询按钮查询数据 - getDataList() { + 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') @@ -913,7 +910,7 @@ export default { } }, // 重置按钮查询数据 - resetDataList() { + resetDataList () { this.value1 = [] this.startDate = '' this.endDate = '' @@ -951,7 +948,7 @@ export default { } }, // 定义格式化函数： - handleTime(time, format) { + handleTime (time, format) { if (time == null || time == undefined || time == '') { return '' } From 6b1c3f30a4c422a3b885f07e61f13b40f7862667 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 10:09:41 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/abilityStatistics.js | 32 +++ .../components/AbilityRanking.vue | 187 ++++++++++++++---- 2 files changed, 179 insertions(+), 40 deletions(-) diff --git a/front/src/api/abilityStatistics.js b/front/src/api/abilityStatistics.js index c2bf733e..2144f144 100644 --- a/front/src/api/abilityStatistics.js +++ b/front/src/api/abilityStatistics.js @@ -47,6 +47,38 @@ export function pageWithAttrs(data) { data, }) } +//获取好评榜 +export function getPraiseList(params) { + return request({ + url: '/resource/getPraiseList', + method: 'get', + params, + }) +} +//获取热门榜 +export function getPopularList(params) { + return request({ + url: '/resource/getPopularList', + method: 'get', + params, + }) +} +//获取明星榜 +export function getStarList(params) { + return request({ + url: '/resource/getStarList', + method: 'get', + params, + }) +} +//获取潜力榜 +export function getPotentialList(params) { + return request({ + url: '/resource/getPotentialList', + method: 'get', + params, + }) +} //能力统计-能力需求 export function capabilityRequirements(params) { return request({ diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue index ea0efca1..2f731501 100644 --- a/front/src/views/abilityStatistics/components/AbilityRanking.vue +++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue @@ -15,10 +15,45 @@ }" >
{{ item }} + + + + + + +
@@ -28,12 +63,54 @@ class="content-son" v-for="(item, index) in dataList" :key="item" - @click="viewDetails(item.id)" + @click="viewDetails(item.resourceId)" > -
+
{{ index + 1 }}
-
{{ item.name }}
-
访问量：{{ item.visits }}
+
{{ item.resourceName }}
+
+ 平均分：{{ item.score }} +
+
+ 申请量：{{ item.applyCount }} +
+
+ 热度值： + + + +
+
+ + +
@@ -46,10 +123,17 @@ - \ No newline at end of file diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 9e788e19..e7bd6353 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -1,8 +1,8 @@ @@ -93,6 +93,8 @@ 同意 退回 --> + + {{ $t('process.entrustTask') }} 同意 驳回 // 引入工作流公共方法 +import RenTaskEntrust from '@/components/ren-process-running/src/ren-task-entrust' import processModule from '@/mixins/process-module' // import mixinViewModule from '@/mixins/view-module' import debounce from 'lodash/debounce' @@ -125,9 +129,11 @@ import bus from '@/views/bus.js' export default { // 注入公共方法 mixins: [processModule], - data() { + data () { return { + taskEntrustFlag: false, dialogVisible: false, + renTaskEntrustVisible: false, dialogType: '', input: '', visible: true, @@ -154,7 +160,18 @@ export default { agreeOrList: '同意' } }, - created() { + created () { + // 获取角色信息 + this.$http.get('/sys/user/info').then(({ data: res }) => { + res.data.roleIdList.map(val => { + this.$http.get('/sys/role/' + val).then(role => { + console.log('depid', role.data.data) + if (role.data.data.name === '申请流转员') { + this.taskEntrustFlag = true + } + }) + }) + }) // 将业务KEY赋值给表单 console.log('params=================>', this.$route, this.$route.params) this.dataForm.taskId = this.$route.params.taskId @@ -185,10 +202,11 @@ export default { // } }, components: { - RenProcessDetail + RenProcessDetail, + RenTaskEntrust }, methods: { - init() { + init () { // this.visible = true this.$nextTick(() => { // this.$refs.dataForm.resetFields() @@ -200,11 +218,19 @@ export default { } }) }, - showDialog(title) { + entrustTask () { + this.renTaskEntrustVisible = true + this.$nextTick(() => { + this.$refs.renTaskEntrust.dataForm.taskId = this.dataForm.taskId + this.$refs.renTaskEntrust.callbacks = this.callbacks + this.$refs.renTaskEntrust.init() + }) + }, + showDialog (title) { this.dialogVisible = true this.dialogType = title }, - handleClose(done) { + handleClose (done) { this.$confirm('确认关闭？') .then((_) => { this.input = '' @@ -212,11 +238,11 @@ export default { }) .catch((_) => { }) }, - handleClose2() { + handleClose2 () { this.dialogVisible = false this.input = '' }, - downloadFile2(url) { + downloadFile2 (url) { console.log(window.SITE_CONFIG.previewUrl) window.open( window.SITE_CONFIG.previewUrl + @@ -225,7 +251,7 @@ export default { ) }, // 获取信息 - getInfo() { + getInfo () { let params = '' if (this.dataForm.taskId) { params = `taskId=${this.dataForm.taskId}` @@ -344,7 +370,7 @@ export default { } }, // 申请能力 - applyData() { + applyData () { this.$http .get(`/resource/select/${this.dataForm.instanceId}`) .then(({ data: res }) => { @@ -436,7 +462,7 @@ export default { 1000, { leading: true, trailing: false } ), - tabRemoveHandle(tabName) { + tabRemoveHandle (tabName) { console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') if (tabName === 'home') { return false @@ -453,7 +479,7 @@ export default { if (tabName === this.$store.state.contentTabsActiveName) { const tab = this.$store.state.contentTabs[ - this.$store.state.contentTabs.length - 1 + this.$store.state.contentTabs.length - 1 ] this.$router.push({ name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, @@ -463,19 +489,19 @@ export default { } }, // 启动流程出错回调 - startProcessErrorCallback(data) { + startProcessErrorCallback (data) { console.log(data) }, // 任务处理出错回调 - taskHandleErrorCallback(data) { }, - download(data) { + taskHandleErrorCallback (data) { }, + download (data) { const alink = document.createElement('a') alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容 alink.href = data.attachment // 创建 url地址 alink.click() // 自动点击 - }, + } }, - mounted() { + mounted () { // this.applyData() } } @@ -618,7 +644,7 @@ export default { } } -::v-deep .agreeOr>div { +::v-deep .agreeOr > div { display: flex; align-items: center; @@ -628,7 +654,7 @@ export default { } } -::v-deep .agreeOr>div:last-of-type { +::v-deep .agreeOr > div:last-of-type { margin-top: 15px; } @@ -644,7 +670,7 @@ export default { border: 1px solid #0558e1; } - ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner { + ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner { box-shadow: unset !important; background: #0558e1; color: #ffffff; @@ -677,7 +703,7 @@ export default { margin-left: 10px; } - ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner { + ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner { box-shadow: unset !important; color: #ffffff; background: #e83a48; From 04ad7eb6edf485362d0ae4ed9f789c325b73081b Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 14:51:16 +0800 Subject: [PATCH 6/8] =?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 --- back/src/views/modules/abilityStatistics/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index cffebf5e..81518082 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -357,7 +357,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 }) }) }) // 当前设定的日期时间 From 6a6d1fc473d7f051e04acb5589a5ebda5f747e90 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 14:52:43 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/abilityStatistics/index.vue | 2 +- back/src/views/modules/myAgent/demo/competency-application.vue | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 81518082..704e4c78 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -354,7 +354,7 @@ export default { }, created () { this.$http.get('/sys/dept/all').then(res => { - console.log('获取部门=========>', res) + // console.log('获取部门=========>', res) this.departmentSelects = [] res.data.data.map(val => { this.departmentSelects.push({ label: val.name, value: val.id }) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index e7bd6353..0867e606 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 14:39:06 + * @LastEditTime: 2022-10-20 14:52:27 * @Description: 告诉大家这是什么 --> @@ -165,7 +165,6 @@ export default { this.$http.get('/sys/user/info').then(({ data: res }) => { res.data.roleIdList.map(val => { this.$http.get('/sys/role/' + val).then(role => { - console.log('depid', role.data.data) if (role.data.data.name === '申请流转员') { this.taskEntrustFlag = true } From 188d9bb85a51fdeccc283fc8846c31f106c3f4c6 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 20 Oct 2022 15:03:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/myAgent/demo/competency-application.vue | 4 ++-- 1 file changed, 2 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 0867e606..f4404006 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 14:52:27 + * @LastEditTime: 2022-10-20 15:03:33 * @Description: 告诉大家这是什么 --> @@ -165,7 +165,7 @@ export default { this.$http.get('/sys/user/info').then(({ data: res }) => { res.data.roleIdList.map(val => { this.$http.get('/sys/role/' + val).then(role => { - if (role.data.data.name === '申请流转员') { + if (role.data.data.name === '流程管理员') { this.taskEntrustFlag = true } })