部分问题修改
This commit is contained in:
parent
aa6022f599
commit
e01788b7b0
|
|
@ -176,14 +176,20 @@
|
|||
style="width: 100%"
|
||||
v-show="this.departmentId === 3 || this.departmentId === 4"
|
||||
>
|
||||
<el-table-column prop="deptName" label="部门" width="180">
|
||||
<el-table-column prop="deptName" label="部门" min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column prop="resourceName" label="资源名称" width="180">
|
||||
<el-table-column prop="resourceName" label="资源名称" min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column prop="type" label="类型"> </el-table-column>
|
||||
<el-table-column prop="createDate" label="日期"> </el-table-column>
|
||||
<el-table-column prop="approveStatus" label="状态">
|
||||
<el-table-column prop="type" label="类型" min-width="100%"> </el-table-column>
|
||||
<el-table-column prop="createDate" label="日期" min-width="100%"> </el-table-column>
|
||||
<el-table-column prop="approveStatus" label="状态" min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" min-width="100%">
|
||||
<template slot-scope="scope" >
|
||||
<el-link type="primary" v-if="scope.row.applyNumber" v-on:click="detailClick(scope.row)">查看详情</el-link>
|
||||
<el-link type="info" v-else disabled>后台挂接，无详情</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
|
|
@ -216,17 +222,35 @@
|
|||
:fatherId="fatherId"
|
||||
@closeApplication="closeApplication"
|
||||
></application-resources>
|
||||
<ability-detail v-if="detailsVisible"
|
||||
:detailsVisible="detailsVisible" :detailParamss="detailParamss" :detailType="detailType" @closeModal="closeModal">
|
||||
</ability-detail>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import componentServices from './componentServices.vue'
|
||||
import AbilityDetail from './components/abilityDetails'
|
||||
import applicationResources from './applicationResources.vue'
|
||||
import ComponentUsed from './componentUsed.vue'
|
||||
|
||||
import { mapState } from 'vuex'
|
||||
// const props = defineProps({
|
||||
// processDefinitionName: { type: String, default: null },
|
||||
// businessKey: { type: String, default: null },
|
||||
// processInstanceId: { type: String, default: null },
|
||||
// resourceId: { type: String, default: null },
|
||||
// refObj: { type: Object, default: null },
|
||||
// showType: { type: String, default: null },
|
||||
// })
|
||||
export default {
|
||||
components: { componentServices, applicationResources, ComponentUsed },
|
||||
components: { componentServices, applicationResources, ComponentUsed,AbilityDetail },
|
||||
data () {
|
||||
return {
|
||||
detailType:'',
|
||||
detailParamss:{},
|
||||
isBack:true,
|
||||
detailsVisible:false,
|
||||
inputTxt: '',
|
||||
tableId: '',
|
||||
fatherId: '',
|
||||
|
|
@ -306,7 +330,7 @@ export default {
|
|||
{ name: '数据资源', key: 3 },
|
||||
{ name: '知识库', key: 3 }
|
||||
],
|
||||
tableData: [{ deptName: '部门', resourceNum: 222 }],
|
||||
tableData: [],
|
||||
tableData2: [
|
||||
{
|
||||
approveStatus: '',
|
||||
|
|
@ -356,16 +380,9 @@ export default {
|
|||
...mapState(['departmentSelects'])
|
||||
},
|
||||
methods: {
|
||||
// 搜索框
|
||||
// searchBtn(){
|
||||
// this.getALLTree()
|
||||
// },
|
||||
// //树
|
||||
// handleNodeClick(data) {
|
||||
// console.log(data.name);
|
||||
// this.getTreeName(data)
|
||||
// },
|
||||
// 翻页
|
||||
closeModal() {
|
||||
this.detailsVisible = false;
|
||||
},
|
||||
handleCurrentChange (val) {
|
||||
if (this.choseId === 0) {
|
||||
this.getFirstTree(val)
|
||||
|
|
@ -404,8 +421,13 @@ export default {
|
|||
|
||||
// 组件服务部门发布情况--改为能力上架统计
|
||||
getFirstTree (page) {
|
||||
if(this.examineStatus== '全部'){
|
||||
|
||||
if(this.examineStatus== '-1' ){
|
||||
this.status=''
|
||||
}else if(this.examineStatus== '0' ){
|
||||
this.status='审核中'
|
||||
}else if(this.examineStatus== '1' ){
|
||||
this.status='审核完成'
|
||||
}else{
|
||||
this.status=this.examineStatus
|
||||
}
|
||||
|
|
@ -452,8 +474,12 @@ export default {
|
|||
},
|
||||
// 组件服务部门使用情况列表-改为能力使用统计
|
||||
getSecondTree () {
|
||||
if(this.examineStatus== '全部'){
|
||||
if(this.examineStatus== '-1' ){
|
||||
this.status=''
|
||||
}else if(this.examineStatus== '0' ){
|
||||
this.status='审核中'
|
||||
}else if(this.examineStatus== '1' ){
|
||||
this.status='审核完成'
|
||||
}else{
|
||||
this.status=this.examineStatus
|
||||
}
|
||||
|
|
@ -497,21 +523,74 @@ export default {
|
|||
this.tableData = res.data.data
|
||||
this.total = res.data.data.total
|
||||
})
|
||||
},
|
||||
//点击查看详情
|
||||
detailClick(row){
|
||||
this.detailParamss={}
|
||||
let applyNumber=row.applyNumber
|
||||
if(applyNumber ==nu)
|
||||
if (this.departmentId === 3) { //能力上架
|
||||
this.detailType='能力上架'
|
||||
let params = {
|
||||
processInstanceId: applyNumber,
|
||||
}
|
||||
this.$http
|
||||
.get('/act/his/getTaskHandleDetailInfo',{params})
|
||||
.then((res) => {
|
||||
if (res.data.code == 0) {
|
||||
|
||||
if(res.data.data!=null){
|
||||
this.detailParamss.resourceApplication=[]
|
||||
this.detailParamss.resourceApplication=res.data.data
|
||||
this.detailsVisible=true
|
||||
} else{
|
||||
this.$message.info('暂无详情数据！')
|
||||
}}else {
|
||||
this.$message.error('数据请求失败！')
|
||||
}
|
||||
|
||||
})
|
||||
} else if (this.departmentId === 4) {//能力使用
|
||||
|
||||
this.detailType='能力使用'
|
||||
this.$http
|
||||
.get('/processForm/tabilityapplication/getByApplyFlag/'+applyNumber)
|
||||
.then((res) => {
|
||||
|
||||
if (res.data.code == 0) {
|
||||
if(res.data.data!=null){
|
||||
this.detailParamss=res.data.data
|
||||
this.detailsVisible=true }
|
||||
else{
|
||||
this.$message.info('暂无详情数据！')
|
||||
}
|
||||
} else {
|
||||
this.$message.error('数据请求失败！')
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
// 能力上架明细
|
||||
getOneDetail (page) {
|
||||
var passAndReview = '' // 转变"审核完成"字段为通过
|
||||
if (this.examineStatus === '审核完成') {
|
||||
passAndReview = '通过'
|
||||
} else {
|
||||
passAndReview = this.examineStatus
|
||||
if(this.examineStatus== '-1' ){
|
||||
this.status=''
|
||||
}else if(this.examineStatus== '0' ){
|
||||
this.status='审核中'
|
||||
}else if(this.examineStatus== '1' ){
|
||||
this.status='通过'
|
||||
}else{
|
||||
this.status=this.examineStatus
|
||||
}
|
||||
this.$http
|
||||
.get('/census/center/selectCensusResourceTable', {
|
||||
params: {
|
||||
// limit: 5,
|
||||
// page: page || 1,
|
||||
approveStatus: passAndReview,
|
||||
approveStatus: this.status,
|
||||
deptId: this.abilityDepartment,
|
||||
type: this.abilityType,
|
||||
startDate: this.startDate,
|
||||
|
|
@ -527,13 +606,12 @@ export default {
|
|||
// 能力使用明细
|
||||
getTwoDetail (page) {
|
||||
var passAndReview = '' // 转变"审核完成"字段为通过
|
||||
if (this.examineStatus === '审核完成') {
|
||||
passAndReview = '通过'
|
||||
} else {
|
||||
passAndReview = this.examineStatus
|
||||
}
|
||||
if(this.examineStatus== '全部'){
|
||||
if(this.examineStatus== '-1' ){
|
||||
this.status=''
|
||||
}else if(this.examineStatus== '0' ){
|
||||
this.status='审核中'
|
||||
}else if(this.examineStatus== '1' ){
|
||||
this.status='通过'
|
||||
}else{
|
||||
this.status=this.examineStatus
|
||||
}
|
||||
|
|
@ -734,13 +812,6 @@ export default {
|
|||
this.startDate =''
|
||||
this.endDate =''
|
||||
}
|
||||
if (this.examineStatus == 0) {
|
||||
this.examineStatus = '审核中'
|
||||
} if (this.examineStatus == 1) {
|
||||
this.examineStatus = '审核完成'
|
||||
} else {
|
||||
this.examineStatus = '全部'
|
||||
}
|
||||
|
||||
if (this.abilityDepartment) {
|
||||
this.abilityDepartment = this.abilityDepartment
|
||||
|
|
@ -753,23 +824,10 @@ export default {
|
|||
} else {
|
||||
this.abilityType = ''
|
||||
}
|
||||
if (this.departmentId === 1) {
|
||||
// if (this.detailFlag) {
|
||||
// this.handleChose(3)
|
||||
// this.detailFlag = !this.detailFlag
|
||||
// } else {
|
||||
if (this.departmentId === 1) {
|
||||
this.handleChose(1)
|
||||
// this.detailFlag = !this.detailFlag
|
||||
// }
|
||||
// this.departmentId = 1;
|
||||
} else if (this.departmentId === 2) {
|
||||
// if (this.detailFlag) {
|
||||
// this.handleChose(4)
|
||||
// this.detailFlag = !this.detailFlag
|
||||
// } else {
|
||||
} else if (this.departmentId === 2) {
|
||||
this.handleChose(2)
|
||||
// this.detailFlag = !this.detailFlag
|
||||
// }
|
||||
} else if (this.departmentId === 3) {
|
||||
this.handleChose(3)
|
||||
} else {
|
||||
|
|
@ -778,6 +836,7 @@ export default {
|
|||
},
|
||||
// 重置按钮查询数据
|
||||
resetDataList () {
|
||||
this.value1=[]
|
||||
this.startDate = ''
|
||||
this.endDate = ''
|
||||
this.examineStatus = '全部'
|
||||
|
|
|
|||
|
|
@ -360,6 +360,15 @@ export function selectCollectComponentList(params) {
|
|||
params,
|
||||
})
|
||||
}
|
||||
//首页 应用资源
|
||||
export function selectCollectResourceList(params) {
|
||||
return request({
|
||||
url: 'resource/selectCollectResourceList',
|
||||
method: 'get',
|
||||
params,
|
||||
})
|
||||
}
|
||||
|
||||
// 根据instanceId获取摄像头列表
|
||||
export function getApplyCameraList(id) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</div> -->
|
||||
<div
|
||||
class="name"
|
||||
v-for="(item, index) in zjList"
|
||||
v-for="(item, index) in zjList.slice(0, 5)"
|
||||
:key="item.name"
|
||||
:class="index == 4 ? 'name-last' : ''"
|
||||
@click="selectOne1(item.name)"
|
||||
|
|
@ -30,14 +30,14 @@
|
|||
</div>
|
||||
<div class="item">
|
||||
<div class="yy">应用资源</div>
|
||||
<div
|
||||
<div
|
||||
class="name"
|
||||
v-for="(item, index) in yyList"
|
||||
:key="item.id"
|
||||
v-for="(item, index) in yyList.slice(0, 5)"
|
||||
:key="item.name"
|
||||
:class="index == 4 ? 'name-last' : ''"
|
||||
@click="selectOne(item.id)"
|
||||
@click="selectOne11(item.name)"
|
||||
>
|
||||
{{ index + 1 }}-{{ item.name }}
|
||||
{{ item.name + '-' + item.num + '项' }}
|
||||
</div>
|
||||
<div class="btn" @click="jumpPage('应用资源')">查看更多</div>
|
||||
</div>
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<div class="jc">基础设施</div>
|
||||
<div
|
||||
class="name"
|
||||
v-for="(item, index) in jcList"
|
||||
v-for="(item, index) in jcList.slice(0, 5)"
|
||||
:key="item.name"
|
||||
:class="index == 2 ? 'name-last' : ''"
|
||||
@click="selectOne2(item.name)"
|
||||
|
|
@ -89,7 +89,8 @@
|
|||
pageWithAttrs,
|
||||
getDataResource,
|
||||
selectInfrastructureList,
|
||||
selectCollectComponentList
|
||||
selectCollectComponentList,
|
||||
selectCollectResourceList
|
||||
} from '@/api/home.js'
|
||||
import { ref, reactive } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
|
|
@ -174,6 +175,7 @@
|
|||
})
|
||||
} else {
|
||||
let type = paramsGetResources.type
|
||||
|
||||
if (type == '基础设施') {
|
||||
jcList.value = []
|
||||
selectInfrastructureList().then((res) => {
|
||||
|
|
@ -264,7 +266,53 @@
|
|||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
}
|
||||
else if (type == '应用资源') {
|
||||
yyList.value = []
|
||||
selectCollectResourceList().then((res) => {
|
||||
for (const key in res.data.data) {
|
||||
if (whoShow1.value.itShowXiHaiAn) {
|
||||
if (key === '视频资源') {
|
||||
yyList.value.push({
|
||||
name: key,
|
||||
num: res.data.data[key],
|
||||
})
|
||||
}
|
||||
} else {
|
||||
yyList.value.push({
|
||||
name: key,
|
||||
num: res.data.data[key],
|
||||
})
|
||||
}
|
||||
}
|
||||
// 西海岸-单兵设备、无人机 获取数量
|
||||
if (whoShow1.value.itShowXiHaiAn) {
|
||||
getSoldierData('无人机')
|
||||
.then((res) => {
|
||||
let { total = 0 } = res.data.data
|
||||
yyList.value.push({
|
||||
name: '无人机',
|
||||
num: total,
|
||||
})
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log('err--无人机---------->', err)
|
||||
})
|
||||
getSoldierData('单兵设备')
|
||||
.then((res) => {
|
||||
let { total = 0 } = res.data.data
|
||||
zjList.value.push({
|
||||
name: '单兵设备',
|
||||
num: total,
|
||||
})
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log('err--单兵设备---------->', err)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
else {
|
||||
pageWithAttrs(paramsGetResources).then((res) => {
|
||||
console.log('object个数======>', type)
|
||||
obj.value = res.data.data.records
|
||||
|
|
@ -382,6 +430,15 @@
|
|||
},
|
||||
})
|
||||
}
|
||||
const selectOne11 = (name) => {
|
||||
router.push({
|
||||
path: '/DetailsPageconetent',
|
||||
query: {
|
||||
type: name,
|
||||
select: '应用资源',
|
||||
},
|
||||
})
|
||||
}
|
||||
const selectOne2 = (name) => {
|
||||
console.log('点击===============》', name)
|
||||
router.push({
|
||||
|
|
|
|||
Loading…
Reference in New Issue