Skip to content

liangzhen / framework-tools-web

Go to a project
Commit c5939db4 by liuyong
Options

修改bug

1 parent d66564c9
Inline Side-by-side
Showing with 153 additions and 39 deletions
src/views/archi-asset-manage/index.vue
...@@ -258,24 +258,45 @@ ...@@ -258,24 +258,45 @@
> >
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams2.let1" v-model="searchParams2.let1"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select v-model="searchParams2.let1" placeholder="请选择">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams2.let2" v-model="searchParams2.let2"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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>
...@@ -339,12 +360,12 @@ ...@@ -339,12 +360,12 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="manageOrgId"
label="单位" label="组织单位"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageDeptId" prop="manageDeptId"
label="部门" label="业务部门"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -417,24 +438,45 @@ ...@@ -417,24 +438,45 @@
> >
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams3.let1" v-model="searchParams3.let1"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select v-model="searchParams3.let1" placeholder="请选择">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams3.let2" v-model="searchParams3.let2"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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>
...@@ -498,12 +540,12 @@ ...@@ -498,12 +540,12 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="manageOrgId"
label="单位" label="组织单位"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageDeptId" prop="manageDeptId"
label="部门" label="业务部门"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -789,7 +831,9 @@ import { ...@@ -789,7 +831,9 @@ import {
editSystemTable, editSystemTable,
archiIntelligenceSearchTreeNew, archiIntelligenceSearchTreeNew,
systemArchiSaveFactor, systemArchiSaveFactor,
getQryByTree getQryByTree,
getDeptOption,
getOrgOption
} from '@/api/index.js' } from '@/api/index.js'
import $ from 'jquery' import $ from 'jquery'
import { MessageBox, Message } from 'element-ui' import { MessageBox, Message } from 'element-ui'
...@@ -910,6 +954,8 @@ export default { ...@@ -910,6 +954,8 @@ export default {
shangJiJieDianSelect: [], shangJiJieDianSelect: [],
treeSelectData: [], treeSelectData: [],
cascaderValue: [], cascaderValue: [],
sysOrgOptions: [],
sysDeptOptions: [],
} }
}, },
mounted() { mounted() {
...@@ -921,6 +967,8 @@ export default { ...@@ -921,6 +967,8 @@ export default {
this.getJianSheLeiXingSelect().then((res) => { this.getJianSheLeiXingSelect().then((res) => {
this.jianSheLeiXingSelect = res this.jianSheLeiXingSelect = res
}) })
this.getZuZhiDanWei();
this.getYeWuBuMeng();
}, },
created() { created() {
// 默认选中第一个系统 // 默认选中第一个系统
...@@ -930,6 +978,30 @@ export default { ...@@ -930,6 +978,30 @@ export default {
}) })
}, },
methods: { methods: {
getZuZhiDanWei() {//获取组织单位下拉菜单数据
getOrgOption().then(res => {
if(res.code === 200) {
this.sysOrgOptions = res.data.map(v => {
return {
label: v.orgName,
value: v.orgId
}
})
}
})
},
getYeWuBuMeng() {//获取业务部门下拉菜单数据
getDeptOption().then(res => {
if(res.code === 200) {
this.sysDeptOptions = res.data.map(v => {
return {
label: v.orgName,
value: v.orgId
}
})
}
})
},
handleDialogClose() { handleDialogClose() {
this.selectGraphSrc = '' this.selectGraphSrc = ''
this.selectGraphShape = '' this.selectGraphShape = ''
......
src/views/otherArchiDesign/index.vue
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<el-table height="400" v-loading="loading2" :data="tableData2" @selection-change="select_table_rows2" stripe border> <el-table height="400" v-loading="loading2" :data="tableData2" @selection-change="select_table_rows2" stripe border>
<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="manageOrgId" label="单位" align="center"></el-table-column> <el-table-column prop="manageOrgId" label="组织单位" align="center"></el-table-column>
<el-table-column prop="manageDeptId" label="部门" align="center"></el-table-column> <el-table-column prop="manageDeptId" label="业务部门" align="center"></el-table-column>
<el-table-column prop="appName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="appName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="建设类型" align="center"> <el-table-column label="建设类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/projectInfoManage/index.vue
...@@ -347,24 +347,45 @@ ...@@ -347,24 +347,45 @@
<div class="search_menu" style="justify-content: center"> <div class="search_menu" style="justify-content: center">
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams2.let1" v-model="searchParams2.let1"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select v-model="searchParams2.let1" placeholder="请选择">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams2.let2" v-model="searchParams2.let2"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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>
...@@ -428,12 +449,12 @@ ...@@ -428,12 +449,12 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="manageOrgId"
label="单位" label="组织单位"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageDeptId" prop="manageDeptId"
label="部门" label="业务部门"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -503,24 +524,45 @@ ...@@ -503,24 +524,45 @@
<div class="search_menu" style="justify-content: center"> <div class="search_menu" style="justify-content: center">
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams3.let1" v-model="searchParams3.let1"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select v-model="searchParams3.let1" placeholder="请选择">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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 <!-- <el-input
v-no-backslash v-no-backslash
v-model="searchParams3.let2" v-model="searchParams3.let2"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</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>
...@@ -584,12 +626,12 @@ ...@@ -584,12 +626,12 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="manageOrgId"
label="单位" label="组织单位"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageDeptId" prop="manageDeptId"
label="部门" label="业务部门"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
......
src/views/summaryArchiDesign/index.vue
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<el-table height="400" v-loading="loading2" :data="tableData2" @selection-change="select_table_rows2" stripe border> <el-table height="400" v-loading="loading2" :data="tableData2" @selection-change="select_table_rows2" stripe border>
<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="manageOrgId" label="单位" align="center"></el-table-column> <el-table-column prop="manageOrgId" label="组织单位" align="center"></el-table-column>
<el-table-column prop="manageDeptId" label="部门" align="center"></el-table-column> <el-table-column prop="manageDeptId" label="业务部门" align="center"></el-table-column>
<el-table-column prop="appName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="appName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="建设类型" align="center"> <el-table-column label="建设类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/systemArchiViewDesign/index.vue
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<el-table height="400" v-loading="loading2" :data="tableData2" @selection-change="select_table_rows2" stripe border> <el-table height="400" v-loading="loading2" :data="tableData2" @selection-change="select_table_rows2" stripe border>
<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="manageOrgId" label="单位" align="center"></el-table-column> <el-table-column prop="manageOrgId" label="组织单位" align="center"></el-table-column>
<el-table-column prop="manageDeptId" label="部门" align="center"></el-table-column> <el-table-column prop="manageDeptId" label="业务部门" align="center"></el-table-column>
<el-table-column prop="appName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="appName" label="系统名称" align="center" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="建设类型" align="center"> <el-table-column label="建设类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!