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:3001/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
guoyue 2022-07-28 17:54:49 +08:00
parent 816d07495c d9139ae621
commit 488dbfbe5f
11 changed files with 170 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/src/router/index.js
View File

@ -5,10 +5,9 @@ import { isURL } from '@/utils/validate'
import store from '@/store' import store from '@/store'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
// 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题 // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题
const originalPush = Router.prototype.push 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) return originalPush.call(this, location).catch(err => err)
} }
@ -42,7 +41,8 @@ export const moduleRoutes = {
meta: { title: '主入口布局' }, meta: { title: '主入口布局' },
children: [ children: [
// todos 临时调整，后期去掉 // 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 } } { path: '/iframe', component: null, name: 'iframe', meta: { title: 'iframe', isTab: true } }
] ]
} }

1
back/src/views/modules/activiti/demo/putaway-process3.vue
View File

@ -117,6 +117,7 @@
<ren-process-detail></ren-process-detail> <ren-process-detail></ren-process-detail>
<el-dialog <el-dialog
title="审批意见" title="审批意见"
:close-on-click-modal="false"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" width="30%"
:before-close="handleClose" :before-close="handleClose"

1
back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
View File

@ -65,6 +65,7 @@
<ren-process-detail></ren-process-detail> <ren-process-detail></ren-process-detail>
<el-dialog <el-dialog
title="审批意见" title="审批意见"
:close-on-click-modal="false"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" width="30%"
:before-close="handleClose" :before-close="handleClose"

3
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51 * @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-25 09:42:46 * @LastEditTime: 2022-07-28 17:23:05
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
@ -109,6 +109,7 @@
<ren-process-detail></ren-process-detail> <ren-process-detail></ren-process-detail>
<el-dialog <el-dialog
title="审批意见" title="审批意见"
:close-on-click-modal="false"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" width="30%"
:before-close="handleClose" :before-close="handleClose"

21
back/src/views/modules/sys/user-add-or-update.vue
View File

@ -56,6 +56,7 @@ import { isEmail, isMobile } from '@/utils/validate'
export default { export default {
data () { data () {
return { return {
submitFlag: true,
visible: false, visible: false,
roleList: [], roleList: [],
roleIdListDefault: [], roleIdListDefault: [],
@ -170,6 +171,22 @@ export default {
]).then(() => { ]).then(() => {
if (this.dataForm.id) { if (this.dataForm.id) {
this.getInfo() this.getInfo()
} else {
this.dataForm = {
id: '',
username: '',
deptId: '',
deptName: '',
password: '',
confirmPassword: '',
realName: '',
gender: 0,
email: '',
mobile: '',
roleIdList: [],
postIdList: [],
status: 1
}
} }
}) })
}) })
@ -219,6 +236,8 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
if (this.submitFlag) {
this.submitFlag = false
this.dataForm.password = Encrypt(this.dataForm.password) this.dataForm.password = Encrypt(this.dataForm.password)
if (this.dataForm.id) { if (this.dataForm.id) {
delete this.dataForm.password delete this.dataForm.password
@ -242,7 +261,9 @@ export default {
this.$emit('refreshDataList') this.$emit('refreshDataList')
} }
}) })
this.submitFlag = true
}).catch(() => {}) }).catch(() => {})
}
}) })
}, 1000, { leading: true, trailing: false }) }, 1000, { leading: true, trailing: false })
} }

22
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.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-26 16:23:53 * @LastEditTime: 2022-07-28 14:42:55
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -48,16 +48,16 @@
// window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
// window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 西海岸版本 // 西海岸版本
// window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
// 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://localhost:8001'; // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/'; // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/'; // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
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['websocketURL'] = '15.2.21.236:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 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/';

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

@ -1,13 +1,13 @@
/* /*
* @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.wuhongjian
* @LastEditTime: 2022-07-28 09:36:58 * @LastEditTime: 2022-07-28 14:32:04
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
const newLocation = 'qingdao' //const newLocation = 'qingdao'
// const newLocation = 'baotou' // const newLocation = 'baotou'
// const newLocation = 'xihaian' const newLocation = 'xihaian'
// 数据资源数据 // 数据资源数据
const whoShow = {} const whoShow = {}

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

@ -239,7 +239,7 @@
getStreamByChannelCode(param).then((res) => { getStreamByChannelCode(param).then((res) => {
console.log(res) console.log(res)
visible.value = true visible.value = true
options.value.src = res.data.data options.src = res.data.data
}) })
} }
// const dataTypeList = () => { // const dataTypeList = () => {

147
front/src/views/home/integrationServicesDetails.vue
View File

@ -23,13 +23,44 @@
</div> </div>
</div> </div>
<!-- 组合能力 --> <!-- 场景痛点 -->
<div
id="integration-pain-point"
class="pain-point scrollBox"
>
<div class="title-1">
<DetalsTitle title="场景痛点" type="PAIN POINT"></DetalsTitle>
</div>
<div class="flex-row-center">
<div class="bg"></div>
<div class="content">
<div class="content-item" v-for="(item, i) in painPoint" :key="i">{{i+1}}.{{item.description}}</div>
</div>
</div>
</div>
<!-- 解决方案 -->
<div
id="integration-solution"
class="solution scrollBox"
>
<div class="title-1">
<DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
</div>
<div class="flex-row-center">
<div class="content">
<div class="content-item" v-for="(item, i) in solution" :key="i">{{i+1}}.{{item.description}}</div>
</div>
</div>
</div>
<!-- 使用能力 -->
<div <div
id="integration-combination-ability" id="integration-combination-ability"
class="combination-ability scrollBox" class="combination-ability scrollBox"
> >
<div class="title-1"> <div class="title-1">
<DetalsTitle title="组合能力" type="COMBINATION ABILITY"></DetalsTitle> <DetalsTitle title="使用能力" type="COMBINATION ABILITY"></DetalsTitle>
</div> </div>
<div class="flex-row-center combine-content"> <div class="flex-row-center combine-content">
<div class="combine-item" v-for="(item, i) in combineList" :key="i"> <div class="combine-item" v-for="(item, i) in combineList" :key="i">
@ -43,47 +74,22 @@
</div> </div>
</div> </div>
<!-- 使用方式 --> <!-- 构建步骤 -->
<div id="integration-use-way" class="use-way scrollBox"> <div
id="integration-step"
class="step scrollBox"
>
<div class="title-1"> <div class="title-1">
<DetalsTitle title="使用方式" type="USE WAY"></DetalsTitle> <DetalsTitle title="构建步骤" type="STEP"></DetalsTitle>
</div> </div>
<div class="content"> <div class="flex-row-center">
<div class="content-card flex-row-between left word-bg"> <div style="height: 300px;">
<div class="content-card-item left-item"> <el-steps direction="vertical" :active="step.length">
<div class="card-title">文档</div> <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
<!-- <div class="card-text">文档描述文档描述文档描述文档描述</div> --> </el-steps>
</div>
<div class="content-card-item btn-box">
<div class="btn" @click="handleOpenUrl('技术文档')">技术文档</div>
<div class="btn" @click="handleOpenUrl('使用手册')">使用手册</div>
</div>
</div>
<div class="content-card flex-row-start">
<div
class="right-item content-card-item"
v-for="(use, i) in useWayShowList"
:key="i"
>
<div class="card-title title">{{ use.title }}</div>
<div
class="card-text"
v-for="(d, k) in Object.keys(use.info)"
:key="k"
>
{{ use.info[d] }}:{{ detailInfoObj[d] || '--' }}
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<!-- 常见问题-->
<application-common-problem
:dataList="detailInfoObj"
id="common-problem"
class="scrollBox"
></application-common-problem>
<home-footer></home-footer> <home-footer></home-footer>
</div> </div>
@ -102,6 +108,9 @@
const router = useRouter() const router = useRouter()
const scrollTop = ref(0) const scrollTop = ref(0)
const domArr = ref([]) const domArr = ref([])
const painPoint = ref([])
const solution = ref([])
const step=ref([])
const id = router.currentRoute.value.query.id const id = router.currentRoute.value.query.id
document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.style.transition = 'all 0.3s ease'
document.documentElement.scrollTop = 0 document.documentElement.scrollTop = 0
@ -117,20 +126,24 @@
const navList = ref([ const navList = ref([
{ {
name: '组合能力', name: '场景痛点',
key: 'integration-pain-point',
},
{
name: '解决方案',
key: 'integration-solution',
},
{
name: '使用能力',
key: 'integration-combination-ability', key: 'integration-combination-ability',
}, },
{ {
name: '使用方式', name: '构建步骤',
key: 'integration-use-way', key: 'integration-step',
},
{
name: '常见问题',
key: 'common-problem',
}, },
]) ])
const selectNow = ref('integration-combination-ability') const selectNow = ref('integration-pain-point')
const useWayShowList = ref([ const useWayShowList = ref([
{ {
@ -214,9 +227,12 @@
attrType: '常见问题', attrType: '常见问题',
attrValue: questionValue.attrValue || '[]', 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 = { let areaObj = {
attrType: '应用领域', attrType: '应用领域',
attrValue: detailInfoObj.value.applicationArea, attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue,
} }
combineList.value.map((item) => { combineList.value.map((item) => {
let arr = ( 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 { .combination-ability {
padding: 0.8rem 0; padding: 0.8rem 0;
background: rgb(247, 248, 250); background: rgb(247, 248, 250);

4
front/src/views/newHome/components/Navigation.vue
View File

@ -19,10 +19,10 @@
size="large" size="large"
@search="onSearch" @search="onSearch"
/> />
<div class="search" @click="gaojisousuo"> <!-- <div class="search" @click="gaojisousuo">
<span></span> <span></span>
<span>高级搜索</span> <span>高级搜索</span>
</div> </div> -->
</div> </div>
</div> </div>
<div class="gaoji-main" v-if="!qeihuan"> <div class="gaoji-main" v-if="!qeihuan">

4
front/src/views/personalCenter/components/AbilityApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44 * @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-25 15:07:05 * @LastEditTime: 2022-07-28 14:13:22
* @Description:我的申请 能力申请 查看详情 * @Description:我的申请 能力申请 查看详情
--> -->
<template> <template>
@ -142,7 +142,7 @@
';' + ';' +
'视频流地址：' + '视频流地址：' +
backUrl + backUrl +
'/resource/hls/getHls/?channelId=' + 'resource/hls/getHls/?channelId=' +
val.channelId val.channelId
}} }}
</div> </div>