Skip to content

liangzhen / framework-tools-web

Go to a project
Commit f26b04c2 by liuyong
Options

Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

2 parents 33c7466e 4d39208c
Inline Side-by-side
Showing with 164 additions and 130 deletions
src/api/index.js
...@@ -564,3 +564,7 @@ export function systemArchiSaveFactor(params) { ...@@ -564,3 +564,7 @@ export function systemArchiSaveFactor(params) {
return post('/network/arc-ast-sys/extend', params); return post('/network/arc-ast-sys/extend', params);
} }
// 概设架构遵从检查-列表
export function getGaiSheJiaGouZunCongJiaChaTable(params) {
return post('/network/app-archi-control-requirements/', params);
}
src/views/reviewArchiFollowCheck/index.vue
...@@ -17,24 +17,22 @@ ...@@ -17,24 +17,22 @@
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">系统名称</span> <span class="search_title">系统名称</span>
<el-select v-model="searchParams.let3" placeholder="请选择" class="search_item"> <el-input v-no-backslash v-model="searchParams.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
<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_item"> <div class="search_menu_item">
<span class="search_title">建设类型</span> <span class="search_title">建设类型</span>
<el-select v-model="searchParams.let4" placeholder="请选择" class="search_item"> <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-option v-for="item in ziJianLeiXing" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div class="search_menu_btn_container"> <div class="search_menu_btn_container">
<div class="query_btn" @click="search_table"> <div class="query_btn" @click="search_table">
<img class="btn_icon" src="@/assets/archi-ele-list/search.png" alt="" /> <img class="btn_icon" src="@/assets/archi-ele-list/search.png" alt=""/>
<p>查询</p> <p>查询</p>
</div> </div>
<div class="reset_btn" @click="reset"> <div class="reset_btn" @click="reset">
<img class="btn_icon" src="@/assets/archi-ele-list/reset.png" alt="" /> <img class="btn_icon" src="@/assets/archi-ele-list/reset.png" alt=""/>
<p>重置</p> <p>重置</p>
</div> </div>
</div> </div>
...@@ -45,31 +43,45 @@ ...@@ -45,31 +43,45 @@
<el-table :height="tableHeight" v-loading="loading" @selection-change="select_table_rows" :data="tableData" stripe border> <el-table :height="tableHeight" v-loading="loading" @selection-change="select_table_rows" :data="tableData" stripe border>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <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="manageOrgId" label="单位" align="center"></el-table-column>
<el-table-column prop="startTime" label="部门" align="center"></el-table-column> <el-table-column prop="manageDeptId" 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="appName" 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="buildType" label="建设类型" align="center">
<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"> <template slot-scope="scope">
<div> <span v-if="scope.row.buildType == 1">统推</span>
{{ scope.row.conformCount }}% <span v-else-if="scope.row.buildType == 2">自建</span>
</div> </template>
</el-table-column>
<el-table-column prop="prjName" label="项目名称" align="center"></el-table-column>
<el-table-column prop="prjPlanClass" label="是否续建" align="center"></el-table-column>
<el-table-column prop="manageOrgId" label="承建单位" align="center"></el-table-column>
<el-table-column prop="projectManager" label="项目经理" align="center"></el-table-column>
<el-table-column prop="remark" label="安全架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="remark" label="部署架构审查" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="remark" label="技术架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="remark" label="应用架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="remark" label="物理数据架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </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-table>
<!-- <el-pagination
background
layout="prev, pager, next"
:total="50">
</el-pagination> -->
<el-pagination <el-pagination
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
...@@ -109,16 +121,14 @@ ...@@ -109,16 +121,14 @@
<script> <script>
import { import {
getJiShuZhengCeGuanLianShiYongTable, getJiShuZhengCeGuanLianShiYongTable,
getDianXingAnLiSelectData getDianXingAnLiSelectData, getGaiSheJiaGouZunCongJiaChaTable, gAllDictKey
} 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';
export default { export default {
name: 'reviewArchiFollowCheck', name: 'reviewArchiFollowCheck',
components: { components: {},
},
data() { data() {
return { return {
ruleForm: { ruleForm: {
...@@ -126,9 +136,7 @@ export default { ...@@ -126,9 +136,7 @@ export default {
let2: '', let2: '',
let3: '', let3: '',
}, },
rules: { rules: {},
},
add_dialog: false, add_dialog: false,
is_add_edit: 'add', is_add_edit: 'add',
tableData: [], tableData: [],
...@@ -148,11 +156,11 @@ export default { ...@@ -148,11 +156,11 @@ export default {
let4: null, let4: null,
}, },
fuHeDu: [], fuHeDu: [],
ziJianLeiXing: [],
selectRows: [] selectRows: []
}; };
}, },
mounted(){ mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.set_table_height(); this.set_table_height();
}) })
...@@ -161,33 +169,40 @@ export default { ...@@ -161,33 +169,40 @@ export default {
this.get_fu_he_du_select().then(res => { this.get_fu_he_du_select().then(res => {
this.fuHeDu = res; this.fuHeDu = res;
}) })
this.get_zi_jian_lei_xing_select().then(
res => {
this.ziJianLeiXing = res;
}
)
}, },
methods: { methods: {
select_table_rows(data){//表格的勾选 select_table_rows(data) {//表格的勾选
this.selectRows = data; this.selectRows = data;
}, },
toDetails() { toDetails() {
if(this.selectRows.length == 0) { if (this.selectRows.length == 0) {
Message({ Message({
type: 'warning', type: 'warning',
message: '请选择一条数据!' message: '请选择一条数据!'
}); });
return; return;
} }
if(this.selectRows.length >1) { if (this.selectRows.length > 1) {
Message({ Message({
type: 'warning', type: 'warning',
message: '只能选择一条数据!' message: '只能选择一条数据!'
}); });
return; return;
} }
this.$router.push( `/main/reviewArchiFollowCheckDetails`, () => {}, () => {} ); this.$router.push(`/main/reviewArchiFollowCheckDetails`, () => {
}, () => {
});
}, },
save_dicy() {//保存字典 save_dicy() {//保存字典
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if(valid) { if (valid) {
}else { } else {
return false; return false;
} }
}); });
...@@ -198,7 +213,19 @@ export default { ...@@ -198,7 +213,19 @@ export default {
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if (res.code == 200) {
resolve(res.data);
}
})
})
},
get_zi_jian_lei_xing_select() {//自建类型下拉
const params = {
key: "build_type"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if (res.code == 200) {
resolve(res.data); resolve(res.data);
} }
}) })
...@@ -236,140 +263,132 @@ export default { ...@@ -236,140 +263,132 @@ export default {
const params = { const params = {
"policyName": this.searchParams.let1, "policyName": this.searchParams.let1,
"conformCount": this.searchParams.let2, "conformCount": this.searchParams.let2,
"conformCount": this.searchParams.let3, "prjName": this.searchParams.let3,
"conformCount": this.searchParams.let4, "buildType": this.searchParams.let4,
"current": this.pager.current, "current": this.pager.current,
"pageSize": this.pager.size, "pageSize": this.pager.size,
}; };
getJiShuZhengCeGuanLianShiYongTable(params).then(res => { getGaiSheJiaGouZunCongJiaChaTable(params).then(res => {
this.loading = false; this.loading = false;
console.log(res) if (res.code === 200) {
// res.records.map(item => { this.loading = false;
// const startTime_year = String(new Date(item.startTime).getFullYear()); this.tableData = res.data.records;
// const startTime_month = String(new Date(item.startTime).getMonth() + 1); this.pager.current = res.data.current;
// let startTime_day = String(new Date(item.startTime).getDay()); this.pager.total = res.data.total;
// startTime_day = startTime_day.length == 1 ? '0' + startTime_day : startTime_day; this.pager.size = res.data.size;
}
// 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> </script>
<style> <style>
.confirmClass{ .confirmClass {
background-color: #0D867F !important; background-color: #0D867F !important;
} }
.el-message-box__content{
.el-message-box__content {
padding: 60px 15px 60px 15px; padding: 60px 15px 60px 15px;
} }
</style> </style>
<style scoped> <style scoped>
.version_btn{ .version_btn {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 84px; width: 84px;
height: 32px; height: 32px;
background: rgba(13,134,127,0.1); background: rgba(13, 134, 127, 0.1);
border-radius: 6px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
/* border: 1px solid #0D867F; */ /* border: 1px solid #0D867F; */
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px; margin-left: 15px;
} }
.cancel_version_btn{
.cancel_version_btn {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 104px; width: 104px;
height: 32px; height: 32px;
background: rgba(13,134,127,0.1); background: rgba(13, 134, 127, 0.1);
border-radius: 6px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
/* border: 1px solid #0D867F; */ /* border: 1px solid #0D867F; */
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px; margin-left: 15px;
} }
.reviewArchiFollowCheck{
.reviewArchiFollowCheck {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.el-button--primary{
background: rgba(13,134,127,0.1); .el-button--primary {
background: rgba(13, 134, 127, 0.1);
color: #0D867F; color: #0D867F;
border: 0; border: 0;
} }
/deep/ .el-input-group__append{
/deep/ .el-input-group__append {
background-color: #0D867F; background-color: #0D867F;
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
} }
.search_btn{
.search_btn {
width: 100%; width: 100%;
display: flex; display: flex;
margin-top: 50px; margin-top: 50px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.search_menu{
.search_menu {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 50px; margin-bottom: 50px;
} }
.search_menu_item_container{
.search_menu_item_container {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.search_menu_btn_container{
.search_menu_btn_container {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.search_menu_item{
.search_menu_item {
display: flex; display: flex;
align-items: center; align-items: center;
width: 344px; width: 344px;
} }
.search_title{
.search_title {
/* width: 20%; */ /* width: 20%; */
flex-shrink: 0; flex-shrink: 0;
margin-right: 15px; margin-right: 15px;
} }
.search_item{
.search_item {
width: 60%; width: 60%;
} }
.query_btn{
.query_btn {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 76px; width: 76px;
height: 32px; height: 32px;
background: rgba(13,134,127,1); background: rgba(13, 134, 127, 1);
border-radius: 6px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F; border: 1px solid #0D867F;
font-size: 14px; font-size: 14px;
...@@ -377,52 +396,62 @@ export default { ...@@ -377,52 +396,62 @@ export default {
margin-right: 10px; margin-right: 10px;
cursor: pointer; cursor: pointer;
} }
.reset_btn{
.reset_btn {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 76px; width: 76px;
height: 32px; height: 32px;
background: rgba(244,244,244,1); background: rgba(244, 244, 244, 1);
border-radius: 6px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
border: 1px solid #ccc; border: 1px solid #ccc;
font-size: 14px; font-size: 14px;
color: #666; color: #666;
cursor: pointer; cursor: pointer;
} }
.btn_icon{
.btn_icon {
margin-right: 10px; margin-right: 10px;
} }
.table_container{
.table_container {
width: 97%; width: 97%;
height: calc(100% - 40px); height: calc(100% - 40px);
margin-top: 20px; margin-top: 20px;
} }
.el-pagination{
.el-pagination {
margin-top: 30px; margin-top: 30px;
} }
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #0D867F; background-color: #0D867F;
} }
/deep/ .el-dialog__header{
/deep/ .el-dialog__header {
background-color: #0D867F; background-color: #0D867F;
text-align: left; text-align: left;
} }
/deep/ .el-dialog__title{
/deep/ .el-dialog__title {
color: #fff; color: #fff;
} }
/deep/ .el-dialog__close {
/deep/ .el-dialog__close {
color: #fff; color: #fff;
} }
.greenButton{
.greenButton {
background-color: #0D867F; background-color: #0D867F;
color: #fff; color: #fff;
} }
.el-form-item{
.el-form-item {
display: flex; display: flex;
align-items: center; align-items: center;
width: 33%; width: 33%;
} }
</style> </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!