From 64a469727fe1e67d3cd0e31cc724a245f67534e7 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Fri, 3 Dec 2021 12:07:27 +0800 Subject: [PATCH 1/9] feat:FOTON rest --- .../processCenter/pages/newProcess/index.vue | 197 +----------------- 1 file changed, 1 insertion(+), 196 deletions(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 4752ed581..5ac7ce987 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -24,202 +24,7 @@ -
-
-
- -
-
-
标准调研流程
-
-
-
-
- - - - -
-
-
- -
-
-
标准征求意见流程
-
-
-
-
- - - - -
-
-
- -
-
-
标准清单发布/更新流程
-
-
-
-
- - - - -
-
-
- -
-
-
标准合规评估流程
-
-
-
-
- - - - -
-
-
- -
-
-
未符合项整改流程
-
-
-
-
- - - - -
-
-
- -
-
-
标准解读流程
-
-
-
-
- - - - -
-
-
- -
-
-
项目合规评估流程-项目
-
-
-
-
- - - - -
-
-
- -
-
-
项目清单确认流程
-
-
-
-
- - - - -
-
-
- -
-
-
政策入库流程
-
-
-
-
- - - - -
-
-
- -
-
-
政策课题入会流程
-
-
-
-
- - - - -
-
-
- -
-
-
政策课题参会流程
-
-
-
-
- - - - -
-
-
- -
-
-
外部署名推荐审批流程
-
-
-
-
- - - - -
-
-
- -
-
-
加入标准化协会信息提报流程
-
-
-
-
- - - - -
+
From 7c3667e6ea2bd2a7ad081848b87d726b5f9606c3 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sun, 5 Dec 2021 16:08:20 +0800 Subject: [PATCH 2/9] feat:FOTON rest --- public/static/onlyOffice/editor.html | 4 ++-- public/static/onlyOffice/onlinePreview.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html index 4ff974662..f06c7a482 100644 --- a/public/static/onlyOffice/editor.html +++ b/public/static/onlyOffice/editor.html @@ -10,7 +10,7 @@ 在线编辑 - + @@ -110,7 +110,7 @@ "documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation "editorConfig": { // 此处配置回调地址 - "callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, + "callbackUrl": `https://srms.foton.com.cn/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, "mode":"edit", "lang":"zh-CN", // "customization": { diff --git a/public/static/onlyOffice/onlinePreview.html b/public/static/onlyOffice/onlinePreview.html index 013abf4a9..2cd328f50 100644 --- a/public/static/onlyOffice/onlinePreview.html +++ b/public/static/onlyOffice/onlinePreview.html @@ -9,7 +9,7 @@ 在线预览 - + @@ -107,7 +107,7 @@ "documentType": documentType, "editorConfig": { // 此处配置回调地址 - "callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, + "callbackUrl": `https://srms.foton.com.cn/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, "mode":"edit", "lang":"zh-CN", // "customization": { From d575a3503d2e38c7d167942926f82f1e722ef7c9 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 6 Dec 2021 06:38:17 +0800 Subject: [PATCH 3/9] feat:FOTON rest --- public/static/onlyOffice/editor.html | 2 +- public/static/onlyOffice/onlinePreview.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html index f06c7a482..77c006104 100644 --- a/public/static/onlyOffice/editor.html +++ b/public/static/onlyOffice/editor.html @@ -10,7 +10,7 @@ 在线编辑 - + diff --git a/public/static/onlyOffice/onlinePreview.html b/public/static/onlyOffice/onlinePreview.html index 2cd328f50..9494710b1 100644 --- a/public/static/onlyOffice/onlinePreview.html +++ b/public/static/onlyOffice/onlinePreview.html @@ -9,7 +9,7 @@ 在线预览 - + From 49dc794e20b2b216aa62ebdf91444f624c6cd31b Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 6 Dec 2021 06:40:51 +0800 Subject: [PATCH 4/9] feat:FOTON rest --- public/static/onlyOffice/editor.html | 4 ++-- public/static/onlyOffice/onlinePreview.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html index 77c006104..b92157117 100644 --- a/public/static/onlyOffice/editor.html +++ b/public/static/onlyOffice/editor.html @@ -44,8 +44,8 @@ var fileSuffix = GetQueryValue('fileType') // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation var documentType = '' - var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT']; - var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX']; + var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT']; + var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX']; var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX']; arr_data_ppt.find(function(value) { diff --git a/public/static/onlyOffice/onlinePreview.html b/public/static/onlyOffice/onlinePreview.html index 9494710b1..897dd02a4 100644 --- a/public/static/onlyOffice/onlinePreview.html +++ b/public/static/onlyOffice/onlinePreview.html @@ -41,8 +41,8 @@ var fileSuffix = GetQueryValue('fileType') // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation var documentType = '' - var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT']; - var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX']; + var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT']; + var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX']; var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX']; arr_data_ppt.find(function(value) { From dcb2d44884cd7c07cb36e6e8b00b2c43893dc6c7 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 6 Dec 2021 11:51:23 +0800 Subject: [PATCH 5/9] feat:FOTON rest --- .../processCenter/pages/newProcess/index.vue | 947 +++++++++++------- 1 file changed, 571 insertions(+), 376 deletions(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 6ca2b5806..fd04f3c10 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -16,9 +16,9 @@
- - - + + +
@@ -30,253 +30,448 @@
-
参与外部标准制修订信息提报流程
+
标准调研流程
 - + -
+
-
外部标准化协会入会流程
+
标准征求意见流程
- + -
+
-
外部标准化协会参会流程
+
标准清单发布/更新流程
- + -
+
-
政策征求意见流程
+
标准合规评估流程
- - -
- + -
+
-
重点认证标准/政策合规性项目审查流程
+
未符合项整改流程
- - -
- + -
+
-
企标制修订流程及企业标准库流程
+
标准解读流程
- + -
+
-
企标复审流程
+
项目合规评估流程-项目
- + -
+
-
企标废止流程
-
-
-
-
- - - - -
-
-
- -
-
-
企标制修订计划管控
+
项目清单确认流程
 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From f839350192f8a984f0de70e57b0e3a4c937259d3 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Thu, 9 Dec 2021 08:52:06 +0800 Subject: [PATCH 6/9] feat:FOTON rest --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 3e7149052..f18f12142 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -16,7 +16,7 @@ const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs& // 配置 前端服务 const devWebUrl = 'https://srms.foton.com.cn/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'dev' +const webLoginType = 'idm' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From c8e47a4cdfe1130e06737db5aac9b813bc1a947e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 13 Dec 2021 21:00:25 +0800 Subject: [PATCH 7/9] feat:FOTON --- .../processCenter/pages/newProcess/index.vue | 432 +++++++++--------- .../searchCenter/pages/standardSearch.vue | 16 +- 2 files changed, 224 insertions(+), 224 deletions(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index fd04f3c10..d8aa13bed 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -142,222 +142,222 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+
+
+ +
+
+
政策入库流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
政策课题入会流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
政策课题参会流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
外部署名推荐审批流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
加入标准化协会信息提报流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
参与外部标准制修订信息提报流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
外部标准化协会入会流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
外部标准化协会参会流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
政策征求意见流程
+
+
+
+ + + +
+ + + + +
+
+
+ +
+
+
重点认证标准/政策合规性项目审查流程
+
+
+
+ + + +
+ + + + +
+
+
+ +
+
+
企标制修订流程及企业标准库流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
企标复审流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
企标废止流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
企标制修订计划管控
+
+
+
+
+ +
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 2399ac2a6..b0ea2d93a 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -388,10 +388,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - // { - // label: '国内外政策', - // value: 'laws' - // }, + { + label: '国内外政策', + value: 'laws' + }, { label: '企业标准', value: 'enterprise' @@ -420,10 +420,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - // { - // label: '国内外政策', - // value: 'laws' - // }, + { + label: '国内外政策', + value: 'laws' + }, { label: '企业标准', value: 'enterprise' From b6ba0f06b1c99cfda7718c9cc50a1dc538ed177a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 16 Dec 2021 21:51:16 +0800 Subject: [PATCH 8/9] feat:new --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 51df1c9b6..37ec9de98 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -19,7 +19,7 @@ const devWebUrl = 'https://srms.foton.com.cn/#/' const webLoginType = 'idm' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://127.0.0.1:8080' +const onlyOfficeUrl = 'http://10.100.5.116:8088' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 24ae3c3ce051d78c0fd69b3a9dbe7bae955c9045 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 21 Dec 2021 17:51:20 +0800 Subject: [PATCH 9/9] feat:new --- src/main.js | 45 +++++++++---------- src/pages/processCenter/pages/phone/index.vue | 1 + 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main.js b/src/main.js index add9eb6ed..b4b8f57ad 100644 --- a/src/main.js +++ b/src/main.js @@ -116,16 +116,20 @@ router.beforeEach(function (to, from, next) { } } else { if (toName.slice(0,5) !== 'phone') { - if (toName === 'processCenter') { - next() - }else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) }else { - extractedVerify(token) + if(toName !== 'blankPage'){ + if(to.matched.length == 0){ + next('/blankPage') + }else { + next() + } + }else { + next() + } } } } else { @@ -147,7 +151,12 @@ router.beforeEach(function (to, from, next) { } } }else if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + } }else { extractedVerify(token) @@ -236,11 +245,7 @@ router.beforeEach(function (to, from, next) { } } } else { - if (isMobile()){ - next() - } else { - extracted3() - } + extracted3() } } function extracted(routerPath) { @@ -284,17 +289,9 @@ router.beforeEach(function (to, from, next) { } if(path === '/loginVerify'){ if(webLoginType != null && webLoginType === 'dev'){ - if(isMobile()) { - next('/blankPage') - } else { - next('/Login') - } + next('/Login') }else { - if(isMobile()) { - next('/blankPage') - } else { - next('/Login') - } + next() } }else { next() diff --git a/src/pages/processCenter/pages/phone/index.vue b/src/pages/processCenter/pages/phone/index.vue index fea9edc89..dac11efef 100644 --- a/src/pages/processCenter/pages/phone/index.vue +++ b/src/pages/processCenter/pages/phone/index.vue @@ -28,6 +28,7 @@ export default { }); }, loginNew (res) { + window.sessionStorage.clear() let Base64 = require('js-base64').Base64 let userInfoStr = Base64.decode(res.data) let userInfo2 = decodeURIComponent(userInfoStr)