{{ title }}
+ {{ '我的'+title }}
{{
formatNum(dataInfo.num)
@@ -90,7 +90,7 @@
查看更多 >
@@ -117,7 +116,8 @@
能力使用明细
-->
- 隐藏空数据
+ 隐藏空数据
@@ -168,14 +168,10 @@
-
-
+
+
@@ -194,7 +190,7 @@
-
+
@@ -233,7 +229,7 @@ import Template from '../devtools/template.vue'
// })
export default {
components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template },
- data () {
+ data() {
return {
checked: false,
departmentSelects: [],
@@ -353,12 +349,12 @@ export default {
{ name: '应用资源', value: 5 },
{ name: '会议室', value: 6 }
], // 类型备选列表
- typeOptions1: [//能力上架隐藏会议室
+ typeOptions1: [// 能力上架隐藏会议室
{ name: '智能算法', value: 1 },
{ name: '图层服务', value: 2 },
{ name: '开发组件', value: 3 },
{ name: '业务组件', value: 4 },
- { name: '应用资源', value: 5 },
+ { name: '应用资源', value: 5 }
], // 类型备选列表
detailFlag: false, // 明细返回按钮显示标志位
@@ -366,7 +362,7 @@ export default {
endDate: '' // 结束时间
}
},
- created () {
+ created() {
this.$http.get('/sys/dept/all').then(res => {
// console.log('获取部门=========>', res)
this.departmentSelects = []
@@ -387,22 +383,27 @@ export default {
// const date2 = new Date(year2, month2, day2, 7)
// this.value1.unshift(date2)
},
- mounted () {
+ mounted() {
// this.getFirstTree()
- if (this.departmentId === 1) {
- this.handleChose(3)
- // this.departmentId = 1;
- } else if (this.departmentId === 2) {
+ console.log('this.$route.query.Id;', this.$route.query.type)
+ if (this.$route.query.type === 'use') {
this.handleChose(4)
- // this.departmentId = 2;
} else {
+ if (this.departmentId === 1) {
+ this.handleChose(3)
+ // this.departmentId = 1;
+ } else if (this.departmentId === 2) {
+ this.handleChose(4)
+ // this.departmentId = 2;
+ } else {
+ }
}
},
computed: {
// ...mapState(['departmentSelects'])
},
methods: {
- chagneCheckbox () {
+ chagneCheckbox() {
if (this.checked) {
this.tableData = this.tableDataClone.filter(val => val.count !== 0)
this.total = this.tableData.length
@@ -411,7 +412,7 @@ export default {
this.total = this.tableData.length
}
},
- closeModal () {
+ closeModal() {
this.detailsVisible = false
},
handleCurrentChange (val) {
@@ -431,7 +432,7 @@ export default {
// this.getReleaseTree(val)
// }
},
- getTreeName (data) {
+ getTreeName(data) {
this.$http
.get('/census/center/v3/treeList/', {
params: {
@@ -461,7 +462,7 @@ export default {
// },
// 组件服务部门发布情况--改为能力上架统计
- getFirstTree (page) {
+ getFirstTree(page) {
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
@@ -527,7 +528,7 @@ export default {
})
},
// 组件服务部门使用情况列表-改为能力使用统计
- getSecondTree (page) {
+ getSecondTree(page) {
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
@@ -593,7 +594,7 @@ export default {
})
},
// 点击查看详情
- detailClick (row) {
+ detailClick(row) {
this.detailParamss = {}
const applyNumber = row.applyNumber
if (this.departmentId == 3) { // 能力上架
@@ -635,7 +636,7 @@ export default {
}
},
// 能力上架明细 能力上架统计
- getOneDetail (page) {
+ getOneDetail(page) {
var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
@@ -674,7 +675,7 @@ export default {
})
},
// 能力使用明细 能力使用统计
- getTwoDetail (page) {
+ getTwoDetail(page) {
var passAndReview = '' // 转变"通过"字段为通过
if (this.examineStatus == '-1') {
this.status = ''
@@ -711,7 +712,7 @@ export default {
})
})
},
- getReleaseTree (page) {
+ getReleaseTree(page) {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: {
@@ -758,7 +759,7 @@ export default {
})
},
// 应用资源部门使用情况列表
- getUsedTree () {
+ getUsedTree() {
this.$http
.get('/census/center/v3/resourceReleaseDetails/', {
params: {
@@ -772,7 +773,7 @@ export default {
this.tableData = res.data.data.list
})
},
- handleClick (row) {
+ handleClick(row) {
if (this.choseId === 0) {
if (this.departmentId === 1) {
this.homeIsShow = false
@@ -793,7 +794,7 @@ export default {
}
},
// 选择组件
- choseBtn (index) {
+ choseBtn(index) {
this.choseId = index
this.handleChose(1)
},
@@ -809,9 +810,11 @@ export default {
// }
// },
// 选择发布or使用表格
- handleChose (index) {
+ handleChose(index) {
this.checked = false
this.departmentId = index
+ this.currentPage=1
+ this.pageSize=10
if (index === 1) {
if (this.choseId === 0) {
if (!this.detailFlag) {
@@ -851,26 +854,32 @@ export default {
}
},
// 翻页
- handleSizeChange (val) {
+ handleSizeChange(val) {
console.log(`每页 ${val} 条`)
},
- closeChild () {
+ closeChild() {
this.homeIsShow = true
this.servicesIsShow = false
this.handleCurrentChange(1)
},
- closeChild2 () {
+ closeChild2() {
this.homeIsShow = true
this.UsedIsShow = false
this.handleCurrentChange(1)
},
- closeApplication () {
+ closeApplication() {
this.homeIsShow = true
this.resourcesIsShow = false
this.handleCurrentChange(1)
},
+ changeIiem(){
+ this.currentPage=1
+ this.pageSize=10
+ },
// 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
goToDetail () {
+ this.currentPage=1
+ this.pageSize=10
this.detailFlag = !this.detailFlag
if (this.departmentId === 1) {
this.handleChose(3)
@@ -882,8 +891,10 @@ export default {
}
},
// 返回按钮
- goToBack () {
+ goToBack() {
this.checked = false
+ this.currentPage=1,
+ this.pageSize=10,
// departmentId 1，3 2，4 两个值共同判断
this.detailFlag = !this.detailFlag
if (this.departmentId === 3) {
@@ -896,10 +907,12 @@ export default {
}
},
// 点击查询按钮查询数据
- getDataList () {
+ getDataList() {
if (this.value1 && this.value1.length > 0) {
- this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
- this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+ // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
+ // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+ this.startDate = this.value1[0]
+ this.endDate = this.value1[1]
} else {
this.startDate = ''
this.endDate = ''
@@ -927,7 +940,7 @@ export default {
}
},
// 重置按钮查询数据
- resetDataList () {
+ resetDataList() {
this.value1 = []
this.startDate = ''
this.endDate = ''
@@ -965,7 +978,7 @@ export default {
}
},
// 定义格式化函数：
- handleTime (time, format) {
+ handleTime(time, format) {
if (time == null || time == undefined || time == '') {
return ''
}
@@ -1159,24 +1172,16 @@ input::placeholder {
background: #fff;
border: 1px solid #dcdfe6;
color: #000;
+ color: #FFF;
+ background-color: #0058e1;
+ border-color: #0058e1;
+ text-decoration: none;
}
.export:hover {
- border-color: #c5ddfd;
- background-color: #ecf4fe;
- color: #0058e1;
- text-decoration: none;
+ background: #65a5f9;
+ border-color: #65a5f9;
+ color: #FFF;
}
-.export:active {
- border-color: #c5ddfd;
- background-color: #ecf4fe;
- color: #0058e1;
- text-decoration: none;
-}
-
-.export:visited {
- color: #fff;
- text-decoration: none;
-}
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 418be3f7..663d940a 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -36,6 +36,7 @@
+
+
diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue
index ff3d8f7f..21625307 100644
--- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue
+++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue
@@ -142,48 +142,7 @@ export default {
// 排行榜
RankingData: [],
// 表格
- AnomalyStatisticsTable: [
- {
- name: '接口名称',
- address: 'http://hhhhhhhhhhhhhhhhhhhh',
- method: '调用方法',
- type: '组件类型',
- provider: '提供商名称',
- state: '监控状态'
- },
- {
- name: '接口名称',
- address: 'http://hhhhhhhhhhhhhhhhhhhh',
- method: '调用方法',
- type: '组件类型',
- provider: '提供商名称',
- state: '监控状态'
- },
- {
- name: '接口名称',
- address: 'http://hhhhhhhhhhhhhhhhhhhh',
- method: '调用方法',
- type: '组件类型',
- provider: '提供商名称',
- state: '监控状态'
- },
- {
- name: '接口名称',
- address: 'http://hhhhhhhhhhhhhhhhhhhh',
- method: '调用方法',
- type: '组件类型',
- provider: '提供商名称',
- state: '监控状态'
- },
- {
- name: '接口名称',
- address: 'http://hhhhhhhhhhhhhhhhhhhh',
- method: '调用方法',
- type: '组件类型',
- provider: '提供商名称',
- state: '监控状态'
- }
- ],
+ AnomalyStatisticsTable: [],
// 分页
currentPage4: 1,
total: 0
diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue
index 5fbacc01..c77ab078 100644
--- a/back/src/views/modules/sys/user.vue
+++ b/back/src/views/modules/sys/user.vue
@@ -1,209 +1,92 @@
@@ -214,7 +97,7 @@ import AddOrUpdate from './user-add-or-update'
import qs from 'qs'
export default {
mixins: [mixinViewModule],
- data () {
+ data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/user/page',
@@ -235,30 +118,33 @@ export default {
components: {
AddOrUpdate
},
- created () {
+ created() {
this.getPostList()
},
methods: {
- reset () {
+ reset() {
+ this.dataForm.username = ''
+ this.dataForm.real_name = ''
+ this.dataForm.deptId = ''
+ this.dataForm.postId = ''
+ this.dataForm.gender = ''
+ if (this.$refs.renDeptTree) {
+ this.$refs.renDeptTree.showDeptName = '';
+ }
this.$http
.get(
this.mixinViewModuleOptions.getDataListURL +
- '?' +
- qs.stringify({
- page: 1,
- limit: 10,
- username: '',
- deptId: '',
- postId: '',
- gender: ''
- })
+ '?' +
+ qs.stringify({
+ page: 1,
+ limit: 10,
+ username: '',
+ deptId: '',
+ postId: '',
+ gender: ''
+ })
)
.then(({ data: res }) => {
- this.dataForm.username = ''
- this.dataForm.real_name = ''
- this.dataForm.deptId = ''
- this.dataForm.postId = ''
- this.dataForm.gender = ''
if (res.code !== 0) {
this.dataList = []
this.total = 0
@@ -279,7 +165,7 @@ export default {
this.dataListLoading = false
})
},
- getPostList () {
+ getPostList() {
this.$http
.get('/sys/post/list')
.then(({ data: res }) => {
@@ -288,7 +174,7 @@ export default {
}
this.postList = res.data
})
- .catch(() => {})
+ .catch(() => { })
}
}
}
diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index 4a018261..15a3fbce 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -9,7 +9,7 @@
>
![]()
-
-
diff --git a/front/src/views/capacitySquare/components/algorithm.vue b/front/src/views/capacitySquare/components/algorithm.vue
index 406a7ffa..47d6b958 100644
--- a/front/src/views/capacitySquare/components/algorithm.vue
+++ b/front/src/views/capacitySquare/components/algorithm.vue
@@ -1,31 +1,38 @@
审批
+ 转办
同意
驳回 -->
-
+
-
-
-
-
- {{ data.postName }}
+
+ {{ data.postName
+ }}
-
+
{{
- $t('query')
+ $t('query')
}}
- {{ $t('add') }}
+ {{ $t('add') }}
+
- {{ $t('deleteBatch') }}
+ {{ $t('deleteBatch')
+ }}
- {{ $t('export') }}
+ {{ $t('export') }}
+
重置
-
-
+
+
+
+
{{ $getDictLabel('gender', scope.row.gender) }}
-
+
{{
- $t('user.status0')
+ $t('user.status0')
}}
{{
- $t('user.status1')
+ $t('user.status1')
}}
-
+
- {{ $t('update') }}
- {{ $t('delete') }}
+ {{ $t('update') }}
+ {{ $t('delete') }}
-
+
-
暂无数据
+ 暂无{{title}}任务
-
-
- {{ typeName2 }}
-
+
+
+
-
+ {{ typeName }}
+
+
+
+
+
全市
+ 市级
+ 区级
+ 企业
+
-
-
- {{ val }}
+
+
+
+ {{ typeName2 }}
+
+
+
+
+
+ {{ val }}
+
-
-
+
+
{{ item.name }}
@@ -39,248 +46,308 @@
diff --git a/front/src/views/capacitySquare/components/application.vue b/front/src/views/capacitySquare/components/application.vue
index e73ff94e..c4372edc 100644
--- a/front/src/views/capacitySquare/components/application.vue
+++ b/front/src/views/capacitySquare/components/application.vue
@@ -1,8 +1,8 @@
@@ -74,9 +74,9 @@
}).then((res) => {
dictList.value = ['全部']
res.data.data.list.map((val) => {
- if (val.dictLabel !== '其他') {
- dictList.value.push(val.dictLabel)
- }
+ // if (val.dictLabel !== '其他') {
+ dictList.value.push(val.dictLabel)
+ // }
})
})
let dom = null
@@ -121,16 +121,19 @@
type: type.value,
area: area.value,
}).then((res) => {
- if (res.data.data.length < 9) {
+ console.log('res---应用广场--------->', res);
+
+ if (res.data.data.total.length < 9) {
dom.removeEventListener('scroll', viewMonitor, true)
}
- res.data.data.map((val) => {
+ // appList
+ res.data.data.appList.map((val) => {
if (!val.pic) {
val.pic = require('@/assets/capacitySquare/yyzy.jpg')
}
val.pic2 = require('@/assets/capacitySquare/yyzy.jpg')
})
- data.list.push(...res.data.data)
+ data.list.push(...res.data.data.appList)
selectFlag.value = false
nextTick(() => {
dom = document.querySelector('.item-box')
diff --git a/front/src/views/capacitySquare/components/layer.vue b/front/src/views/capacitySquare/components/layer.vue
index ff49eff1..01486aac 100644
--- a/front/src/views/capacitySquare/components/layer.vue
+++ b/front/src/views/capacitySquare/components/layer.vue
@@ -1,15 +1,34 @@
-
-
- {{ typeName2 }}
-
+
+
+
-
+ {{ typeName }}
+
+
+
+
+
全市
+ 市级
+ 区级
+ 企业
+
-
-
{{ item.name }}
- {{ val }}
+
@@ -20,13 +39,12 @@
class="algorithm-card"
>
+
+ {{ typeName2 }}
+
+
+
+
+
+ {{ val }}
+
@@ -40,12 +58,15 @@
-
+
\ No newline at end of file
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index b4bfc172..1a6b2752 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -12,32 +12,55 @@
模糊搜索
-
-
-
+
+
{{
- item.name +
- '(' +
- (globalData.data.filter((val) => val.type === item.name)[0]
- .count || '0') +
- ')'
+ item.name +
+ '(' +
+ (globalData.data.filter((val) => val.type === item.name)[0]
+ .count || '0') +
+ ')'
}}
@@ -46,45 +69,89 @@
-
+
-
+
{{ item.name }}
-
@@ -172,14 +282,21 @@
-
-
-
-
+
+
-
+
{{ item2.dict_label }}
-
+
-
-
+
@@ -92,29 +159,47 @@
模糊搜索
-
-
-
+
+
{{
- item.name +
- '(' +
- (globalData.data.filter((val) => val.type === item.name)[0]
- .count || '0') +
- ')'
+ item.name +
+ '(' +
+ (globalData.data.filter((val) => val.type === item.name)[0]
+ .count || '0') +
+ ')'
}}
@@ -123,36 +208,58 @@
-
模糊搜索
-
-
-
+
-
+
{{
- item.name +
- '(' +
- (globalData.data.filter((val) => val.type === item.name)[0]
- .count || '0') +
- ')'
+ item.name +
+ '(' +
+ (globalData.data.filter((val) => val.type === item.name)[0]
+ .count || '0') +
+ ')'
}}
@@ -160,7 +267,10 @@
能力广场
-
-
- +
- {{ item }}
+
-
-
+
+
{{ item.name }}
模糊搜索
-
-
+
-
+
{{ item.name }}
-
@@ -294,76 +497,140 @@
-
-
-
-
+
+
-
+
{{ item2.dict_label }}
-
+
-
-
+
-
-
+
+
{{ item.name }}
-
-
-
-
+
+
{{ item.name }}
模糊搜索
-
+
-
-
+
-
+
{{ item.name }}
+
模糊搜索
-
-
+
-
+
{{ item.name }}
- {
console.log('blur')
}
+ const arrId = []
const handleFocus = () => {
- console.log('focus')
- let arrId = []
- for (var valueIndex of systemOptions2.value) {
+ console.log('focus', systemOptions2.value, systemOptions.value)
+ for (let valueIndex of systemOptions2.value) {
if (arrId.indexOf(valueIndex['value']) == -1) {
arrId.push(valueIndex['value'])
systemOptions.value.push(valueIndex)
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 8c67bc87..fe336352 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -1,8 +1,11 @@
-
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 99d22fcc..1fc314bb 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -230,13 +230,8 @@
-
-
-
-
+
+
-
+
{{ item2.dict_label }}
-
+
-
-
+
@@ -379,18 +646,28 @@
青岛市政务资源管理平台{{ dataShowdev }}
+
-
-
+
@@ -398,572 +675,748 @@
+
{{ item.name }}
-
-
-
+
+
{{ item.name }}
模糊搜索
-
+
-
@@ -11,26 +14,52 @@
(United Capacity System)
-
-
+
+
- 发布时间：
+
+ 发布时间：
{{ item.createDate.substring(0, 10) + ' ' }}
@@ -300,11 +295,13 @@
>
申请量：{{ item.applyCount || 0 }}次
+
数据量：{{ item.sjlCount || 0 }}
@@ -1004,7 +1001,7 @@
margin: 0 10px 0 0;
.header-right {
- // display: flex;
+ // display: flex;
font-size: 14px;
color: #212121;
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index 066d92e9..9401b8a0 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -117,6 +117,7 @@
import mybus from '@/myplugins/mybus'
import { useRouter } from 'vue-router'
import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+ import { useStore } from 'vuex'
export default defineComponent({
setup() {
const selectedKeys = ref([])
@@ -126,6 +127,12 @@
children: 'children',
title: 'name',
}
+ const store = useStore()
+ // 用户信息
+ const user = ref({
+ deptName: store.getters['user/deptName'],
+ deptId: store.getters['user/deptId'],
+ })
const showKey = ref(0)
const treeData = ref([])
const init = () => {
@@ -138,7 +145,7 @@
if (select === '123') {
select = ''
}
- // debugger
+
console.log(
'获取url中的select=====================>',
router.currentRoute.value.query.select
@@ -178,7 +185,33 @@
treeData.value.sort((a, b) => {
return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
})
+ let deptId=user.value.deptId
+ treeData.value.forEach((child) => {
+ let childern=child.children
+ childern.forEach((childs) => {//第一层：市级
+ if(childs.key==deptId ){
+ childs.show=true
+ child.show=true
+ mybus.emit('paramsGetResources', [childs.key])
+ selectId.value =childs.key
+ }
+ if(childs.children && childs.children.length>0){//第二层 区级
+ let qu=childs.children
+ qu.forEach((qu) => {
+ if(qu.key==deptId ){
+ qu.show=true
+ childs.show=true
+ child.show=true
+ mybus.emit('paramsGetResources', [qu.key])
+ selectId.value = qu.key
+ }
+ })
+ }
+ })
+
+ })
console.log('左侧树结构数据======================>', treeData.value)
+
showKey.value++
})
}
@@ -188,6 +221,7 @@
})
// 生成children
const generateChildren = (val, obj) => {
+
if (val.dataList.length > 0) {
val.dataList.forEach((child) => {
let children = {
@@ -197,12 +231,14 @@
total: child.deptCount,
key: child.deptId,
}
+
obj.children.push(children)
})
}
}
// 区级特殊处理
const generateChildren2 = (val, obj) => {
+
if (val.dataList.length > 0) {
val.dataList.forEach((dis) => {
let children = {
@@ -222,6 +258,7 @@
select: false,
key: child.deptId,
}
+
children.children.push(children2)
})
}
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 1d3e712a..ff73deae 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -5,15 +5,24 @@
+
-
+
+
-
-
+
-
{{ item.title }}
-
+
清空
-
+
{{ itemContent.labelName || itemContent }}
@@ -21,19 +30,35 @@
-
+
-
+ "
+ @click="appointment(item)"
+ >
预约
-
会议室预约
-
+
预约结果
会议室搜索
-
+
重置
@@ -44,23 +69,33 @@
可用时间查询
-
- ![]()
+ ![]()
{{ item.name }}
@@ -73,39 +108,54 @@
{{ item.description }}
-
+
{{ record.bookDate }} {{ record.startTime }}-{{
- record.endTime
+ record.endTime
}}
{{
- record.state == 2
- ? '通过'
- : record.state == 1
- ? '审核中'
- : '不通过'
+ record.state == 2
+ ? '通过'
+ : record.state == 1
+ ? '审核中'
+ : '不通过'
}}
@@ -114,27 +164,45 @@
-
- 预约结果
-
-
+ "
+ >
+
审核结果：{{
- lookData.state == 2
- ? '通过'
- : lookData.state == 1
- ? '审核中'
- : '不通过'
+ lookData.state == 2
+ ? '通过'
+ : lookData.state == 1
+ ? '审核中'
+ : '不通过'
}}
@@ -142,24 +210,29 @@
预约信息
-
+ "
+ >
预约时段：{{ lookData.bookDate }} {{ lookData.startTime }}-{{
- lookData.endTime
+ lookData.endTime
}}
-
+ "
+ >
预约人：{{ lookData.name }}
联系方式：{{ lookData.phone }}
预约部门：{{ lookData.dept }}
@@ -169,18 +242,43 @@
使用事项：{{ lookData.matter }}
-
+
-
-
+
-
-
+
@@ -212,23 +329,42 @@
-
+
-
+
-
-
+
+
选择上传附件
@@ -239,11 +375,18 @@
-
+
取消
-
+
提交
@@ -259,12 +402,12 @@
+
视频预览
- {{`(请申请后在我的申请中预览视频)`}}
+
+ {{ `(请申请后在我的申请中观看视频)` }}
+
当日会议室可用时段：{{ roomDateList[0] }}
@@ -188,21 +286,40 @@
-
+
批量预览
-
+
添加至申购车
+
+ 客户端下载
+
-
+
一键申请
- 我要申请{{ selectType }}
+ 一键组会
+ 我要申请{{ selectType }}
- +
备选 {{ pagination.total || 0 }} 个
-+
已选 {{ selectedRowKeys.length }} 个 @@ -273,76 +416,163 @@
-
+
重置
-
+
-
-
+
+ }"
+ :loading="loadingCamera"
+ >
{{ statusText[record.status] || '' }}
-
- 预览
-
+ 预览
- 请申请后在我的申请中预览视频!
-
+ 请申请后在我的申请中观看视频!
+
预览
-
+
+
-
+ "
+ :pagination="pagination"
+ @change="handleTableChange"
+ >
-
+
申请
详情
@@ -351,15 +581,25 @@
-
-
+
@@ -380,70 +620,138 @@
-
+
-
+
-
+
-
-
+
-
+
-
-
+
+
{{ userInfo.usernameShow }}
-
+
+
{
diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue
index 548ad4fe..82412857 100644
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@@ -267,9 +267,12 @@
})
window.open(newpage.href, '_blank')
} else if (data === '资源下架') {
- window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+ window.sessionStorage.setItem('type', JSON.stringify('apply'))
const newpage = router.resolve({
path: '/personalCenter',
+ query: {
+ tabTypeName: '能力上架'
+ }
})
window.location.href = newpage.href
}
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 8e3d9c3a..5cfa10e3 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -8,40 +8,74 @@
-
@@ -192,437 +238,453 @@
-
-
+
+
-
+
-
-
+
+
基础设施
数据资源
组件服务
@@ -94,50 +49,24 @@
-
-
+
+
-
-
+
-
-
-
+
+
+ ">
@@ -188,8 +103,7 @@
-
+ " type="primary" html-type="cancle" @click="signOut">
退出申请
-
+ " type="primary" html-type="submit" @click="processStartHandle()">
提交申请
@@ -234,7 +139,7 @@
@@ -245,250 +150,248 @@
diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue
index d6a6a822..9d05d2cf 100644
--- a/front/src/views/personalCenter/components/asideMenu.vue
+++ b/front/src/views/personalCenter/components/asideMenu.vue
@@ -33,15 +33,16 @@ export default defineComponent({
imgActive: require('@/assets/personalCenter/applyactive.png'),
key: 'apply',
}
+ const push = {
+ title: '我的发布',
+ img: require('@/assets/personalCenter/push.png'),
+ imgActive: require('@/assets/personalCenter/pushactive.png'),
+ key: 'push',
+ }
let menuList = [
car,
- {
- title: '我的发布',
- img: require('@/assets/personalCenter/push.png'),
- imgActive: require('@/assets/personalCenter/pushactive.png'),
- key: 'push',
- },
apply,
+ push,
{
title: '我的收藏',
img: require('@/assets/personalCenter/collect.png'),
@@ -69,7 +70,7 @@ export default defineComponent({
]
// 西海岸
if (itShowXiHaiAn) {
- menuList = [car, apply]
+ menuList = [car, apply, push]
}
const selectedKeys = ref(['apply'])
diff --git a/front/vue.config.js b/front/vue.config.js
index 7a72ae44..efe1ac52 100644
--- a/front/vue.config.js
+++ b/front/vue.config.js
@@ -29,8 +29,8 @@ const productionGzipExtensions = [
'ico',
]
// 是否开启gzip压缩
-const isPro = process.env.NODE_ENV === 'production'
-// const isPro = false
+// const isPro = process.env.NODE_ENV === 'production'
+const isPro = false
if (donation) donationConsole()
const { version, author } = require('./package.json')
const Webpack = require('webpack')
{{ userInfo.realNameShow }}
-
+
-
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
- 
-
+
+ "
+ >
{{ db.attrType || '--' }}
-
+
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 99cd9b4e..7f7c128a 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -66,7 +66,7 @@
>
{{ key2 + '：' + value }}
@@ -454,1142 +762,1291 @@
-
+
组件服务
-
+
{{ item.name + '-' + item.num + '项' }}
查看更多
应用资源
-
+
{{ item.name + '-' + item.num + '项' }}
查看更多
基础设施
-
- {{ item.name + '-' + item.num + '项' }}
+
+ {{
+ item.name +
+ '-' +
+ item.num +
+ (item.name == '会客厅'
+ ? '间'
+ : item.name == '视频会议'
+ ? '个'
+ : '项')
+ }}
查看更多
数据资源
-
+
{{ index + 1 }}-{{ item.name }}
查看更多
知识库
-
+
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index ef1a6069..40e1683b 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -1,8 +1,8 @@
@@ -52,49 +52,68 @@
{{ item.name }}
{{ index + 1 }}-{{ item.name }}
查看更多
@@ -51,436 +85,432 @@
+ "
+ >
-
子单号：{{ item.instanceId }}
-
+
修改
-
+
撤回申请
-
-
+
+
+
+ 查看详情
+
@@ -160,31 +188,49 @@
基础设施
@@ -102,49 +121,58 @@
{{ val.name }}
{{
- val.type == '应用资源'
- ? '应用资源'
- : val.infoList.filter(
- (val2) => val2.attrType == '组件类型'
- )[0].attrValue == '智能算法'
- ? '智能算法'
- : val.infoList.filter(
- (val2) => val2.attrType == '组件类型'
- )[0].attrValue == '图层服务'
- ? '图层服务'
- : val.infoList.filter(
- (val2) => val2.attrType == '组件类型'
- )[0].attrValue == '开发组件'
- ? '开发组件'
- : val.infoList.filter(
- (val2) => val2.attrType == '组件类型'
- )[0].attrValue == '业务组件'
- ? '业务组件'
- : '--'
+ val.type == '应用资源'
+ ? '应用资源'
+ : val.infoList.filter(
+ (val2) => val2.attrType == '组件类型'
+ )[0].attrValue == '智能算法'
+ ? '智能算法'
+ : val.infoList.filter(
+ (val2) => val2.attrType == '组件类型'
+ )[0].attrValue == '图层服务'
+ ? '图层服务'
+ : val.infoList.filter(
+ (val2) => val2.attrType == '组件类型'
+ )[0].attrValue == '开发组件'
+ ? '开发组件'
+ : val.infoList.filter(
+ (val2) => val2.attrType == '组件类型'
+ )[0].attrValue == '业务组件'
+ ? '业务组件'
+ : '--'
}}
资源描述：{{ val.description }}
申请结果：{{
- item.ended ? item.approveStatus || '审核完成' : '审核中'
+ item.ended ? item.approveStatus || '审核完成' : '审核中'
}}
-
+
附件下载
-
- 查看详情
-
+
-
+
视频预览
-
该流程已终止
-
+
位置：{{ val.nodeName }}
申请结果：
- 列表地址：{{
- backUrl +
- 'resource/getApplyCameraList/' +
- item.instanceId }}
+ 列表地址：
+
+ {{
+ backUrl + 'resource/getApplyCameraList/' + item.instanceId
+ }}
+
视频流地址：
- {{
- backUrl +
- 'resource/hls/getHls/?key=' +
- val.channelId}}
+
+ {{ backUrl + 'resource/hls/getHls/?key=' + val.channelId }}
+
-
-
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 29c08390..7654f29e 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -208,6 +208,7 @@
onBeforeUnmount,
h,
defineProps,
+ nextTick,
} from 'vue'
import {
getMyProcessInstancePage,
@@ -252,16 +253,19 @@
typeList.value.push('设备申请')
}
const typeStrObj = {
- 能力上架: 'resourcemountapply',
- 能力下架: 'resourcundercarriageapply',
- 能力需求: 'abilitydemandapply',
- 需求评论: 'comment_review',
+ '能力上架': 'resourcemountapply',
+ '能力下架': 'resourcundercarriageapply',
+ '能力需求': 'abilitydemandapply',
+ '需求评论': 'comment_review',
}
let tabList = ref(['全部', '审核中', '审核完成'])
const contentList = reactive({ data: [] })
let tabIndex = ref(0)
let typeIndex = ref(0)
let typeName = ref(typeList.value[0])
+ if(router.currentRoute.value.query.tabTypeName) {
+ typeName.value = router.currentRoute.value.query.tabTypeName
+ }
const videoVisible = ref(false)
const numFlag = ref(true)
const columns = ref([
@@ -306,7 +310,7 @@
ended.value = ''
page.value = 1
typeIndex.value = index
- typeName.value = item
+ typeName.value = item;
getApplyList()
}
@@ -565,7 +569,6 @@
params.processDefinitionKey = processDefinitionKey.value
getMyProcessInstancePage(params).then((res) => {
contentList.data = []
- // initNum(name.value)
console.log(res.data.data.list)
contentList.data = res.data.data.list
total.value = res.data.data.total
diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue
index d347ae86..47331e43 100644
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@@ -9,83 +9,38 @@
+
-
-
{{userInfo.usernameShow}}
- {{userInfo.realNameShow}}
- {{userInfo.usernameShow}}
- {{userInfo.realNameShow}}
+
+ {{ userInfo.usernameShow }}
+
+
+ {{ userInfo.realNameShow }}
+
+
+ {{ userInfo.usernameShow }}
+
+
+ {{ userInfo.realNameShow }}
+
申请人信息
-
-
-
+
-
-
+
-
-
+
需求信息
- 您已成功申请{{ - formName.demandSubject || '' + formName.demandSubject || '' }},请耐心等待审批结果，结果会第一时间通知您！