Skip to content

liangzhen / framework-tools-web

Go to a project
Commit cea2b101 by liuyong
Options

修改bug

1 parent 7ee6ea43
Inline Side-by-side
Showing with 101 additions and 28 deletions
src/views/archi-asset-manage/index.vue
...@@ -71,10 +71,11 @@ ...@@ -71,10 +71,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="createMan" label="创建人" align="center"></el-table-column> <el-table-column prop="createMan" 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="200" align="center"> <el-table-column label="操作" width="300" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
<el-button icon="el-icon-edit" type="primary" size="mini" @click="editItem(scope.row)" :disabled="scope.row.state == 1">编辑</el-button> <el-button icon="el-icon-edit" type="primary" size="mini" @click="editItem(scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
<el-button icon="el-icon-upload2" type="primary" size="mini" @click="releaseItem(scope.row)" :disabled="scope.row.state == 1 ">发布</el-button>
<el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="deleteItem(scope.row)" :disabled="scope.row.state == 1">删除</el-button> <el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="deleteItem(scope.row)" :disabled="scope.row.state == 1">删除</el-button>
</div> </div>
</template> </template>
...@@ -668,12 +669,6 @@ ...@@ -668,12 +669,6 @@
case 'open_add_dialog2': case 'open_add_dialog2':
this.open_add_dialog2(); this.open_add_dialog2();
break; break;
case 'edit':
this.editItem(data);
break;
case 'delete':
this.deleteItem(data);
break;
case 'open_add_dialog3': case 'open_add_dialog3':
this.addItem(); this.addItem();
break; break;
...@@ -906,6 +901,40 @@ ...@@ -906,6 +901,40 @@
} }
}); });
}, },
releaseItem(row) {//发布
MessageBox.confirm('确定发布?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'messageClass',
confirmButtonClass: 'confirmClass',
type: 'warning'
}).then(() => {
const params = {
assetId: row.assetId,
state: 1,
assetConstant: this.assetConstant,
}
editSystemTable(params).then(res => {
if(res.code == 200) {
this.get_table();
Message({
type: 'success',
message: '发布成功!'
});
}else {
Message({
type: 'error',
message: res.msg
});
}
});
}).catch(() => {
Message({
type: 'info',
message: '已取消'
});
});
},
get_key(key) {//查询字典 get_key(key) {//查询字典
const params = { const params = {
key: key key: key
......
src/views/archiViewConfig/index.vue
...@@ -262,7 +262,6 @@ ...@@ -262,7 +262,6 @@
<el-transfer <el-transfer
v-model="transferValue1" v-model="transferValue1"
:data="tableData1" :data="tableData1"
:left-default-checked="leftDefaultChecked1"
:right-default-checked="transferValue1"> :right-default-checked="transferValue1">
</el-transfer> </el-transfer>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -280,7 +279,6 @@ ...@@ -280,7 +279,6 @@
<el-transfer <el-transfer
v-model="transferValue2" v-model="transferValue2"
:data="tableData2" :data="tableData2"
:left-default-checked="leftDefaultChecked2"
:right-default-checked="transferValue2"> :right-default-checked="transferValue2">
</el-transfer> </el-transfer>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
......
src/views/busi-assets-list/index.vue
...@@ -82,10 +82,11 @@ ...@@ -82,10 +82,11 @@
</el-table-column> </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="createMan" label="创建人" align="center"></el-table-column> <el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="300" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
<el-button icon="el-icon-edit" type="primary" size="mini" @click="editItem(scope.row)" :disabled="scope.row.state == 1">编辑</el-button> <el-button icon="el-icon-edit" type="primary" size="mini" @click="editItem(scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
<el-button icon="el-icon-upload2" type="primary" size="mini" @click="releaseItem(scope.row)" :disabled="scope.row.state == 1 ">发布</el-button>
<el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="deleteItem(scope.row)" :disabled="scope.row.state == 1">删除</el-button> <el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="deleteItem(scope.row)" :disabled="scope.row.state == 1">删除</el-button>
</div> </div>
</template> </template>
...@@ -808,6 +809,40 @@ ...@@ -808,6 +809,40 @@
} }
}); });
}, },
releaseItem(row) {//发布
MessageBox.confirm('确定发布?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'messageClass',
confirmButtonClass: 'confirmClass',
type: 'warning'
}).then(() => {
const params = {
assetId: row.assetId,
state: 1,
assetConstant: this.assetConstant,
}
editZiChanJiaGouTable(params).then(res => {
if(res.code == 200) {
this.get_table();
Message({
type: 'success',
message: '发布成功!'
});
}else {
Message({
type: 'error',
message: res.msg
});
}
});
}).catch(() => {
Message({
type: 'info',
message: '已取消'
});
});
},
deleteItem(row){//删除 deleteItem(row){//删除
MessageBox.confirm('确定删除?', '提示', { MessageBox.confirm('确定删除?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -1051,6 +1086,10 @@ ...@@ -1051,6 +1086,10 @@
.right_container{ .right_container{
width: 80%; width: 80%;
} }
.el-button.is-disabled{
color: #C0C4CC !important;
background-color: #fff !important;
}
.search_menu{ .search_menu{
margin-top: 20px; margin-top: 20px;
margin-right: 20px; margin-right: 20px;
......
src/views/otherArchiDesign/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="otherArchiDesign"> <div class="otherArchiDesign">
<el-card class="box-card" style="margin-bottom: 10px;"> <el-card class="box-card" style="margin-bottom: 10px;">
<div style="text-align: left;display: flex;align-items: center;"> <div style="text-align: left;display: flex;align-items: center;">
<el-button type="primary" size="medium" @click="operation('open_add_dialog1', null)">选择系统</el-button> <el-button type="primary" size="medium" @click="operation('open_add_dialog1', null)">选择项目</el-button>
<div style="margin-left: 20px;margin-right: 20px;" v-if="showSelectTitle.title">您已选择：{{ showSelectTitle.title }}</div> <div style="margin-left: 20px;margin-right: 20px;" v-if="showSelectTitle.title">您已选择：{{ showSelectTitle.title }}</div>
</div> </div>
</el-card> </el-card>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<el-dialog <el-dialog
title='选择系统' title='选择项目'
:visible.sync="add_dialog1" :visible.sync="add_dialog1"
:center="false" :center="false"
:close-on-click-modal="false" :close-on-click-modal="false"
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<el-input v-no-backslash v-model="searchParams2.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams2.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="width: auto;"> <div class="search_menu_item" style="width: auto;">
<span class="search_title">系统名称</span> <span class="search_title">项目名称</span>
<el-input v-no-backslash v-model="searchParams2.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams2.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="width: auto;"> <div class="search_menu_item" style="width: auto;">
...@@ -102,6 +102,13 @@ ...@@ -102,6 +102,13 @@
<span v-else>自建</span> <span v-else>自建</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="prjName" label="项目名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="是否续建" align="center">
<template slot-scope="scope">
<span v-if="scope.row.prjPlanClass == 1">否</span>
<span v-else>是</span>
</template>
</el-table-column>
<el-table-column prop="buildOrg" label="承建单位" align="center"></el-table-column> <el-table-column prop="buildOrg" label="承建单位" align="center"></el-table-column>
<el-table-column prop="projectManager" label="项目经理" align="center"></el-table-column> <el-table-column prop="projectManager" label="项目经理" align="center"></el-table-column>
<el-table-column prop="createMan" label="创建人" align="center"></el-table-column> <el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
...@@ -146,7 +153,7 @@ ...@@ -146,7 +153,7 @@
<script> <script>
import { import {
getArchiViewManage, getArchiViewManage,
querysystemInfoManageTable, queryProjectInfoManageTable,
getDianXingAnLiSelectData, getDianXingAnLiSelectData,
getArchiViewManageDetail, getArchiViewManageDetail,
addArchiViewManage, addArchiViewManage,
...@@ -172,7 +179,7 @@ export default { ...@@ -172,7 +179,7 @@ export default {
currentNodekey: null, currentNodekey: null,
showSelectTitle: { showSelectTitle: {
title: null, title: null,
appId: null, prjId: null,
}, },
add_dialog1: false, add_dialog1: false,
searchParams2: { searchParams2: {
...@@ -237,10 +244,10 @@ export default { ...@@ -237,10 +244,10 @@ export default {
} }
}, },
open_add_dialog2() { open_add_dialog2() {
if(!this.showSelectTitle.appId) { if(!this.showSelectTitle.prjId) {
Message({ Message({
type: 'error', type: 'error',
message: '请先选择系统!' message: '请先选择项目!'
}); });
return; return;
} }
...@@ -262,8 +269,8 @@ export default { ...@@ -262,8 +269,8 @@ export default {
return; return;
} }
this.add_dialog1 = false; this.add_dialog1 = false;
this.showSelectTitle.title = this.selectRow2[0].appName; this.showSelectTitle.title = this.selectRow2[0].prjName;
this.showSelectTitle.appId = this.selectRow2[0].appId; this.showSelectTitle.prjId = this.selectRow2[0].prjId;
this.get_list(); this.get_list();
}, },
open_add_dialog1() { open_add_dialog1() {
...@@ -314,12 +321,12 @@ export default { ...@@ -314,12 +321,12 @@ export default {
const params = { const params = {
"manageOrgId": this.searchParams2.let1, "manageOrgId": this.searchParams2.let1,
"manageDeptId": this.searchParams2.let2, "manageDeptId": this.searchParams2.let2,
"appName": this.searchParams2.let3, "prjName": this.searchParams2.let3,
"buildType": this.searchParams2.let4, "buildType": this.searchParams2.let4,
"current": this.pager2.current, "current": this.pager2.current,
"pageSize": this.pager2.size, "pageSize": this.pager2.size,
}; };
querysystemInfoManageTable(params).then(res => { queryProjectInfoManageTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.loading2 = false; this.loading2 = false;
this.tableData2 = res.data.records; this.tableData2 = res.data.records;
...@@ -366,7 +373,7 @@ export default { ...@@ -366,7 +373,7 @@ export default {
current: this.pager.current, current: this.pager.current,
pageSize: this.pager.size, pageSize: this.pager.size,
viewId: this.viewId, viewId: this.viewId,
appId: this.showSelectTitle.appId prjId: this.showSelectTitle.prjId
} }
getArchiViewManageDetail(params).then(res => { getArchiViewManageDetail(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
...@@ -409,7 +416,7 @@ export default { ...@@ -409,7 +416,7 @@ export default {
const params = { const params = {
version: this.ruleForm.name, version: this.ruleForm.name,
viewId: this.viewId, viewId: this.viewId,
appId: this.showSelectTitle.appId, prjId: this.showSelectTitle.prjId,
}; };
addArchiViewManage(params).then(res => { addArchiViewManage(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
......
src/views/projectInfoManage/index.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-input v-no-backslash v-model="searchParams.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams.let2" maxlength="100" 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-input v-no-backslash v-model="searchParams.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<el-input v-no-backslash v-model="searchParams2.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams2.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="width: auto;"> <div class="search_menu_item" style="width: auto;">
<span class="search_title">系统名称</span> <span class="search_title">项目名称</span>
<el-input v-no-backslash v-model="searchParams2.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams2.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="width: auto;"> <div class="search_menu_item" style="width: auto;">
...@@ -846,7 +846,7 @@ export default { ...@@ -846,7 +846,7 @@ export default {
const params = { const params = {
"manageOrgId": this.searchParams.let1, "manageOrgId": this.searchParams.let1,
"manageDeptId": this.searchParams.let2, "manageDeptId": this.searchParams.let2,
"appName": this.searchParams.let3, "prjName": this.searchParams.let3,
"buildType": this.searchParams.let4, "buildType": this.searchParams.let4,
"current": this.pager.current, "current": this.pager.current,
"pageSize": this.pager.size, "pageSize": this.pager.size,
......
src/views/summaryArchiDesign/index.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<el-input v-no-backslash v-model="searchParams2.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams2.let2" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="width: auto;"> <div class="search_menu_item" style="width: auto;">
<span class="search_title">系统名称</span> <span class="search_title">项目名称</span>
<el-input v-no-backslash v-model="searchParams2.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input> <el-input v-no-backslash v-model="searchParams2.let3" maxlength="100" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item" style="width: auto;"> <div class="search_menu_item" style="width: auto;">
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
const params = { const params = {
"manageOrgId": this.searchParams2.let1, "manageOrgId": this.searchParams2.let1,
"manageDeptId": this.searchParams2.let2, "manageDeptId": this.searchParams2.let2,
"appName": this.searchParams2.let3, "prjName": this.searchParams2.let3,
"buildType": this.searchParams2.let4, "buildType": this.searchParams2.let4,
"current": this.pager2.current, "current": this.pager2.current,
"pageSize": this.pager2.size, "pageSize": this.pager2.size,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!