Commit 3114aa46 by liuyong

修改bug

1 parent cea2b101
...@@ -539,6 +539,10 @@ export function deleteDocument(params) { ...@@ -539,6 +539,10 @@ export function deleteDocument(params) {
export function addEditDocument(params) { export function addEditDocument(params) {
return post('/kl-doc-parser/savOrUptTitle', params); return post('/kl-doc-parser/savOrUptTitle', params);
} }
// 文档解析
export function documentResolve(params) {
return post('/kl-doc-parser/docParser', params);
}
// 系统资产架构,批量删除,删除 // 系统资产架构,批量删除,删除
export function deleteSystemTable(params) { export function deleteSystemTable(params) {
return post('/network/arc-ast-sys/delBatch', params); return post('/network/arc-ast-sys/delBatch', params);
......
...@@ -205,6 +205,16 @@ const routes = [ ...@@ -205,6 +205,16 @@ const routes = [
name: 'otherArchiDesignDetails', name: 'otherArchiDesignDetails',
component: () => import('@/views/otherArchiDesign/details.vue'), component: () => import('@/views/otherArchiDesign/details.vue'),
}, },
{
path: '/main/reviewSituation',//评审情况(概要设计)
name: 'reviewSituation',
component: () => import('@/views/reviewSituation/index.vue'),
},
{
path: '/main/reviewSituationDetails',//评审情况(概要设计),详情
name: 'reviewSituationDetails',
component: () => import('@/views/reviewSituation/details.vue'),
},
] ]
} }
] ]
......
...@@ -61,17 +61,6 @@ ...@@ -61,17 +61,6 @@
<span style="margin-left: 5px;">元模型字典管理</span> <span style="margin-left: 5px;">元模型字典管理</span>
</div> </div>
</div> </div>
<!-- <img class="menu_1_item_line" src="@/assets/main/line.png" alt="" /> -->
<!-- <div class="menu_1_item">
<div class="menu_1_item_title">
<img src="@/assets/main/2img.png" alt="">
<span style="margin-left: 5px;">架构视图管理</span>
</div>
<div class="menu_1_item_subtitle" @click="jumpPage('总体架构资产设计与维护', '架构视图管理', '架构视图管理')">
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">架构视图管理</span>
</div>
</div> -->
<img class="menu_1_item_line" src="@/assets/main/line.png" alt="" /> <img class="menu_1_item_line" src="@/assets/main/line.png" alt="" />
<div class="menu_1_item"> <div class="menu_1_item">
<div class="menu_1_item_title"> <div class="menu_1_item_title">
...@@ -149,15 +138,15 @@ ...@@ -149,15 +138,15 @@
<img src="@/assets/main/2img.png" alt=""> <img src="@/assets/main/2img.png" alt="">
<span style="margin-left: 5px;">系统架构设计</span> <span style="margin-left: 5px;">系统架构设计</span>
</div> </div>
<div class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '系统架构设计', '系统架构视图设计')"> <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>
<div class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '概设阶段架构设计', '概设阶段架构设计')"> <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>
<div class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '概设阶段架构设计', '其他视图设计')"> <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>
...@@ -169,7 +158,7 @@ ...@@ -169,7 +158,7 @@
<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>
...@@ -560,6 +549,10 @@ ...@@ -560,6 +549,10 @@
this.$router.push( '/main/otherArchiDesign', () => {}, () => {} ); this.$router.push( '/main/otherArchiDesign', () => {}, () => {} );
this.visible2 = false; this.visible2 = false;
break; break;
case '评审情况(概要设计)':
this.$router.push( '/main/reviewSituation', () => {}, () => {} );
this.visible2 = false;
break;
} }
} }
} }
......
...@@ -228,8 +228,8 @@ export default { ...@@ -228,8 +228,8 @@ export default {
docId: data.docId, docId: data.docId,
docName: data.docName, docName: data.docName,
titleName: data.titleName, titleName: data.titleName,
parentDocTitleId: data.parentDocTitleId, parentDocTitleId: data.docTitleId,
parentDocTit1e: data.parentDocTitle, parentDocTit1e: data.docTitle,
titleLevel: data.titleLevel, titleLevel: data.titleLevel,
} }
}, },
...@@ -329,7 +329,7 @@ export default { ...@@ -329,7 +329,7 @@ export default {
...this.leftInfo, ...this.leftInfo,
docTitle: this.ruleForm.let1, docTitle: this.ruleForm.let1,
paraExplain: this.ruleForm.let2, paraExplain: this.ruleForm.let2,
docContent: this.ruleForm.let5, docContent: this.editorHtml,
}; };
console.log(requestParams) console.log(requestParams)
addEditDocument(requestParams).then(res => { addEditDocument(requestParams).then(res => {
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
.left_container{ .left_container{
width: 20%; width: 20%;
margin-right: 20px; margin-right: 20px;
overflow-y: auto;
} }
.custom-tree-node { .custom-tree-node {
flex: 1; flex: 1;
......
...@@ -145,6 +145,7 @@ import { ...@@ -145,6 +145,7 @@ import {
get_BaoGaoMoBanJieGouHua_Table, get_BaoGaoMoBanJieGouHua_Table,
editReportTemplateFabric, editReportTemplateFabric,
deleteAllBaoGaoMoBanJieGouHua, deleteAllBaoGaoMoBanJieGouHua,
documentResolve
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
import $ from 'jquery'; import $ from 'jquery';
...@@ -210,7 +211,8 @@ export default { ...@@ -210,7 +211,8 @@ export default {
}, },
is_add_edit: 'add', is_add_edit: 'add',
editId: undefined, editId: undefined,
moBanLeiXing: [] moBanLeiXing: [],
fileBuffer: null,
}; };
}, },
mounted(){ mounted(){
...@@ -257,8 +259,13 @@ export default { ...@@ -257,8 +259,13 @@ export default {
this.ruleForm.let3 = null; this.ruleForm.let3 = null;
this.ruleForm.let5 = null; this.ruleForm.let5 = null;
this.ruleForm.let6 = null; this.ruleForm.let6 = null;
this.fileBuffer = null;
}, },
handleFileUploadSuccess(res, file, fileList) {//文件上传 handleFileUploadSuccess(res, file, fileList) {//文件上传
// console.log(res)
// console.log(file)
// console.log(fileList)
this.fileBuffer = file.raw;
this.ruleForm.let3 = res.data.fileId; this.ruleForm.let3 = res.data.fileId;
this.ruleForm.let5 = file.name; this.ruleForm.let5 = file.name;
this.ruleForm.let6 = res.data.downLoadUrl; this.ruleForm.let6 = res.data.downLoadUrl;
...@@ -309,7 +316,22 @@ export default { ...@@ -309,7 +316,22 @@ export default {
fileUrl: this.ruleForm.let6, fileUrl: this.ruleForm.let6,
tplRemark: this.ruleForm.let4, tplRemark: this.ruleForm.let4,
}; };
let formData = new FormData();
formData.append("docId", this.ruleForm.let3);
formData.append("docName", this.ruleForm.let5);
formData.append("file", this.fileBuffer);
formData.append("titleName", this.ruleForm.let1);
const requestParams = this.is_add_edit == 'add' ? params : { ...params, tplId: this.editId }; const requestParams = this.is_add_edit == 'add' ? params : { ...params, tplId: this.editId };
documentResolve(formData).then(res => {
if(res.code == 200) {
// console.log(res);
}else {
Message({
type: 'error',
message: res.msg
});
}
});
if(this.is_add_edit == 'add') { if(this.is_add_edit == 'add') {
addReportTemplateFabric(requestParams).then(res => { addReportTemplateFabric(requestParams).then(res => {
if(res.code == 200) { if(res.code == 200) {
......
<template>
<div class="reviewSituationDetails">
<el-tabs>
<el-tab-pane label="一致性评审">
<Tab1></Tab1>
</el-tab-pane>
<el-tab-pane label="架构遵从">
<Tab2></Tab2>
</el-tab-pane>
<el-tab-pane label="关键技术深度评审">
<Tab3></Tab3>
</el-tab-pane>
<el-tab-pane label="功能深度评审">
<Tab4></Tab4>
</el-tab-pane>
<el-tab-pane label="数据深度评审">
<Tab5></Tab5>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import Tab1 from './tab1.vue';
import Tab2 from './tab2.vue';
import Tab3 from './tab3.vue';
import Tab4 from './tab4.vue';
import Tab5 from './tab5.vue';
import { MessageBox, Message } from 'element-ui';
import $ from 'jquery';
import {
saveArchiViewManageCardDetails
} from '@/api/index.js';
export default {
name: 'reviewSituationDetails',
components: {
Tab1,
Tab2,
Tab3,
Tab4,
Tab5,
},
data() {
return {
routerId: null,
};
},
mounted(){
},
methods: {
}
}
</script>
<style>
.confirmClass{
background-color: #0D867F !important;
}
.el-message-box__content{
padding: 60px 15px 60px 15px;
}
</style>
<style scoped>
.el-tabs{
width: 100%;
height: 100%;
}
/deep/ .el-tabs__item.is-active {
color: #0D867F;
}
/deep/ .el-tabs__item:hover{
color: #0D867F;
}
/deep/ .el-tabs__active-bar{
background-color: #0D867F;
}
/deep/ .el-tabs__content{
height: calc(100% - 38px);
padding: 0;
}
.el-tab-pane{
height: 100%;
}
.reviewSituationDetails{
width: 100%;
height: 100%;
display: flex;
position: relative;
}
/deep/ .el-dialog__header{
background-color: #0D867F;
text-align: left;
}
/deep/ .el-dialog__title{
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.greenButton{
background-color: #0D867F;
color: #fff;
}
</style>
<template>
<div class="reviewSituation">
<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.let1" 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 class="search_menu_item">
<span class="search_title">部门</span>
<el-select v-model="searchParams.let2" 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 class="search_menu_item">
<span class="search_title">系统名称</span>
<el-select v-model="searchParams.let3" 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 class="search_menu_item">
<span class="search_title">建设类型</span>
<el-select v-model="searchParams.let4" 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" @click="toDetails">评审情况(概要设计)</el-button>
</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" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="policyContent" label="建设类型" align="center"></el-table-column>
<el-table-column prop="policyContent" label="项目名称" align="center"></el-table-column>
<el-table-column prop="policyContent" label="是否续建" align="center"></el-table-column>
<el-table-column prop="policyContent" 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-column prop="remark" 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>
<el-dialog
:title="is_add_edit == 'add' ? '新建字典' : '编辑字典'"
:visible.sync="add_dialog"
:center="false"
:close-on-click-modal="false"
width="60%">
<el-form :model="ruleForm" ref="form" :rules="rules" style="display: flex;flex-wrap: wrap;">
<el-form-item label="字典名称:" prop="let1">
<el-input v-no-backslash v-model="ruleForm.let1" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="字典标识:" prop="let2">
<el-input v-no-backslash v-model="ruleForm.let2" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross1" label="描述:" prop="let3">
<el-input v-no-backslash v-model="ruleForm.let3" type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="请输入内容"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="save_dicy">保存</el-button>
<el-button @click="add_dialog = false">取消</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {
getJiShuZhengCeGuanLianShiYongTable,
getDianXingAnLiSelectData
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
import $ from 'jquery';
export default {
name: 'reviewSituation',
components: {
},
data() {
return {
ruleForm: {
let1: '',
let2: '',
let3: '',
},
rules: {
},
add_dialog: false,
is_add_edit: 'add',
tableData: [],
loading: false,
search_select1: [],
pager: {
current: 1,
sizes: [10, 20, 50, 100, 200],
size: 10,
total: 20 //总条数
},
tableHeight: null,
searchParams: {
let1: null,
let2: null,
let3: null,
let4: 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: {
toDetails() {
this.$router.push( `/main/reviewSituationDetails`, () => {}, () => {} );
},
save_dicy() {//保存字典
this.$refs.form.validate(valid => {
if(valid) {
}else {
return false;
}
});
},
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.let1 = null;
this.searchParams.let2 = null;
this.searchParams.let3 = null;
this.searchParams.let4 = 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.let1,
"conformCount": this.searchParams.let2,
"conformCount": this.searchParams.let3,
"conformCount": this.searchParams.let4,
"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;
}
.reviewSituation{
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;
}
/deep/ .el-dialog__header{
background-color: #0D867F;
text-align: left;
}
/deep/ .el-dialog__title{
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.greenButton{
background-color: #0D867F;
color: #fff;
}
.el-form-item{
display: flex;
align-items: center;
width: 33%;
}
</style>
\ No newline at end of file
<template>
<div class="tab1">
</div>
</template>
<script>
import {
getArchiViewManageTable
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
name: 'tab1',
components: {
},
data() {
return {
};
},
mounted(){
},
methods: {
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
<template>
<div class="tab2">
</div>
</template>
<script>
import {
getArchiViewManageTable
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
name: 'tab2',
components: {
},
data() {
return {
};
},
mounted(){
},
methods: {
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
<template>
<div class="tab3">
</div>
</template>
<script>
import {
getArchiViewManageTable
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
name: 'tab3',
components: {
},
data() {
return {
};
},
mounted(){
},
methods: {
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
<template>
<div class="tab4">
</div>
</template>
<script>
import {
getArchiViewManageTable
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
name: 'tab4',
components: {
},
data() {
return {
};
},
mounted(){
},
methods: {
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
<template>
<div class="tab5">
</div>
</template>
<script>
import {
getArchiViewManageTable
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
name: 'tab5',
components: {
},
data() {
return {
};
},
mounted(){
},
methods: {
}
}
</script>
<style scoped>
</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!