Skip to content

liangzhen / framework-tools-web

Go to a project
Commit f5949104 by liuyong
Options

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

2 parents 961f5e1f 6208408b
Expand all
Inline Side-by-side
Showing with 122 additions and 56 deletions
src/views/archi-ele-list/index.vue
...@@ -901,7 +901,7 @@ export default { ...@@ -901,7 +901,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
graphList: [], graphList: [],
......
src/views/archi-evolute-line/index.vue
...@@ -380,7 +380,7 @@ export default { ...@@ -380,7 +380,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/current-assets-list/tab1.vue
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/current-assets-list/tab2.vue
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/current-assets-list/tab3.vue
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/current-assets-list/tab4.vue
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/current-assets-list/tab5.vue
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/log-manage/index.vue
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
fuHeDu: [], fuHeDu: [],
......
src/views/metaModelDic/index.vue
...@@ -395,7 +395,7 @@ export default { ...@@ -395,7 +395,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/projectInfoManage/index.vue
...@@ -779,7 +779,7 @@ export default { ...@@ -779,7 +779,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
...@@ -807,7 +807,7 @@ export default { ...@@ -807,7 +807,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
selectRow: [], selectRow: [],
selectRow3: [], selectRow3: [],
...@@ -817,7 +817,7 @@ export default { ...@@ -817,7 +817,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
selectRo3: [], selectRo3: [],
tableData4: [ tableData4: [
......
src/views/report-template-fabric/index.vue
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/report-template-relative-use/index.vue
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
moBanMingCheng: [], moBanMingCheng: [],
......
src/views/reviewArchiFollowCheck/index.vue
...@@ -4,32 +4,34 @@ ...@@ -4,32 +4,34 @@
<div class="search_menu"> <div class="search_menu">
<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 <el-select
v-model="searchParams.let1" v-model="searchParams.let1"
placeholder="请选择" placeholder="请选择"
class="search_item" class="search_item"
filterable
> >
<el-option <el-option
v-for="item in fuHeDu" v-for="item in sysOrgOptions"
:key="item.value" :key="item.orgId"
:label="item.label" :label="item.orgName"
:value="item.value" :value="item.orgId"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">部门</span> <span class="search_title">业务部门</span>
<el-select <el-select
filterable
v-model="searchParams.let2" v-model="searchParams.let2"
placeholder="请选择" placeholder="请选择"
class="search_item" class="search_item"
> >
<el-option <el-option
v-for="item in fuHeDu" v-for="item in sysDeptOptions"
:key="item.value" :key="item.orgId"
:label="item.label" :label="item.orgName"
:value="item.value" :value="item.orgId"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
...@@ -101,13 +103,21 @@ ...@@ -101,13 +103,21 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="manageOrgId"
label="单位" label="建设单位"
align="center" align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysOrgOptions')
"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageDeptId" prop="manageDeptId"
label="部门" label="业务部门"
align="center" align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysDeptOptions')
"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="appName" prop="appName"
...@@ -244,6 +254,8 @@ ...@@ -244,6 +254,8 @@
import { import {
getDianXingAnLiSelectData, getDianXingAnLiSelectData,
getGaiSheJiaGouZunCongJiaChaTable, getGaiSheJiaGouZunCongJiaChaTable,
getOrgOption,
getDeptOption,
} from '@/api/index.js' } from '@/api/index.js'
import { MessageBox, Message } from 'element-ui' import { MessageBox, Message } from 'element-ui'
import $ from 'jquery' import $ from 'jquery'
...@@ -268,7 +280,7 @@ export default { ...@@ -268,7 +280,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
...@@ -280,8 +292,13 @@ export default { ...@@ -280,8 +292,13 @@ export default {
fuHeDu: [], fuHeDu: [],
ziJianLeiXing: [], ziJianLeiXing: [],
selectRows: [], selectRows: [],
sysOrgOptions: [],
sysDeptOptions: [],
} }
}, },
created() {
this.getDicts()
},
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.set_table_height() this.set_table_height()
...@@ -296,6 +313,22 @@ export default { ...@@ -296,6 +313,22 @@ export default {
}) })
}, },
methods: { methods: {
formatterColumn(row, column, cellValue, index, options) {
const obj = this[options]?.find((v) => v.orgId == cellValue) || {}
return obj.label
},
getDicts() {
getDeptOption().then((res) => {
if (res.code === 200) {
this.sysDeptOptions = res.data
}
})
getOrgOption().then((res) => {
if (res.code === 200) {
this.sysOrgOptions = res.data
}
})
},
indexMethod(index) { indexMethod(index) {
return (this.pager.current - 1) * this.pager.size + index + 1 return (this.pager.current - 1) * this.pager.size + index + 1
}, },
......
src/views/reviewArchiPoliticeCheck/index.vue
...@@ -31,8 +31,8 @@ import ListPage from '@/components/ListPage.vue' ...@@ -31,8 +31,8 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue' import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue' import TableConfig from '@/components/TableConfig.vue'
// import { getDianXingAnLiSelectData } from '@/api/index.js'
import { queryAppArchiControlRequirements } from '@/api/interface' import { queryAppArchiControlRequirements } from '@/api/interface'
import { getOrgOption, getDeptOption } from '@/api/index'
import { prjPlanClass } from '@/utils/dictionary' import { prjPlanClass } from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils' import { getDictTypeOptions } from '@/utils'
export default { export default {
...@@ -61,18 +61,20 @@ export default { ...@@ -61,18 +61,20 @@ export default {
formOptions() { formOptions() {
return [ return [
{ {
label: '单位', // label文字 label: '建设单位', // label文字
prop: 'manageOrgId', // 字段名 prop: 'manageOrgId', // 字段名
element: 'el-select', // 指定elementui组件 element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性 placeholder: '请选择', // elementui组件属性
dictType: 'sys_org', options: this.sysOrgOptions,
filterable: true
}, },
{ {
label: '部门', // label文字 label: '业务部门', // label文字
prop: 'manageDeptId', // 字段名 prop: 'manageDeptId', // 字段名
element: 'el-select', // 指定elementui组件 element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性 placeholder: '请选择', // elementui组件属性
dictType: 'sys_dept', options: this.sysDeptOptions,
filterable: true
}, },
{ {
label: '系统名称', // label文字 label: '系统名称', // label文字
...@@ -94,14 +96,14 @@ export default { ...@@ -94,14 +96,14 @@ export default {
{ type: 'selection', width: '55px' }, { type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' }, { label: '序号', type: 'index', width: '80px' },
{ {
label: '单位', label: '建设单位',
prop: 'manageOrgId', prop: 'manageOrgId',
options: this.sysOrgOptions, options: this.sysOrgOptions,
collectionType: true, collectionType: true,
width: '120px', width: '120px',
}, },
{ {
label: '部门', label: '业务部门',
prop: 'manageDeptId', prop: 'manageDeptId',
options: this.sysDeptOptions, options: this.sysDeptOptions,
collectionType: true, collectionType: true,
...@@ -193,11 +195,25 @@ export default { ...@@ -193,11 +195,25 @@ export default {
getDictTypeOptions('build_type').then((res) => { getDictTypeOptions('build_type').then((res) => {
this.buildTypeOptions = res this.buildTypeOptions = res
}) })
getDictTypeOptions('sys_org').then((res) => { getDeptOption().then((res) => {
this.sysOrgOptions = res if (res.code === 200) {
this.sysDeptOptions = res.data.map((v) => {
return {
label: v.orgName,
value: v.orgId,
}
})
}
}) })
getDictTypeOptions('sys_dept').then((res) => { getOrgOption().then((res) => {
this.sysDeptOptions = res if (res.code === 200) {
this.sysOrgOptions = res.data.map((v) => {
return {
label: v.orgName,
value: v.orgId,
}
})
}
}) })
getDictTypeOptions('sys_build_org').then((res) => { getDictTypeOptions('sys_build_org').then((res) => {
this.sysBuildOrgOptions = res this.sysBuildOrgOptions = res
......
src/views/reviewSituation/index.vue
...@@ -36,6 +36,7 @@ import SearchForm from '@/components/SearchForm.vue' ...@@ -36,6 +36,7 @@ import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue' import TableConfig from '@/components/TableConfig.vue'
import { queryPrelDesInspecte } from '@/api/interface' import { queryPrelDesInspecte } from '@/api/interface'
import { getOrgOption, getDeptOption } from '@/api/index'
import { prjPlanClass, completionStatus } from '@/utils/dictionary' import { prjPlanClass, completionStatus } from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils' import { getDictTypeOptions } from '@/utils'
export default { export default {
...@@ -63,18 +64,20 @@ export default { ...@@ -63,18 +64,20 @@ export default {
formOptions() { formOptions() {
let arr = [ let arr = [
{ {
label: '单位', // label文字 label: '建设单位', // label文字
prop: 'manageOrgId', // 字段名 prop: 'manageOrgId', // 字段名
element: 'el-select', // 指定elementui组件 element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性 placeholder: '请选择', // elementui组件属性
dictType: 'sys_org', options: this.sysOrgOptions,
filterable: true
}, },
{ {
label: '部门', // label文字 label: '业务部门', // label文字
prop: 'manageDeptId', // 字段名 prop: 'manageDeptId', // 字段名
element: 'el-select', // 指定elementui组件 element: 'el-select', // 指定elementui组件
placeholder: '请选择', // elementui组件属性 placeholder: '请选择', // elementui组件属性
dictType: 'sys_dept', options: this.sysDeptOptions,
filterable: true
}, },
{ {
label: '系统名称', // label文字 label: '系统名称', // label文字
...@@ -98,14 +101,14 @@ export default { ...@@ -98,14 +101,14 @@ export default {
{ type: 'selection', width: '55px' }, { type: 'selection', width: '55px' },
{ label: '序号', type: 'index', width: '80px' }, { label: '序号', type: 'index', width: '80px' },
{ {
label: '单位', label: '建设单位',
prop: 'manageOrgId', prop: 'manageOrgId',
options: this.sysOrgOptions, options: this.sysOrgOptions,
collectionType: true, collectionType: true,
width: '120px', width: '120px',
}, },
{ {
label: '部门', label: '业务部门',
prop: 'manageDeptId', prop: 'manageDeptId',
options: this.sysDeptOptions, options: this.sysDeptOptions,
collectionType: true, collectionType: true,
...@@ -193,11 +196,25 @@ export default { ...@@ -193,11 +196,25 @@ export default {
getDictTypeOptions('build_type').then((res) => { getDictTypeOptions('build_type').then((res) => {
this.buildTypeOptions = res this.buildTypeOptions = res
}) })
getDictTypeOptions('sys_org').then((res) => { getDeptOption().then((res) => {
this.sysOrgOptions = res if (res.code === 200) {
this.sysDeptOptions = res.data.map((v) => {
return {
label: v.orgName,
value: v.orgId,
}
})
}
}) })
getDictTypeOptions('sys_dept').then((res) => { getOrgOption().then((res) => {
this.sysDeptOptions = res if (res.code === 200) {
this.sysOrgOptions = res.data.map((v) => {
return {
label: v.orgName,
value: v.orgId,
}
})
}
}) })
getDictTypeOptions('sys_build_org').then((res) => { getDictTypeOptions('sys_build_org').then((res) => {
this.sysBuildOrgOptions = res this.sysBuildOrgOptions = res
......
src/views/systemInfoManage/index.vue
...@@ -371,7 +371,7 @@ export default { ...@@ -371,7 +371,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
...@@ -433,7 +433,7 @@ export default { ...@@ -433,7 +433,7 @@ export default {
}) })
} }
}) })
getDictTypeOptions('sys_build_org').then((res) => { getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res this.sysBuildOrgOptions = res
}) })
// console.log(getDictTypeOptions('sys_build_org')) // console.log(getDictTypeOptions('sys_build_org'))
......
src/views/tech-politics-fabric/index.vue
...@@ -399,7 +399,7 @@ export default { ...@@ -399,7 +399,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
is_add_edit: 'add', is_add_edit: 'add',
......
src/views/tech-politics-relative-use/index.vue
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
src/views/total-archi-property-document/index.vue
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
formData: { formData: {
fileName: '', fileName: '',
......
src/views/typical-example-relative-use/index.vue
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20, //总条数 total: 0, //总条数
}, },
tableHeight: null, tableHeight: null,
} }
......
src/views/通用页面.vue
<template> <template>
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0 //总条数
}, },
tableHeight: null, tableHeight: null,
searchParams: { searchParams: {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!