Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 2bd3d759 by liuyong
Options

修改bug

1 parent 1a6cab35
Inline Side-by-side
Showing with 120 additions and 55 deletions
src/views/Main/index.vue
......@@ -118,7 +118,7 @@
</el-popover>
<el-popover
placement="bottom"
width="960"
width="1100"
class="menu_item"
v-model="visible2"
style="margin-right: 80px;cursor: pointer;position: relative;"
......@@ -127,7 +127,7 @@
<div class="menu_1_item">
<div class="menu_1_item_title">
<img src="@/assets/main/2img.png" alt="">
<span style="margin-left: 5px;">系统架构视图设计</span>
<span style="margin-left: 5px;">系统架构资产管理</span>
</div>
<div class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '系统架构图设计', '系统信息管理')">
......@@ -142,29 +142,44 @@
<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="" />
<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 class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '概设阶段架构设计', '概设阶段架构设计')">
<img src="@/assets/main/3img.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="" />
<div class="menu_1_item">
<div class="menu_1_item_title">
<img src="@/assets/main/2img.png" alt="">
<span style="margin-left: 5px;">概设阶段架构设计</span>
<span style="margin-left: 5px;">系统架构管控要求</span>
</div>
<div class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '概设阶段架构设计', '概设阶段架构设计')">
<div class="menu_1_item_subtitle">
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">概设阶段架构设计</span>
<span style="margin-left: 5px;">评审情况(概要设计)</span>
</div>
<div class="menu_1_item_subtitle" @click="jumpPage('系统架构设计与管控', '概设阶段架构设计', '其他视图设计')">
<div class="menu_1_item_subtitle">
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">其他视图设计</span>
<span style="margin-left: 5px;">概设架构遵从检查</span>
</div>
<div class="menu_1_item_subtitle">
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">系统架构管控要求(自查)</span>
<span style="margin-left: 5px;">概设架构政策审查</span>
</div>
</div>
<img class="menu_1_item_line" src="@/assets/main/line.png" alt="" />
......@@ -194,6 +209,10 @@
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">概设关联业务管理</span>
</div>
<div class="menu_1_item_subtitle">
<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="" />
<div class="menu_1_item">
......@@ -230,14 +249,6 @@
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">技术政策审查</span>
</div>
<div class="menu_1_item_subtitle">
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">架构遵从符合度检查</span>
</div>
<div class="menu_1_item_subtitle">
<img src="@/assets/main/3img.png" alt="">
<span style="margin-left: 5px;">技术政策符合度检查</span>
</div>
</div>
</div>
<div slot="reference">
......
src/views/archi-asset-manage/index.vue
......@@ -2,7 +2,7 @@
<div class="archiAssetsManage">
<el-card class="box-card" style="margin-bottom: 10px;">
<div class="topMenuContainer">
<div>
<div style="display: flex;align-items: center;">
<el-button type="primary" size="medium" @click="operation('open_add_dialog1', null)">选择系统</el-button>
<el-button type="primary" size="medium" @click="operation('open_add_dialog2', null)">选择项目</el-button>
<div style="margin-left: 20px;margin-right: 20px;" v-if="showSelectTitle.title">您已选择：{{ showSelectTitle.title }}</div>
......@@ -508,6 +508,8 @@
// "archiAssetTypeId": this.archiAssetTypeId,
"current": this.pager.current,
"pageSize": this.pager.size,
"prjId": this.showSelectTitle.prjId,
"appId": this.showSelectTitle.appId,
};
this.loading = true;
getTotalZiChanJiaGouTable(params).then(res => {
......@@ -827,13 +829,6 @@
saveDialog(){//保存架构
this.$refs.form.validate(valid => {
if(valid) {
if(!this.showSelectTitle.title) {
Message({
type: 'error',
message: '请选择系统或项目!'
});
return;
}
let fieldsValue = [], eleName, targetAsset = [];
const items2 = this.zuJianLeiXingSelect.find(item => item.elementId == this.ruleForm.let4);
eleName = items2.elementName;
......@@ -958,6 +953,7 @@
this.showSelectTitle.appId = this.selectRow2[0].appId;
this.showSelectTitle.appCode = this.selectRow2[0].appCode;
this.showSelectTitle.appName = this.selectRow2[0].appName;
this.get_table();
},
cancelSelectSystem() {//取消选择系统
this.add_dialog1 = false;
......@@ -977,7 +973,6 @@
});
return;
}
console.log(this.selectRow3)
this.showSelectTitle.title = this.selectRow3[0].prjName;
this.showSelectTitle.status = this.selectRow3[0].prjPlanClass == 1 ? '新建' : '续建';
......@@ -991,6 +986,7 @@
this.showSelectTitle.appCode = null;
this.showSelectTitle.appName = null;
this.add_dialog2 = false;
this.get_table();
},
cancelSelectProject() {//取消选择项目
this.add_dialog2 = false;
......@@ -1003,6 +999,13 @@
this.tableHeight = right_container_height - 260 + 'px';
},
addItem() {//新增
if(!this.showSelectTitle.title) {
Message({
type: 'error',
message: '请先选择系统或项目!'
});
return;
}
this.add_dialog3 = true;
this.is_add_edit = 'add';
this.$nextTick(() => {
......
src/views/archiViewConfig/index.vue
......@@ -81,8 +81,8 @@
</template>
</el-table-column>
<el-table-column prop="content" label="视图描述" width="150" align="center"></el-table-column>
<el-table-column prop="eleName" label="元素范围" align="center"></el-table-column>
<el-table-column prop="relName" label="元素关系范围" align="center"></el-table-column>
<el-table-column prop="eleName" label="元素范围" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="relName" label="元素关系范围" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="version" label="版本" width="150" align="center"></el-table-column>
<el-table-column prop="state" label="状态" width="80" align="center">
<template slot-scope="scope">
......@@ -259,7 +259,12 @@
:center="false"
:close-on-click-modal="false"
width="40%">
<el-transfer v-model="transferValue1" :data="tableData1"></el-transfer>
<el-transfer
v-model="transferValue1"
:data="tableData1"
:left-default-checked="leftDefaultChecked1"
:right-default-checked="transferValue1">
</el-transfer>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="saveDialog2">保存</el-button>
<el-button @click="cancelDialog2">取消</el-button>
......@@ -312,6 +317,7 @@ export default {
data() {
return {
transferValue1: [],
leftDefaultChecked1: [],
transferValue2: [],
dialog2: false,
dialog3: false,
......@@ -753,6 +759,8 @@ export default {
this.getDicyTable();
this.formData = item;
this.transferValue1 = this.formData.archiEleId.split(",").map(item => Number(item));
console.log(this.transferValue1)
console.log(this.tableData1)
this.transferValue2 = this.formData.archiEleRelId.split(",").map(item => Number(item));
if (item.eleName) {
......
src/views/otherArchiDesign/index.vue
......@@ -34,7 +34,7 @@
</div> -->
</div>
</el-card>
<div v-if="viewId" class="add_container" @click="add_dialog2 = true">
<div v-if="viewId" class="add_container" @click="open_add_dialog2">
<i class="el-icon-plus"></i>
</div>
</div>
......@@ -172,7 +172,7 @@ export default {
currentNodekey: null,
showSelectTitle: {
title: null,
archiId: null,
appId: null,
},
add_dialog1: false,
searchParams2: {
......@@ -222,7 +222,7 @@ export default {
this.open_add_dialog1();
break;
case 'open_add_dialog2':
// this.open_add_dialog2();
this.open_add_dialog2();
break;
}
},
......@@ -236,6 +236,16 @@ export default {
break;
}
},
open_add_dialog2() {
if(!this.showSelectTitle.appId) {
Message({
type: 'error',
message: '请先选择系统!'
});
return;
}
this.add_dialog2 = true;
},
selectSystem() {//确定选择系统
if(this.selectRow2.length == 0) {
Message({
......@@ -253,7 +263,8 @@ export default {
}
this.add_dialog1 = false;
this.showSelectTitle.title = this.selectRow2[0].appName;
this.showSelectTitle.archiId = this.selectRow2[0].appId;
this.showSelectTitle.appId = this.selectRow2[0].appId;
this.get_list();
},
open_add_dialog1() {
this.add_dialog1 = true;
......@@ -339,7 +350,7 @@ export default {
},
treeClick(data, node, e) {//树点击的时候
if(!data.subList) {
// this.graphGroup = node.parent.data.viewId;
this.graphGroup = node.parent.data.viewId;
this.assetConstant = node.parent.data.archiType;
this.viewId = data.viewId;
this.pager.current = 1;
......@@ -355,6 +366,7 @@ export default {
current: this.pager.current,
pageSize: this.pager.size,
viewId: this.viewId,
appId: this.showSelectTitle.appId
}
getArchiViewManageDetail(params).then(res => {
if(res.code == 200) {
......@@ -397,7 +409,7 @@ export default {
const params = {
version: this.ruleForm.name,
viewId: this.viewId,
archiId: this.showSelectTitle.archiId,
appId: this.showSelectTitle.appId,
};
addArchiViewManage(params).then(res => {
if(res.code == 200) {
......
src/views/summaryArchiDesign/index.vue
......@@ -2,7 +2,7 @@
<div class="summaryArchiDesign">
<el-card class="box-card" style="margin-bottom: 10px;">
<div style="text-align: left;display: flex;align-items: center;">
<el-button type="primary" size="medium" @click="operation('open_add_dialog1', null)">选择系统</el-button>
<el-button type="primary" size="medium" @click="operation('open_add_dialog1', null)">选择项目</el-button>
<div style="margin-left: 20px;margin-right: 20px;" v-if="showSelectTitle.title">您已选择：{{ showSelectTitle.title }}</div>
</div>
</el-card>
......@@ -34,7 +34,7 @@
</div> -->
</div>
</el-card>
<div v-if="viewId" class="add_container" @click="add_dialog2 = true">
<div v-if="viewId" class="add_container" @click="open_add_dialog2">
<i class="el-icon-plus"></i>
</div>
</div>
......@@ -53,7 +53,7 @@
</div>
<el-dialog
title='选择系统'
title='选择项目'
:visible.sync="add_dialog1"
:center="false"
:close-on-click-modal="false"
......@@ -102,6 +102,13 @@
<span v-else>自建</span>
</template>
</el-table-column>
<el-table-column prop="prjName" label="项目名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="是否续建" align="center">
<template slot-scope="scope">
<span v-if="scope.row.prjPlanClass == 1">否</span>
<span v-else>是</span>
</template>
</el-table-column>
<el-table-column prop="buildOrg" label="承建单位" align="center"></el-table-column>
<el-table-column prop="projectManager" label="项目经理" align="center"></el-table-column>
<el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
......@@ -118,7 +125,7 @@
:total="pager2.total">
</el-pagination>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="dialogOperation('selectSystem', null)">确定</el-button>
<el-button class="greenButton" @click="dialogOperation('selectProject', null)">确定</el-button>
<el-button @click="add_dialog1 = false">取消</el-button>
</span>
</el-dialog>
......@@ -146,7 +153,7 @@
<script>
import {
getArchiViewManage,
querysystemInfoManageTable,
queryProjectInfoManageTable,
getDianXingAnLiSelectData,
getArchiViewManageDetail,
addArchiViewManage,
......@@ -173,7 +180,7 @@ export default {
currentNodekey: null,
showSelectTitle: {
title: null,
archiId: null,
prjId: null,
},
add_dialog1: false,
searchParams2: {
......@@ -223,21 +230,31 @@ export default {
this.open_add_dialog1();
break;
case 'open_add_dialog2':
// this.open_add_dialog2();
this.open_add_dialog2();
break;
}
},
dialogOperation(type, data) {
switch(type){
case 'selectSystem':
this.selectSystem();
case 'selectProject':
this.selectProject();
break;
case 'cancelSelectSystem':
// this.cancelSelectSystem();
break;
}
},
selectSystem() {//确定选择系统
open_add_dialog2() {
if(!this.showSelectTitle.prjId) {
Message({
type: 'error',
message: '请先选择项目!'
});
return;
}
this.add_dialog2 = true;
},
selectProject() {//确定选择系统
if(this.selectRow2.length == 0) {
Message({
type: 'error',
......@@ -253,8 +270,9 @@ export default {
return;
}
this.add_dialog1 = false;
this.showSelectTitle.title = this.selectRow2[0].appName;
this.showSelectTitle.archiId = this.selectRow2[0].appId;
this.showSelectTitle.title = this.selectRow2[0].prjName;
this.showSelectTitle.prjId = this.selectRow2[0].prjId;
this.get_list();
},
open_add_dialog1() {
this.add_dialog1 = true;
......@@ -309,7 +327,7 @@ export default {
"current": this.pager2.current,
"pageSize": this.pager2.size,
};
querysystemInfoManageTable(params).then(res => {
queryProjectInfoManageTable(params).then(res => {
if(res.code == 200) {
this.loading2 = false;
this.tableData2 = res.data.records;
......@@ -340,7 +358,7 @@ export default {
},
treeClick(data, node, e) {//树点击的时候
if(!data.subList) {
// this.graphGroup = node.parent.data.viewId;
this.graphGroup = node.parent.data.viewId;
this.assetConstant = node.parent.data.archiType;
this.viewId = data.viewId;
this.pager.current = 1;
......@@ -356,6 +374,7 @@ export default {
current: this.pager.current,
pageSize: this.pager.size,
viewId: this.viewId,
prjId: this.showSelectTitle.prjId,
}
getArchiViewManageDetail(params).then(res => {
if(res.code == 200) {
......@@ -424,7 +443,7 @@ export default {
const params = {
version: this.ruleForm.name,
viewId: this.viewId,
archiId: this.showSelectTitle.archiId,
prjId: this.showSelectTitle.prjId,
};
addArchiViewManage(params).then(res => {
if(res.code == 200) {
......@@ -551,7 +570,7 @@ export default {
/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content >.is-leaf{
background-color: #0D867F !important;
}
/deep/ .is-leaf {
/deep/ .filter-tree .is-leaf {
background-color: #fff !important;
}
.right_container{
......
src/views/systemArchiViewDesign/index.vue
......@@ -34,7 +34,7 @@
</div> -->
</div>
</el-card>
<div v-if="viewId" class="add_container" @click="add_dialog2 = true">
<div v-if="viewId" class="add_container" @click="open_add_dialog2">
<i class="el-icon-plus"></i>
</div>
</div>
......@@ -173,7 +173,7 @@ export default {
currentNodekey: null,
showSelectTitle: {
title: null,
archiId: null,
appId: null,
},
add_dialog1: false,
searchParams2: {
......@@ -237,6 +237,16 @@ export default {
break;
}
},
open_add_dialog2() {
if(!this.showSelectTitle.appId) {
Message({
type: 'error',
message: '请先选择系统!'
});
return;
}
this.add_dialog2 = true;
},
selectSystem() {//确定选择系统
if(this.selectRow2.length == 0) {
Message({
......@@ -254,7 +264,8 @@ export default {
}
this.add_dialog1 = false;
this.showSelectTitle.title = this.selectRow2[0].appName;
this.showSelectTitle.archiId = this.selectRow2[0].appId;
this.showSelectTitle.appId = this.selectRow2[0].appId;
this.get_list();
},
open_add_dialog1() {
this.add_dialog1 = true;
......@@ -340,7 +351,7 @@ export default {
},
treeClick(data, node, e) {//树点击的时候
if(!data.subList) {
// this.graphGroup = node.parent.data.viewId;
this.graphGroup = node.parent.data.viewId;
this.assetConstant = node.parent.data.archiType;
this.viewId = data.viewId;
this.pager.current = 1;
......@@ -356,6 +367,7 @@ export default {
current: this.pager.current,
pageSize: this.pager.size,
viewId: this.viewId,
appId: this.showSelectTitle.appId
}
getArchiViewManageDetail(params).then(res => {
if(res.code == 200) {
......@@ -424,7 +436,7 @@ export default {
const params = {
version: this.ruleForm.name,
viewId: this.viewId,
archiId: this.showSelectTitle.archiId,
appId: this.showSelectTitle.appId
};
addArchiViewManage(params).then(res => {
if(res.code == 200) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!