Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 8bc9010e by liuyong
Options

修改bug

1 parent 05cee8b3
Expand all
Inline Side-by-side
Showing with 206 additions and 185 deletions
src/api/index.js
......@@ -262,7 +262,7 @@ export function getETPManageList(params) {
}
// 新建专家人才库
export function getETPManageAdd(params) {
return post('/kl-talent-pool/adKlTalentPool', params);
return post('/kl-talent-pool/adKlTalent', params);
}
// 编辑专家人才库
export function getETPManageUpdate(params) {
......
src/views/archi-asset-manage/index.vue
......@@ -489,7 +489,6 @@
this.treeData[0].subList = res.data;
this.archiBelongId = res.data[0].viewId;
this.assetConstant = res.data[0].archiType;
this.getZuJianLeiXingSelect(null);
this.get_table();
}else {
Message({
......@@ -532,7 +531,6 @@
treeClick(data) {//左侧树点击
this.archiBelongId = data.viewId;
this.assetConstant = data.archiType;
this.getZuJianLeiXingSelect(null);
this.get_table();
},
queryZuJianLeiXingSelect(data) {//组件类型搜索
......@@ -553,6 +551,9 @@
};
queryZiChanJiaGouZuJianLeiXing(params).then(res => {
if(res.code == 200) {
console.log('组件类型')
console.log(res.data)
this.zuJianLeiXingSelect = res.data;
}else {
Message({
......@@ -1072,6 +1073,7 @@
}
this.add_dialog3 = true;
this.is_add_edit = 'add';
this.getZuJianLeiXingSelect(null);
this.$nextTick(() => {
this.$refs.form.resetFields();
this.ruleForm.let1 = null;
......
src/views/busi-assets-list/index.vue
......@@ -49,7 +49,7 @@
<img class="btn_icon" src="@/assets/archi-ele-list/create.png" alt="" />
<p>新建</p>
</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-plus">导入</el-button> -->
<div class="import_btn" @click="importFile">
......@@ -528,10 +528,11 @@
this.selectLabel2 = '';
});
},
add() {//新建
addItem() {//新建
this.addDialog = true;
this.is_add_edit = 'add';
this.getShangJiJieDianSelect();
// this.getShangJiJieDianSelect();
this.getZuJianLeiXingSelect(null);
this.$nextTick(() => {
this.$refs.form.resetFields();
this.ruleForm.let1 = null;
......@@ -700,9 +701,9 @@
};
queryZiChanJiaGouZuJianLeiXing(params).then(res => {
if(res.code == 200) {
// console.log('组件类型')
console.log('组件类型')
// console.log(res.data)
console.log(res.data)
this.zuJianLeiXingSelect = res.data;
}else {
Message({
......@@ -890,7 +891,6 @@
this.archiBelongId = data.archiBelongId;
this.assetConstant = data.assetConstant;
// this.archiAssetTypeId = data.viewId;
this.getZuJianLeiXingSelect(null);
this.get_table();
},
getTreeData() {//查询左侧树
......@@ -976,7 +976,6 @@
this.assetConstant = res.data[0].assetConstant;
// this.archiAssetTypeId = res.data[0].viewId;
this.getShangJiJieDianSelect();
this.getZuJianLeiXingSelect(null);
this.getGuanLianZiChanSelectData(null);
this.get_table();
......
src/views/current-assets-list/tab1.vue
......@@ -229,4 +229,7 @@ export default {
align-items: center;
width: 33%;
}
.btn_icon{
margin-right: 10px;
}
</style>
\ No newline at end of file
src/views/current-assets-list/tab2.vue
......@@ -229,4 +229,7 @@ export default {
align-items: center;
width: 33%;
}
.btn_icon{
margin-right: 10px;
}
</style>
\ No newline at end of file
src/views/current-assets-list/tab3.vue
......@@ -230,4 +230,7 @@ export default {
align-items: center;
width: 33%;
}
.btn_icon{
margin-right: 10px;
}
</style>
\ No newline at end of file
src/views/current-assets-list/tab4.vue
......@@ -227,4 +227,7 @@ export default {
align-items: center;
width: 33%;
}
.btn_icon{
margin-right: 10px;
}
</style>
\ No newline at end of file
src/views/current-assets-list/tab5.vue
......@@ -227,4 +227,7 @@ export default {
align-items: center;
width: 33%;
}
.btn_icon{
margin-right: 10px;
}
</style>
\ No newline at end of file
src/views/report-template-relative-use/index.vue
......@@ -17,8 +17,8 @@
</div>
<div class="search_menu_item">
<span class="search_title">模版名称</span>
<el-select clearable v-model="searchParams.tempName" placeholder="请选择" style="width: 210px;">
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option>
<el-select clearable v-model="searchParams.tplName" placeholder="请选择" style="width: 210px;">
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tplName" :value="item.tplId"></el-option>
</el-select>
</div>
</div>
......@@ -57,7 +57,7 @@
<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="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 label="操作" width="600" align="center">
<template slot-scope="scope">
......@@ -123,7 +123,7 @@
</el-form-item>
<el-form-item label="模板名称:" prop="let4">
<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-form-item>
</div>
......@@ -183,7 +183,7 @@ export default {
deptName: null,
appName: null,
projectName: null,
tempName: null,
tplName: null,
},
loading: false,
selectTable: [],
......@@ -219,6 +219,7 @@ export default {
return new Promise((resolve, reject) => {
getMoBanMingCheng({}).then(res => {
if(res.code == 200) {
console.log(res.data)
resolve(res.data);
}
})
......@@ -238,7 +239,7 @@ export default {
"deptName": this.searchParams.deptName,
"appName": this.searchParams.appName,
"projectName": this.searchParams.projectName,
"tempName": this.searchParams.tempName,
"tplName": this.searchParams.tplName,
"current": this.pager.current,
"pageSize": this.pager.size,
};
......@@ -447,7 +448,7 @@ export default {
this.searchParams.deptName = null;
this.searchParams.appName = null;
this.searchParams.projectName = null;
this.searchParams.tempName = null;
this.searchParams.tplName = null;
},
// 每页条数改变
handleSizeChange(val) {
......@@ -466,7 +467,7 @@ export default {
"deptName": this.searchParams.deptName,
"appName": this.searchParams.appName,
"projectName": this.searchParams.projectName,
"tempName": this.searchParams.tempName,
"tplName": this.searchParams.tplName,
"current": this.pager.current,
"pageSize": this.pager.size,
};
......
src/views/total-archi-property-document/index.vue
......@@ -5,11 +5,11 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<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 class="search_menu_item">
<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-select>
</div>
......@@ -26,7 +26,7 @@
</div>
</div>
<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="" />
<p>查询</p>
</div>
......@@ -45,11 +45,7 @@
<!-- <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 prop="fileName" label="文档名称" align="center"></el-table-column>
<el-table-column prop="fileType" label="文档类型" align="center">
<template slot-scope="scope">
<span >{{dicObj.fileType[String(scope.row.fileType)]}}</span>
</template>
</el-table-column>
<el-table-column prop="fileType_" 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="fileName" label="附件" align="center">
......@@ -146,35 +142,8 @@ export default {
tableData: [],
add_dialog: false,
loading: false,
selectData1: [
{
label: "元模型",
value: 1,
},
{
label: "业务架构",
value: 2,
},
{
label: "应用架构",
value: 3,
},
{
label: "数据架构",
value: 4,
},
{
label: "技术架构",
value: 5,
},
{
label: "安全架构",
value: 6,
},
],
params: {
current: 1,
pageSize: 10,
selectData1: [],
searchParams: {
startTime: "",
endTime: "",
fileName: "",
......@@ -208,37 +177,55 @@ export default {
})
this.set_table_height();
this.selectData1.forEach(item => {
this.dicObj.fileType[item.value] = item.label;
});
// 初始化查询列表
this.getList();
// 获取元素列表
this.getFileTypeSelect();
this.getFileTypeSelect().then(res => {
this.selectData1 = res;
});
},
methods: {
search_table() {//搜索
this.pager.current = 1;
this.getList();
},
// 查询列表
getList() {
this.loading = true;
if (this.searchDate != null && this.searchDate.length == 2) {
this.params.beginTime = this.searchDate[0];
this.params.endTime = this.searchDate[1];
this.searchParams.beginTime = this.searchDate[0];
this.searchParams.endTime = this.searchDate[1];
} else {
this.params.beginTime = "";
this.params.endTime = "";
this.searchParams.beginTime = "";
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) {
this.pager.total = res.data.total;
this.tableData = res.data.records;
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.size = res.data.size;
this.tableData = res.data.records;
});
}
});
},
// 重置
reset() {
this.params = {
current: 1,
pageSize: 10,
this.searchParams = {
beginTime: "",
endTime: "",
fileName: "",
......@@ -348,7 +335,7 @@ export default {
},
// 导出
exportFile() {
getDocPoolExcel(this.params).then(res => {
getDocPoolExcel(this.searchParams).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
......@@ -369,30 +356,28 @@ export default {
// console.log(fileList);
},
getFileTypeSelect() {//案例类型下拉
getFileTypeSelect() {//文档类型下拉
const params = {
key: "kl_file_type"
}
key: "kl_file_type"
}
return new Promise((resolve, reject) => {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
this.selectData1 = res.data;
resolve(res.data);
}
})
})
},
// 每页条数改变
handleSizeChange(val) {
this.pager.current = 1;
this.params.current = 1;
this.pager.size = val;
this.params.pageSize = val;
this.getList();
},
//当前页码改变
handleCurrentChange(val) {
this.pager.current = val;
this.params.current = val;
this.getList();
},
......
src/views/typical-example-relative-use/index.vue
......@@ -5,23 +5,23 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<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 class="search_menu_item">
<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-select>
</div>
<div class="search_menu_item">
<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-select>
</div>
</div>
<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="" />
<p>查询</p>
</div>
......@@ -38,29 +38,13 @@
<!-- <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="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="tcName" label="案例名称" align="center"></el-table-column>
<el-table-column prop="tcType" label="案例类型" align="center">
<template slot-scope="scope">
<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="caseName" label="案例名称" align="center"></el-table-column>
<el-table-column prop="caseType_" label="案例类型" align="center"></el-table-column>
<el-table-column prop="projectType_" 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="problemType" label="问题类型" align="center">
<template slot-scope="scope">
<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="problemType_" label="问题类型" align="center"></el-table-column>
<el-table-column prop="problemLevel_" label="问题等级" align="center"></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">
<template slot-scope="scope">
......@@ -107,71 +91,16 @@ export default {
add_dialog: false,
loading: false,
selectTable: [],
selectData1: [
{
label: "移动应用典型案例",
value: 1,
},
{
label: "数据模型典型案例",
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: "",
selectData1: [],
selectData2: [],
selectData3: [],
selectData4: [],
searchParams: {
caseName: "",
caseType: "",
problemType: "",
},
dicObj: {
tcType: {
// 1: "在库",
// 2: "出库",
// 3: "出库",
},
prjType: {},
problemType: {},
problemLevel: {},
},
dicObj: {},
pager: {
current: 1,
sizes: [10, 20, 50, 100, 200],
......@@ -188,7 +117,7 @@ export default {
this.set_table_height();
this.selectData1.forEach(item => {
this.dicObj.tcType[item.value] = item.label;
this.dicObj.caseType[item.value] = item.label;
});
this.selectData2.forEach(item => {
this.dicObj.problemType[item.value] = item.label;
......@@ -204,26 +133,115 @@ export default {
this.getList();
// 获取元素列表
// this.get_an_li_lei_xing_select();
// this.get_wen_ti_lei_xing_select();
this.get_an_li_lei_xing_select().then(res => {
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: {
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() {
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) {
this.pager.total = res.data.total;
this.tableData = res.data.records;
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.size = res.data.size;
this.tableData = res.data.records;
})
}
});
},
// 重置
reset() {
this.params = {
current: 1,
pageSize: 10,
tcName: "",
tcType: "",
this.searchParams = {
caseName: "",
caseType: "",
problemType: "",
}
},
......@@ -316,8 +334,8 @@ export default {
// 新建清空表单
resetForm(){
this.formData = {
tcName: '',
tcType: '',
caseName: '',
caseType: '',
prjType: '',
buildContent: '',
problemType: '',
......@@ -327,7 +345,7 @@ export default {
}
},
exportFile() {//导出
getTypicalExampleExcel(this.params).then(res => {
getTypicalExampleExcel(this.searchParams).then(res => {
let blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
......@@ -357,16 +375,12 @@ export default {
// 每页条数改变
handleSizeChange(val) {
this.pager.current = 1;
this.params.current = 1;
this.pager.size = val;
this.params.pageSize = val;
this.getList();
},
//当前页码改变
handleCurrentChange(val) {
this.pager.current = val;
this.params.current = val;
this.getList();
},
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!