








diff --git a/src/assets/css/main.css b/src/assets/css/main.css index a9499235..f0c78455 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -362,7 +362,8 @@ textarea { display: flex; align-items: center; justify-content: center; - width: 120px; + min-width: 120px; + padding: 0 5px; height: 34px; background: rgba(0, 255, 186, 0.15); border: 1px solid rgba(0, 255, 186, 0.5); diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 0a7fd1da..777f9757 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -392,7 +392,8 @@ textarea { display: flex; align-items: center; justify-content: center; - width: 120px; + min-width: 120px; + padding: 0 5px; height: 34px; background: rgba(0, 255, 186, 0.15); border: 1px solid rgba(0, 255, 186, 0.50); diff --git a/src/components/setParamsControl.vue b/src/components/setParamsControl.vue index 2bac4316..991d86cc 100644 --- a/src/components/setParamsControl.vue +++ b/src/components/setParamsControl.vue @@ -128,6 +128,7 @@ export default { var data = store.equipmentList[store.equipmentIndex - 1].deviceId; this.api.getcontrol_cpermission(data).then((res) => { this.routerList = []; + this.loading.close(); this.purview = res.data.data; this.purview.forEach((el, index) => { if (el.state == 1) { diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index b87bb875..07474112 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -16,14 +16,24 @@ module.exports = { { name: 'Greater than or equal (>=)', value: 3 }, { name: 'Less than or equal (<=)', value: 4 } ], - message:{ - delete:'Delete successfully.', - add:'Added successfully', - change:'Modified successfully', + message: { + delete: 'Delete successfully.', + add: 'Added successfully', + change: 'Modified successfully', loading: 'Loading', - uploading:'Uploading', + uploading: 'Uploading', + deviceCodeRequired: "Device code is required", + deviceTypeRequired: "Device type is required", + deviceNameRequired: "Device name is required", + usernameRequired: "Username is required", + phoneRequired: "Phone number is required", + nicknameRequired: "Nickname is required", + roleRequired: "Role is required", + deviceRequired: "Please add at least one device", + passwordMismatch: "Passwords do not match", + sortRequired: "Sort code is required" }, - placeholder:{ + placeholder: { setValue: 'Set Value', deviceCodePlaceholder: "Please select weather station device code", @@ -33,31 +43,80 @@ module.exports = { sortOrderPlaceholder: "Please enter sort order", deviceNamePlaceholder: "Please enter device name", quantityPlaceholder: "Please enter quantity", + deviceTypePlaceholder: "Please select device type", + deviceAlias: "Please enter device alias", + newSortOrder: "Please enter new sort order", + nicknameQuery: "Enter nickname", + username: "Enter username", + phone: "Enter phone number", + nickname: "Enter nickname", + oldPassword: "Enter old password", + newPassword: "Enter new password", + confirmPassword: "Confirm password", + sortOrder: "Enter sort order", + role: "Select role" }, - nameText:{ - sortOrder: "Sort Order", + text: { + sortOrder: "Sort Order", operations: "Operations", edit: "Edit", delete: "Delete", deleteContent: "Are you sure to delete this content?", deviceCode: 'Device Code', deviceName: "Device Name", + deviceType: "Device Type", + add: 'Add', + add1: 'Add', + search: "Search", + download: 'Download', + statistics: 'Statistics', + serialNumber: "No.", + deviceAlias: "Device Alias", + subDeviceName: "Sub-device Name", + id: "ID", + "valid": "Valid", + "invalid": "Invalid", + "autoRun": "Auto Run", + "manualOn": "Manual On", + "manualOff": "Manual Off", + "manualSet": "Manual Setting", + "selection": "Work Mode Selection", + expand: 'Expand', + collapse: 'Collapse', + stop: 'Stop', + autoSet: 'Auto Setting', + min: 'mins', + sec: 'sec', + turnOn: 'Turn on', + seconds: 'seconds', + turnOff: 'Turn off', + minutes: 'minutes', + degrees: 'degrees', + collapseIn: 'collapse in', + return: "Return", + auto: 'Auto', + manual: 'Manual Start', + "openWindow": "Open", + "closeWindow": "Close", + + Configuration:'Configuration', }, index: { // header - noData:'NO DATA', + noData: 'NO DATA', confirm: 'Confirm', + confirm1: 'Confirm', cancel: 'Cancel', cancel1: 'Cancel', - realTimeData: "Realtime", - setParams: "Params", - galleryData: "Gallery", - videoMonitor: "Monitor", - historyData: "History", - dataAnalysis: "Analytics", - management: "Admin", - bigData: "Dashboard", - qrTrace: "Trace" , + realTimeData: "Realtime", + setParams: "Params", + galleryData: "Gallery", + videoMonitor: "Monitor", + historyData: "History", + dataAnalysis: "Analytics", + management: "Admin", + bigData: "Dashboard", + qrTrace: "Trace", // leftMenu home: "Home", @@ -69,7 +128,7 @@ module.exports = { pestMonitor: "Pest Monitoring", // management - mgmt:'Management', + mgmt: 'Management', userMgmt: "User Management", adminMgmt: "Admin Management", deviceStatusConfig: "Device Status Settings", @@ -102,20 +161,20 @@ module.exports = { pestDevice: 'Pest monitoring device', cardExpiryWarning: `