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

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

# Conflicts:
#	front/src/views/home/DetailsPageconetent.vue
This commit is contained in:
a0049873 2022-06-24 19:50:41 +08:00
parent 2bb502921f 2caa5a859c
commit 5cab30d2cc
6 changed files with 27 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/src/views/modules/ability/bsabilityai.vue
View File

@ -120,7 +120,7 @@
ref="addOrUpdate" ref="addOrUpdate"
@refreshDataList="getDataList" @refreshDataList="getDataList"
></add-or-update> ></add-or-update>
<relate-application v-if="relateApplicationVisible" ref="relateApplication" :relateInfo="relateInfo" @isShowRelatePopup="handleIsShowRelatePopup"></relate-application> <relate-application v-if="relateApplicationVisible" ref="relateApplication" :nameArray="['未关联应用名称', '已关联应用名称']" :relateInfo="relateInfo" @isShowRelatePopup="handleIsShowRelatePopup"></relate-application>
</div> </div>
</el-card> </el-card>
</template> </template>

2
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -66,7 +66,7 @@
:label="item.attrType" :label="item.attrType"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ findValue(scope.row.infoList, item.attrType) }} {{ findValue(scope.row.infoList, item.attrType) }}

6
front/package.json
View File

@ -67,11 +67,11 @@
"stylelint": "^13.13.1", "stylelint": "^13.13.1",
"stylelint-config-prettier": "^8.0.2", "stylelint-config-prettier": "^8.0.2",
"stylelint-config-recess-order": "^2.4.0", "stylelint-config-recess-order": "^2.4.0",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"svg-sprite-loader": "^6.0.9", "svg-sprite-loader": "^6.0.9",
"vab-config": "0.0.8", "vab-config": "0.0.8",
"webpackbar": "^5.0.0-3", "webpackbar": "^5.0.0-3"
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2"
}, },
"gitHooks": { "gitHooks": {
"pre-commit": "lint-staged" "pre-commit": "lint-staged"

20
front/public/index.html
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-23 14:37:03 * @LastEditTime: 2022-06-24 19:49:15
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -44,15 +44,15 @@
// window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
// 开发 // 开发
// window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796'; window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796';
// window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
// 穿透版本 // 穿透版本
window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/';
window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
</script> </script>
<link href="./leaflet/libs/leaflet/1.3.1/leaflet.css" rel="stylesheet"> <link href="./leaflet/libs/leaflet/1.3.1/leaflet.css" rel="stylesheet">

20
front/public/static/config/location.js
View File

@ -2,12 +2,12 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-23 17:55:06 * @LastEditTime: 2022-06-24 18:16:44
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
const newLocation = 'qingdao' // const newLocation = 'qingdao'
// const newLocation = 'baotou' // const newLocation = 'baotou'
// const newLocation = 'xihaian' const newLocation = 'qingdao'
// 数据资源数据 // 数据资源数据
const whoShow = {} const whoShow = {}
@ -57,39 +57,39 @@ if (newLocation === 'qingdao') {
{ {
name: '基础设施', name: '基础设施',
key: 'lsjcss', key: 'lsjcss',
num: 20135, num: '20135路',
}, },
{ {
name: '数据资源', name: '数据资源',
key: 'lsjcss', key: 'lsjcss',
num: 857, num: '857条',
}, },
{ {
name: '应用资源', name: '应用资源',
key: 'lsjcss', key: 'lsjcss',
num: 28, num: '28个',
}, },
] ]
mapTestNum.xhaNum = [ mapTestNum.xhaNum = [
{ {
name: '基础设施', name: '基础设施',
key: 'xhajcss', key: 'xhajcss',
num: 35282, num: '35282路',
}, },
{ {
name: '数据资源', name: '数据资源',
key: 'xhajcss', key: 'xhajcss',
num: 11, num: '11条',
}, },
{ {
name: '应用资源', name: '应用资源',
key: 'xhajcss', key: 'xhajcss',
num: 23, num: '23个',
}, },
{ {
name: '组件服务', name: '组件服务',
key: 'xhazjfw', key: 'xhazjfw',
num: 8, num: '8个',
}, },
] ]
} }

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

@ -1,15 +1,11 @@
<template> <template>
<!-- 青岛 --> <!-- 青岛 -->
<div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao"> <div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
<home-header></home-header> <home-header></home-header>
<div class="details-pageconetent-left" v-if="Cardsname != '基础设施'"> <div class="details-pageconetent-left">
<detailsPageconetentTree /> <detailsPageconetentTree />
</div> </div>
<div class="details-pageconetent-left" v-else> <div class="top" v-if="Cardsname != '知识库'">
<detailsPageInfrastructureTree />
</div>
<div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
<div class="top-title"> <div class="top-title">
<div <div
v-for="item in titleName" v-for="item in titleName"
@ -147,28 +143,6 @@
<a-empty /> <a-empty />
</div> </div>
</div> </div>
<div class="top" v-else-if="Cardsname === '基础设施'">
<div class="top-title">
<div
v-for="item in titleName"
:key="item.name"
:class="item.name === Cardsname ? 'sel' : ''"
@click="changeCards(item.name)"
>
<span
class="photo"
:style="{
backgroundImage: `url(${item.photo}) `,
backgroundSize: 'cover',
}"
></span>
<span>{{ item.name }}</span>
</div>
</div>
<div class="">
<infrastructure-page></infrastructure-page>
</div>
</div>
<div class="top" v-else> <div class="top" v-else>
<div class="top-title"> <div class="top-title">
<div <div
@ -682,9 +656,6 @@
// import VideoSurveillance from '@/views/home/videoSurveillance' // import VideoSurveillance from '@/views/home/videoSurveillance'
// 数据资源引用 // 数据资源引用
import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue' import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
// 基础设施引用
import InfrastructurePage from './infrastructurePage.vue'
import detailsPageInfrastructureTree from './detailsPageInfrastructureTree.vue'
export default defineComponent({ export default defineComponent({
setup() { setup() {
// const store = useStore() // const store = useStore()
@ -716,7 +687,6 @@
// const jichusheshi=ref([ // const jichusheshi=ref([
// { // {
// name:'青岛市云资源管理平台' // name:'青岛市云资源管理平台'
// } // }
// ]) // ])
// 模糊查询 // 模糊查询
@ -811,7 +781,6 @@
} }
// 免批 // 免批
const tagFlag = ref('') const tagFlag = ref('')
// 视频资源 // 视频资源
const stateTags = ref(['在线', '离线']) const stateTags = ref(['在线', '离线'])
const selStateTags = ref([]) const selStateTags = ref([])
@ -1322,8 +1291,6 @@
// VideoCameraOutlined, // VideoCameraOutlined,
// VideoSurveillance, // VideoSurveillance,
DetailsPageResource, DetailsPageResource,
InfrastructurePage,
detailsPageInfrastructureTree,
}, },
beforeUnmount() { beforeUnmount() {
mybus.off('selectCardsitem') mybus.off('selectCardsitem')