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

合并

This commit is contained in:
guoyue 2022-10-26 15:03:29 +08:00
parent d28628f35a ccebe3d09c
commit 82718e3d02
9 changed files with 210 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/public/config/basicConfig.js
View File

@ -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'
}
}
}

6
back/src/components/ren-process-detail/src/ren-process-detail.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.wuhongjian
* @Date: 2022-04-11 16:30:04
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-16 15:07:44
* @LastEditors: Light
* @LastEditTime: 2022-10-26 11:05:07
* @Description: 告诉大家这是什么
-->
<template>
@ -31,7 +31,7 @@
<!-- 审核意见 -->
<el-table-column prop="comment" :label="$t('process.comment')" header-align="center" align="center"></el-table-column>
<!-- 任务时长（秒） -->
<el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="duration" :label="$t('task.durationInSeconds')" header-align="center" align="center" width="180"></el-table-column>
</el-table>
<el-pagination
v-if="dataForm.pid === '0'"

136
back/src/views/modules/abilityStatistics/components/abilityDetails.vue
View File

@ -1,5 +1,6 @@
<template>
<el-dialog
width="70%"
:destroy-on-close="true"
:close-on-click-modal="false"
@close="closeModal"
@ -104,6 +105,11 @@
label="任务名称"
width="180">
</el-table-column>
<el-table-column
prop="assigneeDeptName"
label="处理人部门"
width="200">
</el-table-column>
<el-table-column
prop="assigneeName"
label="处理人"
@ -142,126 +148,125 @@ export default {
props: {
detailType: {
type: String,
default: "",
default: ''
},
detailsVisible: {
type: Boolean,
default: false,
default: false
},
detailParamss: {
type: Object,
default: {},
},
default: {}
}
},
watch: {
detailsVisible: {
handler(newVal) {
this.detailsVisibleCopy = newVal;
handler (newVal) {
this.detailsVisibleCopy = newVal
},
immediate: true,
immediate: true
},
detailParamss: {
handler(newVal) {
this.detailParams = newVal;
this.getDetail(newVal);
handler (newVal) {
this.detailParams = newVal
this.getDetail(newVal)
},
immediate: true,
immediate: true
}
},
},
data() {
data () {
return {
detailsVisibleCopy: false,
columns: [
{
title: "任务名称",
dataIndex: "activityName",
key: "activityName",
title: '任务名称',
dataIndex: 'activityName',
key: 'activityName'
},
{
title: "处理人",
dataIndex: "assigneeName",
key: "assigneeName",
title: '处理人',
dataIndex: 'assigneeName',
key: 'assigneeName'
},
{
title: "任务开始时间",
dataIndex: "startTime",
key: "startTime",
title: '任务开始时间',
dataIndex: 'startTime',
key: 'startTime'
},
{
title: "任务结束时间",
dataIndex: "endTime",
key: "endTime",
title: '任务结束时间',
dataIndex: 'endTime',
key: 'endTime'
},
{
title: "审核意见",
dataIndex: "comment",
key: "comment",
title: '审核意见',
dataIndex: 'comment',
key: 'comment'
},
{
title: "任务时长/秒",
dataIndex: "durationInSeconds",
key: "durationInSeconds",
},
title: '任务时长/秒',
dataIndex: 'durationInSeconds',
key: 'durationInSeconds'
}
],
dataSource: [{ data: [] }],
showArr: [],
};
showArr: []
}
},
computed: {},
components: {},
methods: {
getDetail(newVal) {
getDetail (newVal) {
if (newVal.resourceApplication) {
this.dataSource.data = [];
if (this.detailType == "能力上架") {
let arr = [];
this.dataSource.data = []
if (this.detailType == '能力上架') {
const arr = []
newVal.resourceApplication.forEach((item) => {
arr.push(item);
});
arr.push(item)
})
this.dataSource.data.push([
newVal.resourceApplication.processInstanceId,
arr,
]);
arr
])
} else {
for (const key in newVal.resourceApplication) {
if (newVal.resourceApplication[key].length > 0) {
newVal.resourceApplication[key].map((item) => {
this.dataSource.data.push([
item.instanceId,
item.taskHandleDetailInfo,
]);
});
item.taskHandleDetailInfo
])
})
}
}
}
this.showArr.value = [];
this.showArr.value = []
for (const key in newVal.resourceApplication) {
if (newVal.resourceApplication[key].length > 0) {
let obj = { name: "", instanceId: "", list: [], list2: [] };
obj.name = key;
const obj = { name: '', instanceId: '', list: [], list2: [] }
obj.name = key
newVal.resourceApplication[key].map((item) => {
obj.instanceId = item.instanceId;
obj.backToFirst = item.backToFirst;
obj.ended = item.ended;
obj.approveStatus = item.approveStatus;
obj.instanceId = item.instanceId
obj.backToFirst = item.backToFirst
obj.ended = item.ended
obj.approveStatus = item.approveStatus
if (item.resources.length > 0) {
item.resources.map((val) => {
obj.list.push(val);
});
obj.list.push(val)
})
} else {
item.camera.map((val) => {
obj.list2.push(val);
});
obj.list2.push(val)
})
}
});
})
this.showArr.push(obj);
this.showArr.push(obj)
}
}
}
console.log("this.dataSource.data[0]========",this.dataSource.data[0][1])
console.log('this.dataSource.data[0]========', this.dataSource.data[0][1])
},
// init () {
// this.visible = true
@ -269,11 +274,11 @@ export default {
// this.$refs['dataForm'].resetFields()
// })
// },
closeModal() {
this.$emit("closeModal");
},
},
};
closeModal () {
this.$emit('closeModal')
}
}
}
</script>
<style scoped>
.title {
@ -457,4 +462,3 @@ export default {
}
}
</style>

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

@ -350,12 +350,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, // 明细返回按钮显示标志位
@ -386,6 +386,10 @@ export default {
},
mounted() {
// this.getFirstTree()
console.log('this.$route.query.Id;', this.$route.query.type)
if (this.$route.query.type === 'use') {
this.handleChose(4)
} else {
if (this.departmentId === 1) {
this.handleChose(3)
// this.departmentId = 1;
@ -394,6 +398,7 @@ export default {
// this.departmentId = 2;
} else {
}
}
},
computed: {
// ...mapState(['departmentSelects'])
@ -809,6 +814,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) {
@ -867,7 +874,9 @@ export default {
this.handleCurrentChange(1)
},
// 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
goToDetail() {
goToDetail () {
this.currentPage=1
this.pageSize=10
this.detailFlag = !this.detailFlag
if (this.departmentId === 1) {
this.handleChose(3)
@ -881,6 +890,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) {

8
back/src/views/modules/workBench/components/frequency-top5-view.vue
View File

@ -4,19 +4,19 @@
<div v-if="!noData" v-loading="loading">
<div class="no-box">
<div class="no no2">
<el-tooltip effect="dark" :content="no2Obj.name" placement="top">
<el-tooltip effect="dark" :content="no2Obj.name" placement="top" v-if="no2Obj.name">
<div class="name ellipsis" :style="{ color: colorObj[2] }">{{ no2Obj.name || '--' }}</div>
</el-tooltip>
<div class="count">{{ formatCount(no2Obj.count) }}</div>
</div>
<div class="no no1">
<el-tooltip effect="dark" :content="no1Obj.name" placement="top">
<el-tooltip effect="dark" :content="no1Obj.name" placement="top" v-if="no1Obj.name">
<div class="name ellipsis" :style="{ color: colorObj[1] }">{{ no1Obj.name || '--' }}</div>
</el-tooltip>
<div class="count">{{ formatCount(no1Obj.count) }}</div>
</div>
<div class="no no3">
<el-tooltip effect="dark" :content="no3Obj.name" placement="top">
<el-tooltip effect="dark" :content="no3Obj.name" placement="top" v-if="no3Obj.name">
<div class="name ellipsis" :style="{ color: colorObj[3] }">{{ no3Obj.name || '--' }}</div>
</el-tooltip>
@ -26,7 +26,7 @@
<div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
<div class="left">
<div class="row-index">{{ i + 4 }}</div>
<el-tooltip effect="dark" :content="data.name" placement="top">
<el-tooltip effect="dark" :content="data.name" placement="top" v-if="data.name">
<div class="name-text ellipsis">{{ data.name || '--' }}</div>
</el-tooltip>
</div>

2
front/public/static/config/basicConfig.js
View File

@ -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',

13
front/src/api/home.js
View File

@ -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,
})
}

2
front/src/views/abilityStatistics/components/AbilityTotal.vue
View File

@ -109,7 +109,7 @@
break
case '资源申请量':
window.open(
window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index',
window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index?type=use',
'_blank'
)
break

100
front/src/views/home/DetailsPageconetent.vue
View File

@ -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这个参数是下面的分页传过来的参数