diff --git a/src/views/projectFront/configManage/sysConfig.vue b/src/views/projectFront/configManage/sysConfig.vue index 832d97f6..1f12f4c2 100644 --- a/src/views/projectFront/configManage/sysConfig.vue +++ b/src/views/projectFront/configManage/sysConfig.vue @@ -178,9 +178,15 @@
- - - + + +
@@ -218,9 +224,14 @@
- - - + + +
{{$t('message.projectInfo.addPeople')}} @@ -259,9 +270,15 @@
- - - + + +
{{$t('message.projectInfo.addPeople')}} diff --git a/src/views/projectFront/environmentalMonitor/alarmValueSet.vue b/src/views/projectFront/environmentalMonitor/alarmValueSet.vue index 331511f3..401964f6 100644 --- a/src/views/projectFront/environmentalMonitor/alarmValueSet.vue +++ b/src/views/projectFront/environmentalMonitor/alarmValueSet.vue @@ -118,35 +118,51 @@ label-width="140px" class="dialogFormBox yj-dialogFormBox"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> + :placeholder="$t('message.alarmValueSet.placeholder')" + type="number" + oninput="if(value.length>20)value=value.slice(0,20)"> diff --git a/src/views/projectFront/epidemicPrevention/visitorsManage.vue b/src/views/projectFront/epidemicPrevention/visitorsManage.vue index a18ea066..783f4ff4 100644 --- a/src/views/projectFront/epidemicPrevention/visitorsManage.vue +++ b/src/views/projectFront/epidemicPrevention/visitorsManage.vue @@ -262,7 +262,8 @@ v-model="addForm.phoneNumber" style="width:210px" :placeholder="$t('message.laborMange.placeholder2')" - maxlength="11" + type="number" + oninput="if(value.length>11)value=value.slice(0,11)" :disabled="operationType=='detail'" >
diff --git a/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue b/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue index b47a68ef..c377bfd8 100644 --- a/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue +++ b/src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue @@ -171,21 +171,40 @@ export default { }, // 新建文件夹按钮:打开模态框 addFolder() { - this.$prompt(this.$t('message.fileManage.confirmDeleteTipText2'), this.$t('message.fileManage.createFolder'), { - confirmButtonText: /* '确定', */this.$t('message.fileManage.confirm'), - cancelButtonText: /* '取消' */this.$t('message.fileManage.cancel'), - inputPattern:/\S/, - inputErrorMessage: '请输入文件夹名称!' - }) - .then(({ value }) => { - this.createFile(value) - }) - .catch(() => { + this.$prompt('创建文件夹', '请输入文件名', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputPattern:/\S/, + inputErrorMessage: '请输入文件夹名称!' + }).then(({ value }) => { + this.createFile(value) + this.$message({ + type: 'success', + message: '新增成功' + }); + + }).catch(() => { this.$message({ type: 'info', message: /* '取消输入' */this.$t('message.fileManage.cancelInput'), - }) - }) + }); + }); + + // this.$prompt(this.$t('message.fileManage.confirmDeleteTipText2'), this.$t('message.fileManage.createFolder'), { + // confirmButtonText: /* '确定', */this.$t('message.fileManage.confirm'), + // cancelButtonText: /* '取消' */this.$t('message.fileManage.cancel'), + // inputPattern:/\S/, + // inputErrorMessage: '请输入文件夹名称!' + // }) + // .then(({ value }) => { + // this.createFile(value) + // }) + // .catch(() => { + // this.$message({ + // type: 'info', + // message: /* '取消输入' */this.$t('message.fileManage.cancelInput'), + // }) + // }) }, // 新建文件夹模态框-确定按钮 createFile(fileName) { diff --git a/src/views/projectFront/inOutboundManagement/departmentTeam.vue b/src/views/projectFront/inOutboundManagement/departmentTeam.vue index bab43e47..cf1223bf 100644 --- a/src/views/projectFront/inOutboundManagement/departmentTeam.vue +++ b/src/views/projectFront/inOutboundManagement/departmentTeam.vue @@ -129,9 +129,10 @@ diff --git a/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue b/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue index 49b08eeb..4e6ad5df 100644 --- a/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue +++ b/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue @@ -7,11 +7,11 @@
- + {{ $t("message.laborMange.save") }} - {{ + {{ $t("message.laborMange.issue") }}
@@ -468,7 +468,59 @@ export default { } }, }, + created() { + // 模拟查询数据 + // this.initLED() + }, methods: { + initLED() { + let data = [ + { + animationTime: "10", + direction: 1, + fontSize: '10', + height: "30", + type: 1, + value: "欢迎光临" + }, + { + animationTime: "10", + direction: 1, + fontSize: '10', + height: "30", + type: 2, + modelData: [ + { + name: '木工班组', + num: '33' + }, + { + name: '木工班组', + num: '33' + }, + { + name: '木工班组', + num: '33' + }, + { + name: '木工班组', + num: '33' + }, + { + name: '木工班组', + num: '33' + }, + ] + } + ] + this.LEDContentList = data + console.log('初始化',data) + }, + + saveLED() { + console.log('打印LED',this.LEDContentList) + }, + addRow() { console.log(parseInt(this.rowIndex.split("-")[0])); if (this.rowIndex) { @@ -1035,7 +1087,8 @@ export default { animation: 0s wordsLoop linear infinite normal; } .textBox2 { - overflow: hidden; + // overflow: hidden; + display: block; animation: 0s wordsLoop2 linear infinite normal; } .listBox { @@ -1085,6 +1138,8 @@ export default { } } @keyframes wordsLoop2 { + // from { right: 100%; } + // to { left: 100%; } 0% { transform: translateX(0px); -webkit-transform: translateX(0px); diff --git a/src/views/projectFront/laborManage/personAudit.vue b/src/views/projectFront/laborManage/personAudit.vue index 28645f4f..a3d76909 100644 --- a/src/views/projectFront/laborManage/personAudit.vue +++ b/src/views/projectFront/laborManage/personAudit.vue @@ -363,7 +363,8 @@ v-model="addForm.phoneNumber" style="width: 210px" :placeholder="$t('message.laborMange.placeholder2')" - maxlength="11" + type="number" + oninput="if(value.length>11)value=value.slice(0,11)" :disabled="operationType == 'detail'" >
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index b0ae824c..8ab80e1f 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -760,7 +760,8 @@ v-model="personForm.phoneNumber" :placeholder="$t('message.laborMange.placeholder2')" :disabled="titleType == 'detail'" - maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" > @@ -1098,7 +1099,8 @@ v-model="personForm.emergentPhone" :placeholder="$t('message.laborMange.placeholder2')" :disabled="titleType == 'detail'" - maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" > diff --git a/src/views/projectFront/laborManage/personModule/administration1.vue b/src/views/projectFront/laborManage/personModule/administration1.vue index a228840c..d9a25eb9 100644 --- a/src/views/projectFront/laborManage/personModule/administration1.vue +++ b/src/views/projectFront/laborManage/personModule/administration1.vue @@ -440,7 +440,8 @@ > @@ -465,7 +466,8 @@ > @@ -936,7 +938,8 @@ v-model="personForm.phoneNumber" :disabled="titleType == 'detail'" :placeholder="$t('message.laborMange.placeholder2')" - maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" > @@ -962,7 +965,8 @@ @@ -1700,7 +1704,8 @@ diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 454ae0a3..336403e2 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -609,7 +609,8 @@ > @@ -634,7 +635,8 @@ > @@ -1105,7 +1107,8 @@ v-model="personForm.phoneNumber" :disabled="titleType == 'detail'" :placeholder="$t('message.laborMange.placeholder2')" - maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" > @@ -1131,7 +1134,8 @@ @@ -1705,7 +1709,8 @@ diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue index 6fc0df9b..227a18be 100644 --- a/src/views/projectFront/laborManage/personModule/temporary.vue +++ b/src/views/projectFront/laborManage/personModule/temporary.vue @@ -333,7 +333,8 @@ v-model="addForm.phoneNumber" style="width: 210px" :placeholder="$t('message.laborMange.placeholder2')" - maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" :disabled="operationType == 'detail'" > diff --git a/src/views/projectFront/laborManage/roster.vue b/src/views/projectFront/laborManage/roster.vue index a2775543..3f9a2119 100644 --- a/src/views/projectFront/laborManage/roster.vue +++ b/src/views/projectFront/laborManage/roster.vue @@ -550,7 +550,8 @@ v-model="addForm.phoneNumber" style="width: 210px" :placeholder="$t('message.laborMange.placeholder2')" - maxlength="11" + type="number" + oninput="if(value.length>11)value=value.slice(0,11)" :disabled="operationType == 'detail'" > diff --git a/src/views/projectFront/lifter/basicInfo.vue b/src/views/projectFront/lifter/basicInfo.vue index c9d72174..8cf7a368 100644 --- a/src/views/projectFront/lifter/basicInfo.vue +++ b/src/views/projectFront/lifter/basicInfo.vue @@ -132,15 +132,15 @@ - + - + - + diff --git a/src/views/projectFront/procurementManagement/materialSupplierManagement.vue b/src/views/projectFront/procurementManagement/materialSupplierManagement.vue index 1d8d560b..e8803e6c 100644 --- a/src/views/projectFront/procurementManagement/materialSupplierManagement.vue +++ b/src/views/projectFront/procurementManagement/materialSupplierManagement.vue @@ -182,7 +182,8 @@ diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index 7b63ba44..9dd2b0d5 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -330,7 +330,7 @@ @@ -356,7 +356,7 @@ diff --git a/src/views/projectFront/quality/material/forwardingUnit.vue b/src/views/projectFront/quality/material/forwardingUnit.vue index c60692a2..9364ad67 100644 --- a/src/views/projectFront/quality/material/forwardingUnit.vue +++ b/src/views/projectFront/quality/material/forwardingUnit.vue @@ -113,9 +113,8 @@ v-model="form.chargePhone" style="width: 350px" placeholder="请输入" - onkeyup="if(isNaN(value))execCommand('undo')" - onafterpaste="if(isNaN(value))execCommand('undo')" - :maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" > @@ -170,9 +169,8 @@ v-model="editForm.chargePhone" style="width: 350px" placeholder="请输入" - onkeyup="if(isNaN(value))execCommand('undo')" - onafterpaste="if(isNaN(value))execCommand('undo')" - :maxlength="11" + oninput="if(value.length>11)value=value.slice(0,11)" + type="number" > diff --git a/src/views/projectFront/quality/material/tradeName.vue b/src/views/projectFront/quality/material/tradeName.vue index 482f00e2..d3ef806a 100644 --- a/src/views/projectFront/quality/material/tradeName.vue +++ b/src/views/projectFront/quality/material/tradeName.vue @@ -53,20 +53,16 @@ - + - + - + - + @@ -80,16 +76,16 @@ - + - + - + - + diff --git a/src/views/projectFront/qualitySafeReport/engineeringManagement.vue b/src/views/projectFront/qualitySafeReport/engineeringManagement.vue index ba6a33ba..70323768 100644 --- a/src/views/projectFront/qualitySafeReport/engineeringManagement.vue +++ b/src/views/projectFront/qualitySafeReport/engineeringManagement.vue @@ -82,7 +82,7 @@ + onafterpaste="if(isNaN(value))execCommand('undo')" oninput="if(value > 100) value = 100; if(value < 0 || value == '' || value == null) value = '';"> + onafterpaste="if(isNaN(value))execCommand('undo')" oninput="if(value > 100) value = 100; if(value < 0 || value == '' || value == null) value = '';">