diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html
index e60778481..d8200d73f 100644
--- a/public/static/onlyOffice/editor.html
+++ b/public/static/onlyOffice/editor.html
@@ -1,6 +1,6 @@
-
+
@@ -8,8 +8,10 @@
在线编辑
-
-
+
+
+
+
@@ -17,12 +19,46 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/api/process.js b/src/api/process.js
index bb866770b..cfab0cb4e 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -604,6 +604,15 @@ export function getConvertFileByAttId(data) {
})
}
+// 获取openOffice 在线预览文件
+export function getBusStandFileByAttId(data) {
+ return axios({
+ url: 'api/att/attFile/getBusStandFileByAttId',
+ method: 'get',
+ params: data
+ })
+}
+
// 未符合项跟踪修改状态
export function updateBaseInfo(data) {
return axios({
diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue
index c5ea683dc..132f60b76 100644
--- a/src/components/CustomFormComponents/DatePicker.vue
+++ b/src/components/CustomFormComponents/DatePicker.vue
@@ -14,7 +14,7 @@
:value-format="valueFormat"
format="yyyy-MM-dd"
:value="value"
- type="date"
+ type="dates"
:editable="true"
:disabled="disabled"
:placeholder="placeholder"
@@ -74,5 +74,7 @@ export default {
diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 7f43379ab..5a64f5188 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -67,7 +67,8 @@
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 2c55be7df..c3db04114 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -248,12 +248,13 @@
-
+ 批量删除
+
移除标准
+ 编辑
+
@@ -380,7 +385,7 @@
+ v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="50">
-
-
-
- 收藏
-
-
- 取消收藏
-
- 编辑
-
-
- 删除
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1306,6 +1321,9 @@ export default {
},
data () {
return {
+ OCRType: '',
+ OCRTitle: '',
+ ocrList: [],
orderBy: '',
nowOrder: '',
nowOrderBy: '',
@@ -3674,6 +3692,7 @@ export default {
},
// 修改成表格样式后,选择项勾选改变
standSelectChange (data) {
+ this.ocrList = data
this.selectedList = []
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id)
@@ -3690,6 +3709,47 @@ export default {
})
window.open(routeUrl.href, '_blank')
},
+ OCRAdd (type) {
+ let text = ''
+ this.OCRType = type
+ if (type === '0') {
+ text = 'OCR识别'
+ this.OCRTitle = '选择OCR实别文件'
+ } else if(type === '1') {
+ text = '拆分'
+ this.OCRTitle = '选择拆分文件'
+ }else if(type === '2') {
+ text = '编辑'
+ this.OCRTitle = '选择编辑文件'
+ }
+ if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
+ this.$message.warning('仅能选择一条数据进行' + text)
+ } else if (this.ocrList.length === 0 && (type === '0' || type === '1' || type === '2')) {
+ this.$message.warning('请选择一条数据进行' + text)
+ } else if (this.ocrList.length === 1 && (type === '0' || type === '1')) {
+ this.OCRModel = true
+ this.OCRLoading = true
+ this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
+ type: type,
+ standId: this.selectedList[0]
+ },{
+ _this: this
+ }, res => {
+ this.OCRLoading = false
+ if (res.ok) {
+ if (res.data.length > 0) {
+ this.OCRData = res.data
+ } else {
+ this.$message.warning('当前标准没有' + text + '文件')
+ this.this.OCRData = []
+ }
+ }
+ })
+ } else if (this.ocrList.length === 1 && type === '2'){
+ console.log('4228',this.ocrList)
+ this.selectStandardPro(this.ocrList[0], 'edit')
+ }
+ },
// 查询二级菜单
selectMenu () {
this.countRootId = 0
@@ -4397,6 +4457,21 @@ export default {
flex-direction: column;
position: relative;
flex: auto;
+ .collection-btn {
+ padding: 0;
+ border: none;
+ color: #4788c0;
+ font-size: 18px;
+ width: 18px;
+ height: 18px;
+ background-color: transparent;
+ /*background: rgba(244, 162, 39, 0.1);*/
+
+ //.icon-collection {
+ // background-image: url("~assets/images/shangqi/standardDetails/collection.png");
+ //}
+
+ }
.pagination {
position: static;
/deep/ .pagination-slot {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 0368a7373..ab4011a92 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -145,12 +145,12 @@
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
v-btn-permission="'8871ed1be74cf65851659514880bb50a'">导出
-
+
配置标准
@@ -160,6 +160,10 @@
@click="deleteStandFromKind(2)"
v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'">移除标准
+ 编辑
+
-
- 删除
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2242,6 +2256,9 @@ export default {
orgName: '',
validFlag: '0'
},
+ OCRType: '',
+ OCRTitle: '',
+ ocrList: [],
standItemList: [],
drawerWidth: 1400,
// 配置标准相关 开始
@@ -3126,6 +3143,7 @@ export default {
},
// 修改成表格样式后,选择项勾选改变
standSelectChange(data) {
+ this.ocrList = data
this.selectedList = []
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id)
@@ -4180,6 +4198,47 @@ export default {
this.configStandFlag = false
this.selectConfigStand = []
},
+ OCRAdd (type) {
+ let text = ''
+ this.OCRType = type
+ if (type === '0') {
+ text = 'OCR识别'
+ this.OCRTitle = '选择OCR实别文件'
+ } else if(type === '1') {
+ text = '拆分'
+ this.OCRTitle = '选择拆分文件'
+ }else if(type === '2') {
+ text = '编辑'
+ this.OCRTitle = '选择编辑文件'
+ }
+ if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
+ this.$message.warning('仅能选择一条数据进行' + text)
+ } else if (this.ocrList.length === 0 && (type === '0' || type === '1' || type === '2')) {
+ this.$message.warning('请选择一条数据进行' + text)
+ } else if (this.ocrList.length === 1 && (type === '0' || type === '1')) {
+ this.OCRModel = true
+ this.OCRLoading = true
+ this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
+ type: type,
+ standId: this.selectedList[0]
+ },{
+ _this: this
+ }, res => {
+ this.OCRLoading = false
+ if (res.ok) {
+ if (res.data.length > 0) {
+ this.OCRData = res.data
+ } else {
+ this.$message.warning('当前标准没有' + text + '文件')
+ this.this.OCRData = []
+ }
+ }
+ })
+ } else if (this.ocrList.length === 1 && type === '2'){
+ console.log('4228',this.ocrList)
+ this.selectStandardPro(this.ocrList[0], 'edit')
+ }
+ },
// 表对应标准移除分类到
deleteStandFromKind(flag, item) {
// this.getMenu().then(boolean => {
@@ -5092,6 +5151,21 @@ export default {
overflow: hidden;
display: flex;
flex-direction: column;
+ .collection-btn {
+ padding: 0;
+ border: none;
+ color: #4788c0;
+ font-size: 18px;
+ width: 18px;
+ height: 18px;
+ background-color: transparent;
+ /*background: rgba(244, 162, 39, 0.1);*/
+
+ //.icon-collection {
+ // background-image: url("~assets/images/shangqi/standardDetails/collection.png");
+ //}
+
+ }
}
.pagination {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index ab9c3998e..2a852402a 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -84,7 +84,7 @@
label="标准号"
fixed="left"
show-overflow-tooltip
- width="120px"
+ width="190px"
>
-
-
-
-
-
-
+ label="合规评估结果">
国内标准法规
@@ -61,7 +61,7 @@
{{ scope.row.standName }}
-
-
-
+ 查看
@@ -155,28 +150,40 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 符合性状态
+
+
+
+
+
+
+