wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-10-20 16:08:12 +08:00
parent 33ba30d97f 188d9bb85a
commit ba5526d7d8
9 changed files with 333 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
back/src/components/ren-process-running/src/ren-task-entrust.vue
View File

@ -9,13 +9,14 @@
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button> <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="entrustTask()">{{ $t('confirm') }}</el-button> <el-button type="primary" @click="entrustTask($store.state.contentTabsActiveName)">{{ $t('confirm') }}</el-button>
</template> </template>
<select-user v-if="selectUserVisible" ref="selectUser" ></select-user> <select-user v-if="selectUserVisible" ref="selectUser" ></select-user>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import bus from '@/views/bus.js'
import SelectUser from './select-user' import SelectUser from './select-user'
import qs from 'qs' import qs from 'qs'
export default { export default {
@ -52,11 +53,11 @@ export default {
init () { init () {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs.dataForm.resetFields()
}) })
}, },
// 委托 // 委托
entrustTask () { entrustTask (data) {
if (!this.dataForm.entrustUserId) { if (!this.dataForm.entrustUserId) {
this.$message.error(this.$t('process.entrustError')) this.$message.error(this.$t('process.entrustError'))
return return
@ -65,9 +66,11 @@ export default {
taskId: this.dataForm.taskId, taskId: this.dataForm.taskId,
assignee: this.dataForm.entrustUserId assignee: this.dataForm.entrustUserId
}) })
this.$http['post']('/act/task/entrust', task).then(({ data: res }) => { this.$http.post('/act/task/entrust', task).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error(res.msg) this.$message.error(res.msg)
this.tabRemoveHandle(data)
bus.$emit('updateTaskNum')
if (this.callbacks.taskHandleErrorCallback) { if (this.callbacks.taskHandleErrorCallback) {
this.callbacks.taskHandleErrorCallback(res) this.callbacks.taskHandleErrorCallback(res)
} }
@ -79,6 +82,8 @@ export default {
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.tabRemoveHandle(data)
bus.$emit('updateTaskNum')
if (this.callbacks.taskHandleSuccessCallback) { if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res) this.callbacks.taskHandleSuccessCallback(res)
} }
@ -93,6 +98,33 @@ export default {
this.$refs.selectUser.init(this.setUserInfo) this.$refs.selectUser.init(this.setUserInfo)
}) })
}, },
tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') {
return false
}
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => item.name !== tabName
)
if (this.$store.state.contentTabs.length <= 0) {
this.$store.state.sidebarMenuActiveName =
this.$store.state.contentTabsActiveName = 'home'
return false
}
// 当前选中tab被删除
if (tabName === this.$store.state.contentTabsActiveName) {
const tab =
this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1
]
this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
params: { ...tab.params },
query: { ...tab.query }
})
}
},
setUserInfo (userInfo) { setUserInfo (userInfo) {
this.dataForm.entrustUserId = userInfo.id this.dataForm.entrustUserId = userInfo.id
this.dataForm.entrustUserName = userInfo.realName this.dataForm.entrustUserName = userInfo.realName

61
back/src/views/modules/abilityStatistics/index.vue
View File

@ -76,10 +76,7 @@
}}</el-button> }}</el-button>
</el-form-item> </el-form-item>
<!-- 导出 --> <!-- 导出 -->
<a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出</a> <a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出全部</a>
<!-- <el-form-item>
<el-button type="primary" @click="exportExcel()">导出</el-button>
</el-form-item> -->
</el-form> </el-form>
<el-card shadow="never" class="aui-card--fill" v-if="homeIsShow"> <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
<div class="mod-demand__bsdemand"> <div class="mod-demand__bsdemand">
@ -357,10 +354,10 @@ export default {
}, },
created () { created () {
this.$http.get('/sys/dept/all').then(res => { this.$http.get('/sys/dept/all').then(res => {
console.log('获取部门=========>', res) // console.log('获取部门=========>', res)
this.departmentSelects = [] this.departmentSelects = []
res.data.data.map(val => { res.data.data.map(val => {
this.departmentSelects.push({ label: val.name, value: val.name }) this.departmentSelects.push({ label: val.name, value: val.id })
}) })
}) })
// 当前设定的日期时间 // 当前设定的日期时间
@ -376,7 +373,7 @@ export default {
// const date2 = new Date(year2, month2, day2, 7) // const date2 = new Date(year2, month2, day2, 7)
// this.value1.unshift(date2) // this.value1.unshift(date2)
}, },
mounted() { mounted () {
// this.getFirstTree() // this.getFirstTree()
if (this.departmentId === 1) { if (this.departmentId === 1) {
this.handleChose(3) this.handleChose(3)
@ -397,30 +394,30 @@ export default {
this.total = this.tableData.length this.total = this.tableData.length
} else { } else {
this.tableData = this.tableDataClone this.tableData = this.tableDataClone
this.total = this.tableData.length this.total = this.tableData.length
} }
}, },
closeModal () { closeModal () {
this.detailsVisible = false this.detailsVisible = false
}, },
handleCurrentChange(val) { handleCurrentChange (val) {
console.log('val------------>', val); console.log('val------------>', val)
this.currentPage = val; this.currentPage = val
// todo // todo
if(this.departmentId === 3) { if (this.departmentId === 3) {
this.getOneDetail(val) this.getOneDetail(val)
} }
if(this.departmentId === 4) { if (this.departmentId === 4) {
this.getTwoDetail(val) this.getTwoDetail(val)
} }
// if (this.choseId === 0) { // if (this.choseId === 0) {
// this.getFirstTree(val) // this.getFirstTree(val)
// } else if (this.choseId === 1) { // } else if (this.choseId === 1) {
// this.getReleaseTree(val) // this.getReleaseTree(val)
// } // }
}, },
getTreeName(data) { getTreeName (data) {
this.$http this.$http
.get('/census/center/v3/treeList/', { .get('/census/center/v3/treeList/', {
params: { params: {
@ -450,7 +447,7 @@ export default {
// }, // },
// 组件服务部门发布情况--改为能力上架统计 // 组件服务部门发布情况--改为能力上架统计
getFirstTree(page) { getFirstTree (page) {
if (this.examineStatus == '-1') { if (this.examineStatus == '-1') {
this.status = '' this.status = ''
} else if (this.examineStatus == '0') { } else if (this.examineStatus == '0') {
@ -515,7 +512,7 @@ export default {
}) })
}, },
// 组件服务部门使用情况列表-改为能力使用统计 // 组件服务部门使用情况列表-改为能力使用统计
getSecondTree() { getSecondTree (page) {
if (this.examineStatus == '-1') { if (this.examineStatus == '-1') {
this.status = '' this.status = ''
} else if (this.examineStatus == '0') { } else if (this.examineStatus == '0') {
@ -580,7 +577,7 @@ export default {
}) })
}, },
// 点击查看详情 // 点击查看详情
detailClick(row) { detailClick (row) {
this.detailParamss = {} this.detailParamss = {}
const applyNumber = row.applyNumber const applyNumber = row.applyNumber
if (this.departmentId == 3) { // 能力上架 if (this.departmentId == 3) { // 能力上架
@ -622,7 +619,7 @@ export default {
} }
}, },
// 能力上架明细 能力上架统计 // 能力上架明细 能力上架统计
getOneDetail(page) { getOneDetail (page) {
var passAndReview = '' // 转变"通过"字段为通过 var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') { if (this.examineStatus == '-1') {
this.status = '' this.status = ''
@ -661,7 +658,7 @@ export default {
}) })
}, },
// 能力使用明细 能力使用统计 // 能力使用明细 能力使用统计
getTwoDetail(page) { getTwoDetail (page) {
var passAndReview = '' // 转变"通过"字段为通过 var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') { if (this.examineStatus == '-1') {
this.status = '' this.status = ''
@ -698,7 +695,7 @@ export default {
}) })
}) })
}, },
getReleaseTree(page) { getReleaseTree (page) {
this.$http this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList/', { .get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: { params: {
@ -744,7 +741,7 @@ export default {
}) })
}, },
// 应用资源部门使用情况列表 // 应用资源部门使用情况列表
getUsedTree() { getUsedTree () {
this.$http this.$http
.get('/census/center/v3/resourceReleaseDetails/', { .get('/census/center/v3/resourceReleaseDetails/', {
params: { params: {
@ -758,7 +755,7 @@ export default {
this.tableData = res.data.data.list this.tableData = res.data.data.list
}) })
}, },
handleClick(row) { handleClick (row) {
if (this.choseId === 0) { if (this.choseId === 0) {
if (this.departmentId === 1) { if (this.departmentId === 1) {
this.homeIsShow = false this.homeIsShow = false
@ -779,7 +776,7 @@ export default {
} }
}, },
// 选择组件 // 选择组件
choseBtn(index) { choseBtn (index) {
this.choseId = index this.choseId = index
this.handleChose(1) this.handleChose(1)
}, },
@ -837,26 +834,26 @@ export default {
} }
}, },
// 翻页 // 翻页
handleSizeChange(val) { handleSizeChange (val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
}, },
closeChild() { closeChild () {
this.homeIsShow = true this.homeIsShow = true
this.servicesIsShow = false this.servicesIsShow = false
this.handleCurrentChange(1) this.handleCurrentChange(1)
}, },
closeChild2() { closeChild2 () {
this.homeIsShow = true this.homeIsShow = true
this.UsedIsShow = false this.UsedIsShow = false
this.handleCurrentChange(1) this.handleCurrentChange(1)
}, },
closeApplication() { closeApplication () {
this.homeIsShow = true this.homeIsShow = true
this.resourcesIsShow = false this.resourcesIsShow = false
this.handleCurrentChange(1) this.handleCurrentChange(1)
}, },
// 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数 // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
goToDetail() { goToDetail () {
this.detailFlag = !this.detailFlag this.detailFlag = !this.detailFlag
if (this.departmentId === 1) { if (this.departmentId === 1) {
this.handleChose(3) this.handleChose(3)
@ -882,7 +879,7 @@ export default {
} }
}, },
// 点击查询按钮查询数据 // 点击查询按钮查询数据
getDataList() { getDataList () {
if (this.value1 && this.value1.length > 0) { if (this.value1 && this.value1.length > 0) {
this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss') 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.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
@ -913,7 +910,7 @@ export default {
} }
}, },
// 重置按钮查询数据 // 重置按钮查询数据
resetDataList() { resetDataList () {
this.value1 = [] this.value1 = []
this.startDate = '' this.startDate = ''
this.endDate = '' this.endDate = ''
@ -951,7 +948,7 @@ export default {
} }
}, },
// 定义格式化函数： // 定义格式化函数：
handleTime(time, format) { handleTime (time, format) {
if (time == null || time == undefined || time == '') { if (time == null || time == undefined || time == '') {
return '' return ''
} }

27
back/src/views/modules/hasToDoTasks/deviceApprovalDetail.vue
View File

@ -72,33 +72,33 @@
</el-card> </el-card>
</template> </template>
<script> <script>
import * as moment from 'moment'; import * as moment from 'moment'
export default { export default {
data() { data () {
return { return {
// 详情信息 // 详情信息
detailInfo: {}, detailInfo: {},
dataList: [], dataList: []
} }
}, },
created() { created () {
this.detailInfo = this.$route.params.params || {}; this.detailInfo = this.$route.params.params || {}
console.log('this.detailInfo------------>', this.detailInfo); console.log('this.detailInfo------------>', this.detailInfo)
// 表格数据 // 表格数据
let durationInSeconds = '' let durationInSeconds = ''
if (this.detailInfo.auditTime && this.detailInfo.auditTime) { if (this.detailInfo.auditTime && this.detailInfo.auditTime) {
durationInSeconds = moment(this.detailInfo.auditTime).diff(moment(this.detailInfo.createDate), 'seconds') durationInSeconds = moment(this.detailInfo.auditTime).diff(moment(this.detailInfo.createDate), 'seconds')
} }
let _obj = { const _obj = {
activityName: this.detailInfo.title || '', activityName: this.detailInfo.title || '',
assigneeName: this.detailInfo.auditorName || '', assigneeName: this.detailInfo.auditorName || '',
startTime: this.detailInfo.createDate || '', startTime: this.detailInfo.createDate || '',
endTime: this.detailInfo.auditTime, endTime: this.detailInfo.auditTime,
comment: this.detailInfo.auditViem, comment: this.detailInfo.auditViem,
durationInSeconds: durationInSeconds, durationInSeconds: durationInSeconds
} }
this.dataList.push(_obj) this.dataList.push(_obj)
} }
@ -242,7 +242,7 @@ export default {
} }
} }
::v-deep .agreeOr>div { ::v-deep .agreeOr > div {
display: flex; display: flex;
align-items: center; align-items: center;
@ -252,7 +252,7 @@ export default {
} }
} }
::v-deep .agreeOr>div:last-of-type { ::v-deep .agreeOr > div:last-of-type {
margin-top: 15px; margin-top: 15px;
} }
@ -268,7 +268,7 @@ export default {
border: 1px solid #0558e1; 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; box-shadow: unset !important;
background: #0558e1; background: #0558e1;
color: #ffffff; color: #ffffff;
@ -301,7 +301,7 @@ export default {
margin-left: 10px; 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; box-shadow: unset !important;
color: #ffffff; color: #ffffff;
background: #e83a48; background: #e83a48;
@ -316,4 +316,3 @@ export default {
padding-right: 10px; padding-right: 10px;
} }
</style> </style>

71
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51 * @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.liangjunhua * @LastEditors: Light
* @LastEditTime: 2022-08-04 14:34:45 * @LastEditTime: 2022-10-20 15:03:33
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
@ -93,6 +93,8 @@
<el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button> <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
<el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button> <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
</el-radio-group> --> </el-radio-group> -->
<!-- 委托 -->
<el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag'>{{ $t('process.entrustTask') }}</el-button>
<el-button type="primary" @click="showDialog('同意')">同意</el-button> <el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button> <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
<!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input> <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
@ -101,6 +103,7 @@
</div> </div>
</div> </div>
<ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
<!-- 流程详情 --> <!-- 流程详情 -->
<ren-process-detail></ren-process-detail> <ren-process-detail></ren-process-detail>
<el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%" <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
@ -116,6 +119,7 @@
<script> <script>
// 引入工作流公共方法 // 引入工作流公共方法
import RenTaskEntrust from '@/components/ren-process-running/src/ren-task-entrust'
import processModule from '@/mixins/process-module' import processModule from '@/mixins/process-module'
// import mixinViewModule from '@/mixins/view-module' // import mixinViewModule from '@/mixins/view-module'
import debounce from 'lodash/debounce' import debounce from 'lodash/debounce'
@ -125,9 +129,11 @@ import bus from '@/views/bus.js'
export default { export default {
// 注入公共方法 // 注入公共方法
mixins: [processModule], mixins: [processModule],
data() { data () {
return { return {
taskEntrustFlag: false,
dialogVisible: false, dialogVisible: false,
renTaskEntrustVisible: false,
dialogType: '', dialogType: '',
input: '', input: '',
visible: true, visible: true,
@ -154,7 +160,17 @@ export default {
agreeOrList: '同意' 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 => {
if (role.data.data.name === '流程管理员') {
this.taskEntrustFlag = true
}
})
})
})
// 将业务KEY赋值给表单 // 将业务KEY赋值给表单
console.log('params=================>', this.$route, this.$route.params) console.log('params=================>', this.$route, this.$route.params)
this.dataForm.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId
@ -185,10 +201,11 @@ export default {
// } // }
}, },
components: { components: {
RenProcessDetail RenProcessDetail,
RenTaskEntrust
}, },
methods: { methods: {
init() { init () {
// this.visible = true // this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
// this.$refs.dataForm.resetFields() // this.$refs.dataForm.resetFields()
@ -200,11 +217,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.dialogVisible = true
this.dialogType = title this.dialogType = title
}, },
handleClose(done) { handleClose (done) {
this.$confirm('确认关闭？') this.$confirm('确认关闭？')
.then((_) => { .then((_) => {
this.input = '' this.input = ''
@ -212,11 +237,11 @@ export default {
}) })
.catch((_) => { }) .catch((_) => { })
}, },
handleClose2() { handleClose2 () {
this.dialogVisible = false this.dialogVisible = false
this.input = '' this.input = ''
}, },
downloadFile2(url) { downloadFile2 (url) {
console.log(window.SITE_CONFIG.previewUrl) console.log(window.SITE_CONFIG.previewUrl)
window.open( window.open(
window.SITE_CONFIG.previewUrl + window.SITE_CONFIG.previewUrl +
@ -225,7 +250,7 @@ export default {
) )
}, },
// 获取信息 // 获取信息
getInfo() { getInfo () {
let params = '' let params = ''
if (this.dataForm.taskId) { if (this.dataForm.taskId) {
params = `taskId=${this.dataForm.taskId}` params = `taskId=${this.dataForm.taskId}`
@ -344,7 +369,7 @@ export default {
} }
}, },
// 申请能力 // 申请能力
applyData() { applyData () {
this.$http this.$http
.get(`/resource/select/${this.dataForm.instanceId}`) .get(`/resource/select/${this.dataForm.instanceId}`)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -436,7 +461,7 @@ export default {
1000, 1000,
{ leading: true, trailing: false } { leading: true, trailing: false }
), ),
tabRemoveHandle(tabName) { tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') { if (tabName === 'home') {
return false return false
@ -453,7 +478,7 @@ export default {
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
const tab = const tab =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
] ]
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
@ -463,19 +488,19 @@ export default {
} }
}, },
// 启动流程出错回调 // 启动流程出错回调
startProcessErrorCallback(data) { startProcessErrorCallback (data) {
console.log(data) console.log(data)
}, },
// 任务处理出错回调 // 任务处理出错回调
taskHandleErrorCallback(data) { }, taskHandleErrorCallback (data) { },
download(data) { download (data) {
const alink = document.createElement('a') const alink = document.createElement('a')
alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容 alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
alink.href = data.attachment // 创建 url地址 alink.href = data.attachment // 创建 url地址
alink.click() // 自动点击 alink.click() // 自动点击
}, }
}, },
mounted() { mounted () {
// this.applyData() // this.applyData()
} }
} }
@ -618,7 +643,7 @@ export default {
} }
} }
::v-deep .agreeOr>div { ::v-deep .agreeOr > div {
display: flex; display: flex;
align-items: center; align-items: center;
@ -628,7 +653,7 @@ export default {
} }
} }
::v-deep .agreeOr>div:last-of-type { ::v-deep .agreeOr > div:last-of-type {
margin-top: 15px; margin-top: 15px;
} }
@ -644,7 +669,7 @@ export default {
border: 1px solid #0558e1; 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; box-shadow: unset !important;
background: #0558e1; background: #0558e1;
color: #ffffff; color: #ffffff;
@ -677,7 +702,7 @@ export default {
margin-left: 10px; 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; box-shadow: unset !important;
color: #ffffff; color: #ffffff;
background: #e83a48; background: #e83a48;

32
front/src/api/abilityStatistics.js
View File

@ -47,6 +47,38 @@ export function pageWithAttrs(data) {
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) { export function capabilityRequirements(params) {
return request({ return request({

BIN
front/src/assets/newHome/yiwang.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

5
front/src/supermap/advance-init.js
View File

@ -1676,9 +1676,7 @@ export function MapFun(mapObj) {
// } // }
//_removeLayerByLayerName(layerName) //_removeLayerByLayerName(layerName)
let clickReplaceIcon = true;
let selectedLayerList = []; let selectedLayerList = [];
let selectedLayerId = [];
let layers = null; let layers = null;
// 判断是否是聚合图层 // 判断是否是聚合图层
layers = createMarkerClusterLayer() layers = createMarkerClusterLayer()
@ -1755,7 +1753,8 @@ export function MapFun(mapObj) {
}); });
} }
} }
mybus.emit('pointMarkerClick', feature) mybus.emit('pointMarkerClick', feature);
selectedLayerList = [];
}) })
layers.addLayer(marker) layers.addLayer(marker)
} }

187
front/src/views/abilityStatistics/components/AbilityRanking.vue
View File

@ -15,10 +15,45 @@
}" }"
></div> ></div>
<div <div
style="position: relative"
:class="taboldName == item ? 'bianlan' : ''" :class="taboldName == item ? 'bianlan' : ''"
@click="tabswitch(item, index)" @click="tabswitch(item, index)"
> >
{{ item }} {{ item }}
<a-tooltip placement="right">
<template #title>
<span v-if="item === '好评榜'">
根据能力能力评价平均分排名，申请无评分则计3分，排名相同时按上架时间倒序排列
</span>
<span v-else-if="item === '热门榜'">
根据近30天能力申请量排名，申请量相同时按收藏量、访问量以及上架时间进行倒序排列
</span>
<span v-else-if="item === '明星榜'">
采取5分制，根据浏览量、收藏量、申请量以及评价平均分以占比1:2:3:4计算综合评分，综合评分相同时按上架时间倒序排列
</span>
<span v-else>
根据能力15日增幅排名，增幅相同时按上架时间倒序排列
</span>
</template>
<svg
t="1666146422372"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="4749"
width="20"
height="20"
style="position: absolute"
>
<path
d="M530.64 211.33a36 36 0 1 1-36 36 36 36 0 0 1 36-36z m66.86 193.53l-90.2 336.63a90.25 90.25 0 0 0 62.93-41.33c0-0.07 0.61-1 0 0a11.15 11.15 0 0 1 20.44 8.41l-6.44 24A108 108 0 0 1 452 809a36 36 0 0 1-25.45-44.09l90.2-336.63a90.26 90.26 0 0 0-62.93 41.34c0 0.06-0.61 1 0 0a11.15 11.15 0 0 1-20.44-8.42l6.44-24a108 108 0 0 1 132.28-76.37 36 36 0 0 1 25.4 44.03z"
p-id="4750"
fill="#707070"
></path>
</svg>
</a-tooltip>
</div> </div>
</div> </div>
</div> </div>
@ -28,12 +63,54 @@
class="content-son" class="content-son"
v-for="(item, index) in dataList" v-for="(item, index) in dataList"
:key="item" :key="item"
@click="viewDetails(item.id)" @click="viewDetails(item.resourceId)"
> >
<div class="content-son-css"> <div class="content-son-css" style="position: relative">
<div class="content-index">{{ index + 1 }}</div> <div class="content-index">{{ index + 1 }}</div>
<div class="content-neirong">{{ item.name }}</div> <div class="content-neirong">{{ item.resourceName }}</div>
<div class="content-fangwenliang">访问量：{{ item.visits }}</div> <div class="content-fangwenliang" v-if="taboldName === '好评榜'">
平均分：{{ item.score }}
</div>
<div
class="content-fangwenliang"
v-else-if="taboldName === '热门榜'"
>
申请量：{{ item.applyCount }}
</div>
<div
class="content-fangwenliang"
v-else-if="taboldName === '明星榜'"
>
热度值：
<a-rate v-model:value="item.fireNum" allow-half disabled>
<template #character>
<fire-outlined />
</template>
</a-rate>
</div>
<div class="content-fangwenliang" v-else>
<template v-if="item.isNew == 1">
增幅率：100%+
<svg
style="position: absolute; top: 6px; left: 0"
t="1666230976498"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="3440"
width="50"
height="50"
>
<path
d="M0 0v1024L1024 0H0z m333.625806 576.412903L143.690323 540.077419l-1.651613 1.651613 112.309677 112.309678-21.470968 23.12258L82.580645 526.864516l23.122581-23.122581 188.283871 34.683871 1.651613-1.651612-112.309678-112.309678 23.122581-23.122581 150.296774 150.296775-23.122581 24.774193z m52.851613-52.851613l-150.296774-150.296774 107.354839-107.354839 19.819355 19.819355-84.232258 84.232258 42.941935 42.941936 79.277419-79.27742 19.819355 19.819355-79.277419 79.27742 47.896774 47.896774 89.187097-89.187097 19.819355 19.819355-112.309678 112.309677z m188.283871-188.283871l-24.774193 24.774194-193.23871-107.354839 26.425807-26.425806L528.516129 313.806452l1.651613-1.651613-85.883871-146.993549 24.774194-24.774193 146.993548 85.883871 1.651613-1.651613L528.516129 80.929032l26.425806-26.425806L660.645161 249.393548l-24.774193 24.774194-146.993549-85.883871-1.651613 1.651613 87.535484 145.341935z"
fill="#fa4002"
p-id="3441"
></path>
</svg>
</template>
<template v-else>增幅率：{{ item.growthRate }}</template>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -46,10 +123,17 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, watch } from 'vue' import { ref } from 'vue'
import { onMounted } from 'vue' // import { onMounted } from 'vue'
import { pageWithAttrs } from '@/api/abilityStatistics' import {
// pageWithAttrs,
getPraiseList,
getPopularList,
getStarList,
getPotentialList,
} from '@/api/abilityStatistics'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { FireOutlined } from '@ant-design/icons-vue'
const router = useRouter() const router = useRouter()
//查看详情方法 //查看详情方法
function viewDetails(id) { function viewDetails(id) {
@ -61,6 +145,27 @@
}, },
}) })
} }
// 获取榜单数据
const praiseList = ref([])
const popularList = ref([])
const starList = ref([])
const potentialList = ref([])
getPraiseList().then((res) => {
praiseList.value = res.data.data
res.data.data.map((val) => {
val.score = Math.round(val.score * 100) / 100
})
tabswitch('好评榜', 0)
})
getPopularList().then((res) => {
popularList.value = res.data.data
})
getStarList().then((res) => {
starList.value = res.data.data
})
getPotentialList().then((res) => {
potentialList.value = res.data.data
})
//跳转查看更多页面 //跳转查看更多页面
function jumpPage() { function jumpPage() {
let snum = { let snum = {
@ -93,7 +198,6 @@
]) ])
//记录点击的tab页 //记录点击的tab页
let taboldName = ref('好评榜') let taboldName = ref('好评榜')
let tabName = ref('score')
const tabswitch = (name, index) => { const tabswitch = (name, index) => {
photoOldJiLu.value.map((item, index) => { photoOldJiLu.value.map((item, index) => {
photoOld.value[index] = item photoOld.value[index] = item
@ -102,49 +206,49 @@
console.log('name===========>', name) console.log('name===========>', name)
switch (name) { switch (name) {
case '好评榜': case '好评榜':
tabName.value = 'score' dataList.value = praiseList.value
break break
case '热门榜': case '热门榜':
tabName.value = 'total' dataList.value = popularList.value
break break
case '明星榜': case '明星榜':
tabName.value = 'visits' dataList.value = starList.value
break break
case '潜力榜': case '潜力榜':
tabName.value = 'collectCount' dataList.value = potentialList.value
break break
} }
taboldName.value = name taboldName.value = name
} }
//能力排行接口 //能力排行接口
let dataList = ref([]) //数据初始化 let dataList = ref([]) //数据初始化
const mySelectMostPopular = (name) => { // const mySelectMostPopular = (name) => {
const data = { // const data = {
deptIds: [], // deptIds: [],
districtId: '', // districtId: '',
infoList: [], // infoList: [],
name: '', // name: '',
orderField: name, // orderField: name,
orderType: 'DESC', // orderType: 'DESC',
pageNum: 1, // pageNum: 1,
pageSize: 10, // pageSize: 10,
type: '', // type: '',
} // }
pageWithAttrs(data).then((res) => { // pageWithAttrs(data).then((res) => {
dataList.value = res.data.data.records // dataList.value = res.data.data.records
console.log('aaaaaa111aaaaaaa', res) // console.log('aaaaaa111aaaaaaa', res)
}) // })
} // }
onMounted(() => { // onMounted(() => {
watch( // watch(
tabName, // tabName,
(value) => { // (value) => {
mySelectMostPopular(value) // mySelectMostPopular(value)
}, // },
{ deep: true } // { deep: true }
) // )
mySelectMostPopular(tabName.value) // mySelectMostPopular(tabName.value)
}) // })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.ability-ranking { .ability-ranking {
@ -234,6 +338,9 @@
background-position: center; background-position: center;
margin-bottom: 17px; margin-bottom: 17px;
margin-right: 5px; margin-right: 5px;
border-radius: 2px;
border: 1px solid #f1f4fb;
box-shadow: 0px 8px 20px rgba(0, 88, 225, 0);
cursor: pointer; cursor: pointer;
.content-son-css { .content-son-css {
display: flex; display: flex;
@ -242,7 +349,7 @@
padding-top: 5px; padding-top: 5px;
padding: 2px; padding: 2px;
.content-index { .content-index {
padding-left: 15px; // padding-left: 15px;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
font-size: 20px; font-size: 20px;

45
front/src/views/home/components/header.vue
View File

@ -64,26 +64,12 @@
</span> </span>
</a-tooltip> </a-tooltip>
<span @click="logout" class="out">退出</span> <span @click="logout" class="out">退出</span>
<!-- <svg
t="1655286092324"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="2160"
width="20"
height="20"
style="margin-top: 0.05rem"
@click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
>
<path
d="M1016.832 606.208q2.048 12.288-1.024 29.696t-10.24 35.328-17.408 32.256-22.528 20.48-21.504 6.144-20.48-4.096q-10.24-3.072-25.6-5.632t-31.232-1.024-31.744 6.656-27.136 17.408q-24.576 25.6-28.672 58.368t9.216 62.464q10.24 20.48-3.072 40.96-6.144 8.192-19.456 16.896t-29.184 15.872-33.28 11.264-30.72 4.096q-9.216 0-17.408-7.168t-11.264-15.36l-1.024 0q-11.264-31.744-38.4-54.784t-62.976-23.04q-34.816 0-62.976 23.04t-39.424 53.76q-5.12 12.288-15.36 17.92t-22.528 5.632q-14.336 0-32.256-5.12t-35.84-12.8-32.256-17.92-21.504-20.48q-5.12-7.168-5.632-16.896t7.68-27.136q11.264-23.552 8.704-53.76t-26.112-55.808q-14.336-15.36-34.816-19.968t-38.912-3.584q-21.504 1.024-44.032 8.192-14.336 4.096-28.672-2.048-11.264-4.096-20.992-18.944t-17.408-32.768-11.776-36.864-2.048-31.232q3.072-22.528 20.48-28.672 30.72-12.288 55.296-40.448t24.576-62.976q0-35.84-24.576-62.464t-55.296-38.912q-9.216-3.072-15.36-14.848t-6.144-24.064q0-13.312 4.096-29.696t10.752-31.744 15.36-28.16 18.944-18.944q8.192-5.12 15.872-4.096t16.896 4.096q30.72 12.288 64 7.68t58.88-29.184q12.288-12.288 17.92-30.208t7.168-35.328 0-31.744-2.56-20.48q-2.048-6.144-3.584-14.336t1.536-14.336q6.144-14.336 22.016-25.088t34.304-17.92 35.84-10.752 27.648-3.584q13.312 0 20.992 8.704t10.752 17.92q11.264 27.648 36.864 48.64t60.416 20.992q35.84 0 63.488-19.968t38.912-50.688q4.096-8.192 12.8-16.896t17.92-8.704q14.336 0 31.232 4.096t33.28 11.264 30.208 18.432 22.016 24.576q5.12 8.192 3.072 17.92t-4.096 13.824q-13.312 29.696-8.192 62.464t29.696 57.344 60.416 27.136 66.56-11.776q8.192-5.12 19.968-4.096t19.968 9.216q15.36 14.336 27.136 43.52t15.872 58.88q2.048 17.408-5.632 27.136t-15.872 12.8q-31.744 11.264-54.272 39.424t-22.528 64q0 34.816 18.944 60.928t49.664 37.376q7.168 4.096 12.288 8.192 11.264 9.216 15.36 23.552zM540.672 698.368q46.08 0 87.04-17.408t71.168-48.128 47.616-71.168 17.408-86.528-17.408-86.528-47.616-70.656-71.168-47.616-87.04-17.408-86.528 17.408-70.656 47.616-47.616 70.656-17.408 86.528 17.408 86.528 47.616 71.168 70.656 48.128 86.528 17.408z"
p-id="2161"
fill="#bfbfbf"
></path>
</svg> -->
<i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo" v-show="backFlag"></i> <i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo" v-show="backFlag"></i>
<!-- <i class="img1" @click="jumpWaibu"></i> -->
</div> </div>
<div class="info1">
<i class="img1" @click="jumpWaibu"></i>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
@ -156,6 +142,9 @@ const goToHome = () => {
path: '/home', path: '/home',
}) })
} }
const jumpWaibu=()=>{
window.open('http://15.72.177.175:18460/analystrunner/tonglan', "_blank");
}
// 跳转页面 // 跳转页面
const jumpPage = (item) => { const jumpPage = (item) => {
// 西海岸 // 西海岸
@ -405,6 +394,16 @@ onBeforeUnmount(() => {
background: #0058e1; background: #0058e1;
color: #fff !important; color: #fff !important;
} }
.info1 {
margin-left: 0.1rem;
display: flex;
.img1{
height: 0.3rem;
width: 1.4rem;
margin-left: 0.1rem;
background: url('~@/assets/newHome/yiwang.png') no-repeat;
}
}
.info { .info {
// width: 2rem; // width: 2rem;
@ -419,7 +418,15 @@ onBeforeUnmount(() => {
background: url('~@/assets/newHome/user.png') no-repeat; background: url('~@/assets/newHome/user.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.img1 {
margin-left: 0.08rem;
height: 0.3rem;
width: 0.8rem;
border-radius: 0.1rem;
background: url('~@/assets/newHome/yiwang.png') no-repeat;
background-size: 100%;
}
span { span {
height: 0.3rem; height: 0.3rem;
line-height: 0.3rem; line-height: 0.3rem;