Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 21e89caf by liuyong
Options

修改bug

1 parent ca72b919
Inline Side-by-side
Showing with 183 additions and 49 deletions
src/api/index.js
......@@ -580,3 +580,7 @@ export function getReviewArchiFollowCheckRightGraph(params) {
export function saveReviewArchiFollowCheckRightSuggestion(params) {
return post('/network/app-archi-control-requirements/cComment', params);
}
// 概设架构遵从检查, 保存
export function queryReviewArchiFollowCheckRightSuggestionDetails(params) {
return post('/network/app-archi-control-requirements/qReview', params);
}
src/views/Main/index.vue
......@@ -724,6 +724,7 @@ export default {
$(this).find('.under_line').css('display', 'none')
},
)
},
methods: {
openDrawIO() {
......
src/views/reviewArchiFollowCheck/index.vue
......@@ -269,14 +269,14 @@ export default {
}
const prjId = this.selectRows[0].prjId;
this.$router.push(
`/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1`,
`/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1&state=1`,
() => {},
() => {}
);
},
check(row, type) {//查看点击
this.$router.push(
`/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}`,
`/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}&state=2`,
() => {},
() => {}
);
......
src/views/reviewArchiFollowCheck/tab1.vue
......@@ -11,10 +11,12 @@
<el-alert title="评审内容" type="success" :closable="false"></el-alert>
<el-select v-model="select2" class="rightSelect" @change="select2Change">
<!-- <el-option v-for="item in rightSelect" :key="item.viewDetailsId" :label="item.viewDetailName" :value="item.viewDetailsId"></el-option> -->
<el-option label="本项目-安全防护方案.pdf" value="1"></el-option>
<el-option label="系统架构-概设阶段架构设计-安全架构视图" value="1"></el-option>
</el-select>
<div v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
<div style="height: calc(100% - 40px);overflow-y: auto;">
<div style="display: inline-block;" v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
</div>
</div>
</div>
</div>
......@@ -36,7 +38,8 @@
<script>
import {
getReviewArchiFollowCheckRightGraph,
saveReviewArchiFollowCheckRightSuggestion
saveReviewArchiFollowCheckRightSuggestion,
queryReviewArchiFollowCheckRightSuggestionDetails
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
......@@ -48,8 +51,8 @@ export default {
return {
radio: '1',
textarea: '',
select1: null,
select2: null,
select1: '1',
select2: '1',
rightImageArray: [],
rightImageSrc: null,
prjId: null,
......@@ -59,9 +62,26 @@ export default {
mounted(){
this.prjId = this.$route.query.prjId;
this.getRightGraph(5);
this.getRightGraph(5);
const state = this.$route.query.state;
if(state == 2) {
this.getDetails();
}
},
methods: {
getDetails() {//查看详情，从表格跳转过来的
const params = {
archiPrjReviewEnum: 'SECURITY_ARCHITECTURE_CONFORMANCE',
prjId: this.prjId,
}
queryReviewArchiFollowCheckRightSuggestionDetails(params).then(res => {
if (res.code == 200) {
this.textarea = res.data.reviewSuggestion;
}
})
},
getRightGraph(archiBelongId) {//获取右侧图片
const params = {
archiBelongId: archiBelongId,
......@@ -76,7 +96,6 @@ export default {
item.metaModelSvg = 'data:image/svg+xml;base64,'+ item.metaModelSvg;
})
this.rightImageArray = res.data;
console.log(this.rightImageArray)
// this.rightSelect = res.data;
// this.select2 = res.data[0].viewDetailsId;
// this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.data[0].metaModelSvg;
......@@ -97,7 +116,10 @@ export default {
}
saveReviewArchiFollowCheckRightSuggestion(params).then(res => {
if (res.code == 200) {
console.log(res.code)
Message({
type: "success",
message: '保存成功',
});
}else {
Message({
type: "error",
......@@ -121,11 +143,14 @@ export default {
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.rightSelect{
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.el-button--primary{
background: rgba(13,134,127,1);
......@@ -142,13 +167,13 @@ export default {
}
.left_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
margin-right: 1%;
position: relative;
}
.right_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
position: relative;
}
.rightImageContainer{
......
src/views/reviewArchiFollowCheck/tab2.vue
......@@ -13,8 +13,10 @@
<!-- <el-option v-for="item in rightSelect" :key="item.viewDetailsId" :label="item.viewDetailName" :value="item.viewDetailsId"></el-option> -->
<el-option label="系统架构-系统架构视图设计-安全架构视图" value="1"></el-option>
</el-select>
<div v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
<div style="height: calc(100% - 40px);overflow-y: auto;">
<div style="display: inline-block;" v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
</div>
</div>
</div>
</div>
......@@ -36,7 +38,8 @@
<script>
import {
getReviewArchiFollowCheckRightGraph,
saveReviewArchiFollowCheckRightSuggestion
saveReviewArchiFollowCheckRightSuggestion,
queryReviewArchiFollowCheckRightSuggestionDetails
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
......@@ -48,8 +51,8 @@ export default {
return {
radio: '1',
textarea: '',
select1: null,
select2: null,
select1: '1',
select2: '1',
rightImageArray: [],
rightImageSrc: null,
prjId: null,
......@@ -60,8 +63,25 @@ export default {
this.prjId = this.$route.query.prjId;
this.getRightGraph(5);
const state = this.$route.query.state;
if(state == 2) {
this.getDetails();
}
},
methods: {
getDetails() {//查看详情，从表格跳转过来的
const params = {
archiPrjReviewEnum: 'SECURITY_ARCHITECTURE_CONFORMANCE',
prjId: this.prjId,
}
queryReviewArchiFollowCheckRightSuggestionDetails(params).then(res => {
if (res.code == 200) {
this.textarea = res.data.reviewSuggestion;
}
})
},
getRightGraph(archiBelongId) {//获取右侧图片
const params = {
archiBelongId: archiBelongId,
......@@ -76,7 +96,6 @@ export default {
item.metaModelSvg = 'data:image/svg+xml;base64,'+ item.metaModelSvg;
})
this.rightImageArray = res.data;
console.log(this.rightImageArray)
// this.rightSelect = res.data;
// this.select2 = res.data[0].viewDetailsId;
// this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.data[0].metaModelSvg;
......@@ -97,7 +116,10 @@ export default {
}
saveReviewArchiFollowCheckRightSuggestion(params).then(res => {
if (res.code == 200) {
console.log(res.code)
Message({
type: "success",
message: '保存成功',
});
}else {
Message({
type: "error",
......@@ -121,11 +143,15 @@ export default {
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.rightSelect{
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.el-button--primary{
background: rgba(13,134,127,1);
......@@ -142,13 +168,13 @@ export default {
}
.left_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
margin-right: 1%;
position: relative;
}
.right_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
position: relative;
}
.rightImageContainer{
......
src/views/reviewArchiFollowCheck/tab3.vue
......@@ -13,8 +13,10 @@
<!-- <el-option v-for="item in rightSelect" :key="item.viewDetailsId" :label="item.viewDetailName" :value="item.viewDetailsId"></el-option> -->
<el-option label="系统架构-概设阶段架构设计-技术架构视图" value="1"></el-option>
</el-select>
<div v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
<div style="height: calc(100% - 40px);overflow-y: auto;">
<div style="display: inline-block;" v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
</div>
</div>
</div>
</div>
......@@ -36,7 +38,8 @@
<script>
import {
getReviewArchiFollowCheckRightGraph,
saveReviewArchiFollowCheckRightSuggestion
saveReviewArchiFollowCheckRightSuggestion,
queryReviewArchiFollowCheckRightSuggestionDetails
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
......@@ -48,8 +51,8 @@ export default {
return {
radio: '1',
textarea: '',
select1: null,
select2: null,
select1: '1',
select2: '1',
rightImageArray: [],
rightImageSrc: null,
prjId: null,
......@@ -60,8 +63,25 @@ export default {
this.prjId = this.$route.query.prjId;
this.getRightGraph(4);
const state = this.$route.query.state;
if(state == 2) {
this.getDetails();
}
},
methods: {
getDetails() {//查看详情，从表格跳转过来的
const params = {
archiPrjReviewEnum: 'SECURITY_ARCHITECTURE_CONFORMANCE',
prjId: this.prjId,
}
queryReviewArchiFollowCheckRightSuggestionDetails(params).then(res => {
if (res.code == 200) {
this.textarea = res.data.reviewSuggestion;
}
})
},
getRightGraph(archiBelongId) {//获取右侧图片
const params = {
archiBelongId: archiBelongId,
......@@ -76,7 +96,6 @@ export default {
item.metaModelSvg = 'data:image/svg+xml;base64,'+ item.metaModelSvg;
})
this.rightImageArray = res.data;
console.log(this.rightImageArray)
// this.rightSelect = res.data;
// this.select2 = res.data[0].viewDetailsId;
// this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.data[0].metaModelSvg;
......@@ -97,7 +116,10 @@ export default {
}
saveReviewArchiFollowCheckRightSuggestion(params).then(res => {
if (res.code == 200) {
console.log(res.code)
Message({
type: "success",
message: '保存成功',
});
}else {
Message({
type: "error",
......@@ -121,11 +143,15 @@ export default {
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.rightSelect{
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.el-button--primary{
background: rgba(13,134,127,1);
......@@ -142,13 +168,13 @@ export default {
}
.left_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
margin-right: 1%;
position: relative;
}
.right_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
position: relative;
}
.rightImageContainer{
......
src/views/reviewArchiFollowCheck/tab4.vue
......@@ -13,8 +13,10 @@
<!-- <el-option v-for="item in rightSelect" :key="item.viewDetailsId" :label="item.viewDetailName" :value="item.viewDetailsId"></el-option> -->
<el-option label="系统架构-概设阶段架构设计-应用架构视图" value="1"></el-option>
</el-select>
<div v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
<div style="height: calc(100% - 40px);overflow-y: auto;">
<div style="display: inline-block;" v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
</div>
</div>
</div>
</div>
......@@ -36,7 +38,8 @@
<script>
import {
getReviewArchiFollowCheckRightGraph,
saveReviewArchiFollowCheckRightSuggestion
saveReviewArchiFollowCheckRightSuggestion,
queryReviewArchiFollowCheckRightSuggestionDetails
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
......@@ -48,8 +51,8 @@ export default {
return {
radio: '1',
textarea: '',
select1: null,
select2: null,
select1: '1',
select2: '1',
rightImageArray: [],
rightImageSrc: null,
prjId: null,
......@@ -60,8 +63,25 @@ export default {
this.prjId = this.$route.query.prjId;
this.getRightGraph(2);
const state = this.$route.query.state;
if(state == 2) {
this.getDetails();
}
},
methods: {
getDetails() {//查看详情，从表格跳转过来的
const params = {
archiPrjReviewEnum: 'SECURITY_ARCHITECTURE_CONFORMANCE',
prjId: this.prjId,
}
queryReviewArchiFollowCheckRightSuggestionDetails(params).then(res => {
if (res.code == 200) {
this.textarea = res.data.reviewSuggestion;
}
})
},
getRightGraph(archiBelongId) {//获取右侧图片
const params = {
archiBelongId: archiBelongId,
......@@ -76,7 +96,6 @@ export default {
item.metaModelSvg = 'data:image/svg+xml;base64,'+ item.metaModelSvg;
})
this.rightImageArray = res.data;
console.log(this.rightImageArray)
// this.rightSelect = res.data;
// this.select2 = res.data[0].viewDetailsId;
// this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.data[0].metaModelSvg;
......@@ -97,7 +116,10 @@ export default {
}
saveReviewArchiFollowCheckRightSuggestion(params).then(res => {
if (res.code == 200) {
console.log(res.code)
Message({
type: "success",
message: '保存成功',
});
}else {
Message({
type: "error",
......@@ -121,11 +143,15 @@ export default {
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.rightSelect{
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.el-button--primary{
background: rgba(13,134,127,1);
......@@ -142,13 +168,13 @@ export default {
}
.left_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
margin-right: 1%;
position: relative;
}
.right_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
position: relative;
}
.rightImageContainer{
......
src/views/reviewArchiFollowCheck/tab5.vue
......@@ -13,8 +13,10 @@
<!-- <el-option v-for="item in rightSelect" :key="item.viewDetailsId" :label="item.viewDetailName" :value="item.viewDetailsId"></el-option> -->
<el-option label="系统架构-概设阶段架构设计-数据架构视图" value="1"></el-option>
</el-select>
<div v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
<div style="height: calc(100% - 40px);overflow-y: auto;">
<div style="display: inline-block;" v-for="item in rightImageArray" :key="item.viewDetailsId">
<img :src="item.metaModelSvg" alt="">
</div>
</div>
</div>
</div>
......@@ -36,7 +38,8 @@
<script>
import {
getReviewArchiFollowCheckRightGraph,
saveReviewArchiFollowCheckRightSuggestion
saveReviewArchiFollowCheckRightSuggestion,
queryReviewArchiFollowCheckRightSuggestionDetails
} from '@/api/index.js';
import { MessageBox, Message } from 'element-ui';
export default {
......@@ -48,8 +51,8 @@ export default {
return {
radio: '1',
textarea: '',
select1: null,
select2: null,
select1: '1',
select2: '1',
rightImageArray: [],
rightImageSrc: null,
prjId: null,
......@@ -60,8 +63,25 @@ export default {
this.prjId = this.$route.query.prjId;
this.getRightGraph(3);
const state = this.$route.query.state;
if(state == 2) {
this.getDetails();
}
},
methods: {
getDetails() {//查看详情，从表格跳转过来的
const params = {
archiPrjReviewEnum: 'SECURITY_ARCHITECTURE_CONFORMANCE',
prjId: this.prjId,
}
queryReviewArchiFollowCheckRightSuggestionDetails(params).then(res => {
if (res.code == 200) {
this.textarea = res.data.reviewSuggestion;
}
})
},
getRightGraph(archiBelongId) {//获取右侧图片
const params = {
archiBelongId: archiBelongId,
......@@ -76,7 +96,6 @@ export default {
item.metaModelSvg = 'data:image/svg+xml;base64,'+ item.metaModelSvg;
})
this.rightImageArray = res.data;
console.log(this.rightImageArray)
// this.rightSelect = res.data;
// this.select2 = res.data[0].viewDetailsId;
// this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.data[0].metaModelSvg;
......@@ -97,7 +116,10 @@ export default {
}
saveReviewArchiFollowCheckRightSuggestion(params).then(res => {
if (res.code == 200) {
console.log(res.code)
Message({
type: "success",
message: '保存成功',
});
}else {
Message({
type: "error",
......@@ -121,11 +143,15 @@ export default {
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.rightSelect{
position: absolute;
top: 44px;
left: 22px;
width: 400px;
}
.el-button--primary{
background: rgba(13,134,127,1);
......@@ -142,13 +168,13 @@ export default {
}
.left_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
margin-right: 1%;
position: relative;
}
.right_container{
width: 49%;
border: 1px solid red;
border: 1px solid #ccc;
position: relative;
}
.rightImageContainer{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!