Compare commits

..

No commits in common. "4e271b6aa729172afc77e5da97b7805bac223146" and "1a23d640646f473eb863eff5f5615f586987bb8b" have entirely different histories.

2 changed files with 167 additions and 142 deletions

View File

@ -26,18 +26,29 @@
<!--起始日期 @keyup.enter.native="getDataList()"-->
<el-form-item>
<span>日期</span>
<el-date-picker v-model="value1" type="datetimerange" range-separator="" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
<el-date-picker
v-model="value1"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<!--审核状态-->
<el-form-item>
<el-form-item >
<span>审核状态</span>
<el-select v-model="examineStatus" 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="2"></el-option>
<el-select
v-model="examineStatus"
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="2"></el-option>
</el-select>
</el-form-item>
@ -51,7 +62,11 @@
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>
@ -60,8 +75,13 @@
<span>类型</span>
<el-select v-model="abilityType" placeholder="请选择类型" clearable>
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :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>
@ -72,7 +92,7 @@
<!--操作按钮重置-->
<el-form-item>
<el-button type="primary" @click="resetDataList()">{{
$t('reset')
$t('reset')
}}</el-button>
</el-form-item>
<!-- 导出 -->
@ -93,18 +113,25 @@
</div> -->
<div class="second-title">
<span style="margin-right: 30px" :class="[
departmentId === 1 || departmentId === 3
? 'departmentStyle'
: ''
]" @click="handleChose(3)">
<span
style="margin-right: 30px"
:class="[
departmentId === 1 || departmentId === 3
? 'departmentStyle'
: ''
]"
@click="handleChose(3)"
>
能力上架统计
</span>
<span :class="[
departmentId === 2 || departmentId === 4
? 'departmentStyle'
: ''
]" @click="handleChose(4)">
<span
:class="[
departmentId === 2 || departmentId === 4
? 'departmentStyle'
: ''
]"
@click="handleChose(4)"
>
能力使用统计
</span>
<!-- <span v-if='this.choseId===0' :class="[departmentId===3?'departmentStyle':'']" @click="handleChose(3)">
@ -123,8 +150,14 @@
</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">
<el-table
:data="tableData"
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
border
style="width: 100%"
v-show="this.departmentId === 1"
>
<el-table-column prop="name" label="上架部门" min-width="100%">
</el-table-column>
<el-table-column label="组件">
@ -132,9 +165,17 @@
</el-table-column>
<el-table-column prop="tcfw" label="图层服务" min-width="100%">
</el-table-column>
<el-table-column prop="kfzj" label="通用开发组件" min-width="100%">
<el-table-column
prop="kfzj"
label="通用开发组件"
min-width="100%"
>
</el-table-column>
<el-table-column prop="ywzj" label="业务能力组件" min-width="100%">
<el-table-column
prop="ywzj"
label="业务能力组件"
min-width="100%"
>
</el-table-column>
</el-table-column>
<el-table-column prop="yyzy" label="应用资源" min-width="100%">
@ -142,8 +183,14 @@
<el-table-column prop="zj" label="总计" min-width="100%">
</el-table-column>
</el-table>
<el-table :data="tableData" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
border style="width: 100%" v-show="this.departmentId === 2">
<el-table
:data="tableData"
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
border
style="width: 100%"
v-show="this.departmentId === 2"
>
<el-table-column prop="name" label="申请部门" min-width="100%">
</el-table-column>
<el-table-column label="组件">
@ -151,9 +198,17 @@
</el-table-column>
<el-table-column prop="tcfw" label="图层服务" min-width="100%">
</el-table-column>
<el-table-column prop="kfzj" label="通用开发组件" min-width="100%">
<el-table-column
prop="kfzj"
label="通用开发组件"
min-width="100%"
>
</el-table-column>
<el-table-column prop="ywzj" label="业务能力组件" min-width="100%">
<el-table-column
prop="ywzj"
label="业务能力组件"
min-width="100%"
>
</el-table-column>
</el-table-column>
<el-table-column prop="yyzy" label="应用资源" min-width="100%">
@ -179,35 +234,52 @@
<el-table-column prop="resourceName" label="资源名称" min-width="100%">
</el-table-column>
<el-table-column prop="type" label="类型" min-width="100%"> </el-table-column>
<el-table-column v-if="this.departmentId === 4" prop="resourceDeptName" label="提供部门" min-width="100%">
<el-table-column v-if="this.departmentId === 4" prop="resourceDeptName" 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>
<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 @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper"
:total="total" :page-size="pageSize" :current-page="currentPage">
<!-- <div class="block">
<el-pagination
@current-change="handleCurrentChange"
layout="total, prev, pager, next, jumper"
:total="total"
:page-size="5"
:current-page="currentPage"
>
</el-pagination>
</div>
</div> -->
</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>
<ability-detail v-if="detailsVisible" :detailsVisible="detailsVisible" :detailParamss="detailParamss"
:detailType="detailType" @closeModal="closeModal">
</ability-detail>
<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>
<ability-detail v-if="detailsVisible"
:detailsVisible="detailsVisible" :detailParamss="detailParamss" :detailType="detailType" @closeModal="closeModal">
</ability-detail>
</div>
</template>
@ -310,7 +382,6 @@ export default {
choseId: 0,
departmentId: 1,
currentPage: 1,
pageSize: 10,
homeIsShow: true,
servicesIsShow: false,
resourcesIsShow: false,
@ -376,7 +447,7 @@ 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)
@ -397,30 +468,20 @@ export default {
this.total = this.tableData.length
} else {
this.tableData = this.tableDataClone
this.total = this.tableData.length
this.total = this.tableData.length
}
},
closeModal () {
this.detailsVisible = false
},
handleCurrentChange(val) {
console.log('val------------>', val);
this.currentPage = val;
// todo
if(this.departmentId === 3) {
this.getOneDetail(val)
handleCurrentChange (val) {
if (this.choseId === 0) {
this.getFirstTree(val)
} else if (this.choseId === 1) {
this.getReleaseTree(val)
}
if(this.departmentId === 4) {
this.getTwoDetail(val)
}
// if (this.choseId === 0) {
// this.getFirstTree(val)
// } else if (this.choseId === 1) {
// this.getReleaseTree(val)
// }
},
getTreeName(data) {
getTreeName (data) {
this.$http
.get('/census/center/v3/treeList/', {
params: {
@ -450,7 +511,7 @@ export default {
// },
// --
getFirstTree(page) {
getFirstTree (page) {
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
@ -515,7 +576,7 @@ export default {
})
},
// 使-使
getSecondTree() {
getSecondTree () {
if (this.examineStatus == '-1') {
this.status = ''
} else if (this.examineStatus == '0') {
@ -530,8 +591,8 @@ export default {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList', {
params: {
page: page || 1,
limit: this.pageSize,
// page: page || 1,
// limit: 5,
approveStatus: this.status,
deptId: this.abilityDepartment,
params: '',
@ -580,7 +641,7 @@ export default {
})
},
//
detailClick(row) {
detailClick (row) {
this.detailParamss = {}
const applyNumber = row.applyNumber
if (this.departmentId == 3) { //
@ -621,8 +682,8 @@ export default {
})
}
},
//
getOneDetail(page) {
//
getOneDetail (page) {
var passAndReview = '' // ""
if (this.examineStatus == '-1') {
this.status = ''
@ -638,8 +699,8 @@ export default {
this.$http
.get('/census/center/selectCensusResourceTable', {
params: {
limit: this.pageSize,
page: this.currentPage,
// limit: 5,
// page: page || 1,
approveStatus: this.status,
deptId: this.abilityDepartment,
type: this.abilityType,
@ -649,8 +710,8 @@ export default {
})
.then((res) => {
console.log('111111', this.tableData, res.data.data)
this.tableData = res.data.data.list
this.tableDataClone = res.data.data.list
this.tableData = res.data.data
this.tableDataClone = res.data.data
this.total = res.data.data.total
this.exportExcelCondition = qs.stringify({
approveStatus: this.status,
@ -660,8 +721,8 @@ export default {
})
})
},
// 使 使
getTwoDetail(page) {
// 使
getTwoDetail (page) {
var passAndReview = '' // ""
if (this.examineStatus == '-1') {
this.status = ''
@ -677,8 +738,8 @@ export default {
this.$http
.get('/census/center/selectCensusApplyTable', {
params: {
limit: this.pageSize,
page: this.currentPage,
// limit: 5,
// page: page || 1,
approveStatus: this.status,
deptId: this.abilityDepartment,
type: this.abilityType,
@ -687,8 +748,8 @@ export default {
}
})
.then((res) => {
this.tableData = res.data.data.list
this.tableDataClone = res.data.data.list
this.tableData = res.data.data
this.tableDataClone = res.data.data
this.total = res.data.data.total
this.exportExcelCondition = qs.stringify({
approveStatus: this.status,
@ -698,7 +759,7 @@ export default {
})
})
},
getReleaseTree(page) {
getReleaseTree (page) {
this.$http
.get('/census/center/selectApplyDeptDetailTypeCountList/', {
params: {
@ -744,7 +805,7 @@ export default {
})
},
// 使
getUsedTree() {
getUsedTree () {
this.$http
.get('/census/center/v3/resourceReleaseDetails/', {
params: {
@ -758,7 +819,7 @@ export default {
this.tableData = res.data.data.list
})
},
handleClick(row) {
handleClick (row) {
if (this.choseId === 0) {
if (this.departmentId === 1) {
this.homeIsShow = false
@ -779,7 +840,7 @@ export default {
}
},
//
choseBtn(index) {
choseBtn (index) {
this.choseId = index
this.handleChose(1)
},
@ -837,26 +898,26 @@ 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)
},
// //////////
goToDetail() {
goToDetail () {
this.detailFlag = !this.detailFlag
if (this.departmentId === 1) {
this.handleChose(3)
@ -882,7 +943,7 @@ export default {
}
},
//
getDataList() {
getDataList () {
if (this.value1 && 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')
@ -913,7 +974,7 @@ export default {
}
},
//
resetDataList() {
resetDataList () {
this.value1 = []
this.startDate = ''
this.endDate = ''
@ -951,7 +1012,7 @@ export default {
}
},
//
handleTime(time, format) {
handleTime (time, format) {
if (time == null || time == undefined || time == '') {
return ''
}
@ -990,7 +1051,6 @@ export default {
display: flex;
flex-direction: column;
}
.container-left {
width: 250px;
height: 1000px;
@ -998,13 +1058,11 @@ export default {
// background-color: #ffffff;
margin-right: 10px;
}
.left-search {
width: 250px;
height: 76px;
background-color: #ffffff;
}
.input-style {
width: 210px;
height: 36px;
@ -1014,13 +1072,11 @@ export default {
border: 1px solid transparent;
background-color: #f2f4fa;
}
input::placeholder {
font-weight: 400;
font-size: 14px;
color: #b0b3ca;
}
.input-search {
width: 44px;
height: 30px;
@ -1030,12 +1086,10 @@ input::placeholder {
top: 38px;
left: 196px;
}
::v-deep.tree-style {
.el-tree-node__label {
font-size: 16px;
}
.el-tree-node__content {
width: 240px;
overflow: hidden;
@ -1051,7 +1105,6 @@ input::placeholder {
background-color: #fafafc;
display: inline-block;
}
.title {
display: flex;
font-size: 20px;
@ -1060,12 +1113,10 @@ input::placeholder {
padding-left: 15px;
padding-top: 10px;
}
.title-list-style {
display: flex;
margin-top: 10px;
}
.title-single {
font-size: 14px;
width: 90px;
@ -1076,7 +1127,6 @@ input::placeholder {
border-radius: 12px;
cursor: pointer;
}
.box-style {
width: 90px;
height: 24px;
@ -1085,13 +1135,11 @@ input::placeholder {
align-items: center;
padding-bottom: 2px;
}
.second-title {
margin-top: 20px;
font-size: 14px;
color: #979eb9;
cursor: pointer;
.detail-button {
width: 60px;
height: 30px;
@ -1105,7 +1153,6 @@ input::placeholder {
color: #fff;
}
}
.line-style {
width: 100%;
height: 1px;
@ -1113,28 +1160,23 @@ input::placeholder {
margin-top: 15px;
margin-bottom: 15px;
}
.aui-card--fill {
width: 100% !important;
padding: 0px !important;
}
.choseStyle {
color: #526aff;
border: 1px solid #526aff;
}
.departmentStyle {
color: #526aff;
}
::v-deep .tree-text-styleJ {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.export {
display: inline-block;
width: 70px;
@ -1146,21 +1188,18 @@ input::placeholder {
border: 1px solid #dcdfe6;
color: #000;
}
.export:hover {
border-color: #c5ddfd;
background-color: #ecf4fe;
color: #0058e1;
text-decoration: none;
}
.export:active {
border-color: #c5ddfd;
background-color: #ecf4fe;
color: #0058e1;
text-decoration: none;
}
.export:visited {
color: #fff;
text-decoration: none;

View File

@ -312,24 +312,16 @@
<span>{{ statusText[record.status] || '' }}</span>
</template>
<template v-if="column.dataIndex === 'operation'">
<!-- 离线 -->
<a v-if="record.status != 1" class="disabled-text">
<a :class="record.status != 1 ? 'disabled-text' : ''" @click="
openVideo(
record.channelCode ||
record.channelId ||
record.channelCode.channelId,
record
)
">
预览
</a>
<a-tooltip v-else placement="top">
<template #title>请申请后在我的申请中预览视频!</template>
<a @click="
openVideo(
record.channelCode ||
record.channelId ||
record.channelCode.channelId,
record
)
">
预览
</a>
</a-tooltip>
</template>
</template>
</a-table>
@ -351,12 +343,7 @@
</a-table>
</div>
<!-- 单个预览弹窗 -->
<a-modal wrapClassName="single-preview-modal" v-model:visible="visible" :width="960" destroyOnClose>
<!-- title="视频预览" -->
<template #title>
<span>视频预览</span>
<span style="color: #ff4d4f;margin-left:10px">{{`(请申请后在我的申请中预览视频)`}}</span>
</template>
<a-modal wrapClassName="single-preview-modal" v-model:visible="visible" title="视频预览" :width="960" destroyOnClose>
<template #footer></template>
<div style="width: 100%; display: flex; justify-content: center">
<div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
@ -2383,7 +2370,6 @@ video::-webkit-media-controls {
cursor: not-allowed;
opacity: 0.5;
color: #666666;
&:hover {
color: #666666;
}