diff --git a/back/public/index.html b/back/public/index.html index c8f9e70b..5ba2148d 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-26 20:23:13 + * @LastEditTime: 2022-07-28 20:14:40 * @Description: 告诉大家这是什么 --> @@ -45,9 +45,9 @@ // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; + // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // WebSocket地址 window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket'; diff --git a/back/src/router/index.js b/back/src/router/index.js index b2f3777e..c386dc1b 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -5,10 +5,9 @@ import { isURL } from '@/utils/validate' import store from '@/store' import Cookies from 'js-cookie' - // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题 const originalPush = Router.prototype.push -Router.prototype.push = function push(location) { +Router.prototype.push = function push (location) { return originalPush.call(this, location).catch(err => err) } @@ -42,7 +41,8 @@ export const moduleRoutes = { meta: { title: '主入口布局' }, children: [ // todos 临时调整，后期去掉 - { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }, + // { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }, + { path: '/home', redirect: '/workBench-workBench', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }, { path: '/iframe', component: null, name: 'iframe', meta: { title: 'iframe', isTab: true } } ] } diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 3ad53de6..9e3833ac 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -801,6 +801,8 @@ export default { } ) this.submitFrom.infoList = newArr + // 检验是否有空值 + this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue) this.$http .put('/resource/update', this.submitFrom) .then(({ data: res }) => { diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 382d93b1..84874bc2 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -709,6 +709,8 @@ export default { } }) console.log('编辑===============>', this.submitFrom) + // 检验是否有空值 + this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue) this.$http .put('/resource/update', this.submitFrom) .then(({ data: res }) => { diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue index 9837ee1a..4f1e12cc 100644 --- a/back/src/views/modules/activiti/demo/putaway-process3.vue +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -117,6 +117,7 @@ @@ -109,6 +109,7 @@ \ No newline at end of file + diff --git a/front/src/api/capabilityCloud.js b/front/src/api/capabilityCloud.js index 8c72303b..d6e2e151 100644 --- a/front/src/api/capabilityCloud.js +++ b/front/src/api/capabilityCloud.js @@ -97,8 +97,15 @@ export function callTheTrendPort(start, end, params) { export function totalCallsSnum(params) { return request({ url: - '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' + - params, + `metrics/api/v1/query?query=sum(increase(apigateway_http_status))&time=${params}`, + method: 'get', + }) +} +//能力云图-调用成功次数 +export function totalCallsSnum2(params) { + return request({ + url: + `metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}))&time=${params}`, method: 'get', }) } diff --git a/front/src/router/index.js b/front/src/router/index.js index 8a34d071..729ba193 100644 --- a/front/src/router/index.js +++ b/front/src/router/index.js @@ -453,6 +453,15 @@ export const constantRoutes = [ icon: 'error-warning-line', }, }, + { + path: '/packagingDetails', + name: 'packagingDetails', + component: () => import('@/views/home/packagingDetails'), + meta: { + title: '打包模式详情', + icon: 'error-warning-line', + }, + }, { path: '/integrationServices', name: 'integrationServices', diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue index 799722d6..b3359fd0 100644 --- a/front/src/views/capabilityCloud/components/ComponentServices.vue +++ b/front/src/views/capabilityCloud/components/ComponentServices.vue @@ -119,6 +119,7 @@ componentServiceRank, callTheTrendPort, totalCallsSnum, + totalCallsSnum2, } from '@/api/capabilityCloud' import * as moment from 'moment' let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本 @@ -410,6 +411,13 @@ if (!xinhaianIsShow) { totalCallsSnum(end).then((res) => { snum.value[1].num = res.data.data.result[0].value[1] + totalCallsSnum2(end).then((resSon) => { + snum.value[2].num = + ((snum.value[1].num - resSon.data.data.result[0].value[1]) / + snum.value[1].num) * + 100 + + '%' + }) }) } } diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index e7510cd5..531885ad 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -6,153 +6,101 @@ 检测结果: {{ resourceTotal || '' }} 个{{ - cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : '' + cardType == '组件服务' ? '组件' : cardType == '应用资源' ? '应用' : '' }}
    -
  • +
  • {{ item.name }} - +
    -
  • +
  • {{ item.name }} - +
-
+
-
+ - + .attrValue + " />
-
- +
-
+ ? 'znsf' + : item.infoList && + item.infoList.filter((val) => val.attrType == '组件类型')[0] + .attrValue == '智能算法' + ? 'znsf' + : item.infoList && + item.infoList.filter((val) => val.attrType == '组件类型')[0] + .attrValue == '图层服务' + ? 'tcfw' + : item.infoList && + item.infoList.filter((val) => val.attrType == '组件类型')[0] + .attrValue == '开发组件' + ? 'kfzj' + : item.infoList && + item.infoList.filter((val) => val.attrType == '组件类型')[0] + .attrValue == '业务组件' + ? 'ywzj' + : '' + " v-else-if=" + selectCardsname !== '基础设施' && selectCardsname !== '融合服务' +">
{{ item.name }} - + + fill="#d81e06" p-id="3063"> + fill="#d81e06" p-id="3064"> + fill="#d81e06" p-id="3065">
-
- diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index fe18730d..ca2033eb 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -23,13 +23,44 @@
- + +
+
+ +
+
+
+
+
{{i+1}}.{{item.description}}
+
+
+
+ + +
+
+ +
+
+
+
{{i+1}}.{{item.description}}
+
+
+
+ +
- +
@@ -43,48 +74,23 @@
- -
+ +
- +
-
-
-
-
文档
- -
-
-
技术文档
-
使用手册
-
-
-
-
-
{{ use.title }}
-
- {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }} -
-
+
+
+ + +
- - -
@@ -102,6 +108,9 @@ const router = useRouter() const scrollTop = ref(0) const domArr = ref([]) + const painPoint = ref([]) + const solution = ref([]) + const step=ref([]) const id = router.currentRoute.value.query.id document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.scrollTop = 0 @@ -117,20 +126,24 @@ const navList = ref([ { - name: '组合能力', + name: '场景痛点', + key: 'integration-pain-point', + }, + { + name: '解决方案', + key: 'integration-solution', + }, + { + name: '使用能力', key: 'integration-combination-ability', }, { - name: '使用方式', - key: 'integration-use-way', - }, - { - name: '常见问题', - key: 'common-problem', + name: '构建步骤', + key: 'integration-step', }, ]) - const selectNow = ref('integration-combination-ability') + const selectNow = ref('integration-pain-point') const useWayShowList = ref([ { @@ -214,9 +227,12 @@ attrType: '常见问题', attrValue: questionValue.attrValue || '[]', } + painPoint.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '场景痛点').attrValue) || [] + solution.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '解决方案').attrValue) || [] + step.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '使用步骤').attrValue) || [] let areaObj = { attrType: '应用领域', - attrValue: detailInfoObj.value.applicationArea, + attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue, } combineList.value.map((item) => { let arr = ( @@ -409,6 +425,43 @@ } } + .pain-point { + padding: 0.8rem 0; + background: rgb(247, 248, 250); + .bg { + height: 2rem; + width: 2rem; + background: url('~@/assets/home/rhfw_square.png') no-repeat; + background-size: 100%; + margin-top: 0.3rem; + } + .content { + height: 2rem; + width: 6rem; + .content-item { + margin: 0.1rem; + } + } + } + + .solution { + padding: 0.8rem 0; + background: rgb(247, 248, 250); + .content { + height: 2rem; + width: 8rem; + .content-item { + margin: 0.3rem; + } + } + } + + .step { + padding: 0.8rem 0; + background: rgb(247, 248, 250); + + } + .combination-ability { padding: 0.8rem 0; background: rgb(247, 248, 250); diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue new file mode 100644 index 00000000..da672d45 --- /dev/null +++ b/front/src/views/home/packagingDetails.vue @@ -0,0 +1,153 @@ + + + diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 54b2653d..32097d52 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -224,7 +224,7 @@ pageSize: this.mapSearchParam.pageSize, name: this.mapSearchParam.cameraName || '', longitude: this.mapSearchParam.gpsX || '', - atitude: this.mapSearchParam.gpsY || '', + latitude: this.mapSearchParam.gpsY || '', radius: this.mapSearchParam.radius || '', } let paramsFather = ''