WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213

Browse Source 
# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue
This commit is contained in:
高嵩
2023-02-13 09:51:53 +08:00
parent 72fe8d8ca3 a8357dbd48
commit 8c3f610b04
120 changed files with 1852 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentManage/collection/index.vue
+14 -2
View File
@@ -57,6 +57,7 @@
</div>
<div class="colloction-table">
<a-table
:components="drag(columns,'columns')"
ref="table"
size="middle"
rowKey="id"
@@ -102,12 +103,13 @@
<script>
import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
import problemKnowledgeBaseList from './components/problemKnowledgeBaseList'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'collection',
components: {
problemKnowledgeBaseList
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
selectedRowKeys: [],
@@ -323,7 +325,7 @@
}
</script>
<style lang="less" scoped>
@import '~@assets/less/common.less';
@import'~@assets/less/common.less';
.collection {
.collection-search-wrapper {
@@ -369,6 +371,16 @@
height: 38px;
}
///deep/ .nio-drag-handler {
// position: absolute;
// right: 0;
// top: 0;
// height: 100%;
// width: 1px;
// z-index: 1;
// border-left: 1px #e8e8e8 solid;
//}
::v-deep .ant-card-body {
padding: 0 24px!important;
}
jero-web/src/views/documentManage/library/docDetail/index.vue
+13 -4
View File
@@ -177,9 +177,10 @@
>
<a-table
class="table"
:components="drag(columns,'columns')"
:columns="columns"
:pagination="false"
:scroll="{y: 400}"
:scroll="{x: '100%',y: 400}"
:data-source="dataSource"
:loading="loading"
>
@@ -217,7 +218,7 @@
class="table"
:columns="columnsRelated"
:pagination="false"
:scroll="{y: 400}"
:scroll="{x: '100%',y: 400}"
:data-source="dataSourceRelated"
:loading="loading"
>
@@ -273,12 +274,14 @@
import { Base64 } from 'js-base64'
import uploadFile from '@/components/uploadFile/file'
import { mapGetters } from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'docIndex',
components: {
uploadFile
},
mixins: [ResizeColumnProvide,ResizeHeader],
data() {
return {
url: {
@@ -295,7 +298,8 @@
dataIndex: 'title',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'operation' }
scopedSlots: { customRender: 'operation' },
width: 544
}
],
columnsFile: [
@@ -333,7 +337,8 @@
dataIndex: 'content',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'content' }
scopedSlots: { customRender: 'content' },
width: 484
},
{
title: this.$t('ModificationTime'),
@@ -828,4 +833,8 @@
///deep/.table .ant-table-tbody > tr > td {
// color: #040B29 ;
//}
/deep/ .ant-table-placeholder{
margin-top: 8px !important;
}
</style>
jero-web/src/views/documentManage/ocr/index.vue
+2 -1
View File
@@ -69,6 +69,7 @@
@actionSynchron="actionSynchron"
:url="url"
showAction
ref='tableAdmin'
@actionDown="actionDown"
@onSelectChange="onSelectChange"
@actionDelete="actionDelete"
@@ -441,7 +442,7 @@
},
docVisible(val){
this.drawVisible=val
this.$refs.tableAdmin.getDataAdmin()
},
//文件详情跳转
detailClick(val){
jero-web/src/views/documentManage/splitting/index.vue
+2
View File
@@ -24,6 +24,7 @@
:flag="'3'"
:OperationList="OperationList"
showAction
ref='tableAdmin'
@onSelectChange="onSelectChange"
@backDocument="backDocument"
@deleteDetail="deleteDetail"
@@ -249,6 +250,7 @@
if (num == 1){
eventBUs.$emit('searchGetData')
}
this.$refs.tableAdmin.getDataAdmin()
},
iVisible(val,num) {
this.importsVisible = val
jero-web/src/views/documentManage/subscribtion/index.vue
+14 -1
View File
@@ -60,6 +60,7 @@
</div>
<div class="colloction-table">
<a-table
:components="drag(columns,'columns')"
ref="table"
size="middle"
rowKey="id"
@@ -101,12 +102,14 @@
<script>
import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
import SubArea from './module/SubArea'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'subscribtion',
components: {
SubArea
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
selectedRowKeys: [],
@@ -336,7 +339,7 @@
}
</script>
<style lang="less" scoped>
@import '~@assets/less/common.less';
@import'~@assets/less/common.less';
.subscribtion {
.subscribtion-search-wrapper {
@@ -379,6 +382,16 @@
.box-button {
height: 38px;
}
///deep/ .nio-drag-handler {
// position: absolute;
// right: 0;
// top: 0;
// height: 100%;
// width: 1px;
// z-index: 1;
// border-left: 1px #e8e8e8 solid;
//}
</style>
<style lang="less">
.subscribtion {
jero-web/src/views/documentManage/tags/dialog/AreaManage.vue
+5 -1
View File
@@ -65,11 +65,12 @@
ref="table"
size="middle"
rowKey="id"
:components="drag(columns,'columns')"
:columns="columns"
:dataSource="areaTable"
:pagination="false"
:loading="loading"
:scroll="{x: 600}"
:scroll="{x: '100%'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<a slot="name" slot-scope="text">{{ text }}</a>
@@ -95,11 +96,14 @@
<script>
import { putAction,postAction,getAction,deleteAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'diolagArea',
components:{
},
mixins:[ResizeHeader, ResizeColumnProvide],
data(){
return{
title:this.$t('add'),
jero-web/src/views/documentManage/tags/dialog/ListTable.vue
+4
View File
@@ -2,6 +2,7 @@
<div class="list-table">
<a-table :data-source="tableData" :scroll="{x: 900}"
:columns="columns" rowKey="id"
:components="drag(columns,'columns')"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="false"
class="tag-con-table">
@@ -27,6 +28,8 @@
</template>
<script>
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'listTable',
props:{
@@ -34,6 +37,7 @@
total:Number,
queryParams: Object
},
mixins:[ResizeHeader, ResizeColumnProvide],
data(){
return{
// tableData:[],
jero-web/src/views/documentManage/tags/dialog/TreeTable.vue
+7
View File
@@ -3,6 +3,7 @@
<div class="tree-table-content">
<a-table
class="tree-table-con"
:components="drag(columns,'columns')"
:columns="columns"
:data-source="tabData"
rowKey="id"
@@ -35,6 +36,8 @@
<script>
import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'treeTable',
props:{
@@ -47,6 +50,7 @@
default: true
}
},
mixins:[ResizeHeader, ResizeColumnProvide],
data(){
return{
loading:false, //搜索条件
@@ -56,18 +60,21 @@
dataIndex: 'name',
key: 'name',
ellipsis: true,
width: 100
},
{
title: this.$t('enName'),
dataIndex: 'enName',
key: 'enName',
ellipsis: true,
width: 100
},
{
title: this.$t('describe'),
dataIndex: 'description',
key: 'description',
ellipsis: true,
width: 100
},
{
title: this.$t('operation'),
jero-web/src/views/documentManage/tags/tabs/TabTable.vue
+7
View File
@@ -4,6 +4,8 @@
ref="table"
size="middle"
rowKey="id"
:scroll="{x: '100%'}"
:components="drag(columns,'columns')"
:columns="columns"
:dataSource="tableData"
:pagination="false"
@@ -31,8 +33,11 @@
</template>
<script>
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'tabTable',
mixins:[ResizeHeader, ResizeColumnProvide],
data(){
return{
queryParams:{
@@ -92,6 +97,8 @@
</script>
<style lang="less" scoped>
@import'~@assets/less/common.less';
.tab-table{
.action-edit{
margin-right: 10px;
jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+3
View File
@@ -67,6 +67,7 @@
<a-table :data-source="tableData" rowKey="id" :columns="columns"
:scroll="{x: true}"
:components="drag(columns,'columns')"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false"
:loading="loading" class="tag-con-table">
@@ -115,6 +116,7 @@
import DicList from '../dialog/DicList'
import Vue from 'vue'
import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'tagContent',
@@ -122,6 +124,7 @@
// tabTable,
DicList
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
title: this.$t('add'),