Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 8bc9010e by liuyong
Options

修改bug

1 parent 05cee8b3
Inline Side-by-side
Showing with 396 additions and 427 deletions
src/api/index.js
...@@ -262,7 +262,7 @@ export function getETPManageList(params) { ...@@ -262,7 +262,7 @@ export function getETPManageList(params) {
} }
// 新建专家人才库 // 新建专家人才库
export function getETPManageAdd(params) { export function getETPManageAdd(params) {
return post('/kl-talent-pool/adKlTalentPool', params); return post('/kl-talent-pool/adKlTalent', params);
} }
// 编辑专家人才库 // 编辑专家人才库
export function getETPManageUpdate(params) { export function getETPManageUpdate(params) {
......
src/views/archi-asset-manage/index.vue
...@@ -489,7 +489,6 @@ ...@@ -489,7 +489,6 @@
this.treeData[0].subList = res.data; this.treeData[0].subList = res.data;
this.archiBelongId = res.data[0].viewId; this.archiBelongId = res.data[0].viewId;
this.assetConstant = res.data[0].archiType; this.assetConstant = res.data[0].archiType;
this.getZuJianLeiXingSelect(null);
this.get_table(); this.get_table();
}else { }else {
Message({ Message({
...@@ -532,7 +531,6 @@ ...@@ -532,7 +531,6 @@
treeClick(data) {//左侧树点击 treeClick(data) {//左侧树点击
this.archiBelongId = data.viewId; this.archiBelongId = data.viewId;
this.assetConstant = data.archiType; this.assetConstant = data.archiType;
this.getZuJianLeiXingSelect(null);
this.get_table(); this.get_table();
}, },
queryZuJianLeiXingSelect(data) {//组件类型搜索 queryZuJianLeiXingSelect(data) {//组件类型搜索
...@@ -553,6 +551,9 @@ ...@@ -553,6 +551,9 @@
}; };
queryZiChanJiaGouZuJianLeiXing(params).then(res => { queryZiChanJiaGouZuJianLeiXing(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
console.log('组件类型')
console.log(res.data)
this.zuJianLeiXingSelect = res.data; this.zuJianLeiXingSelect = res.data;
}else { }else {
Message({ Message({
...@@ -1072,6 +1073,7 @@ ...@@ -1072,6 +1073,7 @@
} }
this.add_dialog3 = true; this.add_dialog3 = true;
this.is_add_edit = 'add'; this.is_add_edit = 'add';
this.getZuJianLeiXingSelect(null);
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.ruleForm.let1 = null; this.ruleForm.let1 = null;
......
src/views/busi-assets-list/index.vue
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<img class="btn_icon" src="@/assets/archi-ele-list/create.png" alt="" /> <img class="btn_icon" src="@/assets/archi-ele-list/create.png" alt="" />
<p>新建</p> <p>新建</p>
</div> --> </div> -->
<el-button @click="add" type="primary" size="medium" icon="el-icon-document-add">新建</el-button> <el-button @click="addItem" type="primary" size="medium" icon="el-icon-document-add">新建</el-button>
<el-button type="primary" size="medium" icon="el-icon-delete" @click="moreDelete">删除</el-button> <el-button type="primary" size="medium" icon="el-icon-delete" @click="moreDelete">删除</el-button>
<!-- <el-button type="primary" size="medium" icon="el-icon-plus">导入</el-button> --> <!-- <el-button type="primary" size="medium" icon="el-icon-plus">导入</el-button> -->
<div class="import_btn" @click="importFile"> <div class="import_btn" @click="importFile">
...@@ -528,10 +528,11 @@ ...@@ -528,10 +528,11 @@
this.selectLabel2 = ''; this.selectLabel2 = '';
}); });
}, },
add() {//新建 addItem() {//新建
this.addDialog = true; this.addDialog = true;
this.is_add_edit = 'add'; this.is_add_edit = 'add';
this.getShangJiJieDianSelect(); // this.getShangJiJieDianSelect();
this.getZuJianLeiXingSelect(null);
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.ruleForm.let1 = null; this.ruleForm.let1 = null;
...@@ -700,9 +701,9 @@ ...@@ -700,9 +701,9 @@
}; };
queryZiChanJiaGouZuJianLeiXing(params).then(res => { queryZiChanJiaGouZuJianLeiXing(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
// console.log('组件类型') console.log('组件类型')
// console.log(res.data) console.log(res.data)
this.zuJianLeiXingSelect = res.data; this.zuJianLeiXingSelect = res.data;
}else { }else {
Message({ Message({
...@@ -890,7 +891,6 @@ ...@@ -890,7 +891,6 @@
this.archiBelongId = data.archiBelongId; this.archiBelongId = data.archiBelongId;
this.assetConstant = data.assetConstant; this.assetConstant = data.assetConstant;
// this.archiAssetTypeId = data.viewId; // this.archiAssetTypeId = data.viewId;
this.getZuJianLeiXingSelect(null);
this.get_table(); this.get_table();
}, },
getTreeData() {//查询左侧树 getTreeData() {//查询左侧树
...@@ -976,7 +976,6 @@ ...@@ -976,7 +976,6 @@
this.assetConstant = res.data[0].assetConstant; this.assetConstant = res.data[0].assetConstant;
// this.archiAssetTypeId = res.data[0].viewId; // this.archiAssetTypeId = res.data[0].viewId;
this.getShangJiJieDianSelect(); this.getShangJiJieDianSelect();
this.getZuJianLeiXingSelect(null);
this.getGuanLianZiChanSelectData(null); this.getGuanLianZiChanSelectData(null);
this.get_table(); this.get_table();
......
src/views/current-assets-list/tab1.vue
...@@ -229,4 +229,7 @@ export default { ...@@ -229,4 +229,7 @@ export default {
align-items: center; align-items: center;
width: 33%; width: 33%;
} }
.btn_icon{
margin-right: 10px;
}
</style> </style>
\ No newline at end of file
src/views/current-assets-list/tab2.vue
...@@ -229,4 +229,7 @@ export default { ...@@ -229,4 +229,7 @@ export default {
align-items: center; align-items: center;
width: 33%; width: 33%;
} }
.btn_icon{
margin-right: 10px;
}
</style> </style>
\ No newline at end of file
src/views/current-assets-list/tab3.vue
...@@ -230,4 +230,7 @@ export default { ...@@ -230,4 +230,7 @@ export default {
align-items: center; align-items: center;
width: 33%; width: 33%;
} }
.btn_icon{
margin-right: 10px;
}
</style> </style>
\ No newline at end of file
src/views/current-assets-list/tab4.vue
...@@ -227,4 +227,7 @@ export default { ...@@ -227,4 +227,7 @@ export default {
align-items: center; align-items: center;
width: 33%; width: 33%;
} }
.btn_icon{
margin-right: 10px;
}
</style> </style>
\ No newline at end of file
src/views/current-assets-list/tab5.vue
...@@ -227,4 +227,7 @@ export default { ...@@ -227,4 +227,7 @@ export default {
align-items: center; align-items: center;
width: 33%; width: 33%;
} }
.btn_icon{
margin-right: 10px;
}
</style> </style>
\ No newline at end of file
src/views/etpManage/index.vue
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">专家库名称</span> <span class="search_title">专家库名称</span>
<el-input v-model="params.talentPoolName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="searchParams.talentPoolName" placeholder="请输入内容" class="search_item"></el-input>
</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="params.tagId" placeholder="请选择" clearable class="search_item"> <el-select v-model="searchParams.tagId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in selectData3" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in selectData3" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select> </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="params.state" placeholder="请选择" clearable class="search_item"> <el-select v-model="searchParams.state" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in selectData4" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in selectData4" :key="idnex" :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="getList"> <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>
...@@ -40,30 +40,23 @@ ...@@ -40,30 +40,23 @@
<!-- <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column> --> <!-- <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column> -->
<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="talentPoolName" label="专家库名称" align="center">
<template slot-scope="scope">
<span >{{dicObj.name[scope.row.talentPoolName] == null ? (scope.row.talentPoolName):dicObj.name[scope.row.talentPoolName]}}</span>
</template>
</el-table-column> -->
<el-table-column prop="talentPoolName" label="专家库名称" align="center"></el-table-column> <el-table-column prop="talentPoolName" label="专家库名称" align="center"></el-table-column>
<el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column> <el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column>
<el-table-column prop="talentName" label="专家名称" align="center"></el-table-column> <el-table-column prop="talentName" label="专家名称" align="center"></el-table-column>
<el-table-column prop="" width="250" label="专业标签" align="center"> <el-table-column prop="" width="250" label="专家标签" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tagName"><el-tag v-for="(item,index) in scope.row.ktagIdlist" :key="index" v-show="dicObj.tagId[item.tagId]">{{dicObj.tagId[item.tagId]}}</el-tag></div> <div class="tagName">
</template> <el-tag
</el-table-column> v-for="item in scope.row.tagIdlist"
<el-table-column prop="level" label="专家级别" align="center"> :key="item.tagId">
<template slot-scope="scope"> {{ item.name }}
<span >{{dicObj.level[scope.row.level]}}</span> </el-tag>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="level_" label="专家级别" align="center"></el-table-column>
<el-table-column prop="comments" label="专家评价" align="center"></el-table-column> <el-table-column prop="comments" label="专家评价" align="center"></el-table-column>
<el-table-column prop="state" label="专家状态" width="150" align="center"> <el-table-column prop="state_" label="专家状态" width="150" align="center"></el-table-column>
<template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span>
</template>
</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 label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -78,11 +71,11 @@ ...@@ -78,11 +71,11 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="page.current" :current-page="pager.current"
:page-sizes="page.sizes" :page-sizes="pager.sizes"
:page-size="page.size" :page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total"> :total="pager.total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -116,7 +109,7 @@ ...@@ -116,7 +109,7 @@
<div class="dialog_content_1"> <div class="dialog_content_1">
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">专家标签</div> <div class="dialog_form_item_title">专家标签</div>
<el-select v-model="labelList" placeholder="请选择" clearable class="search_item" :multiple="true"> <el-select v-model="formData.taglist" placeholder="请选择" clearable class="search_item" :multiple="true">
<el-option v-for="(item,idnex) in selectData3" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in selectData3" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select> </el-select>
</div> </div>
...@@ -185,75 +178,28 @@ export default { ...@@ -185,75 +178,28 @@ export default {
deptName: "", deptName: "",
talentPoolName: "", talentPoolName: "",
talentName: "", talentName: "",
klTaglist: [], taglist: [],
level: "", level: "",
comments: "", comments: "",
state: "", state: "",
remark: "", remark: "",
talentId: null,
}, },
params: { searchParams: {
current: 1,
pageSize: 10,
talentPoolName: "", talentPoolName: "",
tagId: "", tagId: "",
state: "", state: "",
}, },
labelList: [], pager: {
page: {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 0, //总条数 total: 0, //总条数
}, },
dicObj: { selectData1: [],
state: { selectData2: [],
1: "在库", selectData3: [],
2: "出库", selectData4: [],
},
level: {
1: "初级",
2: "中级",
3: "高级",
},
tagId: {
1: "设备",
2: "信息化",
3: "技术",
},
name:{
21: "专家业务库",
22: "专家文档库",
23: "专家评审库",
}
},
selectData1: [
],
selectData2: [
{
label: "初级",
value: 1
},
{
label: "中级",
value: 2,
},
{
label: "高级",
value: 3,
},
],
selectData3: [
],
selectData4: [
{
label: "在库",
value: 1,
},
{
label: "出库",
value: 2,
},
],
eleList: [], eleList: [],
radioName: "", radioName: "",
search_select1: [], search_select1: [],
...@@ -269,9 +215,15 @@ export default { ...@@ -269,9 +215,15 @@ export default {
// 获取元素列表 // 获取元素列表
this.getSelect1(); this.getSelect1();
this.getSelect2(); this.getSelect2().then(res => {
this.getSelect3(); this.selectData2 = res;
this.getSelect4(); });
this.getSelect3().then(res => {
this.selectData3 = res;
});
this.getSelect4().then(res => {
this.selectData4 = res;
});
}, },
created() { created() {
// 初始化查询列表 // 初始化查询列表
...@@ -279,23 +231,47 @@ export default { ...@@ -279,23 +231,47 @@ export default {
}, },
methods: { methods: {
search_table() {//搜索
this.pager.current = 1;
this.getList();
},
// 查询列表 // 查询列表
getList() { getList() {
getETPManageList(this.params).then(res => { this.loading = true;
this.page.total = res.total; const params = {
"talentPoolName": this.searchParams.talentPoolName,
"tagId": this.searchParams.tagId,
"state": this.searchParams.state,
"current": this.pager.current,
"pageSize": this.pager.size,
};
getETPManageList(params).then(res => {
Promise.all([ this.getSelect2(), this.getSelect4(), this.getSelect3() ]).then(res2 => {
res.records.map(item => {
if(item.tagIdlist && item.tagIdlist.length > 0) {
res2[2].forEach(item2 => {
item.tagIdlist.map(item3 => {
if(item2.value == item3.tagId) {
item3['name'] = item2.label;
}
})
})
}
let result1 = res2[0].find(item2 => item2.value == item.level);
let result2 = res2[1].find(item2 => item2.value == item.state);
item['level_'] = result1 ? result1.label : '';
item['state_'] = result2 ? result2.label : '';
});
this.pager.current = res.current;
this.pager.total = res.total;
this.pager.size = res.size;
this.tableData = res.records; this.tableData = res.records;
// if (res.code == 200) { })
// this.page.total = res.data.total;
// this.tableData = res.data.records;
// console.log(this.tableData);
// }
}); });
}, },
// 重置 // 重置
reset(){ reset(){
this.params = { this.params = {
current: 1,
pageSize: 10,
talentPoolName: "", talentPoolName: "",
tagId: "", tagId: "",
state: "", state: "",
...@@ -304,15 +280,11 @@ export default { ...@@ -304,15 +280,11 @@ export default {
// 分页事件 // 分页事件
handleSizeChange(val) { handleSizeChange(val) {
this.page.current = 1; this.page.current = 1;
this.params.current = 1;
this.page.size = val; this.page.size = val;
this.params.pageSize = val;
this.getList(); this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.page.current = val; this.page.current = val;
this.params.current = val;
this.getList(); this.getList();
}, },
// 所有操作 // 所有操作
...@@ -322,35 +294,47 @@ export default { ...@@ -322,35 +294,47 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "新建专家人才库"; this.title = "新建专家人才库";
this.resetForm(); this.resetForm();
this.formData.talentId = null;
}else if (type == "edit") { }else if (type == "edit") {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑专家人才库"; this.title = "编辑专家人才库";
this.resetForm(); this.resetForm();
this.formData = item; // this.formData = item;
// this.formData.talentPoolName = Number(this.formData.talentPoolName); this.formData.deptName = item.deptName;
this.formData.state = String(this.formData.state); this.formData.talentPoolName = Number(item.talentPoolName);
this.formData.level = String(this.formData.level); this.formData.talentName = item.talentName;
this.formData.klTaglist = []; this.formData.state = String(item.state);
this.formData.ktagIdlist.forEach(item => { this.formData.level = String(item.level);
this.labelList.push(String(item.tagId)); this.formData.taglist = [];
if(item.tagIdlist) {
item.tagIdlist.forEach(item => {
this.formData.taglist.push(String(item.tagId));
}); });
}
this.formData.comments = item.comments;
this.formData.remark = item.remark;
this.formData.talentId = item.talentId;
}else if (type == "create") { }else if (type == "create") {
let tagIdlist_ = [];
this.selectData3.forEach(item1 => { this.selectData3.forEach(item1 => {
this.labelList.forEach(item2 => { this.formData.taglist.forEach(item2 => {
if (item1.value == item2) { if (item1.value == item2) {
this.formData.klTaglist.push( tagIdlist_.push(
{ {
tagId: item1.value, tagId: item1.value,
ktagName: item1.label,
} }
) )
} }
}) })
}) })
const params = { ...this.formData, taglist: tagIdlist_ };
if (this.formData.talentId) { if (this.formData.talentId) {
// 编辑保存 // 编辑保存
getETPManageUpdate(this.formData).then(res => { getETPManageUpdate(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success("保存成功"); this.$message.success("保存成功");
this.add_dialog = false; this.add_dialog = false;
...@@ -362,7 +346,7 @@ export default { ...@@ -362,7 +346,7 @@ export default {
}); });
}else{ }else{
// 新建保存 // 新建保存
getETPManageAdd(this.formData).then(res => { getETPManageAdd(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success("保存成功"); this.$message.success("保存成功");
this.add_dialog = false; this.add_dialog = false;
...@@ -429,7 +413,7 @@ export default { ...@@ -429,7 +413,7 @@ export default {
deptName: "", deptName: "",
talentPoolName: "", talentPoolName: "",
talentName: "", talentName: "",
klTaglist: [], taglist: [],
level: "", level: "",
comments: "", comments: "",
state: "", state: "",
...@@ -472,31 +456,37 @@ export default { ...@@ -472,31 +456,37 @@ export default {
const params = { const params = {
key: "talent_level" key: "talent_level"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData2 = res.data; resolve(res.data);
} }
}) })
})
}, },
getSelect3() {//专家标签下拉 getSelect3() {//专家标签下拉
const params = { const params = {
key: "talent_tag" key: "talent_tag"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData3 = res.data; resolve(res.data);
} }
}) })
})
}, },
getSelect4() {//专家状态下拉 getSelect4() {//专家状态下拉
const params = { const params = {
key: "talent_status" key: "talent_status"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData4 = res.data; resolve(res.data);
} }
}) })
})
}, },
set_table_height() {//动态设置表格高度 set_table_height() {//动态设置表格高度
......
src/views/report-template-relative-use/index.vue
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">模版名称</span> <span class="search_title">模版名称</span>
<el-select clearable v-model="searchParams.tempName" placeholder="请选择" style="width: 210px;"> <el-select clearable v-model="searchParams.tplName" placeholder="请选择" style="width: 210px;">
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option> <el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tplName" :value="item.tplId"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<el-table-column prop="deptName" label="单位" align="center"></el-table-column> <el-table-column prop="deptName" label="单位" align="center"></el-table-column>
<el-table-column prop="appName" label="系统名称" align="center"></el-table-column> <el-table-column prop="appName" label="系统名称" align="center"></el-table-column>
<el-table-column prop="projectName" label="项目名称" align="center"></el-table-column> <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
<el-table-column prop="tempName" label="模板名称" align="center"></el-table-column> <el-table-column prop="tplName" label="模板名称" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column label="操作" width="600" align="center"> <el-table-column label="操作" width="600" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
</el-form-item> </el-form-item>
<el-form-item label="模板名称:" prop="let4"> <el-form-item label="模板名称:" prop="let4">
<el-select clearable v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;"> <el-select clearable v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option> <el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tplName" :value="item.tplId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
deptName: null, deptName: null,
appName: null, appName: null,
projectName: null, projectName: null,
tempName: null, tplName: null,
}, },
loading: false, loading: false,
selectTable: [], selectTable: [],
...@@ -219,6 +219,7 @@ export default { ...@@ -219,6 +219,7 @@ export default {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getMoBanMingCheng({}).then(res => { getMoBanMingCheng({}).then(res => {
if(res.code == 200) { if(res.code == 200) {
console.log(res.data)
resolve(res.data); resolve(res.data);
} }
}) })
...@@ -238,7 +239,7 @@ export default { ...@@ -238,7 +239,7 @@ export default {
"deptName": this.searchParams.deptName, "deptName": this.searchParams.deptName,
"appName": this.searchParams.appName, "appName": this.searchParams.appName,
"projectName": this.searchParams.projectName, "projectName": this.searchParams.projectName,
"tempName": this.searchParams.tempName, "tplName": this.searchParams.tplName,
"current": this.pager.current, "current": this.pager.current,
"pageSize": this.pager.size, "pageSize": this.pager.size,
}; };
...@@ -447,7 +448,7 @@ export default { ...@@ -447,7 +448,7 @@ export default {
this.searchParams.deptName = null; this.searchParams.deptName = null;
this.searchParams.appName = null; this.searchParams.appName = null;
this.searchParams.projectName = null; this.searchParams.projectName = null;
this.searchParams.tempName = null; this.searchParams.tplName = null;
}, },
// 每页条数改变 // 每页条数改变
handleSizeChange(val) { handleSizeChange(val) {
...@@ -466,7 +467,7 @@ export default { ...@@ -466,7 +467,7 @@ export default {
"deptName": this.searchParams.deptName, "deptName": this.searchParams.deptName,
"appName": this.searchParams.appName, "appName": this.searchParams.appName,
"projectName": this.searchParams.projectName, "projectName": this.searchParams.projectName,
"tempName": this.searchParams.tempName, "tplName": this.searchParams.tplName,
"current": this.pager.current, "current": this.pager.current,
"pageSize": this.pager.size, "pageSize": this.pager.size,
}; };
......
src/views/total-archi-property-document/index.vue
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">文档名称</span> <span class="search_title">文档名称</span>
<el-input v-model="params.fileName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="searchParams.fileName" placeholder="请输入内容" class="search_item"></el-input>
</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="params.fileType" placeholder="请选择" class="search_item"> <el-select v-model="searchParams.fileType" placeholder="请选择" class="search_item">
<el-option v-for="item in selectData1" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData1" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</div> </div>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div class="search_menu_btn_container"> <div class="search_menu_btn_container">
<div class="query_btn" @click="getList"> <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>
...@@ -45,11 +45,7 @@ ...@@ -45,11 +45,7 @@
<!-- <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> --> <!-- <el-table-column type="selection" width="55" :selectable="selectable"></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="fileName" label="文档名称" align="center"></el-table-column> <el-table-column prop="fileName" label="文档名称" align="center"></el-table-column>
<el-table-column prop="fileType" label="文档类型" align="center"> <el-table-column prop="fileType_" label="文档类型" align="center"></el-table-column>
<template slot-scope="scope">
<span >{{dicObj.fileType[String(scope.row.fileType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="fileVersion" label="文档版本" align="center"></el-table-column> <el-table-column prop="fileVersion" label="文档版本" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="fileName" label="附件" align="center"> <el-table-column prop="fileName" label="附件" align="center">
...@@ -146,35 +142,8 @@ export default { ...@@ -146,35 +142,8 @@ export default {
tableData: [], tableData: [],
add_dialog: false, add_dialog: false,
loading: false, loading: false,
selectData1: [ selectData1: [],
{ searchParams: {
label: "元模型",
value: 1,
},
{
label: "业务架构",
value: 2,
},
{
label: "应用架构",
value: 3,
},
{
label: "数据架构",
value: 4,
},
{
label: "技术架构",
value: 5,
},
{
label: "安全架构",
value: 6,
},
],
params: {
current: 1,
pageSize: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
fileName: "", fileName: "",
...@@ -208,37 +177,55 @@ export default { ...@@ -208,37 +177,55 @@ export default {
}) })
this.set_table_height(); this.set_table_height();
this.selectData1.forEach(item => {
this.dicObj.fileType[item.value] = item.label;
});
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 获取元素列表 // 获取元素列表
this.getFileTypeSelect(); this.getFileTypeSelect().then(res => {
this.selectData1 = res;
});
}, },
methods: { methods: {
search_table() {//搜索
this.pager.current = 1;
this.getList();
},
// 查询列表 // 查询列表
getList() { getList() {
this.loading = true;
if (this.searchDate != null && this.searchDate.length == 2) { if (this.searchDate != null && this.searchDate.length == 2) {
this.params.beginTime = this.searchDate[0]; this.searchParams.beginTime = this.searchDate[0];
this.params.endTime = this.searchDate[1]; this.searchParams.endTime = this.searchDate[1];
} else { } else {
this.params.beginTime = ""; this.searchParams.beginTime = "";
this.params.endTime = ""; this.searchParams.endTime = "";
} }
getDocPoolList(this.params).then(res => { const params = {
"beginTime": this.searchParams.beginTime,
"endTime": this.searchParams.endTime,
"fileName": this.searchParams.fileName,
"fileType": this.searchParams.fileType,
"current": this.pager.current,
"pageSize": this.pager.size,
};
getDocPoolList(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.loading = false;
this.getFileTypeSelect().then(res2 => {
res.data.records.map(item => {
let result1 = res2.find(item2 => item2.value == item.fileType);
item['fileType_'] = result1 ? result1.label : '';
});
this.pager.current = res.data.current;
this.pager.total = res.data.total; this.pager.total = res.data.total;
this.pager.size = res.data.size;
this.tableData = res.data.records; this.tableData = res.data.records;
});
} }
}); });
}, },
// 重置 // 重置
reset() { reset() {
this.params = { this.searchParams = {
current: 1,
pageSize: 10,
beginTime: "", beginTime: "",
endTime: "", endTime: "",
fileName: "", fileName: "",
...@@ -348,7 +335,7 @@ export default { ...@@ -348,7 +335,7 @@ export default {
}, },
// 导出 // 导出
exportFile() { exportFile() {
getDocPoolExcel(this.params).then(res => { getDocPoolExcel(this.searchParams).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob); let url = URL.createObjectURL(blob);
let link = document.createElement('a'); let link = document.createElement('a');
...@@ -369,30 +356,28 @@ export default { ...@@ -369,30 +356,28 @@ export default {
// console.log(fileList); // console.log(fileList);
}, },
getFileTypeSelect() {//案例类型下拉 getFileTypeSelect() {//文档类型下拉
const params = { const params = {
key: "kl_file_type" key: "kl_file_type"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData1 = res.data; resolve(res.data);
} }
}) })
})
}, },
// 每页条数改变 // 每页条数改变
handleSizeChange(val) { handleSizeChange(val) {
this.pager.current = 1; this.pager.current = 1;
this.params.current = 1;
this.pager.size = val; this.pager.size = val;
this.params.pageSize = val;
this.getList(); this.getList();
}, },
//当前页码改变 //当前页码改变
handleCurrentChange(val) { handleCurrentChange(val) {
this.pager.current = val; this.pager.current = val;
this.params.current = val;
this.getList(); this.getList();
}, },
......
src/views/typical-example-manage/index.vue
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">案例名称</span> <span class="search_title">案例名称</span>
<el-input v-model="params.tcName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="searchParams.caseName" placeholder="请输入内容" class="search_item"></el-input>
</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="params.tcType" placeholder="请选择" class="search_item"> <el-select v-model="searchParams.caseType" placeholder="请选择" class="search_item">
<el-option v-for="item in selectData1" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData1" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </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="params.problemType" placeholder="请选择" class="search_item"> <el-select v-model="searchParams.problemType" placeholder="请选择" class="search_item">
<el-option v-for="item in selectData2" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData2" :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="getList"> <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>
...@@ -40,29 +40,13 @@ ...@@ -40,29 +40,13 @@
<!-- <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> --> <!-- <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> -->
<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="tcName" label="案例名称" align="center"></el-table-column> <el-table-column prop="caseName" label="案例名称" align="center"></el-table-column>
<el-table-column prop="tcType" label="案例类型" align="center"> <el-table-column prop="caseType_" label="案例类型" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="projectType_" label="项目类型" align="center"></el-table-column>
<span >{{dicObj.tcType[String(scope.row.tcType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="prjType" label="项目类型" align="center">
<template slot-scope="scope">
<span >{{dicObj.prjType[String(scope.row.prjType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="buildContent" label="建设内容" align="center"></el-table-column> <el-table-column prop="buildContent" label="建设内容" align="center"></el-table-column>
<el-table-column prop="archiDetail" label="架构详情" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="archiDetail" label="架构详情" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="problemType" label="问题类型" align="center"> <el-table-column prop="problemType_" label="问题类型" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="problemLevel_" label="问题等级" align="center"></el-table-column>
<span >{{dicObj.problemType[String(scope.row.problemType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="problemLevel" label="问题等级" align="center">
<template slot-scope="scope">
<span >{{dicObj.problemLevel[String(scope.row.problemLevel)]}}</span>
</template>
</el-table-column>
<el-table-column prop="problemContent" label="问题描述" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="problemContent" label="问题描述" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="操作" width="260" align="center"> <el-table-column label="操作" width="260" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -94,16 +78,16 @@ ...@@ -94,16 +78,16 @@
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="formData" ref="form"> <el-form :model="formData" ref="form">
<div class="form_item_container"> <div class="form_item_container">
<el-form-item label="案例名称:" prop="tcName"> <el-form-item label="案例名称:" prop="caseName">
<el-input v-model="formData.tcName"></el-input> <el-input v-model="formData.caseName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="案例类型:" prop="tcType"> <el-form-item label="案例类型:" prop="caseType">
<el-select v-model="formData.tcType" placeholder="请选择"> <el-select v-model="formData.caseType" placeholder="请选择">
<el-option v-for="item in selectData1" :key="item.label" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData1" :key="item.label" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目类型:" prop="prjType"> <el-form-item label="项目类型:" prop="projectType">
<el-select v-model="formData.prjType" placeholder="请选择"> <el-select v-model="formData.projectType" placeholder="请选择">
<el-option v-for="item in selectData3" :key="item.label" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData3" :key="item.label" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -162,59 +146,13 @@ export default { ...@@ -162,59 +146,13 @@ export default {
title: "", title: "",
loading: false, loading: false,
selectList: [], selectList: [],
selectData1: [ selectData1: [],
{ selectData2: [],
label: "移动应用典型案例", selectData3: [],
value: 1, selectData4: [],
}, searchParams: {
{ caseName: "",
label: "数据模型典型案例", caseType: "",
value: 2,
},
{
label: "数据中台典型案例",
value: 3,
},
],
selectData2: [
{
label: "一致性",
value: 1,
},
{
label: "架构遵从",
value: 2,
},
{
label: "重复风险",
value: 3,
},
],
selectData3: [
{
label: "暂时未例举",
value: 1,
},
],
selectData4: [
{
label: "一级",
value: 1,
},
{
label: "二级",
value: 2,
},
{
label: "三级",
value: 3,
},
],
params: {
current: 1,
pageSize: 10,
tcName: "",
tcType: "",
problemType: "", problemType: "",
}, },
pager: { pager: {
...@@ -224,9 +162,9 @@ export default { ...@@ -224,9 +162,9 @@ export default {
total: 0, //总条数 total: 0, //总条数
}, },
formData: { formData: {
tcName: '', caseName: '',
tcType: '', caseType: '',
prjType: '', projectType: '',
buildContent: '', buildContent: '',
problemType: '', problemType: '',
problemLevel: '', problemLevel: '',
...@@ -234,16 +172,6 @@ export default { ...@@ -234,16 +172,6 @@ export default {
archiDetail: "", archiDetail: "",
}, },
tableHeight: null, tableHeight: null,
dicObj: {
tcType: {
// 1: "在库",
// 2: "出库",
// 3: "出库",
},
prjType: {},
problemType: {},
problemLevel: {},
},
}; };
}, },
mounted(){ mounted(){
...@@ -252,46 +180,72 @@ export default { ...@@ -252,46 +180,72 @@ export default {
}) })
this.set_table_height(); this.set_table_height();
this.selectData1.forEach(item => {
this.dicObj.tcType[item.value] = item.label;
});
this.selectData2.forEach(item => {
this.dicObj.problemType[item.value] = item.label;
});
this.selectData3.forEach(item => {
this.dicObj.prjType[item.value] = item.label;
});
this.selectData4.forEach(item => {
this.dicObj.problemLevel[item.value] = item.label;
});
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 获取元素列表 // 获取元素列表
this.get_an_li_lei_xing_select(); this.get_an_li_lei_xing_select().then(res => {
this.get_wen_ti_lei_xing_select(); this.selectData1 = res;
this.get_xiang_mu_lei_xing_select(); });
this.get_wen_ti_deng_ji_select(); this.get_wen_ti_lei_xing_select().then(res => {
this.selectData2 = res;
});
this.get_xiang_mu_lei_xing_select().then(res => {
this.selectData3 = res;
});
this.get_wen_ti_deng_ji_select().then(res => {
this.selectData4 = res;
});
}, },
methods: { methods: {
search_table() {//搜索
this.pager.current = 1;
this.getList();
},
// 查询列表 // 查询列表
getList() { getList() {
getTypicalExampleList(this.params).then(res => { this.loading = true;
const params = {
"caseName": this.searchParams.caseName,
"caseType": this.searchParams.caseType,
"problemType": this.searchParams.problemType,
"current": this.pager.current,
"pageSize": this.pager.size,
};
getTypicalExampleList(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.loading = false;
Promise.all([
this.get_an_li_lei_xing_select(),
this.get_xiang_mu_lei_xing_select(),
this.get_wen_ti_lei_xing_select(),
this.get_wen_ti_deng_ji_select()
]).then(res2 => {
res.data.records.map(item => {
let result1 = res2[0].find(item2 => item2.value == item.caseType);
let result2 = res2[1].find(item2 => item2.value == item.projectType);
let result3 = res2[2].find(item2 => item2.value == item.problemType);
let result4 = res2[3].find(item2 => item2.value == item.problemLevel);
item['caseType_'] = result1 ? result1.label : '';
item['projectType_'] = result2 ? result2.label : '';
item['problemType_'] = result2 ? result3.label : '';
item['problemLevel_'] = result2 ? result4.label : '';
});
this.pager.current = res.data.current;
this.pager.total = res.data.total; this.pager.total = res.data.total;
this.pager.size = res.data.size;
this.tableData = res.data.records; this.tableData = res.data.records;
})
} }
}); });
}, },
// 重置 // 重置
reset() { reset() {
this.params = { this.searchParams = {
current: 1, caseName: "",
pageSize: 10, caseType: "",
tcName: "",
tcType: "",
problemType: "", problemType: "",
} }
}, },
...@@ -306,9 +260,9 @@ export default { ...@@ -306,9 +260,9 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑案例"; this.title = "编辑案例";
this.formData = item; this.formData = item;
this.formData.tcType = String(this.formData.tcType); this.formData.caseType = String(this.formData.caseType);
this.formData.problemType = String(this.formData.problemType); this.formData.problemType = String(this.formData.problemType);
this.formData.prjType = String(this.formData.prjType); this.formData.projectType = String(this.formData.projectType);
this.formData.problemLevel = String(this.formData.problemLevel); this.formData.problemLevel = String(this.formData.problemLevel);
}else if (type == "create") { }else if (type == "create") {
if (this.formData.ktcId) { if (this.formData.ktcId) {
...@@ -388,9 +342,9 @@ export default { ...@@ -388,9 +342,9 @@ export default {
// 新建清空表单 // 新建清空表单
resetForm(){ resetForm(){
this.formData = { this.formData = {
tcName: '', caseName: '',
tcType: '', caseType: '',
prjType: '', projectType: '',
buildContent: '', buildContent: '',
problemType: '', problemType: '',
problemLevel: '', problemLevel: '',
...@@ -399,7 +353,7 @@ export default { ...@@ -399,7 +353,7 @@ export default {
} }
}, },
exportFile() {//导出 exportFile() {//导出
getTypicalExampleExcel(this.params).then(res => { getTypicalExampleExcel(this.searchParams).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob); let url = URL.createObjectURL(blob);
let link = document.createElement('a'); let link = document.createElement('a');
...@@ -413,41 +367,49 @@ export default { ...@@ -413,41 +367,49 @@ export default {
const params = { const params = {
key: "kl_case_type" key: "kl_case_type"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData1 = res.data; resolve(res.data);
} }
}) })
})
}, },
get_wen_ti_lei_xing_select() {//问题类型下拉 get_wen_ti_lei_xing_select() {//问题类型下拉
const params = { const params = {
key: "kl_question_type" key: "kl_question_type"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData2 = res.data; resolve(res.data);
} }
}) })
})
}, },
get_xiang_mu_lei_xing_select() {//项目类型下拉 get_xiang_mu_lei_xing_select() {//项目类型下拉
const params = { const params = {
key: "kl_project_type" key: "kl_project_type"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData3 = res.data; resolve(res.data);
} }
}) })
})
}, },
get_wen_ti_deng_ji_select() {//问题等级下拉 get_wen_ti_deng_ji_select() {//问题等级下拉
const params = { const params = {
key: "kl_question_level" key: "kl_question_level"
} }
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData4 = res.data; resolve(res.data);
} }
}) })
})
}, },
set_table_height() {//动态设置表格高度 set_table_height() {//动态设置表格高度
...@@ -470,16 +432,12 @@ export default { ...@@ -470,16 +432,12 @@ export default {
// 每页条数改变 // 每页条数改变
handleSizeChange(val) { handleSizeChange(val) {
this.pager.current = 1; this.pager.current = 1;
this.params.current = 1;
this.pager.size = val; this.pager.size = val;
this.params.pageSize = val;
this.getList(); this.getList();
}, },
//当前页码改变 //当前页码改变
handleCurrentChange(val) { handleCurrentChange(val) {
this.pager.current = val; this.pager.current = val;
this.params.current = val;
this.getList(); this.getList();
}, },
} }
......
src/views/typical-example-relative-use/index.vue
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">案例名称</span> <span class="search_title">案例名称</span>
<el-input v-model="params.tcName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="searchParams.caseName" placeholder="请输入内容" class="search_item"></el-input>
</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="params.tcType" placeholder="请选择" class="search_item"> <el-select v-model="searchParams.caseType" placeholder="请选择" class="search_item">
<el-option v-for="item in selectData1" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData1" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </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="params.problemType" placeholder="请选择" class="search_item"> <el-select v-model="searchParams.problemType" placeholder="请选择" class="search_item">
<el-option v-for="item in selectData2" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in selectData2" :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="getList"> <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>
...@@ -38,29 +38,13 @@ ...@@ -38,29 +38,13 @@
<!-- <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> --> <!-- <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column> -->
<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="tcName" label="案例名称" align="center"></el-table-column> <el-table-column prop="caseName" label="案例名称" align="center"></el-table-column>
<el-table-column prop="tcType" label="案例类型" align="center"> <el-table-column prop="caseType_" label="案例类型" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="projectType_" label="项目类型" align="center"></el-table-column>
<span >{{dicObj.tcType[String(scope.row.tcType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="prjType" label="项目类型" align="center">
<template slot-scope="scope">
<span >{{dicObj.prjType[String(scope.row.prjType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="buildContent" label="建设内容" align="center"></el-table-column> <el-table-column prop="buildContent" label="建设内容" align="center"></el-table-column>
<el-table-column prop="archiDetail" label="架构详情" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="archiDetail" label="架构详情" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="problemType" label="问题类型" align="center"> <el-table-column prop="problemType_" label="问题类型" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="problemLevel_" label="问题等级" align="center"></el-table-column>
<span >{{dicObj.problemType[String(scope.row.problemType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="problemLevel" label="问题等级" align="center">
<template slot-scope="scope">
<span >{{dicObj.problemLevel[String(scope.row.problemLevel)]}}</span>
</template>
</el-table-column>
<el-table-column prop="problemContent" label="问题描述" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="problemContent" label="问题描述" align="center" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="操作" width="260" align="center"> <!-- <el-table-column label="操作" width="260" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -107,71 +91,16 @@ export default { ...@@ -107,71 +91,16 @@ export default {
add_dialog: false, add_dialog: false,
loading: false, loading: false,
selectTable: [], selectTable: [],
selectData1: [ selectData1: [],
{ selectData2: [],
label: "移动应用典型案例", selectData3: [],
value: 1, selectData4: [],
}, searchParams: {
{ caseName: "",
label: "数据模型典型案例", caseType: "",
value: 2,
},
{
label: "数据中台典型案例",
value: 3,
},
],
selectData2: [
{
label: "一致性",
value: 1,
},
{
label: "架构遵从",
value: 2,
},
{
label: "重复风险",
value: 3,
},
],
selectData3: [
{
label: "暂时未例举",
value: 1,
},
],
selectData4: [
{
label: "一级",
value: 1,
},
{
label: "二级",
value: 2,
},
{
label: "三级",
value: 3,
},
],
params: {
current: 1,
pageSize: 10,
tcName: "",
tcType: "",
problemType: "", problemType: "",
}, },
dicObj: { dicObj: {},
tcType: {
// 1: "在库",
// 2: "出库",
// 3: "出库",
},
prjType: {},
problemType: {},
problemLevel: {},
},
pager: { pager: {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
...@@ -188,7 +117,7 @@ export default { ...@@ -188,7 +117,7 @@ export default {
this.set_table_height(); this.set_table_height();
this.selectData1.forEach(item => { this.selectData1.forEach(item => {
this.dicObj.tcType[item.value] = item.label; this.dicObj.caseType[item.value] = item.label;
}); });
this.selectData2.forEach(item => { this.selectData2.forEach(item => {
this.dicObj.problemType[item.value] = item.label; this.dicObj.problemType[item.value] = item.label;
...@@ -204,26 +133,115 @@ export default { ...@@ -204,26 +133,115 @@ export default {
this.getList(); this.getList();
// 获取元素列表 // 获取元素列表
// this.get_an_li_lei_xing_select(); this.get_an_li_lei_xing_select().then(res => {
// this.get_wen_ti_lei_xing_select(); this.selectData1 = res;
});
this.get_wen_ti_lei_xing_select().then(res => {
this.selectData2 = res;
});
this.get_xiang_mu_lei_xing_select().then(res => {
this.selectData3 = res;
});
this.get_wen_ti_deng_ji_select().then(res => {
this.selectData4 = res;
});
}, },
methods: { methods: {
search_table() {//搜索
this.pager.current = 1;
this.getList();
},
get_an_li_lei_xing_select() {//案例类型下拉
const params = {
key: "kl_case_type"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
resolve(res.data);
}
})
})
},
get_wen_ti_lei_xing_select() {//问题类型下拉
const params = {
key: "kl_question_type"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
resolve(res.data);
}
})
})
},
get_xiang_mu_lei_xing_select() {//项目类型下拉
const params = {
key: "kl_project_type"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
resolve(res.data);
}
})
})
},
get_wen_ti_deng_ji_select() {//问题等级下拉
const params = {
key: "kl_question_level"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
resolve(res.data);
}
})
})
},
// 查询列表 // 查询列表
getList() { getList() {
getTypicalExampleList(this.params).then(res => { this.loading = true;
const params = {
"caseName": this.searchParams.caseName,
"caseType": this.searchParams.caseType,
"problemType": this.searchParams.problemType,
"current": this.pager.current,
"pageSize": this.pager.size,
};
getTypicalExampleList(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.loading = false;
Promise.all([
this.get_an_li_lei_xing_select(),
this.get_xiang_mu_lei_xing_select(),
this.get_wen_ti_lei_xing_select(),
this.get_wen_ti_deng_ji_select()
]).then(res2 => {
res.data.records.map(item => {
let result1 = res2[0].find(item2 => item2.value == item.caseType);
let result2 = res2[1].find(item2 => item2.value == item.projectType);
let result3 = res2[2].find(item2 => item2.value == item.problemType);
let result4 = res2[3].find(item2 => item2.value == item.problemLevel);
item['caseType_'] = result1 ? result1.label : '';
item['projectType_'] = result2 ? result2.label : '';
item['problemType_'] = result2 ? result3.label : '';
item['problemLevel_'] = result2 ? result4.label : '';
});
this.pager.current = res.data.current;
this.pager.total = res.data.total; this.pager.total = res.data.total;
this.pager.size = res.data.size;
this.tableData = res.data.records; this.tableData = res.data.records;
})
} }
}); });
}, },
// 重置 // 重置
reset() { reset() {
this.params = { this.searchParams = {
current: 1, caseName: "",
pageSize: 10, caseType: "",
tcName: "",
tcType: "",
problemType: "", problemType: "",
} }
}, },
...@@ -316,8 +334,8 @@ export default { ...@@ -316,8 +334,8 @@ export default {
// 新建清空表单 // 新建清空表单
resetForm(){ resetForm(){
this.formData = { this.formData = {
tcName: '', caseName: '',
tcType: '', caseType: '',
prjType: '', prjType: '',
buildContent: '', buildContent: '',
problemType: '', problemType: '',
...@@ -327,7 +345,7 @@ export default { ...@@ -327,7 +345,7 @@ export default {
} }
}, },
exportFile() {//导出 exportFile() {//导出
getTypicalExampleExcel(this.params).then(res => { getTypicalExampleExcel(this.searchParams).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob); let url = URL.createObjectURL(blob);
let link = document.createElement('a'); let link = document.createElement('a');
...@@ -357,16 +375,12 @@ export default { ...@@ -357,16 +375,12 @@ export default {
// 每页条数改变 // 每页条数改变
handleSizeChange(val) { handleSizeChange(val) {
this.pager.current = 1; this.pager.current = 1;
this.params.current = 1;
this.pager.size = val; this.pager.size = val;
this.params.pageSize = val;
this.getList(); this.getList();
}, },
//当前页码改变 //当前页码改变
handleCurrentChange(val) { handleCurrentChange(val) {
this.pager.current = val; this.pager.current = val;
this.params.current = val;
this.getList(); this.getList();
}, },
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!