diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index fe9d51609..e68488539 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -52,6 +52,7 @@
@titleClick="titleClick"
@onCancel="onCancel"
@onSelectChange="onSelectChange"
+ @detailClick="detailClick"
>
@@ -259,8 +260,14 @@
//点击名称
titleClick(records){
+ },
+ detailClick(item) {
+ let newUrl = this.$router.resolve({
+ path: '/docManage/library/detail',
+ query: item
+ })
+ window.open(newUrl.href, '_blank')
}
-
}
}
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 98e803f26..c5e2a2b26 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -133,20 +133,7 @@
checkVisible:false, //校核弹框
file:'',
form:{}, //表单数据
- rules:{
- attId:[
- { required: true, message: '请选择文件', trigger: 'change' },
- ],
- standNumber:[
- { required: true, message: '请输入编号', trigger: 'blur' },
- ],
- standName:[
- { required: true, message: '请输入名称', trigger: 'blur' },
- ],
- fileType:[
- { required: true, message: '请选择文本状态', trigger: 'blur' },
- ]
- },
+ rules:{},
url: {
tableHeader: 'ocr/ocrRecord/getHeader', //表格头部字段
seachList: 'ocr/ocrRecord/queryCondition', //搜索字段
@@ -356,7 +343,7 @@
},
//文件详情跳转
detailClick(val){
- window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + val.id))
+ window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + val.attId))
},
exportVisible(val){
// this.fileVisible=val
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index 37ecdc82c..0ffa0967d 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -4,37 +4,6 @@
@@ -56,26 +25,8 @@
@titleClick="titleClick"
@onCancel="onCancel"
@onSelectChange="onSelectChange"
+ @detailClick="detailClick"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -272,6 +223,13 @@
},
areaVisible(val){
this.visible=val
+ },
+ detailClick(item) {
+ let newUrl = this.$router.resolve({
+ path: '/docManage/library/detail',
+ query: item
+ })
+ window.open(newUrl.href, '_blank')
}
}
}
diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
index dfd5e5859..9bac951bd 100644
--- a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
+++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
@@ -9,7 +9,7 @@
@ok="handleOk"
@cancel="handleCancel"
>
-
+
{
if(res.success){
- let data=res.result
- this.treeData=this.addAttr(data)
+ this.data=[...res.result]
+ this.treeData=this.addAttr(this.data)
// console.log('treeData',this.treeData)
}
})
},
+ onSearch(){
+ this.loadData()
+ },
//获取用户的订阅
getSubscribtion(){
postAction(`domain/domainUserRel/queryList`,{}).then(res=> {
@@ -96,6 +103,9 @@
if((Array.isArray(dataI)) && dataI.length>0){
dataI.forEach((item,index)=>{
this.$set(item,'key',item.id)
+ // if(item.title.indexOf(this.searchValue)!==-1){
+ // console.log('item.title',item.title)
+ // }
let arr = [];
this.addAttr(item.children,arr);
});
@@ -155,15 +165,17 @@
this.autoExpandParent = false;
},
onChange(e) {
+ // this.loadData()
const value = e.target.value;
const expandedKeys = this.dataList
.map(item => {
if (item.title.indexOf(value) > -1) {
- return this.getParentKey(item.key, this.gData);
+ return this.getParentKey(item.key, this.treeData);
}
return null;
})
.filter((item, i, self) => item && self.indexOf(item) === i);
+ console.log('item',item)
Object.assign(this, {
expandedKeys,
searchValue: value,
@@ -171,11 +183,11 @@
})
},
onCheck(checkedKeys) {
- console.log('onCheck', checkedKeys);
+ // console.log('onCheck', checkedKeys);
this.checkedKeys = checkedKeys;
},
onSelect(selectedKeys, info) {
- console.log('onSelect', info);
+ // console.log('onSelect', info);
this.selectedKeys = selectedKeys;
},