diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 79e35447f..8b4eb5137 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -831,7 +831,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 String key = UUID.randomUUID().toString().replaceAll("-", ""); - paramsConfigDataVO.put(key, paramsConfigDataVOList); + paramsConfigDataVO.put("0+" + key, paramsConfigDataVOList); } configMap.put("controlType",controlType); configMap.put("paramsConfigData",paramsConfigDataVO); @@ -1637,6 +1637,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { - newConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); - }); +// newConfigDataEOList.forEach(newConfigDataEO -> { +// newConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); +// }); this.paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); } @@ -1780,6 +1781,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVO : paramsConfigDataVOList) { @@ -3374,7 +3376,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl
-
+
-
-
-
+
+
+
@@ -23,7 +23,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -33,7 +33,7 @@ @input="onInput(itemval.dataValue,item,index1)" :maxLength="1000" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -42,7 +42,7 @@ :max="99999" :precision="0" :placeholder="$t('enterPositiveInteger')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -50,7 +50,7 @@ :disabled="itemval.isLock == '1' ? true: false" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -58,7 +58,7 @@ :disabled="itemval.isLock == '1' ? true: false" :max="99999" :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -67,7 +67,7 @@ :max="99999" :precision="1" :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -76,7 +76,7 @@ :max="99999" :precision="2" :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -85,7 +85,7 @@ :max="99999" :precision="3" :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -94,28 +94,28 @@ :max="99999" :precision="4" :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
-
- +
-
- +
-
-
-
+
+
+
@@ -133,32 +133,32 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
-
- +
-
- +
-
-
-
+
+
+
- @@ -170,28 +170,28 @@
-
- +
-
- +
-
-
-
+
+
@@ -203,53 +203,53 @@
-
- +
-
- +
-
-
-
+
+
+
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
-
- +
-
- +
-
-
-
+
+
+
@@ -275,7 +275,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -285,7 +285,7 @@ :placeholder="$t('pleaseEnter')+$t('chinese')" @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -294,7 +294,7 @@ :max="99999" :precision="0" :placeholder="$t('enterPositiveInteger')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -302,7 +302,7 @@ :disabled="itemval.isLock == '1' ? true: false" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -310,7 +310,7 @@ :disabled="itemval.isLock == '1' ? true: false" :max="99999" :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -319,7 +319,7 @@ :max="99999" :precision="1" :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -328,7 +328,7 @@ :max="99999" :precision="2" :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -337,7 +337,7 @@ :max="99999" :precision="3" :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -346,34 +346,34 @@ :max="99999" :precision="4" :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
-
- +
-
- +
-
-
-
+
+
+ class="valflex">
@@ -399,7 +399,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -409,7 +409,7 @@ onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')+$t('chinese')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -418,7 +418,7 @@ :max="99999" :precision="0" :placeholder="$t('enterPositiveInteger')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -426,7 +426,7 @@ :disabled="itemval.isLock == '1' ? true: false" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -434,7 +434,7 @@ :disabled="itemval.isLock == '1' ? true: false" :max="99999" :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -443,7 +443,7 @@ :max="99999" :precision="1" :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -452,7 +452,7 @@ :max="99999" :precision="2" :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -461,7 +461,7 @@ :max="99999" :precision="3" :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -470,28 +470,28 @@ :max="99999" :precision="4" :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
-
- +
-
- +
-
-
-
+
+
+
@@ -509,7 +509,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -519,7 +519,7 @@ @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" :placeholder="$t('pleaseEnter')+$t('chinese')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -528,7 +528,7 @@ :max="99999" :precision="0" :placeholder="$t('enterPositiveInteger')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -536,7 +536,7 @@ :disabled="itemval.isLock == '1' ? true: false" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -544,7 +544,7 @@ :disabled="itemval.isLock == '1' ? true: false" :max="99999" :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -553,7 +553,7 @@ :max="99999" :precision="1" :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -562,7 +562,7 @@ :max="99999" :precision="2" :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -571,7 +571,7 @@ :max="99999" :precision="3" :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -580,40 +580,40 @@ :max="99999" :precision="4" :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
-
- +
-
- +
-
-
-
+
+
+
@@ -626,36 +626,36 @@ {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
-
- +
-
- +
-
-
-
+
+
+ class="valflex">
@@ -668,35 +668,35 @@ {{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
-
- +
-
- +
-
-
+
+
-
+
@@ -722,7 +722,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -732,7 +732,7 @@ :placeholder="$t('pleaseEnter')+$t('chinese')" @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -741,7 +741,7 @@ :max="99999" :precision="0" :placeholder="$t('enterPositiveInteger')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -749,7 +749,7 @@ :disabled="itemval.isLock == '1' ? true: false" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -757,7 +757,7 @@ :disabled="itemval.isLock == '1' ? true: false" :max="99999" :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -766,7 +766,7 @@ :max="99999" :precision="1" :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -775,7 +775,7 @@ :max="99999" :precision="2" :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -784,7 +784,7 @@ :max="99999" :precision="3" :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
@@ -793,26 +793,26 @@ :max="99999" :precision="4" :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')" - v-model="itemval.dataValue"/> + v-model="itemval.dataValue" />
{{ (itemval.dataValue === 'null' || itemval.dataValue === '' || - itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} + itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
-
- +
-
- +
@@ -821,363 +821,399 @@
+ :detailDate="detailDate" watermark="download">
diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index d37359513..5eb406f75 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -3,7 +3,7 @@
-
+
@@ -93,7 +93,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -101,7 +101,7 @@
-
+
@@ -128,7 +128,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -136,7 +136,7 @@
-
+
@@ -156,7 +156,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -164,7 +164,7 @@
-
-
@@ -194,7 +194,7 @@
-
@@ -210,7 +210,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -218,7 +218,7 @@
-
+
@@ -320,7 +320,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -328,7 +328,7 @@
-
+
-
@@ -440,7 +440,7 @@
-
+
@@ -537,7 +537,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -545,7 +545,7 @@
-
+
@@ -574,7 +574,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -582,7 +582,7 @@
-
+
-
@@ -621,7 +621,7 @@
-
+
@@ -732,7 +732,7 @@ v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
-
@@ -765,7 +765,8 @@ detailDatetransformation: [], fileNameOne: '', fileNameTwo: '', - fileIndex: '' + fileIndex: '', + key:[], } }, components: { @@ -788,6 +789,11 @@ // }) // this.detailDatetransformation.push(item) }) + this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => { + let index = a.lastIndexOf('+') + let index1 = b.lastIndexOf('+') + return a.slice(0, index) - b.slice(0, index1) + }) }, methods: { onInput(r) { @@ -857,14 +863,27 @@ }, addconfig() { - let paramsConfigData = Object.keys(this.detailDate.paramsConfigData) + let paramsConfigData = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => { + let index = a.lastIndexOf('+') + let index1 = b.lastIndexOf('+') + return a.slice(0, index) - b.slice(0, index1) + }) for (let i = 0; i < paramsConfigData.length; i++) { + // this.detailDate.paramsConfigData[paramsConfigData[i]][0].orderNum = i + 1 if (i == paramsConfigData.length - 1) { let name = paramsConfigData[i] - let generateRandom = this.generateRandom() - console.log(generateRandom) + let index = name.lastIndexOf('+') + let num + if (index == '-1') { + num = 0 + } else { + num = name.slice(0, index) + } + console.log(num) + num = parseInt(num) + let generateRandom = (num + 1) + '+' + this.generateRandom() this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name])) - this.detailDate.paramsConfigData[generateRandom].forEach(res => { + this.detailDate.paramsConfigData[generateRandom].forEach((res, index) => { if (res.type === 'pull_more') { res.dataValue = [] } else { @@ -873,7 +892,20 @@ }) } } - this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } + const ordered = {} + let that = this + + Object.keys(this.detailDate.paramsConfigData).sort().forEach(function(key) { + ordered[key] = that.detailDate.paramsConfigData[key] + }) + console.log(ordered) + this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => { + let index = a.lastIndexOf('+') + let index1 = b.lastIndexOf('+') + return a.slice(0, index) - b.slice(0, index1) + }) + console.log(this.key) + this.detailDate.paramsConfigData = { ...ordered } this.$emit('consolidateData') // postAction('params/configData/add', { // paramsCollectManifestId: this.recordList.id, @@ -885,8 +917,9 @@ // } // }) }, - delconfig(item) { + delconfig(item,index) { delete this.detailDate.paramsConfigData[item] + this.key.splice(index,1) this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } this.$emit('consolidateData') // for (const key in this.detailDate.paramsConfigData) { diff --git a/jero-web/src/views/phoneView/problemKnowledgeBaseFile.vue b/jero-web/src/views/phoneView/problemKnowledgeBaseFile.vue index ccce60ac2..2451027d4 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBaseFile.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBaseFile.vue @@ -8,59 +8,60 @@ \ No newline at end of file