Skip to content

liangzhen / framework-tools-web

Go to a project
Commit e244fe48 by liuyong
Options

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

2 parents 83bc6e48 857d776b
Inline Side-by-side
Showing with 44 additions and 52 deletions
src/views/etpManage/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<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.name" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="params.ktpName" 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>
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="deptName" label="单位" width="150" 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 prop="ktpName" label="专家库名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span >{{dicObj.name[scope.row.name] == null ? (scope.row.name):dicObj.name[scope.row.name]}}</span> <span >{{dicObj.name[scope.row.ktpName] == null ? (scope.row.ktpName):dicObj.name[scope.row.ktpName]}}</span>
</template> </template>
</el-table-column> </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>
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
name: "", ktpName: "",
ktagId: "", ktagId: "",
state: "", state: "",
}, },
...@@ -213,11 +213,6 @@ export default { ...@@ -213,11 +213,6 @@ export default {
2: "信息化", 2: "信息化",
3: "技术", 3: "技术",
}, },
ktagId: {
1: "设备",
2: "信息化",
3: "技术",
},
name:{ name:{
21: "专家业务库", 21: "专家业务库",
22: "专家文档库", 22: "专家文档库",
...@@ -241,18 +236,6 @@ export default { ...@@ -241,18 +236,6 @@ export default {
}, },
], ],
selectData3: [ selectData3: [
// {
// label: "设备",
// value: 1,
// },
// {
// label: "信息化",
// value: 2,
// },
// {
// label: "技术",
// value: 3,
// },
], ],
selectData4: [ selectData4: [
{ {
...@@ -306,7 +289,7 @@ export default { ...@@ -306,7 +289,7 @@ export default {
this.params = { this.params = {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
name: "", ktpName: "",
ktagId: "", ktagId: "",
state: "", state: "",
} }
...@@ -460,7 +443,6 @@ export default { ...@@ -460,7 +443,6 @@ export default {
getETPManagePoolName().then(res => { getETPManagePoolName().then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData1 = res.data; this.selectData1 = res.data;
console.log(this.selectData1);
} }
}) })
}, },
...@@ -481,6 +463,7 @@ export default { ...@@ -481,6 +463,7 @@ export default {
getDianXingAnLiSelectData(params).then(res => { getDianXingAnLiSelectData(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.selectData3 = res.data; this.selectData3 = res.data;
console.log(this.selectData3);
} }
}) })
}, },
......
src/views/metaModelDic/pages/page3.vue
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
<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-select v-model="params.viewName" placeholder="请选择" clearable class="search_item"> <el-input v-model="params.viewName" placeholder="请输入内容" class="search_item"></el-input>
<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
</el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">架构层次</span> <span class="search_title">架构层次</span>
......
src/views/total-archi-property-document/index.vue
...@@ -258,31 +258,35 @@ export default { ...@@ -258,31 +258,35 @@ export default {
this.title = "编辑文档"; this.title = "编辑文档";
this.formData = item; this.formData = item;
}else if (type == "create") { }else if (type == "create") {
if (this.formData.ktcId) { // if (this.formData.ktcId) {
// 编辑保存 // // 编辑保存
getTypicalExampleUpdate(this.formData).then(res => { // getTypicalExampleUpdate(this.formData).then(res => {
if (res.code == 200) { // if (res.code == 200) {
this.$message.success("保存成功"); // this.$message.success("保存成功");
this.add_dialog = false; // this.add_dialog = false;
this.getList(); // this.getList();
}else{ // }else{
this.add_dialog = false; // this.add_dialog = false;
this.$message.error(res.msg); // this.$message.error(res.msg);
} // }
}); // });
}else{ // }else{
// 新建保存 // 新建保存
getDocPoolAdd(this.formData).then(res => { if (this.formData.fileId == "") {
if (res.code == 200) { this.$message.error("请上传文件");
this.$message.success("保存成功"); return;
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
} }
getDocPoolAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
// }
}else if (type == "del") { }else if (type == "del") {
// 删除 // 删除
this.$confirm("确认删除吗", "提示", { this.$confirm("确认删除吗", "提示", {
...@@ -355,6 +359,7 @@ export default { ...@@ -355,6 +359,7 @@ export default {
}, },
// 文件上传逻辑 // 文件上传逻辑
handleRemove(file, fileList) {//文件移出 handleRemove(file, fileList) {//文件移出
this.formData.fileId = "";
// console.log(file, fileList); // console.log(file, fileList);
}, },
handleFileUploadSuccess(res, file, fileList) {//文件上传 handleFileUploadSuccess(res, file, fileList) {//文件上传
...@@ -426,6 +431,12 @@ export default { ...@@ -426,6 +431,12 @@ export default {
} }
.add_dialog_content{ .add_dialog_content{
height: 300px; height: 300px;
/deep/ .el-upload-list__item-name{
width: 150px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap
}
} }
.form_item_container{ .form_item_container{
display: flex; display: flex;
......
src/views/typical-example-relative-use/index.vue
...@@ -204,8 +204,8 @@ export default { ...@@ -204,8 +204,8 @@ export default {
this.getList(); this.getList();
// 获取元素列表 // 获取元素列表
this.get_an_li_lei_xing_select(); // this.get_an_li_lei_xing_select();
this.get_wen_ti_lei_xing_select(); // this.get_wen_ti_lei_xing_select();
}, },
methods: { methods: {
// 查询列表 // 查询列表
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!