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

修改三期优化点

Browse Source
This commit is contained in:
sunFlower
2022-09-28 16:52:31 +08:00
parent 58e4ddf049
commit 2c829d2860
5 changed files with 129 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+3
View File
@@ -1312,4 +1312,7 @@ module.exports = {
firstLevelDirectory:'First level directory',
deselectAll:'Deselect All',
classification:'Classification',
consistentAssessment:'Consistent assessment',
viewConsistentAssessment:'View Consistent Assessment',
viewAll:'View All',
}
jero-web/src/common/lang/zh-cn.js
+3
View File
@@ -1413,4 +1413,7 @@ module.exports = {
firstLevelDirectory:'一级目录',
deselectAll:'取消全选',
classification:'分类',
consistentAssessment:'一致评估',
viewConsistentAssessment:'查看一致评估',
viewAll:'查看全部',
}
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+69 -66
View File
@@ -53,72 +53,6 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('vehicleType')">{{$t('vehicleType')}}</span>
</div>
<a-form-model-item class="itemModel-multi">
<j-multi-select-tag class="box-input" v-model="formInline.applyCar"
:placeholder="$t('PleaseSelect')+$t('vehicleType')"
:type="'select'"
:disabled="disabled"
:triggerChange="false" :dictCode="'car_type'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel-multi">
<j-multi-select-tag class="box-input" v-model="formInline.applyScope"
:placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
:type="'select'"
:disabled="disabled"
:triggerChange="false" :dictCode="'apply_scope'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('status')">{{$t('status')}}</span>
</div>
<a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.state"
@input="handleInput('status')"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('usage')">{{$t('usage')}}</span>
</div>
<a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.useMethod"
@input="handleInput('usage')"
:placeholder="$t('PleaseSelect')+$t('usage')"
:type="'select'"
:disabled="disabled"
:triggerChange="false" :dictCode="'yong4_fa3'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -133,6 +67,72 @@
</a-form-model-item>
</div>
</a-col>
<!-- <a-col :span="12">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('vehicleType')">{{$t('vehicleType')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel-multi">-->
<!-- <j-multi-select-tag class="box-input" v-model="formInline.applyCar"-->
<!-- :placeholder="$t('PleaseSelect')+$t('vehicleType')"-->
<!-- :type="'checkbox'"-->
<!-- :disabled="disabled"-->
<!-- :triggerChange="false" :dictCode="'car_type'"/>-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel-multi itemModel-multi-one">
<j-multi-select-tag class="box-input" v-model="formInline.applyScope"
:placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
:type="'checkbox'"
:disabled="disabled"
:triggerChange="false" :dictCode="'apply_scope'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('status')">{{$t('status')}}</span>
</div>
<a-form-model-item class="itemModel">
<j-multi-select-tag class="box-input" v-model="formInline.state"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'checkbox'"
:triggerChange="false" :dictCode="'state'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('usage')">{{$t('usage')}}</span>
</div>
<a-form-model-item class="itemModel">
<j-multi-select-tag class="box-input" v-model="formInline.useMethod"
:placeholder="$t('PleaseSelect')+$t('usage')"
:type="'checkbox'"
:disabled="disabled"
:triggerChange="false" :dictCode="'yong4_fa3'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<!-- <a-col :span="12">-->
@@ -516,4 +516,7 @@
margin-bottom: 40px;
}
.itemModel-multi-one {
border: 1px solid #d9d9d9;
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+5 -5
View File
@@ -262,21 +262,21 @@
itemNum: res.items_num,
itemName: res.items_name,
itemContent: res.iterms_conditions,
zhan3_shi4_shun4_xu4: res.zhan3_shi4_shun4_xu4 || ''
display_seq: res.display_seq || ''
})
})
}
this.dataList = this.ImportFileData.concat(this.dataListData)
this.dataList.sort((a, b) => {
a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4
this.dataList = this.dataList.sort((a, b) => {
return a.display_seq - b.display_seq
})
this.dataList = [...this.dataList]
},
getPersonnelList(res) {
this.ImportFileData = this.ImportFileData.concat(res)
this.dataList = this.dataListData.concat(this.ImportFileData)
this.dataList.sort((a, b) => {
a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4
this.dataList = this.dataList.sort((a, b) => {
return a.display_seq - b.display_seq
})
this.dataList = [...this.dataList]
},
jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+49 -1
View File
@@ -105,7 +105,10 @@
</a-form-model>
</div>
<div class="submit-button">
<a-button class="box-button" type="primary" @click="submit">{{$t('preservation')}}</a-button>
<a-button class="box-button" style="margin-right: 10px"
type="primary" @click="consistentAssessmentClick()">{{$t('consistentAssessment')}}
</a-button>
<a-button class="box-button" type="primary" @click="submit()">{{$t('preservation')}}</a-button>
</div>
</div>
</div>
@@ -194,6 +197,51 @@
path: '/documentComparison'
})
},
consistentAssessmentClick() {
if (!this.dataLeft.id && !this.dataRight.id) {
this.$message.warning(this.$t('pleaseSelectTheDataCompared'))
return
}
let query = {
itemsIdLeft: this.dataLeft.id,
itemsIdRight: this.dataRight.id,
infoId: this.$route.query.id,
comment: '一致'
}
this.dataLoadingText = this.$t('pleaseWaitWhileRunning')
this.loading = true
postAction('/compare/sarFileCompareItemComment/add', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.loading = false
this.formInline = {}
this.resultData.textRight.forEach(val => {
if (val.id == this.dataRight.id) {
val.reviewed = 1
}
})
this.resultData.textLeft.forEach(val => {
if (val.id == this.dataLeft.id) {
val.reviewed = 1
}
})
this.resultData = { ...this.resultData }
let detailLeftColor = document.getElementsByClassName('detail-content-content-right-data-color')
if (detailLeftColor && detailLeftColor.length > 0) {
detailLeftColor[0].classList.remove('detail-content-content-right-data-color')
}
let detailRightColor = document.getElementsByClassName('detail-content-content-right-data-color-right')
if (detailRightColor && detailRightColor.length > 0) {
detailRightColor[0].classList.remove('detail-content-content-right-data-color-right')
}
this.dataLeft = {}
this.dataRight = {}
} else {
this.$message.warning(this.$t('operationFailed'))
this.loading = false
}
})
},
submit() {
if (!this.dataLeft.id && !this.dataRight.id) {
this.$message.warning(this.$t('pleaseSelectTheDataCompared'))