FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FOTON' into develop

Browse Source 
# Conflicts:
#	src/sysConfig/index.js
This commit is contained in:
宋伟佳
2022-02-17 17:39:32 +08:00
parent 51abb761f5 8151b4dc93
commit 49ba90d928
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/onlyOffice/editor.html
+3 -3
View File
@@ -44,8 +44,8 @@
var fileSuffix = GetQueryValue('fileType') var fileSuffix = GetQueryValue('fileType')
// 文档类word-text、表格类excel-spreadsheet、ppt类-presentation // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
var documentType = '' var documentType = ''
var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT']; var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT'];
var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX']; var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX'];
var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX']; var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX'];
arr_data_ppt.find(function(value) { arr_data_ppt.find(function(value) {
@@ -110,7 +110,7 @@
"documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation "documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
"editorConfig": { "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", "mode":"edit",
"lang":"zh-CN", "lang":"zh-CN",
// "customization": { // "customization": {
public/static/onlyOffice/onlinePreview.html
+3 -3
View File
@@ -41,8 +41,8 @@
var fileSuffix = GetQueryValue('fileType') var fileSuffix = GetQueryValue('fileType')
// 文档类word-text、表格类excel-spreadsheet、ppt类-presentation // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
var documentType = '' var documentType = ''
var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT']; var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT'];
var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX']; var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX'];
var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX']; var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX'];
arr_data_ppt.find(function(value) { arr_data_ppt.find(function(value) {
@@ -107,7 +107,7 @@
"documentType": documentType, "documentType": documentType,
"editorConfig": { "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", "mode":"edit",
"lang":"zh-CN", "lang":"zh-CN",
// "customization": { // "customization": {
src/pages/searchCenter/pages/standardSearch.vue
+8 -8
View File
@@ -401,10 +401,10 @@
label: '海外标准法规', // value没改 label: '海外标准法规', // value没改
value: 'bussstand' value: 'bussstand'
}, },
// { {
// label: '国内外政策', label: '国内外政策',
// value: 'laws' value: 'laws'
// }, },
{ {
label: '企业标准', label: '企业标准',
value: 'enterprise' value: 'enterprise'
@@ -433,10 +433,10 @@
label: '海外标准法规', // value没改 label: '海外标准法规', // value没改
value: 'bussstand' value: 'bussstand'
}, },
// { {
// label: '国内外政策', label: '国内外政策',
// value: 'laws' value: 'laws'
// }, },
{ {
label: '企业标准', label: '企业标准',
value: 'enterprise' value: 'enterprise'