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

修改基础设施BUG 以及 能力统计金字塔图

This commit is contained in:
a0049873 2022-10-13 17:07:51 +08:00
parent 75299e8648
commit 78aabf704b
4 changed files with 709 additions and 560 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
back/src/views/modules/ability/assignedScene/add-update-scene.vue
View File

@ -198,7 +198,7 @@ export default {
name: '', name: '',
applicationArea: '', applicationArea: '',
description: '', description: '',
sceneUrl:'', sceneUrl: '',
fuseAttrList: [ fuseAttrList: [
{ {
attrType: '使用步骤', attrType: '使用步骤',
@ -345,10 +345,10 @@ export default {
update: 'put' update: 'put'
} }
this.dataForm.fuseResourceList = this.getFuseResourceList() this.dataForm.fuseResourceList = this.getFuseResourceList()
if (this.imageUrl == '') { // if (this.imageUrl == '') {
this.$message.error('请上传图片！') // this.$message.error('请上传图片！')
return // return
} // }
this.dataForm.fuseAttrList.find(v => v.attrType == '服务图片').attrValue = this.imageUrl || '' this.dataForm.fuseAttrList.find(v => v.attrType == '服务图片').attrValue = this.imageUrl || ''
const _obj = Object.assign({}, this.dataForm, { const _obj = Object.assign({}, this.dataForm, {
type: '赋能场景' type: '赋能场景'

237
front/src/views/abilityStatistics/components/ResourceAggregation.vue
View File

@ -345,90 +345,207 @@
echarts.init(document.getElementById('right')).dispose() echarts.init(document.getElementById('right')).dispose()
let chartDom = document.getElementById('right') let chartDom = document.getElementById('right')
let myChart = echarts.init(chartDom) let myChart = echarts.init(chartDom)
// let option = {
// tooltip: {
// trigger: 'item',
// formatter: function (info) {
// let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
// let dom = ref()
// dom.value =
// '部门数<br/>' +
// (_obj.fanwei || '--') +
// ' : ' +
// (_obj.value || _obj.value === 0 ? _obj.value : '--') +
// '项'
// console.log('name', info.data)
// return dom.value
// },
// },
// grid: {
// height: '65%',
// width: '45%',
// left: '20%',
// bottom: 30,
// },
// xAxis: {
// show: false,
// type: 'category',
// data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
// },
// yAxis: {
// show: false,
// type: 'value',
// min: 0,
// max: 20,
// },
// series: [
// {
// name: '部门数',
// type: 'funnel',
// left: '28%',
// right: '35%',
// top: '15%',
// bottom: '10%',
// minSize: '0%',
// maxSize: '100%',
// sort: 'ascending',
// label: {
// show: true,
// formatter: function (info) {
// let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
// let dom = ref()
// dom.value =
// (_obj.fanwei || '--') +
// ' : ' +
// (_obj.value || _obj.value === 0 ? _obj.value : '--') +
// '项'
// console.log('name', info.data)
// return dom.value
// },
// rich: {
// b: {
// fontSize: 14,
// },
// },
// },
// labelLine: {
// length: 40,
// lineStyle: {
// width: 1,
// type: 'solid',
// },
// },
// itemStyle: {
// borderColor: '#fff',
// borderWidth: 1,
// },
// emphasis: {
// label: {
// fontSize: 20,
// },
// },
// data: chartData,
// },
// ],
// }
let option = { let option = {
// title: {
// text: 'ECharts 入门示例'
// },
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: function (info) { formatter: function (info) {
let _obj = dataList.find((v) => v.fanwei == info.data.name) || {} let _obj = dataList.find((v) => v.fanwei == info.name) || {}
let dom = ref() let dom = ref()
dom.value = dom.value =
'部门数<br/>' + '部门数<br/>' +
(_obj.fanwei || '--') + (_obj.fanwei || '--') +
' : ' + ' : ' +
(_obj.value || _obj.value === 0 ? _obj.value : '--') + (_obj.value || _obj.value === 0 ? _obj.value : '--') +
'项' '个'
console.log('name', info.data) console.log('name', info)
return dom.value return dom.value
}, },
}, },
grid: { legend: {
height: '65%', data: [],
width: '45%',
left: '20%',
bottom: 30,
}, },
xAxis: { xAxis: {
show: false, data: [],
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
},
yAxis: {
show: false,
type: 'value',
min: 0,
max: 20,
}, },
yAxis: {},
series: [ series: [
{ {
name: '部门数', name: '',
type: 'funnel', type: 'bar',
left: '28%', barGap: '-100%',
right: '35%',
top: '15%',
bottom: '10%',
minSize: '0%',
maxSize: '100%',
sort: 'ascending',
label: {
show: true,
formatter: function (info) {
let _obj = dataList.find((v) => v.fanwei == info.data.name) || {}
let dom = ref()
dom.value =
(_obj.fanwei || '--') +
' : ' +
(_obj.value || _obj.value === 0 ? _obj.value : '--') +
'项'
console.log('name', info.data)
return dom.value
},
rich: {
b: {
fontSize: 14,
},
},
},
labelLine: {
length: 40,
lineStyle: {
width: 1,
type: 'solid',
},
},
itemStyle: { itemStyle: {
borderColor: '#fff', normal: {
borderWidth: 1, color: '#C1232B',
},
emphasis: {
label: {
fontSize: 20,
}, },
}, },
data: chartData, // data: [5, 20, 36, 10, 10, 20]
data: [],
},
{
name: '',
type: 'bar',
barGap: '-100%',
itemStyle: {
normal: {
color: '#B5C334',
},
},
// data: [5, 20, 36, 10, 10, 20]
data: [],
},
{
name: '',
type: 'bar',
barGap: '-100%',
itemStyle: {
normal: {
color: '#FCCE10',
},
},
// data: [5, 20, 36, 10, 10, 20]
data: [],
},
{
name: '',
type: 'bar',
barGap: '-100%',
itemStyle: {
normal: {
color: '#E87C25',
},
},
// data: [5, 20, 36, 10, 10, 20]
data: [],
},
{
name: '',
type: 'bar',
barGap: '-100%',
itemStyle: {
normal: {
color: '#27727B',
},
},
// data: [5, 20, 36, 10, 10, 20]
data: [],
},
{
name: '',
type: 'bar',
barGap: '-100%',
itemStyle: {
normal: {
color: '#FE8463',
},
},
// data: [5, 20, 36, 10, 10, 20]
data: [],
}, },
], ],
} }
option.legend.data = []
option.xAxis.data = []
dataList.map((val, index) => {
// option.legend.data.push(val.fanwei)
option.xAxis.data.push(val.fanwei)
option.series[index].name = val.fanwei
let arr = []
for (let i = 0; i < 5; i++) {
if (i == index) {
arr.push(val.value)
} else {
arr.push(0)
}
}
option.series[index].data = arr
})
option && myChart.setOption(option) option && myChart.setOption(option)
} }
onMounted(() => { onMounted(() => {

224
front/src/views/home/infrastructurePage.vue
View File

@ -331,10 +331,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item <a-form-item name="phone" label="联系电话">
name="phone"
label="联系电话"
>
<a-input v-model:value="formState.phone" style="width: 72%" /> <a-input v-model:value="formState.phone" style="width: 72%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -551,7 +548,10 @@
> >
<template #footer></template> <template #footer></template>
<div style="width: 100%; display: flex; justify-content: center"> <div style="width: 100%; display: flex; justify-content: center">
<div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn"> <div
style="width: 100%; height: 100%; position: relative"
v-show="isXiHaiAn"
>
<!-- 西海岸--预览视频--遮罩 todo--> <!-- 西海岸--预览视频--遮罩 todo-->
<div class="video-cover" @click="videoShowMsg"></div> <div class="video-cover" @click="videoShowMsg"></div>
<div class="waterMark waterMark-left-top"> <div class="waterMark waterMark-left-top">
@ -635,17 +635,33 @@
style="width: 100%; height: 100%; position: relative" style="width: 100%; height: 100%; position: relative"
> >
<!-- 批量预览视频--遮罩 --> <!-- 批量预览视频--遮罩 -->
<div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div> <div
<div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn"> class="batch-video-cover"
@click="videoShowMsg(index)"
v-show="isXiHaiAn"
></div>
<div
class="batch-waterMark batch-waterMark-left-top"
v-show="isXiHaiAn"
>
{{ userInfo.usernameShow }} {{ userInfo.usernameShow }}
</div> </div>
<div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn"> <div
class="batch-waterMark batch-waterMark-right-top"
v-show="isXiHaiAn"
>
{{ userInfo.realNameShow }} {{ userInfo.realNameShow }}
</div> </div>
<div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn"> <div
class="batch-waterMark batch-waterMark-left-bottom"
v-show="isXiHaiAn"
>
{{ userInfo.usernameShow }} {{ userInfo.usernameShow }}
</div> </div>
<div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn"> <div
class="batch-waterMark batch-waterMark-right-bottom"
v-show="isXiHaiAn"
>
{{ userInfo.realNameShow }} {{ userInfo.realNameShow }}
</div> </div>
<p></p> <p></p>
@ -899,12 +915,12 @@
tabClick(0, '视频资源') tabClick(0, '视频资源')
} else { } else {
// 默认选中 // 默认选中
if(formPage && formPage == 'noticePage') { if (formPage && formPage == 'noticePage') {
tabClick(0, '城市云脑会客厅') tabClick(0, '城市云脑会客厅')
roomYuyue.value = false roomYuyue.value = false
roomResult.value = true roomResult.value = true
onSearch() onSearch()
}else { } else {
tabClick(0, '政务云资源') tabClick(0, '政务云资源')
} }
} }
@ -958,7 +974,7 @@
let clickList = ref([]) //存储点击的tab let clickList = ref([]) //存储点击的tab
if (!isXiHaiAn) { if (!isXiHaiAn) {
tabList.value.push({ tabList.value.push({
title: '视频标签', title: '政务云资源',
content: [], content: [],
}) })
} }
@ -1383,6 +1399,7 @@
'点击tab================>', '点击tab================>',
indexFather, indexFather,
name, name,
clickList.value,
clickList.value[indexFather] clickList.value[indexFather]
) )
@ -1397,7 +1414,7 @@
tabList.value[1].title = '视频标签' tabList.value[1].title = '视频标签'
} }
selectType.value = '视频资源' selectType.value = '视频资源'
console.log('444------------>', 444); console.log('444------------>', 444)
} else if (name == '政务云资源') { } else if (name == '政务云资源') {
room.value = true room.value = true
tableHeight.value = 600 tableHeight.value = 600
@ -1579,7 +1596,10 @@
clickList.value[1].content = [] clickList.value[1].content = []
} }
clickList.value[indexFather].content[0] = name clickList.value[indexFather].content[0] = name
console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]); console.log(
'clickList.value[indexFather].content[0]------------>',
clickList.value[indexFather].content[0]
)
if (tabList.value[1]) { if (tabList.value[1]) {
tabList.value[1].title = '' tabList.value[1].title = ''
@ -1814,22 +1834,32 @@
// 西海岸-视频资源loading // 西海岸-视频资源loading
const loadingCamera = ref(false) const loadingCamera = ref(false)
const getCamera = (flag, str) => { const getCamera = (flag, str) => {
loadingCamera.value = true; loadingCamera.value = true
if (flag) { if (flag) {
mapSearchParam.value.cameraName = str mapSearchParam.value.cameraName = str
} }
console.log('初始化调用') console.log('初始化调用')
console.log('不选左侧树的时候不调用接口', mapSearchParam.value) console.log(
'不选左侧树的时候不调用接口',
mapSearchParam.value,
selectType.value
)
if (!whoShow1.value.itShowXiHaiAn) { if (!whoShow1.value.itShowXiHaiAn) {
getCameraByParentId(mapSearchParam.value).then((res) => { if (selectType.value == '视频资源') {
console.log('res--查询摄像头---------->', res); getCameraByParentId(mapSearchParam.value)
loadingCamera.value = false; .then((res) => {
console.log('res--查询摄像头---------->', res)
loadingCamera.value = false
dataSource.value = res.data.data dataSource.value = res.data.data
pagination.value.total = res.data.count pagination.value.total = res.data.count
}).catch(err => { })
loadingCamera.value = false; .catch((err) => {
loadingCamera.value = false
message.error(err) message.error(err)
}) })
} else {
loadingCamera.value = false
}
} else { } else {
let params = { let params = {
regionId: regionId:
@ -1866,13 +1896,15 @@
} }
} }
} }
getCameraByCondition(params).then((res) => { getCameraByCondition(params)
console.log('res--查询摄像头---------->', res); .then((res) => {
loadingCamera.value = false; console.log('res--查询摄像头---------->', res)
loadingCamera.value = false
dataSource.value = res.data.data dataSource.value = res.data.data
pagination.value.total = res.data.count pagination.value.total = res.data.count
}).catch(err => { })
loadingCamera.value = false; .catch((err) => {
loadingCamera.value = false
message.error(err) message.error(err)
}) })
} }
@ -1884,7 +1916,7 @@
const addShoppingCart = () => { const addShoppingCart = () => {
if (selectedList.value.length > 0) { if (selectedList.value.length > 0) {
let _arr = [] let _arr = []
selectedList.value.map(v => { selectedList.value.map((v) => {
_arr.push({ _arr.push({
delFlag: '0', delFlag: '0',
resourceId: v.idtCameraChannel, resourceId: v.idtCameraChannel,
@ -1892,7 +1924,7 @@
}) })
}) })
xhaAddCart(_arr).then((res) => { xhaAddCart(_arr).then((res) => {
if(res.data.code !== 0) { if (res.data.code !== 0) {
return message.error(res.data.msg) return message.error(res.data.msg)
} }
message.success('添加申购车成功！') message.success('添加申购车成功！')
@ -1929,7 +1961,7 @@
}, },
]) ])
// 西海岸--状态展示 // 西海岸--状态展示
if(isXiHaiAn) { if (isXiHaiAn) {
columns.value.splice(2, 0, { columns.value.splice(2, 0, {
title: '状态', title: '状态',
dataIndex: 'status', dataIndex: 'status',
@ -2085,7 +2117,7 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.infrastructrueBox { .infrastructrueBox {
padding: 0.2rem; padding: 0.2rem;
background: #ffffff; background: #ffffff;
border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3); border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
@ -2232,51 +2264,51 @@
margin-left: 0.16rem; margin-left: 0.16rem;
position: relative; position: relative;
} }
} }
.roomBackground { .roomBackground {
background: #0058e1; background: #0058e1;
color: #ffffff; color: #ffffff;
} }
.nullBackground { .nullBackground {
background: #f3f5f9; background: #f3f5f9;
color: #0087ff; color: #0087ff;
} }
:deep(.ant-form-item-control-input-content) { :deep(.ant-form-item-control-input-content) {
margin-left: 0.15rem; margin-left: 0.15rem;
} }
:deep(.ant-col) { :deep(.ant-col) {
.ant-form-item { .ant-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
} }
.jinggaoD { .jinggaoD {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.jinggaoNull { .jinggaoNull {
display: none; display: none;
} }
.imgJinggao { .imgJinggao {
width: 0.2rem; width: 0.2rem;
height: 0.2rem; height: 0.2rem;
background: url('~@/assets/home/jingao.png') no-repeat; background: url('~@/assets/home/jingao.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.introduction { .introduction {
:deep(.ant-form-item-control) { :deep(.ant-form-item-control) {
margin-left: -2.1rem; margin-left: -2.1rem;
} }
} }
.roomBox { .roomBox {
.leftMake { .leftMake {
float: left; float: left;
margin-left: -1rem; margin-left: -1rem;
@ -2406,17 +2438,17 @@
:deep(.ant-pagination) { :deep(.ant-pagination) {
text-align: end; text-align: end;
} }
} }
</style> </style>
<style lang="less"> <style lang="less">
.wrj { .wrj {
.ant-modal-body { .ant-modal-body {
height: 700px !important; height: 700px !important;
overflow-y: auto; overflow-y: auto;
} }
} }
.modalClass { .modalClass {
.ant-modal-body { .ant-modal-body {
height: 4rem !important; height: 4rem !important;
overflow-y: scroll !important; overflow-y: scroll !important;
@ -2431,9 +2463,9 @@
border-bottom: 0 !important; border-bottom: 0 !important;
} }
} }
} }
.appModal { .appModal {
.ant-modal-body { .ant-modal-body {
height: 4.8rem !important; height: 4.8rem !important;
overflow-y: scroll !important; overflow-y: scroll !important;
@ -2448,9 +2480,9 @@
border-bottom: 0 !important; border-bottom: 0 !important;
} }
} }
} }
.single-preview-modal { .single-preview-modal {
.ant-modal-header { .ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat; background: url(~@/assets/home/video-background.png) no-repeat;
background-size: cover; background-size: cover;
@ -2465,9 +2497,9 @@
.anticon { .anticon {
color: #ffffff; color: #ffffff;
} }
} }
.batch-preview-modal { .batch-preview-modal {
.batch-video { .batch-video {
width: 100%; width: 100%;
display: grid; display: grid;
@ -2496,14 +2528,14 @@
.anticon { .anticon {
color: #ffffff; color: #ffffff;
} }
} }
/*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/ /*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
video::-webkit-media-controls { video::-webkit-media-controls {
display: none !important; display: none !important;
} }
.video-cover { .video-cover {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
@ -2512,9 +2544,9 @@
background: transparent; background: transparent;
z-index: 99999999; z-index: 99999999;
cursor: pointer; cursor: pointer;
} }
.batch-video-cover { .batch-video-cover {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
@ -2524,9 +2556,9 @@
width: 512px; width: 512px;
margin-top: 14px; margin-top: 14px;
cursor: pointer; cursor: pointer;
} }
.waterMark { .waterMark {
position: absolute; position: absolute;
z-index: 99999999; z-index: 99999999;
color: #0058e1; color: #0058e1;
@ -2535,38 +2567,38 @@
opacity: 0.4; opacity: 0.4;
transform: rotate(-25deg); transform: rotate(-25deg);
width: 470px; width: 470px;
} }
// 左上 // 左上
.waterMark-left-top { .waterMark-left-top {
left: 50px; left: 50px;
top: 100px; top: 100px;
text-align: left; text-align: left;
} }
// 右上 // 右上
.waterMark-right-top { .waterMark-right-top {
right: 50px; right: 50px;
top: 100px; top: 100px;
text-align: right; text-align: right;
} }
// 左下 // 左下
.waterMark-left-bottom { .waterMark-left-bottom {
left: 50px; left: 50px;
bottom: 100px; bottom: 100px;
text-align: left; text-align: left;
} }
// 右下 // 右下
.waterMark-right-bottom { .waterMark-right-bottom {
right: 50px; right: 50px;
bottom: 100px; bottom: 100px;
text-align: right; text-align: right;
} }
// 批量 // 批量
.batch-waterMark { .batch-waterMark {
position: absolute; position: absolute;
z-index: 99999999; z-index: 99999999;
color: #0058e1; color: #0058e1;
@ -2574,33 +2606,33 @@
opacity: 0.4; opacity: 0.4;
transform: rotate(-25deg); transform: rotate(-25deg);
width: 200px; width: 200px;
} }
// 左上 // 左上
.batch-waterMark-left-top { .batch-waterMark-left-top {
left: 30px; left: 30px;
top: 50px; top: 50px;
text-align: left; text-align: left;
} }
// 右上 // 右上
.batch-waterMark-right-top { .batch-waterMark-right-top {
text-align: right; text-align: right;
right: 30px; right: 30px;
top: 80px; top: 80px;
} }
// 左下 // 左下
.batch-waterMark-left-bottom { .batch-waterMark-left-bottom {
left: 30px; left: 30px;
bottom: 50px; bottom: 50px;
text-align: left; text-align: left;
} }
// 右下 // 右下
.batch-waterMark-right-bottom { .batch-waterMark-right-bottom {
right: 20px; right: 20px;
bottom: 30px; bottom: 30px;
text-align: right; text-align: right;
} }
</style> </style>

20
front/src/views/newHome/index.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-23 16:41:49 * @Date: 2022-06-23 16:41:49
* @LastEditors: hisense.liangjunhua * @LastEditors: Light
* @LastEditTime: 2022-07-04 17:53:27 * @LastEditTime: 2022-10-13 16:40:15
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -32,21 +32,21 @@
import HomeFooter from '@/views/newHome/components/Footer' import HomeFooter from '@/views/newHome/components/Footer'
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@font-face { @font-face {
font-family: 'text-typeface'; font-family: 'text-typeface';
src: url('~@/assets/newHome/font/text-typeface.otf'); src: url('~@/assets/newHome/font/text-typeface.otf');
} }
@font-face { @font-face {
font-family: 'num-typeface'; font-family: 'num-typeface';
src: url('~@/assets/newHome/font/num-typeface.otf'); src: url('~@/assets/newHome/font/num-typeface.otf');
} }
.newHome { .newHome {
font-family: text-typeface; font-family: text-typeface;
.num { .num {
font-family: num-typeface; font-family: num-typeface;
} }
} }
.resource-aggregation { .resource-aggregation {
background: #fff; background: #fff;
} }
</style> </style>