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

This commit is contained in:
guoyue 2022-09-29 17:28:06 +08:00
commit 057b926183
5 changed files with 1764 additions and 1548 deletions

View File

@ -1,6 +1,6 @@
<template>
<div>
<div class='container'>
<div class="container">
<!-- <div class='container-left' v-if='homeIsShow'>
<div class='left-search'>
<div>
@ -31,8 +31,8 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format='yyyy-MM-dd HH:mm:ss'
value-format='yyyy-MM-dd HH:mm:ss'
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
@ -43,14 +43,8 @@
placeholder="请选审核状态"
clearable
>
<el-option
label="审核完成"
value="1"
></el-option>
<el-option
label="审核中"
value="0"
></el-option>
<el-option label="审核完成" value="1"></el-option>
<el-option label="审核中" value="0"></el-option>
</el-select>
</el-form-item>
@ -62,19 +56,25 @@
clearable
>
<el-option label="全部" value=""></el-option>
<el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
<el-option
v-for="item in departmentSelects"
:key="item.label"
v-bind="item"
></el-option>
</el-select>
</el-form-item>
<!--类型-->
<el-form-item>
<el-select
v-model="abilityType"
placeholder="请选择类型"
clearable
>
<el-select v-model="abilityType" placeholder="请选择类型" clearable>
<el-option label="全部" value=""></el-option>
<el-option v-for="item in typeOptions" :key="item.name" :label="item.name" :value="item.name" v-bind="item"></el-option>
<el-option
v-for="item in typeOptions"
:key="item.name"
:label="item.name"
:value="item.name"
v-bind="item"
></el-option>
</el-select>
</el-form-item>
@ -84,10 +84,12 @@
</el-form-item>
<!--操作按钮重置-->
<el-form-item>
<el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
<el-button type="primary" @click="resetDataList()">{{
$t('reset')
}}</el-button>
</el-form-item>
</el-form>
<el-card shadow="never" class="aui-card--fill" v-if='homeIsShow'>
<el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
<div class="mod-demand__bsdemand">
<!-- <div class='top-box'>
<span class='title'>能力统计</span>
@ -98,11 +100,26 @@
</div>
</div> -->
<div class='second-title'>
<span style='margin-right:30px' :class="[(departmentId===1 || departmentId===3)?'departmentStyle':'']" @click="handleChose(1)">
<div class="second-title">
<span
style="margin-right: 30px"
:class="[
departmentId === 1 || departmentId === 3
? 'departmentStyle'
: ''
]"
@click="handleChose(1)"
>
能力上架统计
</span>
<span :class="[(departmentId===2 || departmentId===4)?'departmentStyle':'']" @click="handleChose(2)">
<span
:class="[
departmentId === 2 || departmentId === 4
? 'departmentStyle'
: ''
]"
@click="handleChose(2)"
>
能力使用统计
</span>
<!-- <span v-if='this.choseId===0' :class="[departmentId===3?'departmentStyle':'']" @click="handleChose(3)">
@ -114,54 +131,41 @@
<span v-if="detailFlag" class="detail-button" @click="goToDetail()">
明细
</span>
<span v-else class="detail-button" @click="goToBack()">
返回
</span>
<span v-else class="detail-button" @click="goToBack()"> 返回 </span>
</div>
<div class='line-style'></div>
<div class="line-style"></div>
<!--统计表-->
<el-table
:data="tableData"
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
border
style="width: 100%" v-show='this.departmentId===1 ||this.departmentId===2'>
<el-table-column
prop="name"
label="部门名称"
min-width="100%">
style="width: 100%"
v-show="this.departmentId === 1 || this.departmentId === 2"
>
<el-table-column prop="name" label="部门名称" min-width="100%">
</el-table-column>
<el-table-column label="组件">
<el-table-column
prop="znsf"
label="智能算法"
min-width="100%">
<el-table-column prop="znsf" label="智能算法" min-width="100%">
</el-table-column>
<el-table-column
prop="tcfw"
label="图层服务"
min-width="100%">
<el-table-column prop="tcfw" label="图层服务" min-width="100%">
</el-table-column>
<el-table-column
prop="kfzj"
label="通用开发组件"
min-width="100%">
min-width="100%"
>
</el-table-column>
<el-table-column
prop="ywzj"
label="业务能力组件"
min-width="100%">
min-width="100%"
>
</el-table-column>
</el-table-column>
<el-table-column
prop="yyzy"
label="应用资源"
min-width="100%">
<el-table-column prop="yyzy" label="应用资源" min-width="100%">
</el-table-column>
<el-table-column
prop="zj"
label="总计"
min-width="100%">
<el-table-column prop="zj" label="总计" min-width="100%">
</el-table-column>
</el-table>
<!--明细表-->
@ -169,29 +173,15 @@
<el-table
:data="tableData"
style="width: 100%"
v-show='this.departmentId===3 ||this.departmentId===4'
v-show="this.departmentId === 3 || this.departmentId === 4"
>
<el-table-column
prop="deptName"
label="部门"
width="180">
<el-table-column prop="deptName" label="部门" width="180">
</el-table-column>
<el-table-column
prop="resourceName"
label="资源名称"
width="180">
<el-table-column prop="resourceName" label="资源名称" width="180">
</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="类型"> </el-table-column>
<el-table-column prop="createDate" label="日期"> </el-table-column>
<el-table-column prop="approveStatus" label="状态">
</el-table-column>
</el-table>
<div class="block">
@ -207,9 +197,24 @@
</div>
</el-card>
</div>
<component-used v-if='UsedIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild2='closeChild2'></component-used>
<component-services v-if='servicesIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild='closeChild'></component-services>
<application-resources v-if='resourcesIsShow' :tableId='tableId' :fatherId='fatherId' @closeApplication='closeApplication'></application-resources>
<component-used
v-if="UsedIsShow"
:tableId="tableId"
:fatherId="fatherId"
@closeChild2="closeChild2"
></component-used>
<component-services
v-if="servicesIsShow"
:tableId="tableId"
:fatherId="fatherId"
@closeChild="closeChild"
></component-services>
<application-resources
v-if="resourcesIsShow"
:tableId="tableId"
:fatherId="fatherId"
@closeApplication="closeApplication"
></application-resources>
</div>
</template>
<script>
@ -224,41 +229,63 @@ export default {
inputTxt: '',
tableId: '',
fatherId: '',
treeData: [{
treeData: [
{
label: '一级 1',
children: [{
children: [
{
label: '二级 1-1',
children: [{
children: [
{
label: '三级 1-1-1'
}]
}]
}, {
}
]
}
]
},
{
label: '一级 2',
children: [{
children: [
{
label: '二级 2-1',
children: [{
children: [
{
label: '三级 2-1-1'
}]
}, {
}
]
},
{
label: '二级 2-2',
children: [{
children: [
{
label: '三级 2-2-1'
}]
}]
}, {
}
]
}
]
},
{
label: '一级 3',
children: [{
children: [
{
label: '二级 3-1',
children: [{
children: [
{
label: '三级 3-1-1'
}]
}, {
}
]
},
{
label: '二级 3-2',
children: [{
children: [
{
label: '三级 3-2-1'
}]
}]
}],
}
]
}
]
}
],
total: null,
defaultProps: {
children: 'children',
@ -272,14 +299,26 @@ export default {
resourcesIsShow: false,
UsedIsShow: false,
titleList: [
{ name: '组件服务', key: 1 }, { name: '应用资源', key: 2 }, { name: '基础设施', key: 3 }, { name: '数据资源', key: 3 }, { name: '知识库', key: 3 }
{ name: '组件服务', key: 1 },
{ name: '应用资源', key: 2 },
{ name: '基础设施', key: 3 },
{ name: '数据资源', key: 3 },
{ name: '知识库', key: 3 }
],
tableData: [{ deptName: '部门', resourceNum: 222 }],
tableData2: [{ approveStatus: '', createDate: '' ,deptName:'',resourceName:'',type:''}],
tableData2: [
{
approveStatus: '',
createDate: '',
deptName: '',
resourceName: '',
type: ''
}
],
examineStatus: '0', //
value1: [], //
abilityDepartment:"",//
abilityType:"",//
abilityDepartment: '', //
abilityType: '', //
beginTime: '', //
endTime: '', //
typeOptions: [
@ -287,24 +326,25 @@ export default {
{ name: '图层服务', value: 2 },
{ name: '通用开发组件', value: 3 },
{ name: '页面开发组件', value: 4 },
{ name: '应用资源', value: 5 }],//
{ name: '应用资源', value: 5 }
], //
detailFlag: true, //
startDate:"",//
endDate:"" //
startDate: '', //
endDate: '' //
}
},
created () {
//
let d = new Date
let year1,month1,day1;
[year1,month1,day1] = [d.getFullYear(),d.getMonth(),d.getDate()]
let date1 = new Date(year1, month1, day1,7)
const d = new Date()
let year1, month1, day1
;[year1, month1, day1] = [d.getFullYear(), d.getMonth(), d.getDate()]
const date1 = new Date(year1, month1, day1, 7)
this.value1.push(date1)
//
let year2, month2, day2
d.setTime(d.getTime()-24*60*60*1000);
[year2,month2,day2] = [d.getFullYear(),d.getMonth(),d.getDate()]
let date2 = new Date(year2,month2,day2,7)
d.setTime(d.getTime() - 24 * 60 * 60 * 1000)
;[year2, month2, day2] = [d.getFullYear(), d.getMonth(), d.getDate()]
const date2 = new Date(year2, month2, day2, 7)
this.value1.unshift(date2)
},
mounted () {
@ -332,14 +372,16 @@ export default {
}
},
getTreeName (data) {
this.$http.get('/census/center/v3/treeList/', {
this.$http
.get('/census/center/v3/treeList/', {
params: {
keywords: data.name,
deptId: '1067246875800000066'
// pageNo: pageNo || 1,
// pageSize: 20
}
}).then(res => {
})
.then((res) => {
this.tableData = res.data.data
})
},
@ -360,7 +402,8 @@ export default {
// --
getFirstTree (page) {
this.$http.get('/census/center/selectDeptDetailTypeCountList/', {
this.$http
.get('/census/center/selectDeptDetailTypeCountList/', {
params: {
page: page || 1,
limit: 5,
@ -370,8 +413,9 @@ export default {
startDate: this.startDate,
endDate: this.endDate
}
}).then(res => {
let result= res.data.data
})
.then((res) => {
const result = res.data.data
for (let i = 0; i < result.length; i++) {
if (!result[i].hasOwnProperty('yyzy')) {
result[i].yyzy = 0
@ -388,7 +432,12 @@ export default {
if (!result[i].hasOwnProperty('ywzj')) {
result[i].ywzj = 0
}
result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
result[i].zj =
parseInt(result[i].yyzy) +
parseInt(result[i].kfzj) +
parseInt(result[i].znsf) +
parseInt(result[i].ywzj) +
parseInt(result[i].tcfw)
}
this.tableData = res.data.data
this.total = res.data.data.total
@ -396,18 +445,20 @@ export default {
},
// 使-使
getSecondTree () {
this.$http.get('/census/center/selectApplyDeptDetailTypeCountList/', {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList', {
params: {
// page: page || 1,
limit: 5,
// limit: 5,
approveStatus: this.examineStatus,
deptId: this.abilityDepartment,
params: '',
startDate: this.startDate,
endDate: this.endDate
}
}).then(res => {
let result= res.data.data
})
.then((res) => {
const result = res.data.data
for (let i = 0; i < result.length; i++) {
if (!result[i].hasOwnProperty('yyzy')) {
result[i].yyzy = 0
@ -424,7 +475,12 @@ export default {
if (!result[i].hasOwnProperty('ywzj')) {
result[i].ywzj = 0
}
result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
result[i].zj =
parseInt(result[i].yyzy) +
parseInt(result[i].kfzj) +
parseInt(result[i].znsf) +
parseInt(result[i].ywzj) +
parseInt(result[i].tcfw)
}
this.tableData = res.data.data
this.total = res.data.data.total
@ -432,17 +488,25 @@ export default {
},
//
getOneDetail (page) {
this.$http.get('/census/center/selectCensusResourceTable/', {
var passAndReview = '' // ""
if (this.examineStatus === '审核完成') {
passAndReview = '通过'
} else {
passAndReview = this.examineStatus
}
this.$http
.get('/census/center/selectCensusResourceTable', {
params: {
limit: 5,
// limit: 5,
// page: page || 1,
approveStatus: this.examineStatus,
approveStatus: passAndReview,
deptId: this.abilityDepartment,
params: '',
type: '',
startDate: this.startDate,
endDate: this.endDate
}
}).then(res => {
})
.then((res) => {
console.log('111111', this.tableData, res.data.data)
this.tableData = res.data.data
this.total = res.data.data.total
@ -450,23 +514,32 @@ export default {
},
// 使
getTwoDetail (page) {
this.$http.get('/census/center/selectCensusApplyTable/', {
var passAndReview = '' // ""
if (this.examineStatus === '审核完成') {
passAndReview = '通过'
} else {
passAndReview = this.examineStatus
}
this.$http
.get('/census/center/selectCensusApplyTable', {
params: {
limit: 5,
// limit: 5,
// page: page || 1,
approveStatus: this.examineStatus,
deptId: this.abilityDepartment,
params: '',
type: '',
startDate: this.startDate,
endDate: this.endDate
}
}).then(res => {
})
.then((res) => {
this.tableData = res.data.data
this.total = res.data.data.total
})
},
getReleaseTree (page) {
this.$http.get('/census/center/selectApplyDeptDetailTypeCountList/', {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: {
limit: 5,
// page: page || 1,
@ -475,8 +548,9 @@ export default {
params: '',
startDate: ''
}
}).then(res => {
let result= res.data.data
})
.then((res) => {
const result = res.data.data
for (let i = 0; i < result.length; i++) {
if (!result[i].hasOwnProperty('yyzy')) {
result[i].yyzy = 0
@ -493,7 +567,12 @@ export default {
if (!result[i].hasOwnProperty('ywzj')) {
result[i].ywzj = 0
}
result[i].zj=parseInt(result[i].yyzy)+ parseInt(result[i].kfzj)+parseInt(result[i].znsf)+parseInt(result[i].ywzj)+parseInt(result[i].tcfw)
result[i].zj =
parseInt(result[i].yyzy) +
parseInt(result[i].kfzj) +
parseInt(result[i].znsf) +
parseInt(result[i].ywzj) +
parseInt(result[i].tcfw)
}
this.tableData = res.data.data
this.total = res.data.data.total
@ -501,14 +580,16 @@ export default {
},
// 使
getUsedTree () {
this.$http.get('/census/center/v3/resourceReleaseDetails/', {
this.$http
.get('/census/center/v3/resourceReleaseDetails/', {
params: {
limit: 5,
page: 1,
// id:'1067246875800000066',
resourceType: '应用资源'
}
}).then(res => {
})
.then((res) => {
this.tableData = res.data.data.list
})
},
@ -554,7 +635,7 @@ export default {
if (index === 1) {
if (this.choseId === 0) {
if (!this.detailFlag) {
this.detailFlag = !this.detailFlag;
this.detailFlag = !this.detailFlag
}
this.getFirstTree()
} else if (this.choseId === 1) {
@ -563,14 +644,13 @@ export default {
} else if (index === 2) {
if (this.choseId === 0) {
if (!this.detailFlag) {
this.detailFlag = !this.detailFlag;
this.detailFlag = !this.detailFlag
}
this.getSecondTree()
} else {
// this.getUsedTree()
}
}
else if (index === 3) {
} else if (index === 3) {
if (this.choseId === 0) {
this.getOneDetail()
} else {
@ -605,113 +685,109 @@ export default {
},
// //////////
goToDetail () {
this.detailFlag = !this.detailFlag;
this.detailFlag = !this.detailFlag
if (this.departmentId === 1) {
this.handleChose(3);
this.handleChose(3)
// this.departmentId = 1;
} else if (this.departmentId === 2) {
this.handleChose(4);
this.handleChose(4)
// this.departmentId = 2;
} else {
}
},
//
goToBack () {
// departmentId 13 24
this.detailFlag = !this.detailFlag;
this.detailFlag = !this.detailFlag
if (this.departmentId === 3) {
this.handleChose(1);
this.handleChose(1)
// this.departmentId = 1;
} else if (this.departmentId === 4) {
this.handleChose(2);
this.handleChose(2)
// this.departmentId = 2;
} else {
}
},
//
getDataList () {
if (this.value1.length > 0) {
this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss');
this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss');
this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
}
if (this.examineStatus == 0) {
this.examineStatus = "审核中";
this.examineStatus = '审核中'
} else {
this.examineStatus = "审核完成";
this.examineStatus = '审核完成'
}
if (this.abilityDepartment) {
this.abilityDepartment = this.abilityDepartment
} else {
this.abilityDepartment = "全部";
this.abilityDepartment = ''
}
if (this.abilityType) {
this.abilityType = this.abilityType;
this.abilityType = this.abilityType
} else {
this.abilityType = "全部";
this.abilityType = ''
}
console.log('查询参数开始时间1',this.startDate);
console.log('查询参数结束时间2',this.endDate);
console.log('查询参数审核状态',this.examineStatus);
console.log('查询参数部门',this.abilityDepartment);
console.log('查询参数类型',this.abilityType);
console.log('查询参数开始时间1', this.startDate)
console.log('查询参数结束时间2', this.endDate)
console.log('查询参数审核状态', this.examineStatus)
console.log('查询参数部门', this.abilityDepartment)
console.log('查询参数类型', this.abilityType)
if (this.departmentId === 1) {
if (this.detailFlag) {
this.handleChose(3);
this.detailFlag = !this.detailFlag;
this.handleChose(3)
this.detailFlag = !this.detailFlag
} else {
this.handleChose(1);
this.detailFlag = !this.detailFlag;
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;
this.handleChose(4)
this.detailFlag = !this.detailFlag
} else {
this.handleChose(2);
this.detailFlag = !this.detailFlag;
this.handleChose(2)
this.detailFlag = !this.detailFlag
}
} else if (this.departmentId === 3) {
this.handleChose(3);
this.handleChose(3)
} else {
this.handleChose(4);
this.handleChose(4)
}
},
//
resetDataList () {
this.startDate = "";
this.endDate="";
this.examineStatus = "审核中";
this.abilityDepartment = "全部";
this.abilityType ="全部";
this.startDate = ''
this.endDate = ''
this.examineStatus = '审核中'
this.abilityDepartment = ''
this.abilityType = ''
if (this.departmentId === 1) {
if (this.detailFlag) {
this.handleChose(3);
this.detailFlag = !this.detailFlag;
this.handleChose(3)
this.detailFlag = !this.detailFlag
} else {
this.handleChose(1);
this.detailFlag = !this.detailFlag;
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;
this.handleChose(4)
this.detailFlag = !this.detailFlag
} else {
this.handleChose(2);
this.detailFlag = !this.detailFlag;
this.handleChose(2)
this.detailFlag = !this.detailFlag
}
} else if (this.departmentId === 3) {
this.handleChose(3);
this.handleChose(3)
} else {
this.handleChose(4);
this.handleChose(4)
}
},
//
handleTime (time, format) {
@ -746,7 +822,6 @@ export default {
})
}
}
}
</script>
<style lang="scss" scoped>

View File

@ -2,46 +2,71 @@
<div class="capability-convergence">
<div class="main">
<div class="top">
能力汇聚
能力分类
<span class="line"></span>
</div>
<div class="bottom">
<div class="item">
<div class="zj">组件服务</div>
<div class="name" v-for="(item, index) in zjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)">
<div
class="name"
v-for="(item, index) in zjList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)"
>
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('组件服务')">查看更多</div>
</div>
<div class="item">
<div class="yy">应用资源</div>
<div class="name" v-for="(item, index) in yyList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)">
<div
class="name"
v-for="(item, index) in yyList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)"
>
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('应用资源')">查看更多</div>
</div>
<div class="item">
<div class="jc">基础设施</div>
<div class="name" v-for="(item, index) in jcList" :key="item.name" :class="index == 2 ? 'name-last' : ''"
@click="selectOne2(item.name)">
<div
class="name"
v-for="(item, index) in jcList"
:key="item.name"
:class="index == 2 ? 'name-last' : ''"
@click="selectOne2(item.name)"
>
{{ item.name + '-' + item.num + '项' }}
</div>
<div class="btn" @click="jumpPage('基础设施')">查看更多</div>
</div>
<div class="item">
<div class="sj">数据资源</div>
<div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
@click="selectOne3(item.name)">
<div
class="name"
v-for="(item, index) in sjList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne3(item.name)"
>
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('数据资源')">查看更多</div>
</div>
<div class="item">
<div class="zs">知识库</div>
<div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
@click="openHref(item)">
<div
class="name"
v-for="(item, index) in zsList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="openHref(item)"
>
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('知识库')">查看更多</div>
@ -160,25 +185,27 @@ const getAppResources = (type, obj) => {
}
// 西-
if (whoShow1.value.itShowXiHaiAn) {
getSoldierData('无人机').then(res => {
let { total = 0 } = res.data.data;
getSoldierData('无人机')
.then((res) => {
let { total = 0 } = res.data.data
jcList.value.push({
name: '无人机',
num: total,
})
}).catch(err => {
console.log('err--无人机---------->', err);
})
getSoldierData('单兵设备').then(res => {
let { total = 0 } = res.data.data;
.catch((err) => {
console.log('err--无人机---------->', err)
})
getSoldierData('单兵设备')
.then((res) => {
let { total = 0 } = res.data.data
jcList.value.push({
name: '单兵设备',
num: total,
})
}).catch(err => {
console.log('err--单兵设备---------->', err);
})
.catch((err) => {
console.log('err--单兵设备---------->', err)
})
}
})
@ -213,13 +240,15 @@ const getSoldierData = (name) => {
limit: 10,
}
return new Promise((resolve, reject) => {
getSoldierList(_params).then(res => {
getSoldierList(_params)
.then((res) => {
resolve(res)
console.log('res---获取无人机、单兵设备--------->', res);
console.log('res---获取无人机、单兵设备--------->', res)
if (res.data.code !== 0) {
return message.error(res.data.msg)
}
}).catch(err => {
})
.catch((err) => {
reject(err)
})
})

View File

@ -1,5 +1,7 @@
<template>
<div class="navigation2">
<a-tooltip>
<template #title>点击进入组件服务</template>
<div class="item" @click="jumpPage('组件服务')">
<div class="img zj"></div>
<div class="name">组件服务</div>
@ -8,6 +10,9 @@
</div>
</div>
</a-tooltip>
<a-tooltip>
<template #title>点击进入应用资源</template>
<div class="item" @click="jumpPage('应用资源')">
<div class="img yy"></div>
<div class="name">应用资源</div>
@ -16,6 +21,9 @@
</div>
</div>
</a-tooltip>
<a-tooltip>
<template #title>点击进入基础设施</template>
<div class="item" @click="jumpPage('基础设施')">
<div class="img jc"></div>
<div class="name">基础设施</div>
@ -24,6 +32,9 @@
</div>
</div>
</a-tooltip>
<a-tooltip>
<template #title>点击进入数据资源</template>
<div class="item" @click="jumpPage('数据资源')">
<div class="img sj"></div>
<div class="name">数据资源</div>
@ -32,6 +43,9 @@
</div>
</div>
</a-tooltip>
<a-tooltip>
<template #title>点击进入知识库</template>
<div class="item" @click="jumpPage('知识库')">
<div class="img zs"></div>
<div class="name">知识库</div>
@ -40,6 +54,7 @@
</div>
</div>
</a-tooltip>
</div>
</template>
<script setup>

View File

@ -1,6 +1,6 @@
<template>
<div class="work-dynamics">
<div class="title">
<!-- <div class="title">
<div>工作动态</div>
<div class="title-son"></div>
</div>
@ -51,7 +51,7 @@
<div class="bottom" @click="jumpPage()">
查看更多
<span class="gengduo"></span>
</div>
</div> -->
<div class="fixedmount">
<div @click="applyResource()">
<p></p>
@ -432,8 +432,8 @@
display: flex;
flex-direction: column;
align-items: center;
padding-bottom: 0.8rem;
padding-top: 0.78rem;
// padding-bottom: 0.8rem;
// padding-top: 0.78rem;
.title {
font-size: 0.3rem;
font-family: 'convergence-typeface';

View File

@ -3,16 +3,27 @@
<div class="title" style="margin-bottom: 0.2rem">我的申请</div>
<div class="tab" style="margin-bottom: 0.1rem">
<span>类型</span>
<div :class="typeIndex == index ? 'tabclass' : ' '" @click="changeType(item, index)"
v-for="(item, index) in typeList" :key="index">
<div
:class="typeIndex == index ? 'tabclass' : ' '"
@click="changeType(item, index)"
v-for="(item, index) in typeList"
:key="index"
>
{{ item }}
</div>
</div>
<div class="tab">
<span>申请状态</span>
<div :class="tabIndex == index ? 'tabclass' : ' '" @click="changeApplyState(item, index)"
v-for="(item, index) in tabList" :key="index">
<a-badge :count="item === '审核中' ? num.unfinished : num.finished" v-if="item !== '全部'">
<div
:class="tabIndex == index ? 'tabclass' : ' '"
@click="changeApplyState(item, index)"
v-for="(item, index) in tabList"
:key="index"
>
<a-badge
:count="item === '审核中' ? num.unfinished : num.finished"
v-if="item !== '全部'"
>
{{ item }}
</a-badge>
<template v-else>
@ -22,7 +33,11 @@
</div>
<div v-if="contentList.data.length > 0">
<div class="content">
<div class="content-body" v-for="item in contentList.data" :key="item.index">
<div
class="content-body"
v-for="item in contentList.data"
:key="item.index"
>
<div class="content-body-title">
<span>申请单号{{ item.applyNumber || '--' }}</span>
<div></div>
@ -51,50 +66,111 @@
<div></div>
</div>
<div class="button-box">
<div class="button" v-if="typeName =='设备申请' && phoneSate.includes(item.state)"
@click="showPhoneModal(item)">联系方式</div>
<div
class="button"
v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
@click="showPhoneModal(item)"
>
联系方式
</div>
<div class="button" @click="showDetail(item)">查看详情</div>
<div class="button" @click="showAdd(item)" v-if="item.backToFirst">
修改
</div>
<svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80" height="80" v-if="
<svg
t="1652233950228"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="5970"
data-spm-anchor-id="a313x.7781069.0.i8"
width="80"
height="80"
v-if="
item.processDefinitionName != '能力资源下架' &&
(item.resourceStatus == 4 || item.resourceStatus == 5)
" style="position: absolute; top: 20px; left: -850px">
"
style="position: absolute; top: 20px; left: -850px"
>
<path
d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
fill="#515151" opacity=".5" p-id="5971"></path>
fill="#515151"
opacity=".5"
p-id="5971"
></path>
<path
d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
fill="#515151" opacity=".5" p-id="5972"></path>
fill="#515151"
opacity=".5"
p-id="5972"
></path>
<path
d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
fill="#515151" opacity=".5" p-id="5973"></path>
fill="#515151"
opacity=".5"
p-id="5973"
></path>
<path
d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
fill="#515151" opacity=".5" p-id="5974"></path>
fill="#515151"
opacity=".5"
p-id="5974"
></path>
</svg>
</div>
</div>
</div>
<div class="bottom">
<a-pagination size="small" pageSize="4" :total="total" :current="page" @change="handleCurrentChange"
@showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
<a-pagination
size="small"
pageSize="4"
:total="total"
:current="page"
@change="handleCurrentChange"
@showSizeChange="handlePageSizeChange"
:showSizeChanger="false"
/>
</div>
</div>
<a-empty v-else />
<a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible" title="申请详情" style="width: 900px"
:footer="null" destroyOnClose="true" :maskClosable="false">
<apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
:processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
</apply-details>
<a-modal
bodyStyle="padding:0.1rem 0"
v-model:visible="detailsVisible"
title="申请详情"
style="width: 900px"
:footer="null"
destroyOnClose="true"
:maskClosable="false"
>
<apply-details
:processDefinitionName="processDefinitionName"
:businessKey="businessKey"
:processInstanceId="processInstanceId"
:resourceId="resourceId"
:refObj="refObj"
:showType="showType"
></apply-details>
</a-modal>
<a-modal v-model:visible="visible" title="下架原因" @ok="del()" @cancel="reason = ''">
<a-modal
v-model:visible="visible"
title="下架原因"
@ok="del()"
@cancel="reason = ''"
>
<a-input v-model:value="reason" placeholder="请输入下架原因" />
</a-modal>
<a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
<a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
<a-modal
v-model:visible="videoVisible"
title="已申请摄像头列表"
@ok="videoVisible = false"
>
<a-table
:columns="columns"
:data-source="xVideoList"
bordered
:pagination="{ defaultPageSize: 6 }"
>
<template #bodyCell="{ column, text }">
<!-- <template>
<a>{{ text }}</a>
@ -105,7 +181,11 @@
</div>
<!-- 联系方式弹框 -->
<a-modal v-model:visible="phoneVisible" title="提示" @ok="phoneVisible = false">
<a-modal
v-model:visible="phoneVisible"
title="提示"
@ok="phoneVisible = false"
>
<!-- 工业信息化局那个号电话配这个号199 6399 0996 -->
<p>请联系工业信息化局电话199 6399 0996</p>
</a-modal>
@ -139,23 +219,24 @@ import * as moment from 'moment'
const router = useRouter()
let typeList = ref([
'能力申请',
'能力评价',
'能力上架',
'能力下架',
'能力需求',
'需求评论',
'能力评价',
])
// 西-
let isXiHaiAn = whoShow.itShowXiHaiAn;
let isXiHaiAn = whoShow.itShowXiHaiAn
const phoneSate = ref([2, 3])
if (isXiHaiAn) {
typeList.value.push('设备申请')
}
const typeStrObj = {
'能力上架': 'resourcemountapply',
'能力下架': 'resourcundercarriageapply',
'能力需求': 'abilitydemandapply',
'需求评论': 'comment_review',
能力上架: 'resourcemountapply',
能力下架: 'resourcundercarriageapply',
能力需求: 'abilitydemandapply',
需求评论: 'comment_review',
}
let tabList = ref(['全部', '审核中', '审核完成'])
const contentList = reactive({ data: [] })
@ -196,7 +277,7 @@ function changeApplyState(item, index) {
}
//
const changeType = (item, index) => {
console.log('item, index-----选择类型------->', item, index);
console.log('item, index-----选择类型------->', item, index)
numFlag.value = true
num.value = []
showType.value = ''
@ -234,7 +315,7 @@ const showDetail = (item) => {
if (typeName.value == '能力申请' && item.applyFlag) {
getByApplyFlag(item.applyFlag).then((res) => {
if (res.data.code == 0) {
refObj.value = res.data.data;
refObj.value = res.data.data
detailsVisible.value = true
processDefinitionName.value = item.processDefinitionName
@ -246,7 +327,8 @@ const showDetail = (item) => {
}
})
} else if (typeName.value == '设备申请') {
getDeviceDetailInfo(item.deviceId).then(res => {
getDeviceDetailInfo(item.deviceId)
.then((res) => {
if (res.data.code == 0) {
refObj.value = res.data.data
detailsVisible.value = true
@ -255,9 +337,12 @@ const showDetail = (item) => {
// processInstanceId.value = item.processInstanceId
// resourceId.value = item.resourceId
}
}).catch(err => {
})
} else if (Object.keys(typeStrObj).includes(typeName.value) || typeName.value == '能力评价') {
.catch((err) => {})
} else if (
Object.keys(typeStrObj).includes(typeName.value) ||
typeName.value == '能力评价'
) {
refObj.value = item
detailsVisible.value = true
processDefinitionName.value = item.processDefinitionName
@ -437,21 +522,27 @@ const getApplyList = () => {
num.value = []
showType.value = ''
} else if (typeName.value == '设备申请') {
let _state = ended.value === '' ? '全部' : ended.value === true ? '审核完成' : '审核中';
getDeviceApply(_state).then(res => {
let _state =
ended.value === ''
? '全部'
: ended.value === true
? '审核完成'
: '审核中'
getDeviceApply(_state)
.then((res) => {
if (res.data.code == 0) {
contentList.data = []
contentList.data = res.data.data.list || []
total.value = res.data.data.total
showType.value = '设备申请';
showType.value = '设备申请'
//
getDeviceNum()
}
}).catch(err => {
})
.catch((err) => {})
} else if (Object.keys(typeStrObj).includes(typeName.value)) {
processDefinitionKey.value = typeStrObj[typeName.value]
params.processDefinitionKey = processDefinitionKey.value;
params.processDefinitionKey = processDefinitionKey.value
getMyProcessInstancePage(params).then((res) => {
contentList.data = []
// initNum(name.value)
@ -580,14 +671,16 @@ const getDeviceApply = (state) => {
let _data = {
page: page.value,
limit: 4,
state
state,
}
deviceApplylist(_data).then(res => {
deviceApplylist(_data)
.then((res) => {
resolve(res)
console.log('res----设备申请-------->', res);
}).catch(err => {
console.log('res----设备申请-------->', res)
})
.catch((err) => {
reject(err)
console.log('err------------>', err);
console.log('err------------>', err)
})
})
}
@ -595,12 +688,14 @@ const getDeviceApply = (state) => {
// 西--
const getDeviceDetailInfo = (deviceId) => {
return new Promise((resolve, reject) => {
getDeviceDetail(deviceId).then(res => {
getDeviceDetail(deviceId)
.then((res) => {
resolve(res)
console.log('res----查询详情-------->', res);
}).catch(err => {
console.log('res----查询详情-------->', res)
})
.catch((err) => {
reject(err)
console.log('err------------>', err);
console.log('err------------>', err)
})
})
}
@ -608,18 +703,20 @@ const getDeviceDetailInfo = (deviceId) => {
// 西-,
const getDeviceNum = () => {
if (!numFlag.value) {
return;
return
}
num.value = []
Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')]).then(res => {
console.log('res-----数量------->', res);
let unfinished = res[0] && res[0].data && res[0].data.data;
let finished = res[1] && res[1].data && res[1].data.data;
num.value.unfinished = unfinished.total || '';
num.value.finished = finished.total || '';
Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
.then((res) => {
console.log('res-----数量------->', res)
let unfinished = res[0] && res[0].data && res[0].data.data
let finished = res[1] && res[1].data && res[1].data.data
num.value.unfinished = unfinished.total || ''
num.value.finished = finished.total || ''
numFlag.value = false
}).catch(err => {
console.log('err------------>', err);
})
.catch((err) => {
console.log('err------------>', err)
})
}