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

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

This commit is contained in:
wuhongjian 2022-11-24 20:34:22 +08:00
parent 0fa3708f20 5e9759544d
commit 8f899ecf3e
6 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
back/src/views/main-content.vue
View File

@ -65,75 +65,83 @@
</template> </template>
<script> <script>
import { isURL } from "@/utils/validate"; import { isURL } from '@/utils/validate'
export default { export default {
data() { data () {
return {}; return {}
}, },
methods: { methods: {
// tabs, 是否通过iframe展示 // tabs, 是否通过iframe展示
tabIsIframe(url) { tabIsIframe (url) {
return isURL(url); return isURL(url)
}, },
// tabs, 选中tab // tabs, 选中tab
tabSelectedHandle(tab) { tabSelectedHandle (tab) {
tab = this.$store.state.contentTabs.filter( tab = this.$store.state.contentTabs.filter(
(item) => item.name === tab.name (item) => item.name === tab.name
)[0]; )[0]
if (tab) { if (tab) {
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? "iframe" : tab.name, name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
params: { ...tab.params }, params: { ...tab.params },
query: { ...tab.query }, query: { ...tab.query }
}); })
} }
}, },
// tabs, 删除tab // tabs, 删除tab
tabRemoveHandle(tabName) { tabRemoveHandle (tabName) {
if (tabName === "home") { if (tabName === 'home') {
return false; return false
} }
this.$store.state.contentTabs = this.$store.state.contentTabs.filter( console.log('删除', this.$store.state.contentTabs)
(item) => item.name !== tabName if (this.$store.state.contentTabs.length !== 1) {
); this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
if (this.$store.state.contentTabs.length <= 0) { (item) => item.name !== tabName
this.$store.state.sidebarMenuActiveName = )
this.$store.state.contentTabsActiveName = "home"; } else {
return false; this.$message({
message: '必须打开一个窗口！',
type: 'warning'
})
} }
// if (this.$store.state.contentTabs.length <= 0) {
// this.$store.state.sidebarMenuActiveName =
// this.$store.state.contentTabsActiveName = 'home'
// return false
// }
// 当前选中tab被删除 // 当前选中tab被删除
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
let tab = const tab =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
]; ]
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? "iframe" : tab.name, name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
params: { ...tab.params }, params: { ...tab.params },
query: { ...tab.query }, query: { ...tab.query }
}); })
} }
}, },
// tabs, 关闭其它 // tabs, 关闭其它
tabsCloseOtherHandle() { tabsCloseOtherHandle () {
this.$store.state.contentTabs = this.$store.state.contentTabs.filter( this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => { (item) => {
return ( return (
item.name === "home" || item.name === 'home' ||
item.name === this.$store.state.contentTabsActiveName item.name === this.$store.state.contentTabsActiveName
); )
} }
); )
}, },
// tabs, 关闭全部 // tabs, 关闭全部
tabsCloseAllHandle() { tabsCloseAllHandle () {
this.$store.state.contentTabs = this.$store.state.contentTabs.filter( this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => item.name === "home" (item) => item.name === 'home'
); )
this.$router.push({ name: "home" }); this.$router.push({ name: 'home' })
}, }
}, }
}; }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.aui-content { .aui-content {
@ -152,4 +160,4 @@ export default {
} }
} }
} }
</style> </style>

12
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: Light * @LastEditors: Light
* @LastEditTime: 2022-11-17 17:39:31 * @LastEditTime: 2022-11-24 17:22:23
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
@ -180,7 +180,7 @@ export default {
}) })
}) })
// 将业务KEY赋值给表单 // 将业务KEY赋值给表单
console.log('params=================>', this.$route, this.$route.params) console.log('params=================>', this.$route, this.$route.params, this.dataForm)
this.dataForm.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId
this.dataForm.instanceId = this.$route.params.processInstanceId this.dataForm.instanceId = this.$route.params.processInstanceId
this.init() this.init()
@ -262,6 +262,7 @@ export default {
getInfo () { getInfo () {
let params = '' let params = ''
if (this.dataForm.taskId) { if (this.dataForm.taskId) {
console.log('获取信息')
params = `taskId=${this.dataForm.taskId}` params = `taskId=${this.dataForm.taskId}`
this.$http this.$http
.get( .get(
@ -277,7 +278,9 @@ export default {
this.dataForm, this.dataForm,
'elas============================' 'elas============================'
) )
this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name if (res.data.tAbilityApplicationDTOList[0].resourceOwnerDept) {
this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
}
this.$http this.$http
.get( .get(
`/act/task/getTaskVariables?${params}&variableName=allowEntrust` `/act/task/getTaskVariables?${params}&variableName=allowEntrust`
@ -297,6 +300,7 @@ export default {
} }
} }
}) })
console.log('获取信息', res.data)
if (res.data.tAbilityApplicationDTOList[0].applicationScene) { if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr = '' res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
res.data.tAbilityApplicationDTOList[0].applicationScene.map( res.data.tAbilityApplicationDTOList[0].applicationScene.map(
@ -359,6 +363,7 @@ export default {
this.dataForm, this.dataForm,
'elas============================' 'elas============================'
) )
console.log('获取信息2', res.data)
if (res.data[0].applicationScene) { if (res.data[0].applicationScene) {
res.data[0].applicationSceneStr = '' res.data[0].applicationSceneStr = ''
res.data[0].applicationScene.map((val, index) => { res.data[0].applicationScene.map((val, index) => {
@ -416,7 +421,6 @@ export default {
agreeOrNot: debounce( agreeOrNot: debounce(
function (data, type) { function (data, type) {
if (type === '同意') { if (type === '同意') {
const params = qs.stringify({ const params = qs.stringify({
taskId: this.dataForm.taskId, taskId: this.dataForm.taskId,
comment: this.input || '同意' comment: this.input || '同意'

2
front/src/api/file.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-20 17:16:35 * @Date: 2022-04-20 17:16:35
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-24 17:13:34 * @LastEditTime: 2022-11-24 20:32:27
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
import request from '@/utils/request' import request from '@/utils/request'

6
front/src/views/home/detailsPageInfrastructureTreeXha.vue
View File

@ -167,7 +167,8 @@
const tabClick = (id) => { const tabClick = (id) => {
if (chooseId.value === id) { if (chooseId.value === id) {
chooseId.value = '' chooseId.value = ''
mybus.emit('clearLeftSelect') // mybus.emit('clearLeftSelect')
mybus.emit('CameraConditionPlaceType', [])
} else { } else {
chooseId.value = id chooseId.value = id
let placeTypeCode = [] let placeTypeCode = []
@ -210,6 +211,7 @@
}) })
const onSelect = async (item, val, child) => { const onSelect = async (item, val, child) => {
let res = {} let res = {}
console.log('点击', item, val, child)
res = await getCameraInfoByAreaId({ areaId: val.id }) res = await getCameraInfoByAreaId({ areaId: val.id })
treeData.value.map((treeDataItem, index) => { treeData.value.map((treeDataItem, index) => {
if (item.id == treeDataItem.id) { if (item.id == treeDataItem.id) {
@ -233,7 +235,7 @@
watch(selectId, (newVal) => { watch(selectId, (newVal) => {
if (newVal == '') { if (newVal == '') {
mybus.emit('clearLeftSelect') mybus.emit('getCameraByParentId', '70be8c5b664f4bcf869d82f2e8335051')
} }
}) })

4
front/src/views/home/infrastructureApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: Light * @Author: Light
* @Date: 2022-11-18 11:53:43 * @Date: 2022-11-18 11:53:43
* @LastEditors: Light * @LastEditors: Light
* @LastEditTime: 2022-11-24 15:56:51 * @LastEditTime: 2022-11-24 18:12:43
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -386,7 +386,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.infrastructureApplication { .infrastructureApplication {
background: #fff; background: #fff;
position: fixed; position: absolute;
top: 50%; top: 50%;
right: 0.16rem; right: 0.16rem;
margin-top: -3.9rem; margin-top: -3.9rem;

12
front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue
View File

@ -36,7 +36,7 @@
</div> </div>
<div class="footer-button" v-if="showFlag"> <div class="footer-button" v-if="showFlag">
<a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button> <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>
<a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申购车</a-button> <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申请列表</a-button>
</div> </div>
</div> </div>
</div> </div>
@ -337,10 +337,12 @@
padding: 5px; padding: 5px;
} }
.footer-button{ .footer-button{
width: 750px; display: flex;
//height:50px; justify-content: center;
text-align: center; // width: 750px;
padding-top:5px; //height:50px;
text-align: center;
padding-top:5px;
} }
} }
.ant-carousel { .ant-carousel {