diff --git a/.env.development b/.env.development index ee89ef3..31e3430 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,7 @@ ENV = 'development' VUE_APP_BASE_API = 'http://192.168.99.72:13000' VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:12123' VUE_APP_PROCESSMODEL_API = 'http://192.168.99.72:11200' +VUE_APP_SDEVID = "D002" # VUE_APP_BASE_API = 'http://192.168.99.71:11110' # VUE_APP_BASE_API = 'http://192.168.99.107:11100' diff --git a/.env.production b/.env.production index 87b5e11..4376b19 100644 --- a/.env.production +++ b/.env.production @@ -8,6 +8,7 @@ VUE_APP_PROCESSMODEL_API = 'http://192.168.99.72:11200' # VUE_APP_BASE_API = 'http://27.19.215.77:11100' # VUE_APP_BASE_API = 'http://27.16.212.58:11100' VUE_APP_BASE_API = 'http://192.168.99.71:11110' +VUE_APP_SDEVID = "D002" # 如果接口是 http 形式， wss 需要改为 ws VUE_APP_WS_API = 'ws://27.16.212.58:11110' VUE_APP_CAMERA_API = '192.168.99.107:3000' diff --git a/package.json b/package.json index b4c417d..9a1f3a1 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "wangeditor": "^4.7.11", "web-streams-polyfill": "^3.1.0", "x2js": "^3.4.0", - "xlsx": "^0.17.4" + "xlsx": "^0.17.5" }, "devDependencies": { "@babel/parser": "^7.7.4", diff --git a/public/static/config.js b/public/static/config.js index dfad4ff..e778c9b 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -5,4 +5,5 @@ window.g = { // ApiUrl: 'http://192.168.99.107:11100', AIDeepSeekUrl:'http://192.168.99.86:12123', ProcessModelUrl:'http://192.168.99.72:11200', + sDevId:'D002' } \ No newline at end of file diff --git a/src/api/system/documentArchives.js b/src/api/system/documentArchives.js index 5820282..d25d138 100644 --- a/src/api/system/documentArchives.js +++ b/src/api/system/documentArchives.js @@ -227,6 +227,56 @@ export function FetchFindGroupType(params) { }) } +// 馆藏年度统计 +export function FetchAnnualStatistics(params) { + return request({ + url: 'api/documentArchives/annualStatistics' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 馆藏月份统计 +export function FetchAnnualStatisticsByMonth(params) { + return request({ + url: 'api/documentArchives/annualStatisticsByMonth' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 读取公文标签 +export function FetchReadGW(params) { + return request({ + url: 'api/RFIDInterface/GW_ReadGW' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 读取读者证 +export function FetchReadPatron(params) { + return request({ + url: 'api/RFIDInterface/GW_ReadPatron' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 读者证绑定读者 +export function FetchBindReadNo(data) { + return request({ + url: 'api/documentArchives/bindReadNo', + method: 'post', + data + }) +} + +// 读者证解除绑定 +export function FetchUnbindReadNo(data) { + return request({ + url: 'api/documentArchives/unbindReadNo', + method: 'post', + data + }) +} + export default { FetchInitDocumentParam, updateDocumentParam, @@ -252,5 +302,11 @@ export default { FetchDocumentArchivesSearch, FetchSearchHistory, FetchSeniorSearch, - FetchFindGroupType + FetchFindGroupType, + FetchAnnualStatistics, + FetchAnnualStatisticsByMonth, + FetchReadGW, + FetchReadPatron, + FetchBindReadNo, + FetchUnbindReadNo } diff --git a/src/views/archivesMIOD/miodLibrary/index.vue b/src/views/archivesMIOD/miodLibrary/index.vue index 5366308..b7bf870 100644 --- a/src/views/archivesMIOD/miodLibrary/index.vue +++ b/src/views/archivesMIOD/miodLibrary/index.vue @@ -5,13 +5,14 @@
-
+
- - + + + 搜索 重置
@@ -143,7 +144,7 @@ import CRUD, { presenter, header } from '@crud/crud' import { miodLibraryCrud } from './mixins/index' import crudDocumentArchives, { FetchDelArchives, FetchCompleteDelArchives, FetchRestoreArchives, FetchInitDistributorByDocumentId } from '@/api/system/documentArchives' -import rrOperation from '@crud/RR.operation' +// import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import TreeList from './treeList' @@ -160,7 +161,7 @@ import PdfDialog from './module/pdfDialog' export default { name: 'MiodLibrary', - components: { TreeList, PreviewForm, detail, rrOperation, crudOperation, pagination, PdfDialog }, + components: { TreeList, PreviewForm, detail, crudOperation, pagination, PdfDialog }, cruds() { return [ CRUD({ @@ -221,7 +222,9 @@ export default { printType: 1, pdfSources: [], printSelections: [], - archivesType: null + archivesType: null, + search: '' + } }, computed: { @@ -238,21 +241,23 @@ export default { created() { }, methods: { - + handleSearch() { + this.crud.query.search = this.search + this.crud.toQuery() + }, refreshTreeList() { this.$refs.treeList.refreshData() }, resetQuery() { + this.search = '' + this.crud.query.search = '' if (this.selectedDocument.isType === 3) { this.crud.query.docDepartment = this.selectedDocument.label this.crud.query.archiveYear = null - this.crud.query.search = null } else if (this.selectedDocument.isType === 4) { this.crud.query.docDepartment = null this.crud.query.archiveYear = this.selectedDocument.label - this.crud.query.search = null } else { - this.crud.query.search = null this.crud.query.docDepartment = null this.crud.query.archiveYear = null } @@ -273,16 +278,14 @@ export default { this.archivesBtnLoading = loadingType }, handleNodeClick(data) { - if (data.isType !== 1) { - this.selectedDocument = data - let documentId = null - if (data.isType === 2) { - documentId = data.id - } else { - documentId = data.documentId - } - this.getInitDocumentsViewTable(documentId) + this.selectedDocument = data + let documentId = null + if (data.isType === 2) { + documentId = data.id + } else { + documentId = data.documentId } + this.getInitDocumentsViewTable(documentId) }, // table字段项 getInitDocumentsViewTable(documentId) { @@ -304,7 +307,8 @@ export default { this.crud.query.docDepartment = null this.crud.query.archiveYear = this.selectedDocument.label } else { - this.crud.query.search = null + this.search = '' + this.crud.query.search = '' this.crud.query.docDepartment = null this.crud.query.archiveYear = null } diff --git a/src/views/archivesMIOD/miodLibrary/module/detail.vue b/src/views/archivesMIOD/miodLibrary/module/detail.vue index 390097e..2f85142 100644 --- a/src/views/archivesMIOD/miodLibrary/module/detail.vue +++ b/src/views/archivesMIOD/miodLibrary/module/detail.vue @@ -50,16 +50,26 @@ - - + + @@ -119,7 +129,7 @@
- +
@@ -127,10 +137,10 @@ - - diff --git a/src/views/archivesMIOD/miodStatistics/index.vue b/src/views/archivesMIOD/miodStatistics/index.vue index b48609d..8d7db0c 100644 --- a/src/views/archivesMIOD/miodStatistics/index.vue +++ b/src/views/archivesMIOD/miodStatistics/index.vue @@ -11,8 +11,7 @@ - - + @@ -32,12 +31,9 @@ export default { } }, methods: { - getRecordId(index, id) { - this.changeActiveTab(index) - this.currentRecordId = id - }, changeActiveTab(data) { this.activeIndex = data + this.$emit('tab-change', data) } } } diff --git a/src/views/archivesMIOD/miodStatistics/miodTable copy.vue b/src/views/archivesMIOD/miodStatistics/miodTable copy.vue new file mode 100644 index 0000000..87d79ce --- /dev/null +++ b/src/views/archivesMIOD/miodStatistics/miodTable copy.vue @@ -0,0 +1,412 @@ + + + + + diff --git a/src/views/archivesMIOD/miodStatistics/miodTable.vue b/src/views/archivesMIOD/miodStatistics/miodTable.vue index 04015b8..62b8871 100644 --- a/src/views/archivesMIOD/miodStatistics/miodTable.vue +++ b/src/views/archivesMIOD/miodStatistics/miodTable.vue @@ -1,75 +1,54 @@ @@ -77,6 +56,9 @@