kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into vite

Browse Source 
# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js
This commit is contained in:
aixianling
2022-07-07 09:01:40 +08:00
parent e91d1f73dc 92f8fd0af8
commit da8e8f0d65
208 changed files with 14871 additions and 8799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/party/AppPartyOrg/AppPartyOrganization.vue
View File

@@ -599,5 +599,9 @@ export default {
}
}
}
::v-deep .is-current>.el-tree-node__content{
width: 100%!important;
padding-right: 16px!important;
}
}
</style>

9
packages/party/AppPartyScore/psList.vue
View File

@@ -3,6 +3,15 @@
<ai-list>
<ai-title slot="title" title="党员积分" isShowBottomBorder/>
<template #content>
<ai-search-bar>
<template #right>
<ai-import :instance="instance" name="党员积分" title="导入党员积分"
suffixName="xlsx"
url="/app/apppartyintegralinfo/downloadTemplate"
importUrl="/app/apppartyintegralinfo/import"
@onSuccess="page.current=1,getTableData()"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@getList="getTableData" :col-configs="colConfigs" :dict="dict">
<el-table-column slot="options" label="操作" fixed="right" align="center">