Skip to content

liangzhen / framework-tools-web

Go to a project
Commit f32b365c by xiehao
Options

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

1 parent daf5e126
Inline Side-by-side
Showing with 187 additions and 183 deletions
src/views/reviewArchiFollowCheck/index.vue
......@@ -6,57 +6,57 @@
<div class="search_menu_item">
<span class="search_title">建设单位</span>
<el-select
v-model="searchParams.let1"
placeholder="请选择"
class="search_item"
filterable
v-model="searchParams.let1"
placeholder="请选择"
class="search_item"
filterable
>
<el-option
v-for="item in sysOrgOptions"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId"
v-for="item in sysOrgOptions"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId"
></el-option>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">业务部门</span>
<el-select
filterable
v-model="searchParams.let2"
placeholder="请选择"
class="search_item"
filterable
v-model="searchParams.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId"
v-for="item in sysDeptOptions"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId"
></el-option>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">系统名称</span>
<el-input
v-no-backslash
v-model="searchParams.let3"
maxlength="100"
placeholder="请输入内容"
class="search_item"
v-no-backslash
v-model="searchParams.let3"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input>
</div>
<div class="search_menu_item">
<span class="search_title">建设类型</span>
<el-select
v-model="searchParams.let4"
placeholder="请选择"
class="search_item"
v-model="searchParams.let4"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in ziJianLeiXing"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in ziJianLeiXing"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
......@@ -64,17 +64,17 @@
<div class="search_menu_btn_container">
<div class="query_btn" @click="search_table">
<img
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
/>
<p>查询</p>
</div>
<div class="reset_btn" @click="reset">
<img
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
/>
<p>重置</p>
</div>
......@@ -82,49 +82,42 @@
</div>
<div class="search_btn">
<el-button type="primary" size="medium" @click="toDetails"
>概设遵从情况</el-button
>概设遵从情况
</el-button
>
</div>
<el-table
:height="tableHeight"
v-loading="loading"
@selection-change="select_table_rows"
:data="tableData"
stripe
border
:height="tableHeight"
v-loading="loading"
@selection-change="select_table_rows"
:data="tableData"
stripe
border
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
type="index"
:index="indexMethod"
label="序号"
width="80"
align="center"
type="index"
:index="indexMethod"
label="序号"
width="80"
align="center"
></el-table-column>
<el-table-column
prop="manageOrgId"
label="建设单位"
align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysOrgOptions')
"
prop="manageOrgName"
label="建设单位"
align="center"
></el-table-column>
<el-table-column
prop="manageDeptId"
label="业务部门"
align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysDeptOptions')
"
prop="manageDeptName"
label="业务部门"
align="center"
></el-table-column>
<el-table-column
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="buildType" label="建设类型" align="center">
<template slot-scope="scope">
......@@ -133,11 +126,11 @@
</template>
</el-table-column>
<el-table-column
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="是否续建" align="center">
<template slot-scope="scope">
......@@ -146,99 +139,108 @@
</template>
</el-table-column>
<el-table-column
prop="manageOrgId"
label="承建单位"
align="center"
prop="buildOrg"
label="承建单位"
align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysBuildOrgOptions')
"
></el-table-column>
<el-table-column
prop="projectManager"
label="项目经理"
align="center"
prop="projectManager"
label="项目经理"
align="center"
></el-table-column>
<el-table-column prop="remark" label="安全架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '1')"
>查看</el-button
>查看
</el-button
>
</template>
</el-table-column>
<el-table-column prop="remark" label="部署架构审查" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '2')"
>查看</el-button
>查看
</el-button
>
</template>
</el-table-column>
<el-table-column prop="remark" label="技术架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '3')"
>查看</el-button
>查看
</el-button
>
</template>
</el-table-column>
<el-table-column prop="remark" label="应用架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '4')"
>查看</el-button
>查看
</el-button
>
</template>
</el-table-column>
<el-table-column prop="remark" label="物理数据架构遵从" align="center">
<template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '5')"
>查看</el-button
>查看
</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pager.current"
:page-sizes="pager.sizes"
:page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager.total"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pager.current"
:page-sizes="pager.sizes"
:page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager.total"
>
</el-pagination>
</div>
<el-dialog
:title="is_add_edit == 'add' ? '新建字典' : '编辑字典'"
:visible.sync="add_dialog"
:center="false"
:close-on-click-modal="false"
width="60%"
:title="is_add_edit == 'add' ? '新建字典' : '编辑字典'"
:visible.sync="add_dialog"
:center="false"
:close-on-click-modal="false"
width="60%"
>
<el-form
:model="ruleForm"
ref="form"
:rules="rules"
style="display: flex; flex-wrap: wrap"
:model="ruleForm"
ref="form"
:rules="rules"
style="display: flex; flex-wrap: wrap"
>
<el-form-item label="字典名称:" prop="let1">
<el-input
v-no-backslash
v-model="ruleForm.let1"
maxlength="100"
v-no-backslash
v-model="ruleForm.let1"
maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="字典标识:" prop="let2">
<el-input
v-no-backslash
v-model="ruleForm.let2"
maxlength="100"
v-no-backslash
v-model="ruleForm.let2"
maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="cross1" label="描述:" prop="let3">
<el-input
v-no-backslash
v-model="ruleForm.let3"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
v-no-backslash
v-model="ruleForm.let3"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
></el-input>
</el-form-item>
</el-form>
......@@ -251,14 +253,10 @@
</template>
<script>
import {
getDianXingAnLiSelectData,
getGaiSheJiaGouZunCongJiaChaTable,
getOrgOption,
getDeptOption,
} from '@/api/index.js'
import { MessageBox, Message } from 'element-ui'
import {getDeptOption, getDianXingAnLiSelectData, getGaiSheJiaGouZunCongJiaChaTable, getOrgOption,} from '@/api/index.js'
import {Message} from 'element-ui'
import $ from 'jquery'
import {getDictTypeOptions} from "@/utils";
export default {
name: 'reviewArchiFollowCheck',
......@@ -314,7 +312,8 @@ export default {
},
methods: {
formatterColumn(row, column, cellValue, index, options) {
const obj = this[options]?.find((v) => v.orgId == cellValue) || {}
console.log(cellValue)
const obj = this[options]?.find((v) => v.value == cellValue) || {}
return obj.label
},
getDicts() {
......@@ -328,6 +327,9 @@ export default {
this.sysOrgOptions = res.data
}
})
getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res
})
},
indexMethod(index) {
return (this.pager.current - 1) * this.pager.size + index + 1
......@@ -354,17 +356,21 @@ export default {
}
const prjId = this.selectRows[0].prjId
this.$router.push(
`/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1`,
() => {},
() => {},
`/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1`,
() => {
},
() => {
},
)
},
check(row, type) {
//查看点击
this.$router.push(
`/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}`,
() => {},
() => {},
`/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}`,
() => {
},
() => {
},
)
},
save_dicy() {
......@@ -408,11 +414,11 @@ export default {
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'
table_container_height -
search_menu_height -
search_btn_height -
90 +
'px'
},
search_table() {
//搜索
......@@ -516,9 +522,11 @@ export default {
color: #0d867f;
border: 0;
}
.el-button--text {
color: #0d867f;
}
/deep/ .el-input-group__append {
background-color: #0d867f;
color: #fff;
......
src/views/reviewArchiPoliticeCheck/index.vue
......@@ -3,22 +3,23 @@
<list-page>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions" />
<SearchForm @onSearch="querySearch" :form-options="formOptions"/>
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button type="primary" size="medium" plain @click="toDetails"
>架构政策审查</el-button
>架构政策审查
</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
<table-config
ref="searchTable"
@selection-change="selectionChange"
:query="query"
:columns="columns"
id-key="elementId"
ref="searchTable"
@selection-change="selectionChange"
:query="query"
:columns="columns"
id-key="elementId"
>
</table-config>
</template>
......@@ -31,10 +32,11 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue'
import { queryAppArchiControlRequirements } from '@/api/interface'
import { getOrgOption, getDeptOption } from '@/api/index'
import { prjPlanClass } from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils'
import {queryAppArchiControlRequirements} from '@/api/interface'
import {getDeptOption, getOrgOption} from '@/api/index'
import {prjPlanClass} from '@/utils/dictionary'
import {getDictTypeOptions} from '@/utils'
export default {
name: 'batchPlanManagement',
components: {
......@@ -93,30 +95,26 @@ export default {
},
columns() {
return [
{ type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' },
{type: 'selection', width: '55px'},
{label: '序号', type: 'index', width: '80px'},
{
label: '建设单位',
prop: 'manageOrgId',
options: this.sysOrgOptions,
collectionType: true,
prop: 'manageOrgName',
width: '120px',
},
{
label: '业务部门',
prop: 'manageDeptId',
options: this.sysDeptOptions,
collectionType: true,
prop: 'manageDeptName',
width: '120px',
},
{ label: '系统名称', width: '280px', prop: 'appName' },
{label: '系统名称', width: '280px', prop: 'appName'},
{
label: '建设类型',
prop: 'buildType',
options: this.buildTypeOptions,
collectionType: 'build_type',
},
{ label: '项目名称', width: '295px', prop: 'prjName' },
{label: '项目名称', width: '295px', prop: 'prjName'},
{
label: '是否续建',
prop: 'prjPlanClass',
......@@ -134,7 +132,7 @@ export default {
label: '运安符合性审查',
prop: 'version3',
type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }],
actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => {
this.fnToDetailsTab('1', row.prjId)
},
......@@ -143,7 +141,7 @@ export default {
label: '功能满足审查',
prop: 'version4',
type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }],
actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => {
this.fnToDetailsTab('2', row.prjId)
},
......@@ -152,7 +150,7 @@ export default {
label: '运行可靠性审查',
prop: 'version5',
type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }],
actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => {
this.fnToDetailsTab('3', row.prjId)
},
......@@ -161,7 +159,7 @@ export default {
label: '系统实用性审查',
prop: 'version6',
type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }],
actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => {
this.fnToDetailsTab('4', row.prjId)
},
......@@ -170,7 +168,7 @@ export default {
label: '系统安全性审查',
prop: 'version8',
type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }],
actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => {
this.fnToDetailsTab('5', row.prjId)
},
......@@ -179,7 +177,7 @@ export default {
label: '资源复用性审查',
prop: 'version7',
type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }],
actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => {
this.fnToDetailsTab('6', row.prjId)
},
......@@ -215,7 +213,7 @@ export default {
})
}
})
getDictTypeOptions('sys_build_org').then((res) => {
getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res
})
},
......@@ -237,7 +235,7 @@ export default {
if (this.selectRows.length > 1) {
return this.$message.warning('只能选择一条数据')
}
const { name, prjId } = this.selectRows[0]
const {name, prjId} = this.selectRows[0]
this.$router.push({
path: '/main/reviewArchiPoliticeCheckDetails',
query: {
......
src/views/reviewSituation/index.vue
......@@ -3,26 +3,27 @@
<list-page>
<!-- 查询表单插槽 -->
<template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions" />
<SearchForm @onSearch="querySearch" :form-options="formOptions"/>
</template>
<!-- 中部操作按钮 -->
<template #operationWrap>
<el-button
icon="el-icon-document-add"
type="primary"
size="medium"
plain
@click="toDetails()"
>评审情况(概要设计)</el-button
icon="el-icon-document-add"
type="primary"
size="medium"
plain
@click="toDetails()"
>评审情况(概要设计)
</el-button
>
</template>
<!-- 表格插槽 -->
<template #tableWrap>
<table-config
ref="searchTable"
@selection-change="selectionChange"
:query="query"
:columns="columns"
ref="searchTable"
@selection-change="selectionChange"
:query="query"
:columns="columns"
>
</table-config>
</template>
......@@ -35,10 +36,11 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue'
import { queryPrelDesInspecte } from '@/api/interface'
import { getOrgOption, getDeptOption } from '@/api/index'
import { prjPlanClass, completionStatus } from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils'
import {queryPrelDesInspecte} from '@/api/interface'
import {getDeptOption, getOrgOption} from '@/api/index'
import {completionStatus, prjPlanClass} from '@/utils/dictionary'
import {getDictTypeOptions} from '@/utils'
export default {
name: 'reviewSituation',
data() {
......@@ -98,20 +100,16 @@ export default {
},
columns() {
let arr = [
{ type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' },
{type: 'selection', width: '55px'},
{label: '序号', type: 'index', width: '80px'},
{
label: '建设单位',
prop: 'manageOrgId',
options: this.sysOrgOptions,
collectionType: true,
prop: 'manageOrgName',
width: '120px',
},
{
label: '业务部门',
prop: 'manageDeptId',
options: this.sysDeptOptions,
collectionType: true,
prop: 'manageDeptName',
width: '120px',
},
{
......@@ -216,7 +214,7 @@ export default {
})
}
})
getDictTypeOptions('sys_build_org').then((res) => {
getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res
})
},
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!