Commit 4f391983 by liuyong

修改bug

1 parent 496ed499
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
} }
} }
}) })
this.addPaletteFunctions(item.arciBelongId, item.arciBelongName, false, fns); this.addPaletteFunctions(item.arciBelongId, item.arciBelongName, true, fns);
}); });
......
...@@ -435,3 +435,19 @@ export function getTotalZiChanJiaGouTable(params) { ...@@ -435,3 +435,19 @@ export function getTotalZiChanJiaGouTable(params) {
export function queryMindData(params) { export function queryMindData(params) {
return post('/network/archi-vw-detail/fdBmdTree/', params); return post('/network/archi-vw-detail/fdBmdTree/', params);
} }
// 演进策略和路线
export function queryEvoluteFunAndLine(params) {
return post('/network/arc-at-ev-road/', params);
}
// 演进策略和路线的批量删除,批量发布,批量取消发布
export function evoluteFunAndLineDeleteReleaseCancel(params) {
return post('/network/arc-at-ev-road/updBatch', params);
}
// 演进策略和路线的删除,编辑,单个发布,单个取消发布
export function evoluteFunAndLineDeleteMore(params) {
return post('/network/arc-at-ev-road/upd', params);
}
// 演进策略和路线的新增
export function evoluteFunAndLineAdd(params) {
return post('/network/arc-at-ev-road/ad', params);
}
\ No newline at end of file
...@@ -145,6 +145,16 @@ const routes = [ ...@@ -145,6 +145,16 @@ const routes = [
name: 'logManage', name: 'logManage',
component: () => import('@/views/log-manage/index.vue'), component: () => import('@/views/log-manage/index.vue'),
}, },
{
path: '/main/archiEvoluteLine',//架构演进路线资产管理
name: 'archiEvoluteLine',
component: () => import('@/views/archi-evolute-line/index.vue'),
},
{
path: '/main/archiIntelligenceSearch',//总体架构资产智能搜索
name: 'archiIntelligenceSearch',
component: () => import('@/views/archi-intelligence-search/index.vue'),
},
] ]
} }
] ]
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<img src="@/assets/main/3img.png" alt=""> <img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">现状架构资产管理</span> <span style="margin-left: 5px;">现状架构资产管理</span>
</div> </div>
<div class="menu_1_item_subtitle"> <div class="menu_1_item_subtitle" @click="jumpPage('总体架构资产设计与维护', '总体架构资产维护', '架构演进路线资产管理')">
<img src="@/assets/main/3img.png" alt=""> <img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">架构演进路线资产管理</span> <span style="margin-left: 5px;">架构演进路线资产管理</span>
</div> </div>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<img src="@/assets/main/3img.png" alt=""> <img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">总体架构资产可视化展示</span> <span style="margin-left: 5px;">总体架构资产可视化展示</span>
</div> </div>
<div class="menu_1_item_subtitle"> <div class="menu_1_item_subtitle" @click="jumpPage('总体架构资产设计与维护', '总体架构资产维护', '总体架构资产智能搜索')">
<img src="@/assets/main/3img.png" alt=""> <img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">总体架构资产智能搜索</span> <span style="margin-left: 5px;">总体架构资产智能搜索</span>
</div> </div>
...@@ -548,6 +548,14 @@ ...@@ -548,6 +548,14 @@
this.$router.push( '/main/currentAssetsList', () => {}, () => {} ); this.$router.push( '/main/currentAssetsList', () => {}, () => {} );
this.visible1 = false; this.visible1 = false;
break; break;
case '架构演进路线资产管理':
this.$router.push( '/main/archiEvoluteLine', () => {}, () => {} );
this.visible1 = false;
break;
case '总体架构资产智能搜索':
this.$router.push( '/main/archiIntelligenceSearch', () => {}, () => {} );
this.visible1 = false;
break;
case '在线文档编制': case '在线文档编制':
this.$router.push( '/main/doc-demo', () => {}, () => {} ); this.$router.push( '/main/doc-demo', () => {}, () => {} );
break; break;
......
<template>
<template>
<div class="archiEvoluteLine">
<div class="table_container">
<div class="search_menu">
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">演进项</span>
<el-select v-model="searchParams.conformCount" placeholder="请选择" class="search_item">
<el-option v-for="item in fuHeDu" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
</div>
<div class="search_menu_btn_container">
<div class="query_btn" @click="search_table">
<img class="btn_icon" src="@/assets/archi-ele-list/search.png" alt="" />
<p>查询</p>
</div>
<div class="reset_btn" @click="reset">
<img class="btn_icon" src="@/assets/archi-ele-list/reset.png" alt="" />
<p>重置</p>
</div>
</div>
</div>
<div class="search_btn">
<el-button type="primary" size="medium" icon="el-icon-document-add">新建</el-button>
<el-button type="primary" size="medium" icon="el-icon-delete">删除</el-button>
<div class="version_btn">
<img class="btn_icon" src="@/assets/archi-ele-list/version.png" alt="" />
<p>发布</p>
</div>
<div class="cancel_version_btn">
<img class="btn_icon" src="@/assets/archi-ele-list/version.png" alt="" />
<p>取消发布</p>
</div>
</div>
<el-table :height="tableHeight" v-loading="loading" :data="tableData" stripe border>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="deptName" label="单位" align="center"></el-table-column>
<el-table-column prop="startTime" label="统计时间" align="center"></el-table-column>
<el-table-column prop="policyName" label="政策名称" align="center"></el-table-column>
<el-table-column prop="policyContent" label="政策描述" align="center"></el-table-column>
<el-table-column prop="conformCount" label="符合度" align="center">
<template slot-scope="scope">
<div>
{{ scope.row.conformCount }}%
</div>
</template>
</el-table-column>
<el-table-column prop="usefulCount" label="应用数量" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" align="center"></el-table-column>
</el-table>
<!-- <el-pagination
background
layout="prev, pager, next"
:total="50">
</el-pagination> -->
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pager.current"
:page-sizes="pager.sizes"
:page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager.total">
</el-pagination>
</div>
</div>
</template>
<script>
import {
getJiShuZhengCeGuanLianShiYongTable,
getDianXingAnLiSelectData
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
import $ from 'jquery';
export default {
name: 'ArchiEvoluteLine',
components: {
},
data() {
return {
tableData: [],
query_item3: null,
query_item4: null,
loading: false,
search_select1: [],
pager: {
current: 1,
sizes: [10, 20, 50, 100, 200],
size: 10,
total: 20 //总条数
},
tableHeight: null,
searchParams: {
policyName: null,
conformCount: null,
},
fuHeDu: []
};
},
mounted(){
window.addEventListener('resize', () => {
this.set_table_height();
})
this.set_table_height();
this.get_table();
this.get_fu_he_du_select().then(res => {
this.fuHeDu = res;
})
},
methods: {
get_fu_he_du_select() {//符合度下拉
const params = {
key: "tech_compliance"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
resolve(res.data);
}
})
})
},
set_table_height() {//动态设置表格高度
const table_container_height = $(".table_container").height();
const search_menu_height = $(".search_menu").height();
const search_btn_height = $(".search_btn").outerHeight(true);
this.tableHeight = table_container_height - search_menu_height - search_btn_height - 90 + 'px';
},
search_table() {//搜索
this.pager.current = 1;
this.get_table();
},
reset() {//重置
this.searchParams.policyName = null;
this.searchParams.conformCount = null;
},
// 每页条数改变
handleSizeChange(val) {
this.pager.current = 1;
this.pager.size = val;
this.get_table();
},
//当前页码改变
handleCurrentChange(val) {
this.pager.current = val;
this.get_table();
},
get_table() {//查询表格数据
this.loading = true;
const params = {
"policyName": this.searchParams.policyName,
"conformCount": this.searchParams.conformCount,
"current": this.pager.current,
"pageSize": this.pager.size,
};
getJiShuZhengCeGuanLianShiYongTable(params).then(res => {
this.loading = false;
console.log(res)
// res.records.map(item => {
// const startTime_year = String(new Date(item.startTime).getFullYear());
// const startTime_month = String(new Date(item.startTime).getMonth() + 1);
// let startTime_day = String(new Date(item.startTime).getDay());
// startTime_day = startTime_day.length == 1 ? '0' + startTime_day : startTime_day;
// item['startTime_'] = startTime_year + '-' + startTime_month + '-' + startTime_day;
// });
// this.get_fu_he_du_select().then(res2 => {
// res.records.map(item3 => {
// let result1 = res2.find(item2 => item2.value == item3.conformCount);
// item3['conformCount_'] = result1 ? result1.label : '';
// });
// this.tableData = res.records;
// })
this.tableData = res.records;
this.pager.current = res.current;
this.pager.total = res.total;
this.pager.size = res.size;
// if(res.code == 200) {
// this.loading = false;
// console.log(res)
// // this.tableData = res.
// }
});
},
}
}
</script>
<style>
.confirmClass{
background-color: #0D867F !important;
}
.el-message-box__content{
padding: 60px 15px 60px 15px;
}
</style>
<style scoped>
.version_btn{
display: flex;
align-items: center;
justify-content: center;
width: 84px;
height: 32px;
background: rgba(13,134,127,0.1);
border-radius: 6px 6px 6px 6px;
/* border: 1px solid #0D867F; */
font-size: 14px;
color: #0D867F;
cursor: pointer;
margin-left: 15px;
}
.cancel_version_btn{
display: flex;
align-items: center;
justify-content: center;
width: 104px;
height: 32px;
background: rgba(13,134,127,0.1);
border-radius: 6px 6px 6px 6px;
/* border: 1px solid #0D867F; */
font-size: 14px;
color: #0D867F;
cursor: pointer;
margin-left: 15px;
}
.archiEvoluteLine{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
}
.el-button--primary{
background: rgba(13,134,127,0.1);
color: #0D867F;
border: 0;
}
/deep/ .el-input-group__append{
background-color: #0D867F;
color: #fff;
cursor: pointer;
}
.search_btn{
width: 100%;
display: flex;
margin-top: 50px;
margin-bottom: 20px;
}
.search_menu{
display: flex;
justify-content: space-between;
margin-bottom: 50px;
}
.search_menu_item_container{
display: flex;
align-items: center;
}
.search_menu_btn_container{
display: flex;
align-items: center;
}
.search_menu_item{
display: flex;
align-items: center;
width: 344px;
}
.search_title{
/* width: 20%; */
flex-shrink: 0;
margin-right: 15px;
}
.search_item{
width: 60%;
}
.query_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(13,134,127,1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F;
font-size: 14px;
color: #fff;
margin-right: 10px;
cursor: pointer;
}
.reset_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(244,244,244,1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #ccc;
font-size: 14px;
color: #666;
cursor: pointer;
}
.btn_icon{
margin-right: 10px;
}
.table_container{
width: 97%;
height: calc(100% - 40px);
margin-top: 20px;
}
.el-pagination{
margin-top: 30px;
}
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #0D867F;
}
</style>
\ No newline at end of file
<template>
<div class="archiIntelligenceSearch">
<div class="left_container"></div>
<div class="right_container"></div>
</div>
</template>
<script>
import {
getJiShuZhengCeJieGouHuaTable,
addJiShuZhengCeJieGouHuaTable,
editJiShuZhengCeJieGouHuaTable,
getDianXingAnLiSelectData,
deleteAllJiShuZhengCeJieGouHua,
exportJiShuZhengCeJieGouHuaTable
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
import $ from 'jquery';
export default {
name: 'ArchiIntelligenceSearch',
data() {
return {
};
},
mounted(){
},
methods: {
}
}
</script>
<style>
</style>
<style scoped>
.archiIntelligenceSearch{
width: 100%;
height: 100%;
display: flex;
}
.left_container{
width: 300px;
height: 100%;
}
.right_container{
width: calc(100% - 300px);
height: 100%;
}
</style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!