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

修改bug

Browse Source
This commit is contained in:
zyx.net
2022-08-09 17:53:08 +08:00
parent 3f3806104a
commit e3887b28d6
9 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1252,4 +1252,5 @@ module.exports = {
optionDropDownBox:'Option drop - down box', optionDropDownBox:'Option drop - down box',
attachmentUpload:'file', attachmentUpload:'file',
textInput:'Text Input', textInput:'Text Input',
deleteNode:'If any file information exists, it will be deleted',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1355,4 +1355,5 @@ module.exports = {
Paraname: '参数名称', Paraname: '参数名称',
Parabatch: '参数批次', Parabatch: '参数批次',
freeze:'请选择冻结配置', freeze:'请选择冻结配置',
deleteNode:'若有文件信息将同步删除',
} }
jero-web/src/components/CollectionTypeDisabled/index.vue
+5 -3
View File
@@ -650,6 +650,7 @@
item.dataValue = r.target.value item.dataValue = r.target.value
} }
}) })
console.log(this.detailDate)
}, },
uploadSuccess(data) { uploadSuccess(data) {
let attIdList = [] let attIdList = []
@@ -672,6 +673,7 @@
item.dataValue = attIdList.join(',') item.dataValue = attIdList.join(',')
} }
}) })
this.$emit('update:detailDate', this.detailDate);
}, },
clickButtonToUpload(item) { clickButtonToUpload(item) {
// if (item.isLock == '1') { // if (item.isLock == '1') {
@@ -690,9 +692,9 @@
} }
}, },
watch: { watch: {
detailDate(newold, oldold) { // detailDate(newold, oldold) {
console.log(newold, oldold, 'll') // console.log(newold, oldold, 'll')
}, // },
formInline: { formInline: {
handler(newOld, oldval) { handler(newOld, oldval) {
console.log(newOld, oldval, 'll') console.log(newOld, oldval, 'll')
jero-web/src/components/TaskCutOffTime/index.vue
+21 -22
View File
@@ -17,9 +17,8 @@
<span class="title-text-text" :title="$t('cutoffTime')"> <span class="title-text-text" :title="$t('cutoffTime')">
{{$t('cutoffTime')}}</span> {{$t('cutoffTime')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="legalTaskConfirmation"> <a-form-model-item class="itemModel" prop="legalTaskConfirmation" >
<a-date-picker class="box-input" <a-date-picker class="box-input"
style='width: 160px'
:placeholder="$t('PleaseSelect')+$t('cutoffTime')" :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
@change="onChange" @ok="onOk" @change="onChange" @ok="onOk"
format="YYYY-MM-DD" format="YYYY-MM-DD"
@@ -290,21 +289,20 @@ export default {
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
width: 276px;
/*align-items: center;*/ /*align-items: center;*/
} }
.title-text { .title-text {
width: 114px; width: 90px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: bold;
font-size: 14px; font-size: 14px;
margin-right: 16px; margin-right: 16px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
height: 42px;
line-height: 48px;
} }
.box-input { .box-input {
@@ -325,29 +323,30 @@ export default {
} }
.title-text-text { .title-text-text {
margin-top: 9px; margin-top: 11px;
display: inline-block;
} }
.header-text {
font-size: 16px;
font-weight: bold;
margin-left: 15px;
/*border-bottom: 1px #d9d9d9 dashed;*/
height: 30px;
margin-bottom: 30px;
}
.formAdd { .formAdd {
margin-bottom: 40px; /*margin-bottom: 40px;*/
} }
.button-text {
.drawer-bootom-button { height: 38px;
position: absolute; width: calc(100% - 120px);
bottom: 0; line-height: 38px;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border: 1px #00B3BE solid;
} color: #00B3BE;
/deep/.add-input{
min-height: 135px!important;
} }
</style> </style>
<style lang='less'> <style lang='less'>
jero-web/src/components/TaskCutOffTime/indexonekey.vue
+22 -22
View File
@@ -11,7 +11,7 @@
> >
<a-row :gutter='24'> <a-row :gutter='24'>
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text" >
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" :title="$t('cutoffTime')"> <span class="title-text-text" :title="$t('cutoffTime')">
@@ -19,7 +19,6 @@
</div> </div>
<a-form-model-item class="itemModel" prop="legalTaskConfirmation"> <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
<a-date-picker class="box-input" <a-date-picker class="box-input"
style='width: 160px'
:placeholder="$t('PleaseSelect')+$t('cutoffTime')" :placeholder="$t('PleaseSelect')+$t('cutoffTime')"
@change="onChange" @ok="onOk" @change="onChange" @ok="onOk"
format="YYYY-MM-DD" format="YYYY-MM-DD"
@@ -290,20 +289,20 @@ export default {
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
width: 276px;
/*align-items: center;*/ /*align-items: center;*/
} }
.title-text { .title-text {
width: 114px; width: 90px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: bold;
font-size: 14px; font-size: 14px;
margin-right: 16px; margin-right: 16px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
height: 42px;
line-height: 48px;
} }
.box-input { .box-input {
@@ -324,29 +323,30 @@ export default {
} }
.title-text-text { .title-text-text {
margin-top: 9px; margin-top: 11px;
display: inline-block;
} }
.header-text {
font-size: 16px;
font-weight: bold;
margin-left: 15px;
/*border-bottom: 1px #d9d9d9 dashed;*/
height: 30px;
margin-bottom: 30px;
}
.formAdd { .formAdd {
margin-bottom: 40px; /*margin-bottom: 40px;*/
} }
.button-text {
.drawer-bootom-button { height: 38px;
position: absolute; width: calc(100% - 120px);
bottom: 0; line-height: 38px;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border: 1px #00B3BE solid;
} color: #00B3BE;
/deep/.add-input{
min-height: 135px!important;
} }
</style> </style>
<style lang='less'> <style lang='less'>
jero-web/src/components/tableCollection/index1.vue
-1
View File
@@ -263,7 +263,6 @@
watch: { watch: {
currentPersonRole: { currentPersonRole: {
handler: function() { handler: function() {
console.log(123)
this.getTableList() this.getTableList()
}, },
immediate: true immediate: true
jero-web/src/views/externalReports/index.vue
+25 -26
View File
@@ -41,19 +41,12 @@
{{title && title.length > 18?title.slice(0,17)+'...':title}} {{title && title.length > 18?title.slice(0,17)+'...':title}}
</span> </span>
<template #overlay> <template #overlay>
<a-menu <a-menu v-has="'externalReports:folder'"
@click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)"> @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
<a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}} <a-menu-item key="1" @click="orgAdd" >{{$t('Addingfolder')}}</a-menu-item>
</a-menu-item> <a-menu-item key="4" @click="orgAdds" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
<a-menu-item key="4" @click="orgAdds" v-if="deleteNode" <a-menu-item key="2" @click="orgEdit">{{$t('Editfolder')}}</a-menu-item>
v-has="'externalReports:folder'">{{$t('Addingsubfolders')}} <a-menu-item key="3" @click="orgDelete" >{{$t('Deletefolders')}}</a-menu-item>
</a-menu-item>
<a-menu-item key="2" @click="orgEdit" v-has="'externalReports:folder'">
{{$t('Editfolder')}}
</a-menu-item>
<a-menu-item key="3" @click="orgDelete"
v-has="'externalReports:folder'">{{$t('Deletefolders')}}
</a-menu-item>
</a-menu> </a-menu>
</template> </template>
@@ -72,7 +65,7 @@
<div class="title-text" :title="$t('fileName')"> <div class="title-text" :title="$t('fileName')">
<span>{{ $t('fileName') }}</span> <span>{{ $t('fileName') }}</span>
</div> </div>
<a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+$t('fileName')" <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('fileName')"
v-model="queryParams.fileName"></a-input> v-model="queryParams.fileName"></a-input>
</div> </div>
</a-col> </a-col>
@@ -81,7 +74,7 @@
<div class="title-text" :title="$t('uploadedBy')"> <div class="title-text" :title="$t('uploadedBy')">
<span>{{$t('uploadedBy')}}</span> <span>{{$t('uploadedBy')}}</span>
</div> </div>
<a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+$t('uploadedBy')" <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('uploadedBy')"
v-model="queryParams.createBy"></a-input> v-model="queryParams.createBy"></a-input>
</div> </div>
</a-col> </a-col>
@@ -93,7 +86,6 @@
<!-- :placeholder="$t('PleaseSelect')+$t('uploadTime')"--> <!-- :placeholder="$t('PleaseSelect')+$t('uploadTime')"-->
<a-range-picker <a-range-picker
style='width: 264px' style='width: 264px'
@change="onChange" @change="onChange"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode" :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -127,20 +119,21 @@
</div> </div>
</div> </div>
<div> <div>
<!-- :scroll="{x: 10,y:'calc(100vh - 130px)'}"-->
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 130px)'}"
rowKey="id" rowKey="id"
:scroll="{x: 10}"
:data-source="dataSource" :data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns" :columns="columns"
> >
<span slot="projectName" slot-scope="text,record" :title="text"> <span slot="projectName" slot-scope="text,record" :title="text">
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
</a>
</span> </span>
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
<!-- <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>--> <!-- <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>-->
@@ -193,8 +186,8 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('Foldername')">{{$t('Foldername')}}</span> :title="$t('Foldername')">{{$t('Foldername')}}</span>
</div> </div>
<a-form-model-item prop="folderName"> <a-form-model-item prop="folderName" style='width: 72%'>
<a-input class="box-input add-input" style='width: 239%' v-model.trim="form.folderName" :placeholder="$t('PleaseEnter')+$t('Foldername')"/> <a-input v-model="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -325,7 +318,7 @@ export default {
rules: { rules: {
folderName: [ folderName: [
{ required: true, message: this.$t('PleaseEnter') + this.$t('Foldername'), trigger: 'blur' }, { required: true, message: this.$t('PleaseEnter') + this.$t('Foldername'), trigger: 'blur' },
{ min: 1, max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' } { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }
], ],
// authManageIdsName: [ // authManageIdsName: [
// { required: true, message: this.$t('PleaseSelect') + this.$t('Administrativeprivileges'), trigger: 'change' }, // { required: true, message: this.$t('PleaseSelect') + this.$t('Administrativeprivileges'), trigger: 'change' },
@@ -360,17 +353,20 @@ export default {
title: this.$t('fileName'), title: this.$t('fileName'),
align: 'center', align: 'center',
dataIndex: 'fileName', dataIndex: 'fileName',
width: 200
}, },
{ {
title: this.$t('fileDeclaration'), title: this.$t('fileDeclaration'),
align: 'center', align: 'center',
dataIndex: 'fileDescription', dataIndex: 'fileDescription',
scopedSlots: { customRender: 'projectName' } scopedSlots: { customRender: 'projectName' },
width: 150
}, },
{ {
title: this.$t('uploadedBy'), title: this.$t('uploadedBy'),
align: 'center', align: 'center',
dataIndex: 'createBy', dataIndex: 'createBy',
width: 150
}, },
// { // {
// title: this.$t('category'), // title: this.$t('category'),
@@ -640,7 +636,7 @@ export default {
//树形删除 //树形删除
orgDelete() { orgDelete() {
this.$confirm({ this.$confirm({
content: this.$t('deleteNodes'), content: this.$t('deleteNode'),
onOk: onOk:
async () => { async () => {
deleteAction(`extRepo/extRepoFolder/delete`, { id: this.nodeItem.key }).then(res => { deleteAction(`extRepo/extRepoFolder/delete`, { id: this.nodeItem.key }).then(res => {
@@ -1072,7 +1068,9 @@ export default {
display: flex; display: flex;
/*align-items: center;*/ /*align-items: center;*/
} }
/deep/.ant-table td{
white-space: nowrap;
}
.title-text { .title-text {
width: 114px; width: 114px;
text-align: right; text-align: right;
@@ -1227,14 +1225,15 @@ export default {
} }
} }
/deep/ .ant-table-body { ///deep/ .ant-table-body {
overflow: hidden !important; // overflow: hidden !important; ?????
} //}
</style> </style>
<style lang="less"> <style lang="less">
.split-item { .split-item {
.ant-form-item-label { .ant-form-item-label {
min-width: 100px; min-width: 100px;
} }
} }
jero-web/src/views/parameter/managementdetails/index.vue
+8 -8
View File
@@ -293,11 +293,15 @@ export default {
this.formInline[value] = id this.formInline[value] = id
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
getDataSource(data) {
this.dataSource = data
console.log(this.dataSource)
},
// 保存 // 保存
handlePreservation(num) { handlePreservation(num) {
let _this = this let _this = this
let postDate = [] let postDate = []
let data = JSON.parse(JSON.stringify(this.dataSource)) let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
let selectedRowKeysValue = [] let selectedRowKeysValue = []
data.forEach(res => { data.forEach(res => {
selectedRowKeysValue.push(res) selectedRowKeysValue.push(res)
@@ -306,13 +310,11 @@ export default {
for (let i = 0; i < selectedRowKeysValue.length; i++) { for (let i = 0; i < selectedRowKeysValue.length; i++) {
let postDateobj = {} let postDateobj = {}
let itemIn = Object.keys(selectedRowKeysValue[i]) let itemIn = Object.keys(selectedRowKeysValue[i])
console.log(itemIn)
for (let j = 0; j < itemIn.length; j++) { for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue)
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) {
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
} }
@@ -376,9 +378,7 @@ export default {
onSelectChange() { onSelectChange() {
}, },
getDataSource(data) {
this.dataSource = data
},
LoginUserType(val, currentPersonRole, userType) { LoginUserType(val, currentPersonRole, userType) {
this.RoleType = [] this.RoleType = []
if (this.currentPersonRole == '') { if (this.currentPersonRole == '') {
@@ -419,13 +419,13 @@ export default {
}, },
pageOnChange(page, pageSize) { pageOnChange(page, pageSize) {
this.pageNo = page this.pageNo = page
this.$emit('handlePreservation') // this.$emit('handlePreservation')
this.getTableList() this.getTableList()
}, },
SizeChange(page, pageSize) { SizeChange(page, pageSize) {
this.pageNo = 1 this.pageNo = 1
this.pageSize = pageSize this.pageSize = pageSize
this.$emit('handlePreservation') // this.$emit('handlePreservation')
this.getTableList() this.getTableList()
}, },
} }
jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
+1 -1
View File
@@ -244,7 +244,7 @@
yAxis: yAxis, yAxis: yAxis,
grid: { grid: {
left: '10%', left: '10%',
bottom: '15%' bottom: '20%'
}, },
series: [ series: [
{ {