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

Merge remote-tracking branch 'origin/fix_20230508' into fix_20230508

Browse Source
This commit is contained in:
wangzhijiang
2023-05-12 14:20:09 +08:00
parent dd5251ee8c c3f643e568
commit fa570a914c
10 changed files with 133 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+2 -2
View File
@@ -128,8 +128,8 @@ public class SysUserController {
* @return
*/
@ApiOperation(value = "用户管理-分页查询")
@RequiresPermissions("sys:user:list")
@PermissionData(pageComponent = "system/UserList")
// @RequiresPermissions("sys:user:list")
// @PermissionData(pageComponent = "system/UserList")
@RequestMapping(value = "/page", method = RequestMethod.GET)
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+16
View File
@@ -226,6 +226,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
target.setControlValues(source.getControlValues());
target.setControlVerify(source.getControlVerify());
target.setFileTemplateConnectId(source.getFileTemplateConnectId());
break;
}
}
if(!isHave){
@@ -248,6 +249,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
}
}
paramsCollectManifestEOService.saveOrUpdateBatch(paramsCollectManifestEOList);
List<String> delList = new ArrayList<>();
for (ParamsCollectManifestEO target : paramsCollectManifestEOList) {
boolean isHave = false;
for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
if (target.getNioNumber().equals(source.getNioNumber())) {
isHave = true;
break;
}
}
if(!isHave){
delList.add(target.getId());
}
}
paramsCollectManifestEOService.deleteByIds(delList);
}catch (Exception e){
e.printStackTrace();
return false;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+4
View File
@@ -259,6 +259,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
String projectId = UUID.randomUUID().toString().replace("-", "");
//主表中添加数据
ProjectLibraryBase projectLibraryBaseTemp = this.getById(id);
projectLibraryBaseTemp.setCreateBy(null);
projectLibraryBaseTemp.setCreateTime(null);
projectLibraryBaseTemp.setUpdateBy(null);
projectLibraryBaseTemp.setUpdateTime(null);
projectLibraryBaseTemp.setId(projectId);
projectLibraryBaseTemp.setParentId(id);
projectLibraryBaseTemp.setProjectVersion(projectLibraryBase.getProjectVersion());
jero-web/src/views/documentManage/library/docDetail/index.vue
+2 -2
View File
@@ -846,11 +846,11 @@
}
.text-field-right {
width: calc(66.6% - 130px);
width: calc(100% - 130px);
display: inline-block;
font-size: 14px;
text-overflow: ellipsis;
white-space: nowrap;
white-space: pre-wrap;
word-break: break-word;
overflow: hidden;
float: left;
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+1
View File
@@ -26,6 +26,7 @@
</div>
<div class="dic-list-table">
<list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict"
:record="record"
@deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"
@ok="ok"></list-table>
<tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record"
jero-web/src/views/documentManage/tags/dialog/ListTable.vue
+96 -71
View File
@@ -1,30 +1,30 @@
<template>
<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">
<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">
<template slot="action" slot-scope="text, record">
<a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
<a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dictItem:logicDelete'">{{$t('delete')}}</a>
</template>
</a-table>
<div class="page" v-if="tableData.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:current="queryParams.pageNo"
:page-size.sync="queryParams.pageSize"
:total="total"
@change="onChangePage"
@showSizeChange="SizeChange"
/>
</div>
<template slot="action" slot-scope="text, record">
<a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
<a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dictItem:logicDelete'">{{$t('delete')}}</a>
</template>
</a-table>
<div class="page" v-if="tableData.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:current="queryParams.pageNo"
:page-size.sync="queryParams.pageSize"
:total="total"
@change="onChangePage"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
@@ -32,115 +32,140 @@
export default {
name: 'listTable',
props:{
tableData:Array,
total:Number,
queryParams: Object
props: {
tableData: Array,
total: Number,
queryParams: Object,
record: Object
},
mixins:[ResizeHeader, ResizeColumnProvide],
data(){
return{
mixins: [ResizeHeader, ResizeColumnProvide],
data() {
return {
// tableData:[],
selectedRowKeys:[],
selectedRowKeys: [],
// total:0,
// queryParams:{
// pageNo:1,
// pageSize:10
// }, //搜索条件
columns: [
columnsAll: [
{
title: this.$t('name'),
dataIndex: 'itemText',
key: 'itemText',
align: "left",
align: 'left',
ellipsis: true,
width: 100,
width: 100
},
{
title: this.$t('enName'),
align: "left",
align: 'left',
width: 100,
ellipsis: true,
dataIndex: 'enName',
dataIndex: 'enName'
},
{
title: this.$t('statisticalNodes'),
align: 'left',
dataIndex: 'statNode',
ellipsis: true,
width: 100
},
{
title: this.$t('describe'),
align: "left",
align: 'left',
width: 100,
ellipsis: true,
dataIndex: 'description',
dataIndex: 'description'
},
{
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "left",
scopedSlots: { customRender: 'action' },
align: 'left',
width: 170
}
],
dataFlag:false
dataFlag: false
}
},
mounted() {
// this.loadData()
console.log(this.record)
},
methods:{
//获取列表数据
loadData(){
this.dataFlag=false
let params={
...this.queryParams,
dictId:this.record.id
computed: {
columns() {
let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
if (this.record.id != '1513417672023441409') {
for (let i = 0; i < columnsAll.length; i++) {
if (columnsAll[i].dataIndex == 'statNode') {
columnsAll.splice(i, 1)
i--
}
}
}
getAction(`sys/dictItem/page`,params).then(res=>{
if(res.success){
this.tableData=[...res.result.records]
this.dataFlag=true
return columnsAll
}
},
methods: {
//获取列表数据
loadData() {
this.dataFlag = false
let params = {
...this.queryParams,
dictId: this.record.id
}
getAction(`sys/dictItem/page`, params).then(res => {
if (res.success) {
this.tableData = [...res.result.records]
this.dataFlag = true
}
})
},
//编辑
actionEdit(val){
this.$emit('editDict',val,true)
actionEdit(val) {
this.$emit('editDict', val, true)
},
//删除
onDelete(val){
this.$emit('deleteDict',val.id,true)
onDelete(val) {
this.$emit('deleteDict', val.id, true)
},
onSelectChange(selectedRowKeys) {
this.selectedRowKeys = selectedRowKeys;
this.$emit('selected',this.selectedRowKeys)
this.selectedRowKeys = selectedRowKeys
this.$emit('selected', this.selectedRowKeys)
},
//点击页数
onChangePage(page,pageSize){
onChangePage(page, pageSize) {
this.queryParams.pageNo = page
this.$emit('ok',this.queryParams)
this.$emit('ok', this.queryParams)
// this.loadData()
},
//一页显示条数
SizeChange(page,pageSize){
SizeChange(page, pageSize) {
this.queryParams.pageSize = pageSize
this.queryParams.pageNo=1
this.$emit('ok',this.queryParams)
this.queryParams.pageNo = 1
this.$emit('ok', this.queryParams)
// this.loadData()
},
}
}
}
</script>
<style lang="less" scoped>
.list-table{
.tag-con-table{
.action-edit{
.list-table {
.tag-con-table {
.action-edit {
margin-right: 5px;
}
.action-delete{
color:red;
.action-delete {
color: red;
}
}
.page{
.page {
margin-top: 20px;
text-align: right;
}
jero-web/src/views/projectManagement/components/certificationActivity.vue
+1 -1
View File
@@ -310,7 +310,7 @@
myChart.on('click', (params) => {
console.log(params)
let query = {
title: params.seriesName,
title: params.seriesName+'-'+params.name,
projectLibraryId: this.$route.query.id
}
if (params.seriesName === this.$t('certificationTaskConfirmation')) {
jero-web/src/views/projectManagement/components/listAddModel.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<a-drawer
:title="$t('Add')"
:title="$t('add')"
:maskClosable="false"
:width="1000"
placement="right"
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+7
View File
@@ -295,6 +295,13 @@
visible: false,
queryParam: {},
columnsAll: [
{
title: this.$t('statisticalNodes'),
align: 'left',
dataIndex: 'statNode',
ellipsis: true,
width: 100
},
{
title: this.$t('areaOfResponsibility'),
align: 'left',
jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
+3 -3
View File
@@ -150,21 +150,21 @@
let query = {}
if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
query = {
title: params.seriesName,
title: params.seriesName+'-'+params.name,
projectLibraryId: this.$route.query.id,
operatorType: 'queryFGTaskToConfirmStatistics',
status: params.data.status
}
} else if (params.seriesName == this.$t('designCompliance')) {
query = {
title: params.seriesName,
title: params.seriesName+'-'+params.name,
projectLibraryId: this.$route.query.id,
operatorType: 'queryDesignStatistics',
status: params.data.status
}
} else if (params.seriesName == this.$t('verifyCompliance')) {
query = {
title: params.seriesName,
title: params.seriesName+'-'+params.name,
projectLibraryId: this.$route.query.id,
operatorType: 'queryVerifyStatistics',
status: params.data.status