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-14 17:36:59 +08:00
parent fe85cd370f 033e123edc
commit 29ace46c69
3 changed files with 901 additions and 853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,16 +88,49 @@
<!--审批详情-->
<div>
<div class="title">审批详情</div>
<div v-for="item in this.dataSource.data" :key="item">
<a-table :dataSource="item[1]" :columns="columns">
<!-- <div v-for="item in this.dataSource.data" :key="item"> -->
<!-- <a-table :dataSource="item[1]" :columns="columns">
<template #bodyCell="{ column, text }">
<template v-if="column.dataIndex === 'name'">
<a>{{ text }}</a>
</template>
</template>
</a-table>
</div>
</a-table> -->
<el-table
:data="dataSource.data[0][1]"
style="width: 100%">
<el-table-column
prop="activityName"
label="任务名称"
width="180">
</el-table-column>
<el-table-column
prop="assigneeName"
label="处理人"
width="120">
</el-table-column>
<el-table-column
prop="startTime"
label="任务开始时间"
width="180">
</el-table-column>
<el-table-column
prop="endTime"
label="任务结束时间"
width="180">
</el-table-column>
<el-table-column
prop="comment"
label="审核意见" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="duration"
label="任务时长"
width="100">
</el-table-column>
</el-table>
</div>
<!-- </div> -->
<!-- <div else>
gai
</div> -->
@ -228,6 +261,7 @@ export default {
}
}
}
console.log("this.dataSource.data[0]========",this.dataSource.data[0][1])
},
// init () {
// this.visible = true

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

@ -38,7 +38,7 @@
</el-date-picker>
</el-form-item>
<!--审核状态-->
<el-form-item>
<el-form-item >
<span>审核状态：</span>
<el-select
v-model="examineStatus"
@ -46,8 +46,9 @@
clearable
>
<el-option label="全部" value="-1"></el-option>
<el-option label="审核完成" value="1"></el-option>
<el-option label="审核中" value="0"></el-option>
<el-option label="通过" value="1"></el-option>
<el-option label="不通过" value="2"></el-option>
</el-select>
</el-form-item>
@ -371,8 +372,9 @@ export default {
{ name: '组件服务', key: 1 },
{ name: '应用资源', key: 2 },
{ name: '基础设施', key: 3 },
{ name: '数据资源', key: 3 },
{ name: '知识库', key: 3 }
{ name: '数据资源', key: 4 },
{ name: '知识库', key: 5 },
{ name: '会议室', value: 6}
],
tableData: [],
tableData2: [
@ -396,7 +398,8 @@ export default {
{ name: '图层服务', value: 2 },
{ name: '通用开发组件', value: 3 },
{ name: '页面开发组件', value: 4 },
{ name: '应用资源', value: 5 }
{ name: '应用资源', value: 5 },
{ name: '会议室', value: 6}
], // 类型备选列表
detailFlag: false, // 明细返回按钮显示标志位
startDate: '', // 开始时间
@ -478,7 +481,9 @@ export default {
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '审核完成'
this.status = '通过'
}else if (this.examineStatus == '2') {
this.status = '不通过'
} else {
this.status = this.examineStatus
}
@ -534,7 +539,9 @@ export default {
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '审核完成'
this.status = '通过'
} else if (this.examineStatus == '2') {
this.status = '不通过'
} else {
this.status = this.examineStatus
}
@ -627,13 +634,15 @@ export default {
},
// 能力上架明细
getOneDetail (page) {
var passAndReview = '' // 转变"审核完成"字段为通过
var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '通过'
} else if (this.examineStatus == '2') {
this.status = '不通过'
} else {
this.status = this.examineStatus
}
@ -657,13 +666,15 @@ export default {
},
// 能力使用明细
getTwoDetail (page) {
var passAndReview = '' // 转变"审核完成"字段为通过
var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
this.status = '审核中'
} else if (this.examineStatus == '1') {
this.status = '通过'
} else if (this.examineStatus == '2') {
this.status = '不通过'
} else {
this.status = this.examineStatus
}

65
front/src/supermap/map-showResource.js
View File

@ -21,6 +21,7 @@ const restoreIconObj = {
}
const progress = document.getElementById('progress')
const progressBar = document.getElementById('progress-bar')
function updateProgressBar(processed, total, elapsed, layersArray) {
if (elapsed > 1000) {
// if it takes more than a second to load, display the progress bar:
@ -64,6 +65,14 @@ function createMarkerClusterLayer(layerClassName) {
} else {
// 使用默认图标
markerClusterLayer = L.markerClusterGroup({
iconCreateFunction(cluster) {
const markers = cluster.getAllChildMarkers()
let n = 0
for (let i = 0; i < markers.length; i++) {
n += markers[i].number
}
return L.divIcon({ html: markers.length, className: "topic-marker-cluster-video" })
},
// 是否允许指定 PolylineOptions 样式 spider
spiderfyOnMaxZoom: true,
// 是否显示标记的边界
@ -111,8 +120,7 @@ function chunkData(data, doChunk, chunkCompleted) {
* @param layerGroup
* @return {*|void} layer对象，可以直接用map的removeLayer删除
*/
function addPointOnMap(
{
function addPointOnMap({
feature,
iconSize = [48, 48],
iconUrl = 'poi.png',
@ -134,8 +142,7 @@ function addPointOnMap(
// 区分是否是自定义div图标
if (isCustomIcon) {
iconHtml = iconHtml || createDefaultDivIcon()
icon = createDefaultFeatureStyle(
{ img: iconUrl, iconSize: iconSize },
icon = createDefaultFeatureStyle({ img: iconUrl, iconSize: iconSize },
iconHtml,
iconClassName
)
@ -171,12 +178,12 @@ function addPointOnMap(
})
}
return isOpenPopup
? marker
return isOpenPopup ?
marker
.addTo(mapObj.map)
.bindPopup(elementHtml, { className: popupClassName })
.openPopup()
: marker.addTo(mapObj.map)
.openPopup() :
marker.addTo(mapObj.map)
}
/**
@ -196,9 +203,9 @@ function createPromiseByQueryService(idArray = [], layerConfigInfo, type = '') {
authorityFilter = 'SMID > 0'
} else if (idArray.length <= 1000) {
const authorityFilter1 = "'" + idArray.join("','") + "'"
authorityFilter = type
? `CAMERA_INDEX_CODE in (${authorityFilter1})`
: `UUID in (${authorityFilter1})`
authorityFilter = type ?
`CAMERA_INDEX_CODE in (${authorityFilter1})` :
`UUID in (${authorityFilter1})`
} else {
// 当UUID的个数大于1000
const count = Math.floor(idArray.length / 1000) // 向下取整
@ -209,9 +216,9 @@ function createPromiseByQueryService(idArray = [], layerConfigInfo, type = '') {
const authorityFilterString = "'" + indexCodeSplice.join("','") + "'"
const authorityFilterSplice = `CAMERA_INDEX_CODE in (${authorityFilterString})`
authorityFilter =
i === 0
? authorityFilterSplice
: `${authorityFilter} or ${authorityFilterSplice}`
i === 0 ?
authorityFilterSplice :
`${authorityFilter} or ${authorityFilterSplice}`
}
} else {
for (let i = 0; i <= count; i++) {
@ -219,9 +226,9 @@ function createPromiseByQueryService(idArray = [], layerConfigInfo, type = '') {
const authorityFilterString = "'" + indexCodeSplice.join("','") + "'"
const authorityFilterSplice = `UUID in (${authorityFilterString})`
authorityFilter =
i === 0
? authorityFilterSplice
: `${authorityFilter} or ${authorityFilterSplice}`
i === 0 ?
authorityFilterSplice :
`${authorityFilter} or ${authorityFilterSplice}`
}
}
}
@ -271,9 +278,8 @@ function addResourceOnMapNew(
// 创建图层
let layers = null
// 判断是否是聚合图层
layers = layerConfig.cluster.flag
? createMarkerClusterLayer(layerConfig.cluster.clusterName)
: []
layers = layerConfig.cluster.flag ?
createMarkerClusterLayer(layerConfig.cluster.clusterName) : []
// 该promise用于将资源要素聚合图层添加到地图上，添加完毕之后，把状态置为已决议
return new Promise((resolve) => {
@ -291,7 +297,7 @@ function addResourceOnMapNew(
marker.layerConfigInfo = layerConfig
// 小型水库没有点击事件
// if (feature.size !== 0) {
marker.on('click', async (e) => {
marker.on('click', async(e) => {
console.log('图标点击e', e)
const uuid = e.sourceTarget.uuid
const type = layerConfig.resType
@ -347,8 +353,7 @@ function addResourceOnMapNew(
* @return {*}
* @private
*/
function addResourceOnMap(
{
function addResourceOnMap({
features,
layerName,
layerConfigInfo,
@ -426,7 +431,7 @@ function addResourceOnMap(
if (getLayerPopupInfo !== null && createPopupFun !== null) {
marker.resId = feature.resId
marker.layerConfigInfo = layerConfigInfo
marker.on('click', async (e) => {
marker.on('click', async(e) => {
console.log('图标点击e', e)
// 判断是否需要选中之后更换marker的图标
if (clickReplaceIcon) {
@ -658,14 +663,13 @@ function addResourceOnMapWithoutSuperMap(
feature.traveladdress +
'(' +
feature.count +
'次)</span></p>',
{
'次)</span></p>', {
permanent: true,
}
)
L.tooltipLayout.resetMarker(marker)
if (createPopupFun !== null) {
marker.on('click', async (e) => {
marker.on('click', async(e) => {
const elementHtml = createPopupFun(feature)
if (elementHtml) {
L.popup({
@ -735,7 +739,7 @@ function addPointsToMap(
// })
// L.tooltipLayout.resetMarker(marker)
if (createPopupFun !== null) {
marker.on('click', async (e) => {
marker.on('click', async(e) => {
const elementHtml = createPopupFun(feature)
if (elementHtml) {
if (feature.type == 'road') {
@ -795,8 +799,7 @@ function addPointsToMap(
* @return {*}
* @private
*/
function addResourceOnMapWithoutSuper(
{
function addResourceOnMapWithoutSuper({
features,
layerName,
layerConfigInfo,
@ -874,7 +877,7 @@ function addResourceOnMapWithoutSuper(
marker.uuid = feature.uuid || ''
marker.resId = feature.resId || ''
marker.layerConfigInfo = layerConfigInfo
marker.on('click', async (e) => {
marker.on('click', async(e) => {
// 判断是否需要选中之后更换marker的图标
if (clickReplaceIcon) {
const layers = layerGroup.get(layerName).getLayers()