Skip to content

liangzhen / framework-tools-web

Go to a project
Commit a799dbcb by xiehao
Options

fix:选择系统后重置筛选条件

1 parent c1447062
Inline Side-by-side
Showing with 124 additions and 124 deletions
src/views/archi-asset-manage/index.vue
......@@ -7,13 +7,15 @@
type="primary"
size="medium"
@click="operation('open_add_dialog1', null)"
>选择系统</el-button
>选择系统
</el-button
>
<el-button
type="primary"
size="medium"
@click="operation('open_add_dialog2', null)"
>选择项目</el-button
>选择项目
</el-button
>
<div
style="margin-left: 20px; margin-right: 20px"
......@@ -23,13 +25,15 @@
</div>
<el-tag v-if="showSelectTitle.title">{{
showSelectTitle.status
}}</el-tag>
}}
</el-tag>
</div>
<el-button
type="primary"
size="medium"
@click="operation('open_add_dialog4', null)"
>维护资产要素</el-button
>维护资产要素
</el-button
>
</div>
</el-card>
......@@ -123,14 +127,16 @@
type="primary"
size="medium"
icon="el-icon-document-add"
>新建</el-button
>新建
</el-button
>
<el-button
type="primary"
size="medium"
icon="el-icon-delete"
@click="moreDelete"
>删除</el-button
>删除
</el-button
>
</div>
<el-table
......@@ -219,11 +225,11 @@
<span v-if="scope.row.isExtend == 0">系统资产</span>
</template>
</el-table-column>
<el-table-column
prop="createMan"
label="创建人"
align="center"
></el-table-column>
<!--<el-table-column-->
<!-- prop="createMan"-->
<!-- label="创建人"-->
<!-- align="center"-->
<!--&gt;</el-table-column>-->
<el-table-column
prop="createTime"
label="创建时间"
......@@ -244,7 +250,8 @@
type="primary"
size="mini"
@click="viewItem(scope.row)"
>查看</el-button
>查看
</el-button
>
<el-button
icon="el-icon-edit"
......@@ -252,7 +259,8 @@
size="mini"
@click="editItem(scope.row)"
:disabled="scope.row.state == 1 || scope.row.isExtend == 1"
>编辑</el-button
>编辑
</el-button
>
<el-button
icon="el-icon-upload2"
......@@ -260,7 +268,8 @@
size="mini"
@click="releaseItem(scope.row)"
:disabled="scope.row.state == 1 || scope.row.isExtend == 1"
>发布</el-button
>发布
</el-button
>
<el-button
type="primary"
......@@ -268,7 +277,8 @@
size="mini"
@click="stopItem(scope.row)"
:disabled="scope.row.state != 1 || scope.row.isExtend == 1"
>停用</el-button
>停用
</el-button
>
<el-button
class="shanChu_btn"
......@@ -276,7 +286,8 @@
size="mini"
@click="deleteItem(scope.row)"
:disabled="scope.row.state == 1 || scope.row.isExtend == 1"
>删除</el-button
>删除
</el-button
>
</div>
</template>
......@@ -310,14 +321,7 @@
<div class="search_menu_item_container">
<div class="search_menu_item" style="width: auto">
<span class="search_title">组织单位</span>
<!-- <el-input
v-no-backslash
v-model="searchParams2.let1"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select v-model="searchParams2.let1" placeholder="请选择">
<el-select filterable v-model="searchParams2.let1" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
......@@ -328,19 +332,7 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">业务部门</span>
<!-- <el-input
v-no-backslash
v-model="searchParams2.let2"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
......@@ -432,22 +424,17 @@
<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">
<template v-slot="scope">
<span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
</template>
</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="createTime"
label="创建时间"
align="center"
......@@ -490,14 +477,7 @@
<div class="search_menu_item_container">
<div class="search_menu_item" style="width: auto">
<span class="search_title">组织单位</span>
<!-- <el-input
v-no-backslash
v-model="searchParams3.let1"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select v-model="searchParams3.let1" placeholder="请选择">
<el-select filterable v-model="searchParams3.let1" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
......@@ -508,19 +488,7 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">业务部门</span>
<!-- <el-input
v-no-backslash
v-model="searchParams3.let2"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-select filterable v-model="searchParams3.let2" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
......@@ -531,8 +499,7 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">系统名称</span>
<el-input
v-no-backslash
<el-input v-no-backslash
v-model="searchParams3.let3"
maxlength="100"
placeholder="请输入内容"
......@@ -541,11 +508,7 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">建设类型</span>
<el-select
v-model="searchParams3.let4"
placeholder="请选择"
class="search_item"
>
<el-select v-model="searchParams3.let4" placeholder="请选择" class="search_item">
<el-option
v-for="item in jianSheLeiXingSelect"
:key="item.value"
......@@ -612,39 +575,19 @@
<span v-else>自建</span>
</template>
</el-table-column>
<el-table-column
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="prjName" label="项目名称" align="center" width="200" :show-overflow-tooltip="true"/>
<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="projectManager"
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="buildOrg" label="承建单位" align="center">
<template v-slot="scope">
<span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"/>
</el-table>
<el-pagination
background
......@@ -793,7 +736,8 @@
v-if="is_add_edit == 'view' ? false : true"
>
<el-button type="primary" @click="openGraphDialog"
>图形选择</el-button
>图形选择
</el-button
>
<el-color-picker
v-model="ruleForm.color"
......@@ -876,7 +820,8 @@
:indeterminate="item.isIndeterminate"
v-model="item.checkAll"
@change="(val) => handleCheckAllChange(val, item)"
>{{ item.archiBelongName }}</el-checkbox
>{{ item.archiBelongName }}
</el-checkbox
>
</div>
<div style="margin: 15px 0"></div>
......@@ -889,7 +834,8 @@
v-for="city in item.subList"
:label="city.assetId"
:key="city.assetId"
>{{ city.assetName }}</el-checkbox
>{{ city.assetName }}
</el-checkbox
>
</el-checkbox-group>
</el-card>
......@@ -905,7 +851,7 @@
</el-dialog>
<!-- 选择图形 -->
<ChooseSvg @emitSvg="getChooseSvg" :visible.sync="chooseSvgVisible" />
<ChooseSvg @emitSvg="getChooseSvg" :visible.sync="chooseSvgVisible"/>
</div>
</template>
......@@ -930,12 +876,13 @@ import {
getPreArc,
} from '@/api/index.js'
import $ from 'jquery'
import { MessageBox, Message } from 'element-ui'
import { getDictTypeOptions } from '@/utils'
import { archiEleColor } from '@/config/index.js'
import {MessageBox, Message} from 'element-ui'
import {getDictTypeOptions} from '@/utils'
import {archiEleColor} from '@/config/index.js'
export default {
name: 'archiAssetsManage',
components: { ChooseSvg },
components: {ChooseSvg},
watch: {},
data() {
return {
......@@ -1023,16 +970,17 @@ export default {
},
rules: {
assetName: [
{ required: true, message: '请输入资产名称', trigger: 'blur' },
{required: true, message: '请输入资产名称', trigger: 'blur'},
],
assetNumber: [
{ required: true, message: '请输入资产编号', trigger: 'blur' },
{required: true, message: '请输入资产编号', trigger: 'blur'},
],
archiEleId: [
{ required: true, message: '请选择所属元素', trigger: 'change' },
{required: true, message: '请选择所属元素', trigger: 'change'},
],
icon: [{ required: true, message: '请选择图形', trigger: 'change' }],
icon: [{required: true, message: '请选择图形', trigger: 'change'}],
},
chengJianDeptSelect: [],
zuJianLeiXingSelect: [],
archiBelongId: null,
archiType: null,
......@@ -1053,6 +1001,13 @@ export default {
cascaderValue: [],
sysOrgOptions: [],
sysDeptOptions: [],
that: this
}
},
filters: {
orgNameFilter(orgId, that) {
const org = that.chengJianDeptSelect?.find(item => item.value == orgId);
return org ? org.label : "";
}
},
computed: {
......@@ -1082,11 +1037,14 @@ export default {
getDictTypeOptions('asset_status').then((res) => {
this.assetsStatusOptions = res
})
getDictTypeOptions('build_company').then((res) => {
this.chengJianDeptSelect = res
})
},
methods: {
getZuZhiDanWei() {//获取组织单位下拉菜单数据
getOrgOption().then(res => {
if(res.code === 200) {
if (res.code === 200) {
this.sysOrgOptions = res.data.map(v => {
return {
label: v.orgName,
......@@ -1098,7 +1056,7 @@ export default {
},
getYeWuBuMeng() {//获取业务部门下拉菜单数据
getDeptOption().then(res => {
if(res.code === 200) {
if (res.code === 200) {
this.sysDeptOptions = res.data.map(v => {
return {
label: v.orgName,
......@@ -1117,7 +1075,7 @@ export default {
},
// 获取上级元素
getPreArc(item) {
getPreArc({ eleName: item?.elementName }).then((res) => {
getPreArc({eleName: item?.elementName}).then((res) => {
if (res.code === 200) {
this.preArcList = res.data
if (!this.preArcList.length) {
......@@ -2141,16 +2099,20 @@ export default {
.confirmClass {
background-color: #0d867f !important;
}
.el-message-box__content {
padding: 60px 15px 60px 15px;
}
.el-select-dropdown__item {
height: auto;
}
.el-select-dropdown__item.hover,
.el-select-dropdown__item:hover {
background-color: #fff !important;
}
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #0d867f;
}
......@@ -2159,143 +2121,177 @@ export default {
.archiAssetsManage {
width: 100%;
}
/deep/ .is-leaf {
background-color: rgb(245, 246, 250) !important;
}
.archiAssetsManageContainer {
width: 100%;
height: calc(100% - 86px);
display: flex;
}
.topMenuContainer {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
.filter-tree {
width: 300px;
height: 100%;
overflow-y: auto;
}
.dynamicFormClass {
width: 100% !important;
}
/deep/ .el-tree-node__expand-icon {
column-count: #01b7c9;
}
/deep/ .el-tree-node__expand-icon.is-leaf {
color: transparent !important;
}
/deep/ .dynamicFormClass .el-form-item__content {
width: calc(100% - 210px) !important;
text-align: left;
}
.el-form-item {
display: flex;
width: 33%;
}
/deep/ .el-form-item__label {
width: 160px;
}
.form_item_container {
display: flex;
flex-wrap: wrap;
}
.greenButton {
background-color: #0d867f;
color: #fff;
}
/deep/ .el-dialog__header {
background-color: #0d867f;
text-align: left;
}
/deep/ .el-dialog__title {
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.el-pagination {
margin-top: 30px;
}
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #0d867f;
}
.tingYong_btn {
color: #dea82a;
background-color: #fdf6e6;
}
.shanChu_btn {
color: #dd6a15;
background-color: #f8ebe2;
}
.el-button.is-disabled {
color: #c0c4cc !important;
background-color: #fff !important;
}
.table_container {
width: 97%;
height: calc(100% - 40px);
margin-top: 20px;
}
/deep/
.el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content {
.el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content {
background-color: #0d867f;
color: #fff;
}
/deep/
.el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content
> .is-leaf {
.el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content
> .is-leaf {
background-color: #0d867f !important;
}
/deep/ .el-tree-node__expand-icon.is-leaf {
background-color: #fff !important;
}
.left_container {
width: 20%;
margin-right: 20px;
}
.right_container {
width: 80%;
margin: 20px 20px 0 0;
}
.search_menu {
margin-right: 20px;
display: flex;
justify-content: space-between;
}
.search_menu_item_container {
display: flex;
align-items: center;
}
.search_menu_btn_container {
display: flex;
align-items: center;
}
.search_menu_item {
display: flex;
align-items: center;
width: 344px;
}
.search_title {
/* width: 20%; */
flex-shrink: 0;
margin-right: 15px;
}
.search_item {
width: 60%;
}
.search_btn {
width: 100%;
display: flex;
margin-top: 14px;
margin-bottom: 14px;
}
.import_btn {
display: flex;
align-items: center;
......@@ -2309,9 +2305,11 @@ export default {
color: #0d867f;
cursor: pointer;
}
.btn_icon {
margin-right: 10px;
}
.query_btn {
display: flex;
align-items: center;
......@@ -2326,6 +2324,7 @@ export default {
margin-right: 10px;
cursor: pointer;
}
.reset_btn {
display: flex;
align-items: center;
......@@ -2339,6 +2338,7 @@ export default {
color: #666;
cursor: pointer;
}
.el-button--primary {
background: rgba(13, 134, 127, 0.1);
color: #0d867f;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!