-
-
+
+
+
+
{
+ 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 flag = ref(true)
// userId
@@ -548,6 +592,7 @@
visible,
goComparePk,
whoShow1,
+ showKey,
}
},
beforeUnmount() {
@@ -654,6 +699,7 @@
width: 100%;
margin-top: 10px;
display: flex;
+ align-items: center;
.left {
display: inline-block;
@@ -667,22 +713,28 @@
}
.yyzy {
- background: url('~@/assets/home/yyzy-bg.png') no-repeat;
- background-size: 120px 110px;
+ background: url('~@/assets/home/yyzy_square.png') no-repeat;
+ background-size: 100%;
}
+ .sjzy {
+ background: url('~@/assets/home/sjzy_square.png') no-repeat;
+ background-size: 100%;
+ }
.znsf {
- background: url('~@/assets/home/znsf-bg.png') no-repeat;
- background-size: 120px 110px;
+ background: url('~@/assets/home/znsf_square.png') no-repeat;
+ background-size: 100%;
}
-
- .gis {
- background: url('~@/assets/home/gis-bg.png') no-repeat;
- background-size: 120px 110px;
+ .tcfw {
+ background: url('~@/assets/home/tcfw_square.png') no-repeat;
+ background-size: 100%;
}
-
- .jcss {
- background: url('~@/assets/home/jcss-bg.png') no-repeat;
+ .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%;
}
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index e357fa94..342cc39d 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -118,6 +118,7 @@
import { getCategoryTreePage } from '@/api/personalCenter'
import { dataType } from 'element-plus/es/components/table-v2/src/common'
import { useRouter } from 'vue-router'
+ import { message } from 'ant-design-vue'
import { ref, reactive, onMounted } from 'vue'
import {
getCameraByParentId,
@@ -125,7 +126,6 @@
getCameraAllLabel,
} from '@/api/videoSurveillance'
import { sgcInsert } from '@/api/home'
- import { message } from 'ant-design-vue'
import mybus from '@/myplugins/mybus'
const router = useRouter()
const options = reactive({
@@ -156,7 +156,7 @@
], //显示所有按钮,
})
let visible = ref(false)
- const jjssType = ref(router.currentRoute.value.query.type)
+ const jcssType = ref(router.currentRoute.value.query.type)
const pagination = ref({
total: 0,
current: 1,
@@ -178,13 +178,16 @@
})
const showMap = ref(true)
onMounted(() => {
- if (jjssType.value) {
- tabClick(0, jjssType.value)
+ if (jcssType.value) {
+ tabClick(0, jcssType.value)
+ if (jcssType.value == '视频资源') {
+ getCamera()
+ }
} else {
tabClick(0, '视频资源')
+ getCamera()
}
- getCamera()
mybus.off('getListByParentId')
mybus.on('getListByParentId', (parentId) => {
mapSearchParam.value.parentId = parentId
@@ -250,7 +253,6 @@
let tableHeight = ref('600')
//tab切换点击事件
const tabClick = (indexFather, name) => {
- debugger
if (clickList.value[indexFather].content.indexOf(name) != -1) {
if (name == '视频资源') {
tableHeight.value = 330
@@ -327,6 +329,19 @@
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 = () => {
@@ -350,26 +365,30 @@
dept.deptName = infrastructure.deptName
}
const apply = () => {
- console.log('一键申请', selectedList.value)
- let arr = [
- {
- arr: [
- {
- description: '',
- note1: JSON.stringify(selectedList.value),
- resourceId: '1522550195055828996',
- resourceName: '摄像头列表',
- type: '基础设施',
- },
- ],
- deptId: dept.deptId,
- deptName: dept.deptName,
- },
- ]
- localStorage.setItem('applyList', JSON.stringify(arr))
- router.push({
- path: '/apply',
- })
+ if (selectedRowKeys.value.length != 0) {
+ console.log('一键申请', selectedList.value)
+ let arr = [
+ {
+ arr: [
+ {
+ description: '',
+ note1: JSON.stringify(selectedList.value),
+ resourceId: '1522550195055828996',
+ resourceName: '摄像头列表',
+ type: '基础设施',
+ },
+ ],
+ deptId: dept.deptId,
+ deptName: dept.deptName,
+ },
+ ]
+ localStorage.setItem('applyList', JSON.stringify(arr))
+ router.push({
+ path: '/apply',
+ })
+ } else {
+ message.error('请选择需要申请的数据')
+ }
}
// 添加至购物车
const addShopCar = () => {
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index 94ad8a30..949ffd95 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-21 11:55:07
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-30 18:18:57
+ * @LastEditTime: 2022-07-01 17:03:24
* @Description: 告诉大家这是什么
-->
@@ -211,7 +211,7 @@
}
const read = (item) => {
// console.log(item)
- if (selectData.value.length === 0) {
+ if (selectData.value.length === 0 && !item) {
message.error('未选择消息！')
return
}
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 876eba3d..08f0d019 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -71,7 +71,7 @@
-
+
当前节点：{{ item.currentTaskList[0].taskName }}
@@ -136,13 +136,7 @@