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:
qq787203167
2022-05-17 12:28:49 +08:00
parent 66cbc0cd3c
commit 7255f9d359
19 changed files with 146 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/App.vue
+10
View File
@@ -132,4 +132,14 @@
cursor: not-allowed !important;
}
.itemModel-multi {
width: calc(100% - 130px)!important;
display: inline-block!important;
margin-top: 2px!important;
height: 40px!important;
}
.itemModel-multi .ant-form-explain, .ant-form-extra {
margin-top: -10px;
}
</style>
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -804,7 +804,7 @@ module.exports = {
Deadline: 'Deadline',
toBeConfirmed: 'To be confirmed',
designComplianceReview: 'Confirm design conformance',
preHomeConfirmation: 'PreHomo confirmation',
preHomeConfirmation: 'Pre-Homo confirmation',
verificationComplianceReview: 'Verify conformance validation',
Deployment: 'Deployment',
pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -811,7 +811,7 @@ module.exports = {
number: '序号',
Deadline: '截止时间',
designComplianceReview: '设计符合性确认',
preHomeConfirmation: 'PreHomo确认',
preHomeConfirmation: 'Pre-Homo确认',
verificationComplianceReview: '验证符合性确认',
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据',
jero-web/src/components/OcrAddForm/index.vue
+3 -3
View File
@@ -25,7 +25,7 @@
<!-- <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
<span class="title-text-text">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'checkbox'"
@@ -113,7 +113,7 @@
<!-- <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
<span class="title-text-text">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
@@ -449,7 +449,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/components/SplitBatForm/index.vue
+3 -3
View File
@@ -25,7 +25,7 @@
<!-- <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
<span class="title-text-text">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'checkbox'"
@@ -105,7 +105,7 @@
<!-- <span :class="{'title-text-text':false}">{{item.db_field_en_name}}</span><br>-->
<span class="title-text-text">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
@@ -494,7 +494,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/components/addForm/index.vue
+3 -3
View File
@@ -56,7 +56,7 @@
<span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt"
@@ -200,7 +200,7 @@
<span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('selectStatus')" :type="'checkbox'"
@@ -409,7 +409,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
.itemModel .ant-form-item-control-wrapper {
jero-web/src/components/libraryAddForm/index.vue
+3 -3
View File
@@ -62,7 +62,7 @@
<span class="Required" v-if="item.field_must_input == 1">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt"
@@ -213,7 +213,7 @@
<span class="Required" v-if="item.field_must_input == 1">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('selectStatus')" :type="'checkbox'"
@@ -492,7 +492,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+2 -2
View File
@@ -73,7 +73,7 @@
<span class="Required" v-if="item.field_must_input == 1">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt"
@@ -216,7 +216,7 @@
<span class="Required" v-if="item.field_must_input == 1">*</span>
<span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-form-model-item class="itemModel-multi" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+item.db_field_txt"
jero-web/src/views/documentTools/virtualList/components/batSetting.vue
+3 -3
View File
@@ -77,7 +77,7 @@
<span class="title-text-text"
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel" prop="region">
<a-form-model-item class="itemModel-multi" prop="region">
<j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
@@ -91,7 +91,7 @@
<span class="title-text-text"
:title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel-multi">
<j-multi-select-tag class="box-input" v-model="formInline.shi4Yong4Fan4Wei2"
@input="handleInput('shi4Yong4Fan4Wei2')"
:placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
@@ -251,7 +251,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+21 -5
View File
@@ -195,10 +195,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
</div>
<a-form-model-item class="itemModel" prop="areaOfResponsibility">
<a-form-model-item class="itemModel-multi" prop="dutyTerritory">
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -212,6 +213,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div>
@@ -249,7 +251,7 @@
<span class="title-text-text"
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel" prop="region">
<a-form-model-item class="itemModel-multi" prop="region">
<!-- <a-input class="box-input"-->
<!-- :disabled="true"-->
<!-- v-model="formInline.region_dictText"/>-->
@@ -553,7 +555,7 @@
trigger: 'blur'
}
],
applicableSupplement:[
applicableSupplement: [
{
max: 100,
message: this.$t('applicableSupplement') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
@@ -566,6 +568,20 @@
message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
attestationRank: [
{
required: true,
message: this.$t('certificationLevel') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
dutyTerritory: [
{
required: true,
message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
},
formInline: {},
@@ -672,7 +688,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
@@ -814,7 +830,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
+1 -1
View File
@@ -207,7 +207,7 @@ export default {
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/parameter/parameterlist/components/addModel.vue
+2 -2
View File
@@ -139,7 +139,7 @@
<span class="title-text-text"
:title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
</div>
<a-form-model-item class="itemModel" prop="certCategory">
<a-form-model-item class="itemModel-multi" prop="certCategory">
<j-multi-select-tag class="box-input" v-model="formInline.certCategory"
@change='Onchange'
v-on:changelabel='Onchangelabel'
@@ -553,7 +553,7 @@ export default {
}
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/projectManagement/components/addModel.vue
+2 -2
View File
@@ -38,7 +38,7 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
</div>
<a-form-model-item class="itemModel" prop="targetMarket">
<a-form-model-item class="itemModel-multi" prop="targetMarket">
<j-multi-select-tag class="box-input" v-model="formInline.targetMarket"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('targetMarket')"
@@ -359,7 +359,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/projectManagement/components/batSetting.vue
+1 -1
View File
@@ -195,7 +195,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/projectManagement/components/listEditModel.vue
+3 -3
View File
@@ -178,7 +178,7 @@
<span class="title-text-text"
:title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-form-model-item class="itemModel-multi" prop="dutyTerritory">
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
@change="dutyTerritoryChange"
:disabled="formInline.roleCode == 0 ? false : true"
@@ -270,7 +270,7 @@
<span class="title-text-text"
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel" prop="region">
<a-form-model-item class="itemModel-multi" prop="region">
<!-- <a-input class="box-input"-->
<!-- :disabled="true"-->
<!-- v-model="formInline.region_dictText"/>-->
@@ -1081,7 +1081,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
.itemModel .ant-form-item-control-wrapper {
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+1 -1
View File
@@ -68,7 +68,7 @@
<span class="title-text-text"
:title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-form-model-item class="itemModel-multi" prop="dutyTerritory">
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:disabled="true"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
jero-web/src/views/projectManagement/components/settingList.vue
+1 -1
View File
@@ -282,7 +282,7 @@
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/projectManagement/dialog/configure.vue
+1 -1
View File
@@ -246,7 +246,7 @@ export default {
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: calc(100% - 130px);
width: 100%;
}
/*.formAdd .ant-form-item {*/
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+84 -91
View File
@@ -33,9 +33,49 @@
<div class="box-top">
<span class="box-top-text">{{$t('regulatoryCertificationTaskPlan')}}</span>
<div class="box-top-content">
<div id="main">
<div class="box-top-content-time">
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
<div class="box-top-content-time-text">
2022-10
</div>
</div>
<div style="overflow:auto;height: calc(100% - 80px)">
<div class="box-top-content-left">
<div class="box-top-content-text">111111</div>
<div class="box-top-content-text">哈哈哈</div>
<div class="box-top-content-text">哈哈哈</div>
<div class="box-top-content-text">哈哈哈</div>
</div>
<div class="box-top-content-right">
<div class="box-top-content-text">
<img src="../../../assets/wancheng.png" alt="">
<img src="../../../assets/wancheng.png" alt="">
<img src="../../../assets/wancheng.png" alt="">
<img src="../../../assets/wancheng.png" alt="">
</div>
</div>
</div>
</div>
</div>
<div class="box-bottom">
@@ -159,7 +199,6 @@
},
mounted() {
this.getList()
this.getEcharts()
},
methods: {
searchQuery() {
@@ -180,93 +219,6 @@
this.dataSource = []
}
})
},
getEcharts() {
var chartDom = document.getElementById('main')
var myChart = echarts.init(chartDom)
var option
// prettier-ignore
const hours = [
'12a', '1a', '2a', '3a', '4a', '5a', '6a',
'7a', '8a', '9a', '10a', '11a',
'12p', '1p', '2p', '3p', '4p', '5p',
'6p', '7p', '8p', '9p', '10p', '11p'
]
// prettier-ignore
const days = [
'Saturday', 'Friday', 'Thursday',
'Wednesday', 'Tuesday', 'Monday', 'Sunday'
]
// prettier-ignore
const data = [[0, 5, 2], [0, 1, 1], [0, 2, 0], [0, 3, 0], [0, 4, 0],
[0, 5, 0], [0, 6, 0], [0, 7, 0], [0, 8, 0], [0, 9, 0], [0, 10, 0],
[0, 11, 2], [0, 12, 4], [0, 13, 1], [0, 14, 1], [0, 15, 3],
[0, 16, 4], [0, 17, 6], [0, 18, 4], [0, 19, 4], [0, 20, 3], [0, 21, 3],
[0, 22, 2], [0, 23, 5], [1, 0, 7], [1, 1, 0], [1, 2, 0],
[1, 3, 0], [1, 4, 0], [1, 5, 0], [1, 6, 0], [1, 7, 0], [1, 8, 0], [1, 9, 0],
[1, 10, 5], [1, 11, 2], [1, 12, 2], [1, 13, 6], [1, 14, 9],
[1, 15, 11], [1, 16, 6], [1, 17, 7], [1, 18, 8], [1, 19, 12], [1, 20, 5],
[1, 21, 5], [1, 22, 7], [1, 23, 2], [2, 0, 1], [2, 1, 1], [2, 2, 0],
[2, 3, 0], [2, 4, 0], [2, 5, 0], [2, 6, 0], [2, 7, 0], [2, 8, 0], [2, 9, 0],
[2, 10, 3], [2, 11, 2], [2, 12, 1], [2, 13, 9], [2, 14, 8], [2, 15, 10], [2, 16, 6],
[2, 17, 5], [2, 18, 5], [2, 19, 5], [2, 20, 7], [2, 21, 4], [2, 22, 2], [2, 23, 4],
[3, 0, 7], [3, 1, 3], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [3, 6, 0], [3, 7, 0],
[3, 8, 1], [3, 9, 0], [3, 10, 5], [3, 11, 4], [3, 12, 7], [3, 13, 14], [3, 14, 13],
[3, 15, 12], [3, 16, 9], [3, 17, 5], [3, 18, 5], [3, 19, 10], [3, 20, 6], [3, 21, 4],
[3, 22, 4], [3, 23, 1], [4, 0, 1], [4, 1, 3], [4, 2, 0], [4, 3, 0], [4, 4, 0],
[4, 5, 1], [4, 6, 0], [4, 7, 0], [4, 8, 0], [4, 9, 2], [4, 10, 4], [4, 11, 4],
[4, 12, 2], [4, 13, 4], [4, 14, 4], [4, 15, 14], [4, 16, 12], [4, 17, 1], [4, 18, 8],
[4, 19, 5], [4, 20, 3], [4, 21, 7], [4, 22, 3], [4, 23, 0], [5, 0, 2], [5, 1, 1],
[5, 2, 0], [5, 3, 3], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0], [5, 8, 2], [5, 9, 0],
[5, 10, 4], [5, 11, 1], [5, 12, 5], [5, 13, 10], [5, 14, 5], [5, 15, 7], [5, 16, 11],
[5, 17, 6], [5, 18, 0], [5, 19, 5], [5, 20, 3], [5, 21, 4], [5, 22, 2], [5, 23, 0],
[6, 0, 1], [6, 1, 0], [6, 2, 0], [6, 3, 0], [6, 4, 0], [6, 5, 0], [6, 6, 0], [6, 7, 0],
[6, 8, 0], [6, 9, 0], [6, 10, 1], [6, 11, 0], [6, 12, 2], [6, 13, 1], [6, 14, 3], [6, 15, 4],
[6, 16, 0], [6, 17, 0], [6, 18, 0], [6, 19, 0], [6, 20, 1], [6, 21, 2], [6, 22, 2], [6, 23, 6]]
const title = []
const singleAxis = []
const series = []
days.forEach(function(day, idx) {
title.push({
textBaseline: 'middle',
top: ((idx + 0.5) * 100) / 7 + '%',
text: day
})
singleAxis.push({
left: 150,
type: 'category',
boundaryGap: false,
data: hours,
top: (idx * 100) / 7 + 5 + '%',
height: 100 / 7 - 10 + '%',
axisLabel: {
interval: 2
}
})
series.push({
singleAxisIndex: idx,
coordinateSystem: 'singleAxis',
type: 'scatter',
data: [],
symbolSize: function(dataItem) {
return dataItem[1] * 4
}
})
})
data.forEach(function(dataItem) {
series[dataItem[0]].data.push([dataItem[1], dataItem[2]])
})
option = {
tooltip: {
position: 'top'
},
title: title,
singleAxis: singleAxis,
series: series
}
option && myChart.setOption(option)
}
}
}
@@ -315,7 +267,48 @@
width: 100%;
height: 400px;
margin-bottom: 20px;
overflow: auto;
}
.box-top-content-left {
width: 240px;
float: left;
padding: 0 20px;
box-sizing: border-box;
text-align: center;
}
.box-top-content-right {
width: calc(100% - 240px);
float: left;
}
.box-top-content-text {
height: 80px;
line-height: 80px;
}
.box-top-content-text {
width: 100%;
height: 80px;
line-height: 80px;
font-size: 16px;
font-weight: 500;
color: #000F16;
}
.box-top-content-time {
width: calc(100% - 240px);
margin-left: 240px;
height: 80px;
line-height: 80px;
display: flex;
justify-content: space-between;
}
.box-top-content-time-text {
font-size: 16px;
font-weight: 500;
color: #000F16;
}
.box-button {