diff --git a/.env.development b/.env.development
index a145863..41ba73c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 工具管理与技术交流平台
+VUE_APP_TITLE = 工具管理及技术交流平台
# 开发环境配置
ENV = 'development'
@@ -7,14 +7,14 @@ ENV = 'development'
VUE_APP_CONTEXT_PATH = '/tool-tech'
# 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.2.85:8080/tool-tech-admin'
-VUE_APP_WS_URL = 'ws://192.168.2.85:8080/tool-tech-admin/websocket'
+VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
+VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
# 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://127.0.0.1:8012/tool-tech-file-view'
# 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.1.2:8080/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 033f914..ece2f51 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 工具管理与技术交流平台
+VUE_APP_TITLE = 工具管理及技术交流平台
# 生产环境配置
ENV = 'production'
@@ -7,11 +7,11 @@ ENV = 'production'
VUE_APP_CONTEXT_PATH = '/tool-tech'
# 工具与技术交流管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
-VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
+VUE_APP_BASE_API = '/tool-tech-admin'
+VUE_APP_WS_URL = '/tool-tech-admin/websocket'
# 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
# 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://localhost:8085/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/.env.staging b/.env.staging
index 95953df..b0b8486 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 工具管理与技术交流平台
+VUE_APP_TITLE = 工具管理及技术交流平台
NODE_ENV = production
@@ -9,8 +9,8 @@ ENV = 'staging'
VUE_APP_CONTEXT_PATH = '/tool-tech'
# 工具与技术交流管理系统/测试环境
-VUE_APP_BASE_API = 'https://www.rzdata.net/tool-tech-admin'
-VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
+VUE_APP_BASE_API = '/tool-tech-admin'
+VUE_APP_WS_URL = '/tool-tech-admin/websocket'
# 文档在线预览服务
VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index a8d7249..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index ccb200c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/tool-tech-front.iml b/.idea/tool-tech-front.iml
deleted file mode 100644
index 24643cc..0000000
--- a/.idea/tool-tech-front.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 92cba73..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,973 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- deptName
- peopleSelect
- onChange
- submitForm
- initWebSocket
- generateUniqueID
- progress
- listDocument
- previewUrl
- toolPrincipalsChoose
- showOpenHandle
- toolDetail
- editDocumentRef
- checkDuplicate
- 申请使用
- applyDrawerOpen
- cancelApply
- submitApply
- applyUse
- handleDelete
- 监控
- 审批记录
- tableData4
- drawer2
- tableData7
- getClassName
- 已通过
- el-dialog
- ids
- drawer1
-
-
- docList
- toolList
- handlePublish
- applyDrawerOpen
- exoportDrawerOpen
- detailDrawerOpen
- 通过
-
-
- D:\rzdata\ToolTech\tool-tech-front
- D:\rzdata\ToolTech\tool-tech-front\src
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1720405215626
-
-
- 1720405215626
-
-
-
-
-
-
-
-
-
-
-
-
- 1721110878122
-
-
-
- 1721110878122
-
-
- 1721118453675
-
-
-
- 1721118453676
-
-
- 1721122463517
-
-
-
- 1721122463517
-
-
- 1721123161293
-
-
-
- 1721123161293
-
-
- 1721632270841
-
-
-
- 1721632270841
-
-
- 1721886526500
-
-
-
- 1721886526500
-
-
- 1721888702083
-
-
-
- 1721888702083
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/default.conf b/default.conf
index 1161bec..8494b07 100644
--- a/default.conf
+++ b/default.conf
@@ -15,20 +15,28 @@ server {
}
}
- location /ebpm-process-manage/ {
- proxy_pass http://192.168.1.2:8080/ebpm-process-manage/;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
+ location ^~/tool-tech-admin/ {
+ proxy_pass http://124.223.108.21:8080/tool-tech-admin/;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_ssl_verify off;
}
- location /tool-tech-file-view/ {
- proxy_pass http://192.168.1.2:8012/tool-tech-file-view/;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
+ location ^~/tool-tech-file-view/ {
+ proxy_pass http://124.223.108.21:8012/tool-tech-file-view/;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_ssl_verify off;
+ }
+
+ location ^~/ebpm-process-manage/ {
+ proxy_pass http://124.223.108.21:9080/ebpm-process-manage/;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_ssl_verify off;
}
error_page 500 502 503 504 /50x.html;
diff --git a/package.json b/package.json
index 6b9ea89..39e659d 100644
--- a/package.json
+++ b/package.json
@@ -32,30 +32,40 @@
],
"dependencies": {
"@riophae/vue-treeselect": "0.4.0",
+ "@vue-office/docx": "1.6.1",
+ "@vue-office/pdf": "1.6.5",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.37.1",
+ "docxtemplater": "3.50.0",
+ "docxtemplater-image-module-free": "1.1.1",
"echarts": "5.4.0",
"element-ui": "2.15.14",
+ "file-save": "0.2.0",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"js-base64": "^3.7.7",
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
+ "jszip": "3.10.1",
+ "jszip-utils": "0.1.0",
"nprogress": "0.2.0",
+ "pizzip": "3.1.7",
"quill": "1.3.7",
"screenfull": "5.0.2",
- "sockjs-client": "^1.6.1",
"sortablejs": "1.10.2",
+ "v-viewer": "1.6.4",
"vue": "2.6.12",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
+ "vue-demi": "^0.14.10",
"vue-iframe": "0.0.0",
+ "vue-json-viewer": "2.2.22",
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
- "vuex": "3.6.0",
- "websocket": "^1.0.35"
+ "vue-video-player": "5.0.1",
+ "vuex": "3.6.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
@@ -74,6 +84,7 @@
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
+ "@vue/composition-api": "1.7.2",
"vue-template-compiler": "2.6.12"
},
"engines": {
diff --git a/public/css/tool.css b/public/css/tool.css
index faf15b3..b9cf588 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -75,7 +75,7 @@ body #app .hideSidebar .sidebar-container {
width: 65px !important;
}
body #app .openSidebar .sidebar-container {
- width:180px !important;
+ width:220px !important;
}
body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
body #app .sidebar-container .el-sub-menu .el-menu-item {
@@ -344,7 +344,7 @@ body #app .hideSidebar .main-container {
margin-left: 65px;
}
body #app .main-container {
- margin-left: 180px;
+ margin-left: 220px;
background:#f9fafe;
background-size:100%;
}
@@ -440,6 +440,34 @@ body #app .main-container .navbar .right-menu{
float: inherit;
top: 8px;
right: 16px;
+ display: flex;
+ align-items: center;
+}
+body #app .main-container .navbar .right-menu .el-badge{
+ margin: 0 20px 0 0;
+}
+body #app .main-container .navbar .right-menu .el-badge .el-badge__content.is-fixed{
+ top: 5px;
+ right: 14px;
+ border: 0;
+ padding: 0 4px;
+ min-width: 18px;
+ text-align: center;
+}
+body #app .main-container .navbar .right-menu .el-badge .top-msg{
+ background: rgba(0 64 152 / 6%);
+ color: #004098;
+ font-size: 14px;
+ height: 36px;
+ display: block;
+ padding: 0 12px;
+ line-height: 36px;
+ border-radius: 2px;
+ cursor: pointer;
+}
+body #app .main-container .navbar .right-menu .top-version{
+ margin: 0 10px 0 0;
+ font-size: 14px;
}
body #app .main-container .navbar .right-menu>.el-select{
margin-right: 15px;
@@ -876,7 +904,6 @@ body .el-form-border .el-form-item .el-cascader ,
body .el-form-border .el-form-item .el-select,
body .el-form-border .el-form-item .el-date-editor{
width: 100%;
- max-width: 340px;
}
body .el-form-border .el-form-item .el-checkbox-group .el-checkbox{
min-width: 200px;
@@ -1068,6 +1095,59 @@ body .el-drawer .el-drawer__body{
margin: 0;
padding-top: 0;
}
+body .el-drawer .el-drawer__body .drawer-head{
+ display: flex;
+ padding: 10px 32px 10px 32px;
+ border-bottom: 1px solid rgba(0 0 0 / 5%);
+ margin: -16px -32px 0 -32px;
+ position: sticky;
+ top: -16px;
+ z-index: 2;
+ background: #fff;
+}
+body .el-drawer .el-drawer__body .drawer-head .cell-title{
+ display: block;
+ flex: 1;
+ color: #141414;
+ font-size: 18px;
+ font-weight: 500;
+}
+body .el-drawer .el-drawer__body .drawer-head .cell-title .title{
+ display: block;
+ color: #141414;
+ font-size: 18px;
+ font-weight: 500;
+ line-height: 34px;
+}
+body .el-drawer .el-drawer__body .drawer-head .cell-btn{
+ display: block;
+}
+body .iframe-drawer{
+ background: #fff;
+}
+body .iframe-drawer .drawer-head{
+ display: flex;
+ padding: 0 0 10px 0;
+ border-bottom: 1px solid rgba(0 0 0 / 5%);
+ position: sticky;
+ top: 0;
+ z-index: 2;
+ background: #fff;
+}
+body .iframe-drawer .drawer-head .cell-title{
+ display: block;
+ flex: 1;
+ color: #141414;
+ font-size: 18px;
+ font-weight: 500;
+}
+body .iframe-drawer .drawer-head .cell-title .title{
+ display: block;
+ color: #141414;
+ font-size: 18px;
+ font-weight: 500;
+ line-height: 34px;
+}
/*pagination-container 分页*/
body .apparatus-card>.el-card__body .el-card.gray-card+.pagination-container{
@@ -1437,13 +1517,17 @@ body .el-radio-button__inner:hover {
}
/*el-upload 上传按钮组件*/
+body .el-upload+.el-button,
+body .el-button+.el-upload{
+ margin-left: 10px;
+}
body .el-upload,
body .registerbox .avatar-uploader .el-upload{
background:#fff;
border:1px solid #004098;
color:#004098 !important;
border-radius: 2px;
- height: 36px;
+ height: 34px;
}
body .el-upload:hover,
body .registerbox .avatar-uploader .el-upload:hover{
@@ -1464,6 +1548,8 @@ body .el-upload:hover .el-upload-dragger i{
}
body .el-upload .el-button,
body .el-upload .el-button:hover{
+ height: 32px;
+ line-height: 30px;
border: none !important;
background: transparent !important;
}
@@ -1694,22 +1780,26 @@ body .el-card>.el-card__body .el-tabs--border-card{
body .el-card>.el-card__body .search-btn .el-tabs--border-card{
border: 0;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header{
border-bottom: 1px solid #e6e6e6;
background: transparent;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item{
margin: 0;
border: none;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
border: 0;
background: transparent;
color: #034aac;
font-weight: bold;
position: relative;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active::after{
position: absolute;
left: 0;
bottom: 0;
@@ -2022,7 +2112,7 @@ body .etable1.el-table .el-table__expanded-cell tr>td:nth-child(2){
.search .el-form-item>.el-form-item__content>.el-cascader,
.search .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
.search .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
- width: 250px;
+ width: 230px;
}
.grab .filtrate{
display: none;
@@ -2051,7 +2141,7 @@ body .etable1.el-table .el-table__expanded-cell tr>td:nth-child(2){
.filtrate .el-form-item>.el-form-item__content>.el-cascader,
.filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
.filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
- width: 250px;
+ width: 230px;
}
/*operate 操作区域*/
@@ -2072,7 +2162,7 @@ body .el-card.lrtt>.el-card__body{
.lrtt .lt{
display: block;
padding: 16px;
- width: 310px;
+ width: 250px;
height: 700px;
overflow: auto;
}
@@ -2494,7 +2584,11 @@ body .login-page .loright .locont .el-form--label-top .el-form-item .el-form-ite
.fbox1 .fr{
display: block;
padding: 16px 32px;
- width: 420px;
+}
+body .el-drawer .el-drawer__body .fbox1 .fl,
+body .el-drawer .el-drawer__body .fbox1 .fr{
+ height: calc(100vh - 57px);
+ overflow: auto;
}
/*pltextarea 评论框*/
diff --git a/public/document.docx b/public/document.docx
new file mode 100644
index 0000000..2a0622e
--- /dev/null
+++ b/public/document.docx
@@ -0,0 +1,19 @@
+{#list}
+ {resName}
+ 文档编号
+{docCode}
+ 文档名称
+{docName}
+ 文档类别
+{docTypeName}
+ 负责人
+{docPrincipals}
+ 归属单位
+{docRespDeptName}
+ 文档来源
+{docSourceName}
+ 文档状态
+{statusName}
+ 创建时间
+{createTime}
+{/list}
diff --git a/public/index.html b/public/index.html
index 925455c..b4c517f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -197,12 +197,12 @@