Commit f5cf67b8 by liuyong

Merge branch 'develop' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio into develop

2 parents 5a539968 a4b76b27
......@@ -210,10 +210,22 @@ export function getETPManageAdd(params) {
export function getETPManageUpdate(params) {
return post('/kl-talent-pool/updKlTalentPool', params);
}
// 编辑专家人才库
// 删除专家人才库
export function getETPManageDel(params) {
return post('/kl-talent-pool/delKlTalentPool', params);
}
// 批量删除专家人才库
export function getETPManageDelBatch(params) {
return post('/kl-talent-pool/updKlTalentPoolBatch', params);
}
// 专家库名称下拉
export function getETPManagePoolName(params) {
return post('/kl-talent-pool/gtklPoolName', params);
}
// 新增专家库名称
export function getETPManagePoolNameAdd(params) {
return post('/kl-talent-pool/adklPoolName', params);
}
// 典型案例库管理
......
......@@ -5,22 +5,18 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">专家库名称</span>
<el-input v-model="params.rsName" placeholder="请输入内容" class="search_item"></el-input>
<el-input v-model="params.name" placeholder="请输入内容" class="search_item"></el-input>
</div>
<div class="search_menu_item">
<span class="search_title">专业标签</span>
<el-select v-model="params.scope" placeholder="请选择" clearable class="search_item">
<el-option label="业务架构" value="业务架构"></el-option>
<el-option label="应用架构" value="应用架构"></el-option>
<el-option label="内容架构" value="内容架构"></el-option>
<el-option label="技术架构" value="技术架构"></el-option>
<el-option label="安全架构" value="安全架构"></el-option>
<el-select v-model="params.ktagId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in selectData3" :key="idnex" :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.state" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in stateList" :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>
</div>
</div>
......@@ -38,16 +34,29 @@
<div class="search_btn">
<el-button type="primary" size="medium" icon="el-icon-document-add" @click="operate('add')">新建</el-button>
<el-button type="primary" size="medium" icon="el-icon-delete" @click="operate('delMultiple')">删除</el-button>
<el-button type="primary" size="medium" icon="el-icon-plus" @click="exportFile">导出</el-button>
<!-- <el-button type="primary" size="medium" icon="el-icon-plus" @click="exportFile">导出</el-button> -->
</div>
<el-table :data="tableData" stripe border @selection-change="handleSelectionChange" height="450">
<el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
<el-table :height="tableHeight" :data="tableData" stripe border @selection-change="handleSelectionChange">
<!-- <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="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="deptName" label="单位" width="150" align="center"></el-table-column>
<el-table-column prop="name" label="专家库名称" align="center"></el-table-column>
<el-table-column prop="name" label="专家库名称" align="center">
<template slot-scope="scope">
<span >{{dicObj.name[scope.row.name] == null ? (scope.row.name):dicObj.name[scope.row.name]}}</span>
</template>
</el-table-column>
<el-table-column prop="talentName" label="专家名称" align="center"></el-table-column>
<el-table-column prop="content" label="专业标签" align="center"></el-table-column>
<el-table-column prop="level" label="专家级别" align="center"></el-table-column>
<el-table-column prop="" width="250" label="专业标签" align="center">
<template slot-scope="scope">
<div class="tagName"><el-tag v-for="(item,index) in scope.row.ktagIdlist" :key="index" v-show="dicObj.ktagId[item.ktagId]">{{dicObj.ktagId[item.ktagId]}}</el-tag></div>
</template>
</el-table-column>
<el-table-column prop="level" label="专家级别" align="center">
<template slot-scope="scope">
<span >{{dicObj.level[scope.row.level]}}</span>
</template>
</el-table-column>
<el-table-column prop="comments" label="专家评价" align="center"></el-table-column>
<el-table-column prop="state" label="专家状态" width="150" align="center">
<template slot-scope="scope">
......@@ -58,8 +67,8 @@
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<el-button :class="scope.row.state == 1 ? '':'editBtn'" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
<el-button :class="scope.row.state == 1 ? '':'delBtn'" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)" :disabled="scope.row.state == 1">删除</el-button>
<el-button class="editBtn" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)">编辑</el-button>
<el-button class="delBtn" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)">删除</el-button>
</div>
</template>
</el-table-column>
......@@ -80,55 +89,53 @@
:title="title"
:visible.sync="add_dialog"
:center="false"
width="50%">
width="55%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title">单位</div>
<el-select v-model="formData.schemaLevel" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
<el-input v-model="formData.deptName" placeholder="请输入内容" class="search_item"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">专家库名称</div>
<el-select v-model="formData.schemaLevel" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-select v-model="formData.name" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in selectData1" :key="idnex" :label="item.name" :value="item.ktpId" ></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">专家名称</div>
<el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input>
<el-input v-model="formData.talentName" placeholder="请输入内容" class="search_item"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title">专家标签</div>
<el-select v-model="formData.schemaLevel" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-select v-model="labelList" 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-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">专家级别</div>
<el-select v-model="formData.schemaLevel" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-select v-model="formData.level" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in selectData2" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">专家评价</div>
<el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input>
<el-input v-model="formData.comments" placeholder="请输入内容" class="search_item"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title">专家状态</div>
<el-select v-model="formData.schemaLevel" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-select v-model="formData.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-select>
</div>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">备注</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.remark"></el-input>
</div>
</div>
<span slot="footer" class="dialog-footer">
......@@ -155,7 +162,10 @@ import {
getETPManageAdd,
getETPManageUpdate,
getETPManageDel,
getETPManageDelBatch,
getDianXingAnLiSelectData,
getETPManagePoolName,
getETPManagePoolNameAdd,
} from "@/api/index.js";
import $ from 'jquery';
......@@ -174,24 +184,23 @@ export default {
title: "",
openType: "",
formData: {
rsName: "",
content: "",
arrList: [
{
eleGtId: "",
eleLtId: "",
scope: "",
}
],
iconId: "",
deptName: "",
name: "",
talentName: "",
klTaglist: [],
level: "",
comments: "",
state: "",
remark: "",
},
params: {
current: 1,
pageSize: 10,
rsName: "",
scope: "",
name: "",
ktagId: "",
state: "",
},
labelList: [],
page: {
current: 1,
sizes: [10, 20, 50, 100, 200],
......@@ -203,80 +212,95 @@ export default {
1: "在库",
2: "出库",
},
},
stateList: [
{
label: "在库",
value: 1,
level: {
1: "初级",
2: "中级",
3: "高级",
},
{
label: "出库",
value: 2,
ktagId: {
1: "设备",
2: "信息化",
3: "技术",
},
],
guishuList: [
{
label: "架构之间",
value: 0,
ktagId: {
1: "设备",
2: "信息化",
3: "技术",
},
name:{
21: "专家业务库",
22: "专家文档库",
23: "专家评审库",
}
},
selectData1: [
],
selectData2: [
{
label: "业务架构",
value: 1,
label: "初级",
value: 1
},
{
label: "应用架构",
label: "中级",
value: 2,
},
{
label: "数据架构",
label: "高级",
value: 3,
},
{
label: "技术架构",
value: 4,
},
{
label: "安全架构",
value: 5,
},
],
levelList: [
{
label: "策略层",
value: 0,
},
selectData3: [
// {
// label: "设备",
// value: 1,
// },
// {
// label: "信息化",
// value: 2,
// },
// {
// label: "技术",
// value: 3,
// },
],
selectData4: [
{
label: "管理层",
label: "在库",
value: 1,
},
{
label: "设计层",
label: "出库",
value: 2,
},
{
label: "实施层",
value: 3,
},
],
eleList: [],
radioName: "",
search_select1: [],
tableHeight: null,
};
},
mounted() {
window.addEventListener('resize', () => {
this.set_table_height();
})
this.set_table_height();
// 获取元素列表
this.getSelect1();
this.getSelect2();
this.getSelect3();
this.getSelect4();
},
created() {
// 初始化查询列表
this.getList();
// 获取元素列表
},
methods: {
// 查询列表
getList() {
getETPManageList(this.params).then(res => {
console.log(res);
this.page.total = res.total;
this.tableData = res.records;
// if (res.code == 200) {
......@@ -286,35 +310,13 @@ export default {
// }
});
},
// 获取元素列表
getYuansuList() {
getEleList().then(res => {
if (res.code == 200) {
this.eleList = res.data;
this.eleList.forEach(item=>{
this.dicObj.eleLtId[item.elementId] = item.elementName;
})
}
});
},
get_dialog_select2() {//查询架构归属下拉框值
return new Promise((resolve, reject) => {
query_jia_gou_gui_shu({}).then(res => {
if(res.code == 200) {
resolve(res.data);
}else {
reject(res.msg);
}
});
})
},
// 重置
reset(){
this.params = {
current: 1,
pageSize: 10,
rsName: "",
scope: "",
name: "",
ktagId: "",
state: "",
}
},
......@@ -339,13 +341,32 @@ export default {
}else if (type == "edit") {
this.add_dialog = true;
this.title = "编辑专家人才库";
this.resetForm();
this.formData = item;
this.formData.name = Number(this.formData.name);
this.formData.state = String(this.formData.state);
this.formData.level = String(this.formData.level);
this.formData.klTaglist = [];
this.formData.ktagIdlist.forEach(item => {
this.labelList.push(String(item.ktagId));
});
}else if (type == "create") {
this.formData.state = 2;
this.formData.icon = $(`.src${this.formData.iconId}`)[0].src;
if (this.formData.eleRelaId) {
this.selectData3.forEach(item1 => {
this.labelList.forEach(item2 => {
if (item1.value == item2) {
this.formData.klTaglist.push(
{
ktagId: item1.value,
ktagName: item1.label,
}
)
}
})
})
if (this.formData.ktpId) {
// 编辑保存
getJGYSGLUpdate(this.formData).then(res => {
getETPManageUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
......@@ -357,7 +378,7 @@ export default {
});
}else{
// 新建保存
getJGYSGLAdd(this.formData).then(res => {
getETPManageAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
......@@ -378,7 +399,6 @@ export default {
type: "warning"
}).then(() => {
getETPManageUpdate(this.formData).then(res => {
console.log(res);
if (res.code == 200) {
this.$message.success("删除成功");
this.getList();
......@@ -388,23 +408,48 @@ export default {
});
}).catch(() => {
});
}else if (type == "delMultiple") {
if (this.selectList.length <= 0) {
this.$message.error("请选择一项进行删除");
return;
}
let params = {
ktpId: [],
};
this.selectList.map(item => {
params.ktpId.push(item.ktpId)
})
this.$confirm("确认批量删除吗", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
getETPManageDelBatch(params).then(res => {
if (res.code == 200) {
this.$message.success("批量删除成功");
this.getList();
}else{
this.$message.error(res.msg);
}
});
}).catch(() => {
});
}
},
// 新建清空表单
resetForm(){
this.formData = {
rsName: "",
content: "",
arrList: [
{
eleGtId: "",
eleLtId: "",
scope: "",
}
],
iconId: "",
deptName: "",
name: "",
talentName: "",
klTaglist: [],
level: "",
comments: "",
state: "",
remark: "",
}
this.radioName = "";
this.labelList = [];
},
exportFile() {//导出
// getTypicalExampleExcel(this.params).then(res => {
......@@ -417,6 +462,51 @@ export default {
// })
},
getSelect1() {//专家库下来
getETPManagePoolName().then(res => {
if(res.code == 200) {
this.selectData1 = res.data;
console.log(this.selectData1);
}
})
},
getSelect2() {//专家级别下拉
const params = {
key: "talent_level"
}
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
this.selectData2 = res.data;
}
})
},
getSelect3() {//专家标签下拉
const params = {
key: "talent_tag"
}
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
this.selectData3 = res.data;
}
})
},
getSelect4() {//专家状态下拉
const params = {
key: "talent_status"
}
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
this.selectData4 = res.data;
}
})
},
set_table_height() {//动态设置表格高度
const table_container_height = $(".table_container").height();
const search_menu_height = $(".search_menu").height();
const search_btn_height = $(".search_btn").outerHeight(true);
this.tableHeight = table_container_height - search_menu_height - search_btn_height - 90 + 'px';
},
// 表格多选
handleSelectionChange(e) {
this.selectList = e;
......@@ -445,6 +535,12 @@ export default {
.dialog_content_1{
display: flex;
justify-content: space-between;
.el-input{
width: 210px;
}
.el-select{
width: 210px;
}
}
.dialog_form_item3{
margin-top: 20px;
......@@ -556,6 +652,7 @@ export default {
.table_container{
width: 97%;
margin-top: 20px;
height: calc(100% - 40px);
.tableIcon{
width: 100%;
display: flex;
......@@ -574,7 +671,11 @@ export default {
.stopBtn{
color: #E7A20E;
}
.tagName{
.el-tag{
margin:0 5px;
}
}
}
.el-pagination{
margin-top: 50px;
......
......@@ -261,7 +261,6 @@ export default {
if (this.formData.ktcId) {
// 编辑保存
getTypicalExampleUpdate(this.formData).then(res => {
console.log(this.formData,res);
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
......@@ -280,7 +279,6 @@ export default {
this.getList();
}else{
this.add_dialog = false;
console.log(res);
this.$message.error(res.msg);
}
});
......@@ -361,9 +359,9 @@ export default {
},
handleFileUploadSuccess(res, file, fileList) {//文件上传
this.formData.fileId = res.data.fileId;
console.log(res);
console.log(file);
console.log(fileList);
// console.log(res);
// console.log(file);
// console.log(fileList);
},
getFileTypeSelect() {//案例类型下拉
......@@ -373,7 +371,6 @@ export default {
getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) {
this.selectData1 = res.data;
console.log(this.selectData1);
}
})
},
......
......@@ -306,11 +306,14 @@ export default {
this.add_dialog = true;
this.title = "编辑案例";
this.formData = item;
this.formData.tcType = String(this.formData.tcType);
this.formData.problemType = String(this.formData.problemType);
this.formData.prjType = String(this.formData.prjType);
this.formData.problemLevel = String(this.formData.problemLevel);
}else if (type == "create") {
if (this.formData.ktcId) {
// 编辑保存
getTypicalExampleUpdate(this.formData).then(res => {
console.log(this.formData,res);
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
......
......@@ -242,7 +242,6 @@ export default {
if (this.formData.ktcId) {
// 编辑保存
getTypicalExampleUpdate(this.formData).then(res => {
console.log(this.formData,res);
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!