diff --git a/src/api/system/flowable.js b/src/api/system/flowable.js index 3a601e8..d5bcc61 100644 --- a/src/api/system/flowable.js +++ b/src/api/system/flowable.js @@ -88,4 +88,14 @@ export function FetchUserTaskAllByDeployId(params) { params }) } -export default { FetchInitFlowAll, FetchFlowList, FetchDeloy, FetchSuspendActivate, FetchAllByKey, FetchLeadingOutModelXml, FetchFindFolwImgByModelId, FetchTaskByProcinstId, FetchUserTaskAllByDeployId } + +// 个人中心-流程中心 +export function FetchMyFlow(params) { + return request({ + url: 'api/flowable/myFlow', + method: 'get', + params + }) +} + +export default { FetchInitFlowAll, FetchFlowList, FetchDeloy, FetchSuspendActivate, FetchAllByKey, FetchLeadingOutModelXml, FetchFindFolwImgByModelId, FetchTaskByProcinstId, FetchUserTaskAllByDeployId, FetchMyFlow } diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index 7d3b081..22b47cd 100644 --- a/src/assets/iconfonts/light/iconfont.css +++ b/src/assets/iconfonts/light/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3966148 */ - src: url('iconfont.woff2?t=1707093192160') format('woff2'), - url('iconfont.woff?t=1707093192160') format('woff'), - url('iconfont.ttf?t=1707093192160') format('truetype'); + src: url('iconfont.woff2?t=1710738984247') format('woff2'), + url('iconfont.woff?t=1710738984247') format('woff'), + url('iconfont.ttf?t=1710738984247') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-attachment:before { + content: "\e6a9"; +} + .icon-zhuti:before { content: "\e686"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index 1e71ea3..970cc2a 100644 --- a/src/assets/iconfonts/light/iconfont.js +++ b/src/assets/iconfonts/light/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3966148='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,s,p=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,v(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){s||(s=!0,o())}function v(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(v,50)}z()}}(window); \ No newline at end of file +window._iconfont_svg_string_3966148='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,s,p=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,v(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){s||(s=!0,o())}function v(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(v,50)}z()}}(window); \ No newline at end of file diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json index 5d61462..efa520e 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "265327", + "name": "附件", + "font_class": "attachment", + "unicode": "e6a9", + "unicode_decimal": 59049 + }, { "icon_id": "1263393", "name": "主题", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index be070b4..de23d60 100644 Binary files a/src/assets/iconfonts/light/iconfont.ttf and b/src/assets/iconfonts/light/iconfont.ttf differ diff --git a/src/assets/iconfonts/light/iconfont.woff b/src/assets/iconfonts/light/iconfont.woff index e009ef2..470731c 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff and b/src/assets/iconfonts/light/iconfont.woff differ diff --git a/src/assets/iconfonts/light/iconfont.woff2 b/src/assets/iconfonts/light/iconfont.woff2 index 4aff987..b3ab857 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/store/modules/api.js b/src/store/modules/api.js index 962bc27..2698684 100644 --- a/src/store/modules/api.js +++ b/src/store/modules/api.js @@ -1,5 +1,6 @@ // 适配 Nginx 反向代理 -const baseUrl = process.env.VUE_APP_BASE_API === '/' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API +// const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_BASE_API +const baseUrl = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API const api = { state: { // 部署包上传 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ac85c84..873f73f 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -31,7 +31,6 @@ const user = { const rememberMe = userInfo.rememberMe return new Promise((resolve, reject) => { login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => { - console.log(res.message) if (res.code !== 500) { setToken(res.token, rememberMe) commit('SET_TOKEN', res.token) diff --git a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue index 018edf7..b69a381 100644 --- a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue +++ b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue @@ -51,11 +51,13 @@ - + + diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue index cffff40..eeaa0db 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue @@ -154,6 +154,8 @@ export default { } this.$nextTick(() => { if (this.$refs.uploadFile) { + console.log(this.archivesDetailsData) + this.$refs.uploadFile.parentInfo = this.archivesDetailsData this.$refs.uploadFile.tableData = [] this.$refs.uploadFile.getFileList() } diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue index 0a43b55..08ea534 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue @@ -167,7 +167,8 @@ export default { filePath: '', // 附件 - path px: '', // 附件 - 分辨率 nowDate: '', // 当前时间 - previewSrc: '' // 查看大图src + previewSrc: '', // 查看大图src + parentInfo: null } }, computed: { @@ -178,6 +179,9 @@ export default { watch: { arcId: function(newValue, oldValue) { } + }, + mounted() { + }, methods: { getFileSize(fileSize) { @@ -262,6 +266,7 @@ export default { }, // 上传list getFileList() { + console.log('parentInfo', this.parentInfo) const params = { 'categoryId': this.selectedCategory.id, 'archivesId': this.arcId, @@ -273,8 +278,13 @@ export default { }) }, toPreview() { - const routeData = this.$router.resolve({ path: '/preview' }) + const routeData = this.$router.resolve({ + path: '/preview', + query: { + 'archiveNo': this.parentInfo.find(item => item.fieldName === 'archive_no').context + }}) window.open(routeData.href, '_blank') + localStorage.setItem('fileTables', JSON.stringify(this.tableData)) }, // 下载附件 downloadFile(row) { diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue index da69e91..698a4cf 100644 --- a/src/views/preview/index.vue +++ b/src/views/preview/index.vue @@ -1,6 +1,11 @@