diff --git a/src/components/Crud/index.vue b/src/components/Crud/index.vue index f6b888b..955cdab 100644 --- a/src/components/Crud/index.vue +++ b/src/components/Crud/index.vue @@ -126,10 +126,10 @@ export default { this.allColumnsSelectedIndeterminate = false }, handleCheckedTableColumnsChange(item) { - let totalCount = 0 + let total = 0 let selectedCount = 0 for (const key in this.crud.props.tableColumns) { - ++totalCount + ++total if (Object.prototype.hasOwnProperty.call(this.crud.props.tableColumns, key)) { selectedCount += this.crud.props.tableColumns[key].visible ? 1 : 0 } @@ -141,8 +141,8 @@ export default { }) return } - this.allColumnsSelected = selectedCount === totalCount - this.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0 + this.allColumnsSelected = selectedCount === total + this.allColumnsSelectedIndeterminate = selectedCount !== total && selectedCount !== 0 }, toggleSearch() { this.crud.props.searchToggle = !this.crud.props.searchToggle diff --git a/src/components/Notice/message.vue b/src/components/Notice/message.vue index b8cb5cf..5141c3c 100644 --- a/src/components/Notice/message.vue +++ b/src/components/Notice/message.vue @@ -234,7 +234,7 @@ export default { params: this.readListQuery }).then(data => { this.readMessage = data.list - this.readMessageTotal = data.totalCount + this.readMessageTotal = data.total // this.systemMessageCount = data.systemMessageCount // this.readMessageCount = data.readMessageCount // this.recycleMessageCount = data.recycleMessageCount @@ -287,7 +287,7 @@ export default { params: this.recycleListQuery }).then(data => { this.recycleMessage = data.list - this.recycleMessageTotal = data.totalCount + this.recycleMessageTotal = data.total this.systemMessageCount = data.systemMessageCount this.readMessageCount = data.readMessageCount this.recycleMessageCount = data.recycleMessageCount diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue index b6a0964..a55b733 100644 --- a/src/components/drawerDialog/index.vue +++ b/src/components/drawerDialog/index.vue @@ -356,8 +356,8 @@
{ messagePush.push({ key: 'MyTask', - value: task.totalCount + value: task.total }) }) getRenwuListByPath({ // 待分配任务 @@ -147,10 +147,10 @@ const user = { }, 'list').then(task => { messagePush.push({ key: 'AllotList', - value: task.totalCount + value: task.total }, { key: 'allot', - value: task.totalCount > 0 ? 1 : 0 + value: task.total > 0 ? 1 : 0 }) }) getRenwuListByPath({ // 退回任务 @@ -160,7 +160,7 @@ const user = { }, 'getTuihuiList').then(task => { messagePush.push({ key: 'BackRenwu', - value: task.totalCount + value: task.total }) }) getNeedRecordList({ // 待办记录 @@ -173,10 +173,10 @@ const user = { }).then((ysjl) => { messagePush.push({ key: 'TODOYsjl', - value: ysjl.totalCount + value: ysjl.total }, { key: 'ysjl', - value: ysjl.totalCount > 0 ? 1 : 0 + value: ysjl.total > 0 ? 1 : 0 }) }) getNeedRecordList({ // 检验报告列表 @@ -190,10 +190,10 @@ const user = { }).then((ysjl) => { messagePush.push({ key: 'TODOReport', - value: ysjl.totalCount + value: ysjl.total }, { key: 'bggl', - value: ysjl.totalCount > 0 ? 1 : 0 + value: ysjl.total > 0 ? 1 : 0 }) }) getNeedRecordList({ // 待审报告列表 @@ -205,7 +205,7 @@ const user = { }).then((ysjl) => { messagePush.push({ key: 'dsbg-list', - value: ysjl.totalCount + value: ysjl.total }) }) if (departmentId === 75) { // 锅炉科室定检 @@ -222,7 +222,7 @@ const user = { }).then((data) => { messagePush.push({ key: 'PrintReportGlKsWdy', - value: data.totalCount + value: data.total }) }) getNeedRecordList({ // 未发放 @@ -239,10 +239,10 @@ const user = { }).then((data) => { messagePush.push({ key: 'GrantReportGlCreate', - value: data.totalCount + value: data.total }, { key: 'grant', - value: data.totalCount > 0 ? 1 : 0 + value: data.total > 0 ? 1 : 0 }) }) getNeedRecordList({ // 已发放 @@ -259,7 +259,7 @@ const user = { }).then((data) => { messagePush.push({ key: 'GrantReportGlYiFafang', - value: data.totalCount + value: data.total }) }) } diff --git a/src/views/allot/components/chengya_list.vue b/src/views/allot/components/chengya_list.vue index 6842480..54b0cd4 100644 --- a/src/views/allot/components/chengya_list.vue +++ b/src/views/allot/components/chengya_list.vue @@ -110,7 +110,7 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/allot/components/jidian_list.vue b/src/views/allot/components/jidian_list.vue index bb3b307..c04dada 100644 --- a/src/views/allot/components/jidian_list.vue +++ b/src/views/allot/components/jidian_list.vue @@ -139,7 +139,7 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/allot/hasAllot.vue b/src/views/allot/hasAllot.vue index 3ca67ee..e5620b3 100644 --- a/src/views/allot/hasAllot.vue +++ b/src/views/allot/hasAllot.vue @@ -128,7 +128,7 @@ - +
@@ -140,7 +140,7 @@ export default { components: { Pagination, Sticky }, data() { return { - totalCount: 0, + total: 0, list: [], sbzlList: [], teams: [], @@ -229,7 +229,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/allot/project.vue b/src/views/allot/project.vue index fbeea66..5602d20 100644 --- a/src/views/allot/project.vue +++ b/src/views/allot/project.vue @@ -83,7 +83,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -195,8 +195,8 @@ export default { dialogVisible: false, dialogBaseInfoVisible: false, dialogFormVisibleAddBase: false, - totalCount: 0, - totalCountBase: 0, + total: 0, + totalBase: 0, list: [], listBase: [], listLoading: false, @@ -252,7 +252,7 @@ export default { }).then(data => { this.listLoading = false this.list = data.list - this.totalCount = data.totalCount + this.total = data.total }) }, getListBase() { @@ -265,7 +265,7 @@ export default { }).then(data => { this.listLoading = false this.listBase = data.list - this.totalCountBase = data.totalCount + this.totalBase = data.total }) }, getSblbList(val) { diff --git a/src/views/allot/rwd_list.vue b/src/views/allot/rwd_list.vue index 6f4c939..5847222 100644 --- a/src/views/allot/rwd_list.vue +++ b/src/views/allot/rwd_list.vue @@ -105,7 +105,7 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/allot/team_list.vue b/src/views/allot/team_list.vue index 624fc76..6db7e7e 100644 --- a/src/views/allot/team_list.vue +++ b/src/views/allot/team_list.vue @@ -64,7 +64,7 @@ { this.list = data.list - this.totalCount = data.total + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/allot/tuihui_list.vue b/src/views/allot/tuihui_list.vue index 17e4770..0d50c90 100644 --- a/src/views/allot/tuihui_list.vue +++ b/src/views/allot/tuihui_list.vue @@ -79,7 +79,7 @@ - + @@ -150,7 +150,7 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], sbzlList: [], tempDepartment: {}, @@ -202,7 +202,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/archive/list.vue b/src/views/archive/list.vue index d4a7e85..678e803 100644 --- a/src/views/archive/list.vue +++ b/src/views/archive/list.vue @@ -70,7 +70,7 @@ - +
@@ -84,7 +84,7 @@ export default { components: { Sticky, Pagination, ArchiveInfo, ArchiveScan }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, @@ -116,7 +116,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.total + this.total = data.total }) }, // 获取设备种类列表方法 diff --git a/src/views/assign/hasAssign.vue b/src/views/assign/hasAssign.vue index 6fb83e9..d6f5631 100644 --- a/src/views/assign/hasAssign.vue +++ b/src/views/assign/hasAssign.vue @@ -106,7 +106,7 @@ - + @@ -117,7 +117,7 @@ export default { components: { Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], sbzlList: [], listQuery: { @@ -141,7 +141,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/assign/list.vue b/src/views/assign/list.vue index 9d58dbc..3c7ca0e 100644 --- a/src/views/assign/list.vue +++ b/src/views/assign/list.vue @@ -110,7 +110,7 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/assign/missionList.vue b/src/views/assign/missionList.vue index d1618fa..60637ae 100644 --- a/src/views/assign/missionList.vue +++ b/src/views/assign/missionList.vue @@ -72,7 +72,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -184,9 +184,9 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], - totalCountCopy: 0, + totalCopy: 0, listCopy: [], sbzlList: [], sblbList: [], @@ -252,7 +252,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total }) }, getListCopy() { @@ -266,7 +266,7 @@ export default { params: this.listQueryCopy }).then(data => { this.listCopy = data.list - this.totalCountCopy = data.totalCount + this.totalCopy = data.total }) }, onDialogRowClick(row) { diff --git a/src/views/assign/old_list.vue b/src/views/assign/old_list.vue index 350b411..dd60edf 100644 --- a/src/views/assign/old_list.vue +++ b/src/views/assign/old_list.vue @@ -70,7 +70,7 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.showLoading = false }) }, diff --git a/src/views/audit/list.vue b/src/views/audit/list.vue index 38a71d4..e8f34bd 100644 --- a/src/views/audit/list.vue +++ b/src/views/audit/list.vue @@ -69,7 +69,7 @@
- +
驳回: @@ -156,7 +156,7 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, // 页码 @@ -235,7 +235,7 @@ export default { } } this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.common.switchInspection(this.list) }) }, diff --git a/src/views/bggl/banjie_list.vue b/src/views/bggl/banjie_list.vue index f5ebda6..9f3b4c0 100644 --- a/src/views/bggl/banjie_list.vue +++ b/src/views/bggl/banjie_list.vue @@ -165,8 +165,8 @@ - + @@ -525,7 +525,7 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, // 页码 @@ -572,7 +572,7 @@ export default { hasChild: false, hasFinish: true }, - totalCountExport: 0, + totalExport: 0, outFile: '', // 导出文件el jianyanrenyuanmingcheng: '', departmentName: '', @@ -635,7 +635,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.common.switchInspection(this.list) }) }, @@ -656,7 +656,7 @@ export default { this.exportList[i].guigexinghao = this.exportList[i].shebeimingcheng } } - this.totalCountExport = data.totalCount + this.totalExport = data.total }) }, ExportShow: function() { diff --git a/src/views/bggl/components/boiler_db_list.vue b/src/views/bggl/components/boiler_db_list.vue index 564abea..631909a 100644 --- a/src/views/bggl/components/boiler_db_list.vue +++ b/src/views/bggl/components/boiler_db_list.vue @@ -132,7 +132,7 @@
- +
重启流程: @@ -345,7 +345,7 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, // 页码 @@ -411,7 +411,7 @@ export default { pageRow: 20, // 每页条数 searchYsjl: {} }, - totalCountCopy: 0, + totalCopy: 0, copyNum: 1, // 复制份数 manufacturParam: {}, bzrQianming: false, @@ -443,7 +443,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.common.switchInspection(this.list) }) }, @@ -1110,7 +1110,7 @@ export default { params: this.listQueryCopy }).then(data => { this.listCopy = data.list - this.totalCountCopy = data.totalCount + this.totalCopy = data.total }) }, handleFilterCopy() { diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index 8b9a191..612d8aa 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -151,7 +151,7 @@
- +
重启流程: @@ -413,7 +413,7 @@ export default { components: { Sticky, Pagination, Enclosure }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, // 页码 @@ -482,7 +482,7 @@ export default { pageRow: 20, // 每页条数 searchYsjl: {} }, - totalCountCopy: 0, + totalCopy: 0, copyNum: 1, // 复制份数 manufacturParam: {}, bzrQianming: false, @@ -578,7 +578,7 @@ export default { } } this.list = data.list - this.totalCount = data.total + this.total = data.total this.common.switchInspection(this.list) }) }, @@ -1306,7 +1306,7 @@ export default { params: this.listQueryCopy }).then(data => { this.listCopy = data.list - this.totalCountCopy = data.totalCount + this.totalCopy = data.total }) }, handleFilterCopy() { diff --git a/src/views/bggl/daishen_list.vue b/src/views/bggl/daishen_list.vue index fb49c3a..3ce72ce 100644 --- a/src/views/bggl/daishen_list.vue +++ b/src/views/bggl/daishen_list.vue @@ -78,7 +78,7 @@
- +
重启流程: @@ -171,7 +171,7 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, // 页码 @@ -241,7 +241,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.common.switchInspection(this.list) }) }, diff --git a/src/views/bggl/eliminatingred_list.vue b/src/views/bggl/eliminatingred_list.vue index 7580637..378fc87 100644 --- a/src/views/bggl/eliminatingred_list.vue +++ b/src/views/bggl/eliminatingred_list.vue @@ -137,8 +137,8 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.$nextTick(() => { this.$refs.list.doLayout() }) diff --git a/src/views/bggl/sign_list.vue b/src/views/bggl/sign_list.vue index c75a86d..d203a87 100644 --- a/src/views/bggl/sign_list.vue +++ b/src/views/bggl/sign_list.vue @@ -93,8 +93,8 @@ { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.common.switchInspection(this.list) }) }, diff --git a/src/views/bggl/yiban_list.vue b/src/views/bggl/yiban_list.vue index 9749ca8..56768b4 100644 --- a/src/views/bggl/yiban_list.vue +++ b/src/views/bggl/yiban_list.vue @@ -101,7 +101,7 @@ - +
@@ -114,7 +114,7 @@ export default { components: { Sticky, Pagination }, data() { return { - totalCount: 0, + total: 0, list: [], listQuery: { pageNum: 1, // 页码 @@ -163,7 +163,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.totalCount + this.total = data.total this.common.switchInspection(this.list) }) }, diff --git a/src/views/bjd/department_list.vue b/src/views/bjd/department_list.vue index 787a191..5687d71 100644 --- a/src/views/bjd/department_list.vue +++ b/src/views/bjd/department_list.vue @@ -59,7 +59,7 @@ - + @@ -123,7 +123,7 @@ export default { components: { Pagination }, data() { return { - totalCount: 0, // 分页组件--数据总条数 + total: 0, // 分页组件--数据总条数 list: [], // 表格的数据 listQuery: { pageNum: 1, // 页码 @@ -162,7 +162,7 @@ export default { params: this.listQuery }).then(data => { this.list = data.list - this.totalCount = data.total + this.total = data.total }) }, handleFilter() { diff --git a/src/views/bjd/dj_create.vue b/src/views/bjd/dj_create.vue index c969307..2aa68f2 100644 --- a/src/views/bjd/dj_create.vue +++ b/src/views/bjd/dj_create.vue @@ -317,8 +317,8 @@
{ this.list = data.list - this.totalCount = data.total + this.total = data.total }) }) .catch(() => { @@ -421,7 +421,7 @@ export default { }) } else { this.list = data.list - this.totalCount = data.total + this.total = data.total } }) }, diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue index bde7c53..b16b375 100644 --- a/src/views/bjd/dj_input.vue +++ b/src/views/bjd/dj_input.vue @@ -1441,8 +1441,8 @@ { this.baseList = data.list - this.totalCount = data.totalCount + this.total = data.total }) }, clearSearch() { diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue index b2cf9a2..50588fd 100644 --- a/src/views/bjd/dj_list.vue +++ b/src/views/bjd/dj_list.vue @@ -180,7 +180,7 @@ - +