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

This commit is contained in:
gaoyuanwei 2022-07-01 18:33:26 +08:00
commit 076ea19f88
20 changed files with 261 additions and 125 deletions

View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-30 21:21:10 * @LastEditTime: 2022-07-01 17:06:39
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-30 11:05:52 * @LastEditTime: 2022-07-01 17:40:37
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
const newLocation = 'qingdao' const newLocation = 'qingdao'
@ -30,7 +30,7 @@ if (newLocation === 'qingdao') {
{ name: '能力集市', key: 'DetailsPageconetent' }, { name: '能力集市', key: 'DetailsPageconetent' },
{ name: '能力云图', key: 'capabilityCloud' }, { name: '能力云图', key: 'capabilityCloud' },
{ name: '能力统计', key: 'abilityStatistics' }, { name: '能力统计', key: 'abilityStatistics' },
{ name: '开发指南', key: 'developmentGuide' }, // { name: '', key: 'developmentGuide' },
{ name: '需求中心', key: 'demandCenter' }, { name: '需求中心', key: 'demandCenter' },
// { name: '', key: 'personalCenter' }, // { name: '', key: 'personalCenter' },
{ name: '区市站点', key: 'mapTest' }, { name: '区市站点', key: 'mapTest' },
@ -116,7 +116,7 @@ else if (newLocation === 'baotou') {
{ name: '能力集市', key: 'DetailsPageconetent' }, { name: '能力集市', key: 'DetailsPageconetent' },
{ name: '能力云图', key: 'capabilityCloud' }, { name: '能力云图', key: 'capabilityCloud' },
{ name: '能力统计', key: 'abilityStatistics' }, { name: '能力统计', key: 'abilityStatistics' },
{ name: '开发指南', key: 'developmentGuide' }, // { name: '', key: 'developmentGuide' },
{ name: '需求中心', key: 'demandCenter' }, { name: '需求中心', key: 'demandCenter' },
// { name: '', key: 'personalCenter' }, // { name: '', key: 'personalCenter' },
// { name: '', key: 'mapTest' }, // { name: '', key: 'mapTest' },
@ -152,7 +152,7 @@ else if (newLocation === 'xihaian') {
{ name: '能力集市', key: 'DetailsPageconetent' }, { name: '能力集市', key: 'DetailsPageconetent' },
{ name: '能力云图', key: 'capabilityCloud' }, { name: '能力云图', key: 'capabilityCloud' },
{ name: '能力统计', key: 'abilityStatistics' }, { name: '能力统计', key: 'abilityStatistics' },
{ name: '开发指南', key: 'developmentGuide' }, // { name: '', key: 'developmentGuide' },
{ name: '需求中心', key: 'demandCenter' }, { name: '需求中心', key: 'demandCenter' },
// { name: '', key: 'personalCenter' }, // { name: '', key: 'personalCenter' },
// { name: '', key: 'mapTest' }, // { name: '', key: 'mapTest' },

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -161,18 +161,22 @@
) )
function technical() { function technical() {
// //
const type = pinyin(props.dataList.type, { // const type = pinyin(props.dataList.type, {
pattern: 'initial', // pattern: 'initial',
}).replace(/\s*/g, '') // }).replace(/\s*/g, '')
// // //
const id = props.dataList.id // const id = props.dataList.id
window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank') // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
// console.log('dataFrom.value.link', dataFrom.value.link) // console.log('dataFrom.value.link', dataFrom.value.link)
// window.open( let obj = props.dataList.infoList.filter(
// window.SITE_CONFIG.previewUrl + (item) => item.attrType === '技术文档'
// 'hisense_office/onlinePreview?url=' + )[0]
// btoa(encodeURI(dataFrom.value.link)) console.log('dataFrom.value.link', obj.attrValue)
// ) window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} }
</script> </script>

View File

@ -192,18 +192,22 @@
) )
function technical() { function technical() {
// //
const type = pinyin(props.dataList.type, { // const type = pinyin(props.dataList.type, {
pattern: 'initial', // pattern: 'initial',
}).replace(/\s*/g, '') // }).replace(/\s*/g, '')
// // //
const id = props.dataList.id // const id = props.dataList.id
window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank') // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
// console.log('dataFrom.value.link', dataFrom.value.link) // console.log('dataFrom.value.link', dataFrom.value.link)
// window.open( let obj = props.dataList.infoList.filter(
// window.SITE_CONFIG.previewUrl + (item) => item.attrType === '技术文档'
// 'hisense_office/onlinePreview?url=' + )[0]
// btoa(encodeURI(dataFrom.value.link)) console.log('dataFrom.value.link', obj.attrValue)
// ) window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} }
function technicalNew() { function technicalNew() {
// //

View File

@ -113,18 +113,22 @@
// //
function technical() { function technical() {
// //
const type = pinyin(props.dataList.type, { // const type = pinyin(props.dataList.type, {
pattern: 'initial', // pattern: 'initial',
}).replace(/\s*/g, '') // }).replace(/\s*/g, '')
// // //
const id = props.dataList.id // const id = props.dataList.id
window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank') // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
// console.log('dataFrom.value.link', dataFrom.value.link) // console.log('dataFrom.value.link', dataFrom.value.link)
// window.open( let obj = props.dataList.infoList.filter(
// window.SITE_CONFIG.previewUrl + (item) => item.attrType === '技术文档'
// 'hisense_office/onlinePreview?url=' + )[0]
// btoa(encodeURI(dataFrom.value.link)) console.log('dataFrom.value.link', obj.attrValue)
// ) window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} }
function technicaltow() { function technicaltow() {
let obj = props.dataList.infoList.filter( let obj = props.dataList.infoList.filter(

View File

@ -194,18 +194,22 @@
) )
function technical() { function technical() {
// //
const type = pinyin(props.dataList.type, { // const type = pinyin(props.dataList.type, {
pattern: 'initial', // pattern: 'initial',
}).replace(/\s*/g, '') // }).replace(/\s*/g, '')
// // //
const id = props.dataList.id // const id = props.dataList.id
window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank') // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
// console.log('dataFrom.value.link', dataFrom.value.link) // console.log('dataFrom.value.link', dataFrom.value.link)
// window.open( let obj = props.dataList.infoList.filter(
// window.SITE_CONFIG.previewUrl + (item) => item.attrType === '技术文档'
// 'hisense_office/onlinePreview?url=' + )[0]
// btoa(encodeURI(dataFrom.value.link)) console.log('dataFrom.value.link', obj.attrValue)
// ) window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} }
function technicalNew() { function technicalNew() {
// //
@ -215,11 +219,14 @@
// // // //
// const id = props.dataList.id // const id = props.dataList.id
// window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank') // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
console.log('dataFrom.value.link', dataFrom.value.link) let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
window.open( window.open(
window.SITE_CONFIG.previewUrl + window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' + 'hisense_office/onlinePreview?url=' +
btoa(encodeURI(dataFrom.value.link)) btoa(encodeURI(obj.attrValue))
) )
} }
</script> </script>

View File

@ -296,17 +296,13 @@
text: '是否支持试用', text: '是否支持试用',
key: '', key: '',
}, },
{
text: '试用描述',
key: '',
},
{ {
text: '试用地址', text: '试用地址',
}, },
], ],
服务商: [ 服务商: [
{ {
text: '服务商', text: '服务商',
}, },
{ {
text: '服务商联系人', text: '服务商联系人',
@ -432,6 +428,7 @@
obj.infoList = getInfoList(trName) obj.infoList = getInfoList(trName)
list.push(obj) list.push(obj)
} else { } else {
console.log(titleKey, trName)
_newObj.groupList = getGroupList(titleKey, trName) _newObj.groupList = getGroupList(titleKey, trName)
} }
}) })
@ -440,6 +437,8 @@
} }
tableData.value.push(_newObj) tableData.value.push(_newObj)
}) })
console.log('11111111111111', tableData.value)
} }
// //
@ -457,18 +456,25 @@
const getGroupList = (titleKey, trName) => { const getGroupList = (titleKey, trName) => {
let arr = [] let arr = []
detailArray.value.map((item) => { detailArray.value.map((item) => {
if (arrayStr.includes(titleKey)) { if (item) {
let groupItemObj = {} if (arrayStr.includes(titleKey)) {
let _list = item[titleKey] || [] let groupItemObj = {}
let textInfo = textObj[titleKey] let _list = item[titleKey] || []
_list.map((v) => { let textInfo = textObj[titleKey]
Object.keys(v).map((d) => { _list.map((v) => {
if (textInfo[d] !== undefined) { // console.log(v)
groupItemObj[textInfo[d]] = v[d] Object.keys(v).map((d) => {
} console.log(textInfo[d])
if (textInfo[d]) {
if (!groupItemObj[textInfo[d]]) {
groupItemObj[textInfo[d]] = ''
}
groupItemObj[textInfo[d]] += v[d] + ';'
}
})
}) })
}) arr.push(groupItemObj)
arr.push(groupItemObj) }
} }
}) })
let _arr = translateArray(arr) let _arr = translateArray(arr)

View File

@ -601,7 +601,7 @@
} }
}) })
} }
}, 500) }, 2000)
} }
const handleBlur = () => { const handleBlur = () => {

View File

@ -31,15 +31,27 @@
v-for="(item, index) in resourceList.data" v-for="(item, index) in resourceList.data"
:key="item.index" :key="item.index"
> >
<div class="item"> <div class="item" :key="showKey">
<div <div
class="left" class="left"
:class=" :class="
item.type == '应用资源' item.type == '应用资源'
? 'yyzy' ? 'yyzy'
: item.applicationType == '智能算法' : item.type == '数据资源'
? 'sjzy'
: item.infoList.filter((val) => val.attrType == '组件类型')[0]
.attrValue == '智能算法'
? 'znsf' ? 'znsf'
: 'gis' : item.infoList.filter((val) => val.attrType == '组件类型')[0]
.attrValue == '图层服务'
? 'tcfw'
: item.infoList.filter((val) => val.attrType == '组件类型')[0]
.attrValue == '开发组件'
? 'kfzj'
: item.infoList.filter((val) => val.attrType == '组件类型')[0]
.attrValue == '业务组件'
? 'ywzj'
: ''
" "
v-if="selectCardsname !== '基础设施'" v-if="selectCardsname !== '基础设施'"
></div> ></div>
@ -139,12 +151,17 @@
<div class="btn"> <div class="btn">
<div class="right" v-if="selectCardsname !== '基础设施'"> <div class="right" v-if="selectCardsname !== '基础设施'">
<div class="shopping" :key="shoppingKey"> <div class="shopping" :key="shoppingKey">
<span class="shopping-down" v-if="item.isInShoppingCart"></span> <template v-if="selectCardsname == '组件服务'">
<span <span
class="shopping-on" class="shopping-down"
v-else v-if="item.isInShoppingCart"
@click="addShoppingCart(item, index)" ></span>
></span> <span
class="shopping-on"
v-else
@click="addShoppingCart(item, index)"
></span>
</template>
</div> </div>
<div class="sc"> <div class="sc">
<span <span
@ -328,6 +345,7 @@
setup(props) { setup(props) {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
const whoShow1 = whoShow const whoShow1 = whoShow
const showKey = ref(0)
let shoppingKey = ref(1) let shoppingKey = ref(1)
// id // id
const selList = ref([ const selList = ref([
@ -353,6 +371,32 @@
}) })
} }
} }
console.log('this.resourceList', props.resourceList.data)
props.resourceList.data.map((val) => {
if (val.infoList) {
let obj = val.infoList.filter(
(item) => item.attrType == '组件类型'
)[0]
if (obj) {
switch (obj.attrValue) {
case '智能算法':
val.applicationType = 'znsf'
break
case '图层服务':
val.applicationType = 'tcfw'
break
case '开发组件':
val.applicationType = 'kfzj'
break
case '业务组件':
val.applicationType = 'ywzj'
break
}
console.log('obj', val.applicationType)
}
}
})
showKey.value++
const selData = ref('total') const selData = ref('total')
const flag = ref(true) const flag = ref(true)
// userId // userId
@ -548,6 +592,7 @@
visible, visible,
goComparePk, goComparePk,
whoShow1, whoShow1,
showKey,
} }
}, },
beforeUnmount() { beforeUnmount() {
@ -654,6 +699,7 @@
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
align-items: center;
.left { .left {
display: inline-block; display: inline-block;
@ -667,22 +713,28 @@
} }
.yyzy { .yyzy {
background: url('~@/assets/home/yyzy-bg.png') no-repeat; background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 120px 110px; background-size: 100%;
} }
.sjzy {
background: url('~@/assets/home/sjzy_square.png') no-repeat;
background-size: 100%;
}
.znsf { .znsf {
background: url('~@/assets/home/znsf-bg.png') no-repeat; background: url('~@/assets/home/znsf_square.png') no-repeat;
background-size: 120px 110px; background-size: 100%;
} }
.tcfw {
.gis { background: url('~@/assets/home/tcfw_square.png') no-repeat;
background: url('~@/assets/home/gis-bg.png') no-repeat; background-size: 100%;
background-size: 120px 110px;
} }
.kfzj {
.jcss { background: url('~@/assets/home/kfzj_square.png') no-repeat;
background: url('~@/assets/home/jcss-bg.png') no-repeat; background-size: 100%;
}
.ywzj {
background: url('~@/assets/home/ywzj_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }

View File

@ -118,6 +118,7 @@
import { getCategoryTreePage } from '@/api/personalCenter' import { getCategoryTreePage } from '@/api/personalCenter'
import { dataType } from 'element-plus/es/components/table-v2/src/common' import { dataType } from 'element-plus/es/components/table-v2/src/common'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
import { ref, reactive, onMounted } from 'vue' import { ref, reactive, onMounted } from 'vue'
import { import {
getCameraByParentId, getCameraByParentId,
@ -125,7 +126,6 @@
getCameraAllLabel, getCameraAllLabel,
} from '@/api/videoSurveillance' } from '@/api/videoSurveillance'
import { sgcInsert } from '@/api/home' import { sgcInsert } from '@/api/home'
import { message } from 'ant-design-vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
const router = useRouter() const router = useRouter()
const options = reactive({ const options = reactive({
@ -156,7 +156,7 @@
], //, ], //,
}) })
let visible = ref(false) let visible = ref(false)
const jjssType = ref(router.currentRoute.value.query.type) const jcssType = ref(router.currentRoute.value.query.type)
const pagination = ref({ const pagination = ref({
total: 0, total: 0,
current: 1, current: 1,
@ -178,13 +178,16 @@
}) })
const showMap = ref(true) const showMap = ref(true)
onMounted(() => { onMounted(() => {
if (jjssType.value) { if (jcssType.value) {
tabClick(0, jjssType.value) tabClick(0, jcssType.value)
if (jcssType.value == '视频资源') {
getCamera()
}
} else { } else {
tabClick(0, '视频资源') tabClick(0, '视频资源')
getCamera()
} }
getCamera()
mybus.off('getListByParentId') mybus.off('getListByParentId')
mybus.on('getListByParentId', (parentId) => { mybus.on('getListByParentId', (parentId) => {
mapSearchParam.value.parentId = parentId mapSearchParam.value.parentId = parentId
@ -250,7 +253,6 @@
let tableHeight = ref('600') let tableHeight = ref('600')
//tab //tab
const tabClick = (indexFather, name) => { const tabClick = (indexFather, name) => {
debugger
if (clickList.value[indexFather].content.indexOf(name) != -1) { if (clickList.value[indexFather].content.indexOf(name) != -1) {
if (name == '视频资源') { if (name == '视频资源') {
tableHeight.value = 330 tableHeight.value = 330
@ -327,6 +329,19 @@
clickList.value[indexFather].content.push(name) clickList.value[indexFather].content.push(name)
} }
} }
// labelCode
mapSearchParam.value.labelCodes = []
clickList.value[1].content.map((item) => {
mapSearchParam.value.labelCodes.push(item.labelCode)
})
console.log('选中的标签code', mapSearchParam.value)
mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
if (name == '视频资源') {
getCamera()
} else {
dataSource.value = []
pagination.value.total = 0
}
} }
// //
const nullClick = () => { const nullClick = () => {
@ -350,26 +365,30 @@
dept.deptName = infrastructure.deptName dept.deptName = infrastructure.deptName
} }
const apply = () => { const apply = () => {
console.log('一键申请', selectedList.value) if (selectedRowKeys.value.length != 0) {
let arr = [ console.log('一键申请', selectedList.value)
{ let arr = [
arr: [ {
{ arr: [
description: '', {
note1: JSON.stringify(selectedList.value), description: '',
resourceId: '1522550195055828996', note1: JSON.stringify(selectedList.value),
resourceName: '摄像头列表', resourceId: '1522550195055828996',
type: '基础设施', resourceName: '摄像头列表',
}, type: '基础设施',
], },
deptId: dept.deptId, ],
deptName: dept.deptName, deptId: dept.deptId,
}, deptName: dept.deptName,
] },
localStorage.setItem('applyList', JSON.stringify(arr)) ]
router.push({ localStorage.setItem('applyList', JSON.stringify(arr))
path: '/apply', router.push({
}) path: '/apply',
})
} else {
message.error('请选择需要申请的数据')
}
} }
// //
const addShopCar = () => { const addShopCar = () => {

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-21 11:55:07 * @Date: 2022-06-21 11:55:07
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-30 18:18:57 * @LastEditTime: 2022-07-01 17:03:24
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -211,7 +211,7 @@
} }
const read = (item) => { const read = (item) => {
// console.log(item) // console.log(item)
if (selectData.value.length === 0) { if (selectData.value.length === 0 && !item) {
message.error('未选择消息!') message.error('未选择消息!')
return return
} }

View File

@ -71,7 +71,7 @@
</p> </p>
</div> </div>
<div class="content-body-content" v-if="item.currentTaskList"> <div class="content-body-content" v-if="item.currentTaskList">
<p class="content-body-content-son"> <p class="content-body-content-son" v-if="!item.backToFirst">
当前节点{{ item.currentTaskList[0].taskName }} 当前节点{{ item.currentTaskList[0].taskName }}
</p> </p>
</div> </div>
@ -136,13 +136,7 @@
<div></div> <div></div>
</div> </div>
<div class="button-box"> <div class="button-box">
<div <div class="button" @click="showDetail(item)">查看流程</div>
class="button"
@click="showDetail(item)"
v-if="!(item.processDefinitionName == '能力申请')"
>
查看流程
</div>
<!-- <div class="button" @click="showAdd(item)" v-if="item.backToFirst"> <!-- <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
修改 修改
</div> --> </div> -->

View File

@ -159,6 +159,22 @@
:checked="item.checked" :checked="item.checked"
@click.stop="checkedItem(val, item)" @click.stop="checkedItem(val, item)"
></a-checkbox> ></a-checkbox>
<div
class="tx"
:class="
item.type == '基础设施'
? 'sxt'
: item.componentType == '智能算法'
? 'znsf'
: item.componentType == '图层服务'
? 'tcfw'
: item.componentType == '开发组件'
? 'kfzj'
: item.componentType == '业务组件'
? 'ywzj'
: ''
"
></div>
</template> </template>
</a-list-item-meta> </a-list-item-meta>
</a-skeleton> </a-skeleton>
@ -870,7 +886,37 @@
} }
} }
} }
:deep(.ant-list-item-meta-avatar) {
display: flex;
align-items: center;
}
.ant-pagination { .ant-pagination {
margin-bottom: 0.2rem; margin-bottom: 0.2rem;
} }
.tx {
display: inline-block;
width: 0.8rem;
height: 0.8rem;
margin-left: 0.1rem;
}
.sxt {
background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%;
}
.znsf {
background: url('~@/assets/home/znsf_square.png') no-repeat;
background-size: 100%;
}
.tcfw {
background: url('~@/assets/home/tcfw_square.png') no-repeat;
background-size: 100%;
}
.kfzj {
background: url('~@/assets/home/kfzj_square.png') no-repeat;
background-size: 100%;
}
.ywzj {
background: url('~@/assets/home/ywzj_square.png') no-repeat;
background-size: 100%;
}
</style> </style>