diff --git a/common/style/layout.styl b/common/style/layout.styl index 79a9885..e08ae07 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -43,8 +43,11 @@ uni-button:after { margin-bottom: 20rpx; } .filter_label { - display: block; - line-height: 80rpx; + display: flex; + flex-direction: column; + justify-content: center; + line-height: 28rpx; + height: 80rpx; font-size: 28rpx; color: #323232; font-weight: bold; @@ -157,7 +160,7 @@ uni-button:after { background: #d7d7d7; font-size: 26rpx; line-height: 28rpx; - padding: 35rpx 10rpx; + padding: 35rpx 20rpx; color: #7d7d7d; background-color: #dcdfea; font-weight: bold; @@ -268,8 +271,12 @@ uni-button:after { box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); } .button-default { + display: flex; + flex-direction: column; + justify-content: center; font-size: 34rpx; - line-height: 88rpx; + line-height: 38rpx; + height: 88rpx; color: #ff6a00; text-align: center; letter-spacing: 4rpx; @@ -279,8 +286,12 @@ uni-button:after { border-radius: 10rpx; } .button-primary { + display: flex; + flex-direction: column; + justify-content: center; font-size: 30rpx; - line-height: 88rpx; + line-height: 38rpx; + height: 88rpx; color: #fff; text-align: center; letter-spacing: 4rpx; diff --git a/locale/en-1.json b/locale/en-1.json deleted file mode 100644 index c509330..0000000 --- a/locale/en-1.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "button.check": "Check", - "button.abnormal": "Abnormal", - "button.normal": "Normal", - "filter.bill-code": "Bill code", - "filter.warehouse": "Warehouse", - "filter.woodenbox": "Woodenbox", - "filter.countednum": "Checknum", - "filter.uncountednum": "Unchecknum", - "grid.bill-code": "Bill code", - "grid.bill-type": "Bill type", - "grid.warehouse-name": "Warehouse name", - "grid.dtl-number": "Detail number", - "grid.status": "Status", - "grid.is-error": "Is error", - "grid.create-man": "Create man", - "grid.create-time": "Create time", - "grid.confirm-man": "Confirm man", - "grid.confirm-time": "Confirm time", - "grid.storagevehicle-code": "Storagevehicle code", - "grid.weight": "Weight", - "grid.check-area": "Check area", - "grid.check-point": "Check point", - "grid.material-code": "Material code", - "grid.material-name": "Material name", - "grid.mark": "Mark", - "grid.rolls-num": "Rolls num", - "grid.check-result": "Check result", - "grid.check-man": "Check man", - "grid.check-time": "Check time", - "grid.expected-end-time": "Expected end time", - "grid.remain-time": "Remain time" -} \ No newline at end of file diff --git a/locale/en.json b/locale/en.json index fa9d9c7..adb1f26 100644 --- a/locale/en.json +++ b/locale/en.json @@ -6,32 +6,9 @@ "utils.no-more": "No more", "button.confirm": "OK", "button.cancel": "Cancel", + "button.empty": "Empty", "button.search": "Query", - "button.confirm-receipt": "Confirm receipt", - "button.confirm-outbound": "Confirm outbound", - "button.empty-shaft-return": "Empty shaft return", - "button.full-shaft-return": "Full shaft return", - "button.through-shaft-confirm": "Through shaft confirm", - "button.pull-shaft-confirm": "Pull shaft confirm", - "button.overlap-shaft-confirm": "Overlap shaft confirm", - "button.manual-call": "Manual call", - "button.call": "Call", - "button.vehicle-lateral-movement": "Vehicle lateral movement", - "button.call-vehicle": "Call vehicle", - "button.delivery-check": "Delivery check", - "button.delivery-confirm": "Delivery confirm", - "button.vehicle-return": "Vehicle return", - "button.upload-empty-shaft": "Upload empty shaft", - "button.scrap-foil-roll-down": "Scrap foil roll down", - "button.outbound-delivery": "Outbound delivery", - "button.storage-settings": "Storage settings", - "button.storage-confirm": "Storage confirm", - "button.complement": "Complement", - "button.labeling": "Labeling", - "button.binding": "Binding", - "button.print": "Print", - "button.force-complete": "Force Complete", - "button.reissue": "Reissue", + "button.handtask": "Handling task", "login.username": "User name", "login.password": "Password", "login.remember": "Remember username", @@ -39,139 +16,43 @@ "login.upgrade": "Upgrade version", "login.login": "Login", "login.text1": "Welcome to", - "login.text2": "Hailiang Copper Foil Handheld System!", + "login.text2": "Korean Doosan ACS system!", "setting.language": "language", "setting.server": "server address", "setting.refresh": "Refresh time", - "setting.customer-label-printing": "Label printing", "setting.language-change-confirm": "Applying this setting will restart the app", "upgrade.new-version": "Discovering new versions", - "upgrade.text1": "Hailiang Copper Foil has a new version, upgrade to the latest version, and enjoy richer, more stable, and faster functions and experiences!", + "upgrade.text1": "The Korean Doosan ACS system has a new version, upgrade to the latest version, and enjoy richer, more stable, and faster functions and experiences!", "upgrade.text2": "Installation package download in progress, please wait", "upgrade.upgrade-now": "Upgrade now", "home.title": "home page", - "home.message": "Welcome to the copper foil handheld system!", + "home.message": "Welcome to the Korean Doosan ACS system!", "home.exit": "Exit", - "menu.production-management": "Production management", - "menu.production-progress-of-raw-foil": "Production progress of raw foil", - "menu.foil-production-process": "Foil production process", - "menu.baking-process": "Baking process", - "menu.manual-baking": "Manual baking", - "menu.semi-finished-product-management": "Semi-finished product management", - "menu.semi-finished-product-warehousing": "Semi-finished product warehousing", - "menu.semi-finished-products-outbound": "Semi finished products outbound", - "menu.splitting-management": "Splitting management", - "menu.cutting-and-feeding": "Cutting and feeding", - "menu.hollow-shaft-sleeve": "Hollow shaft sleeve", - "menu.empty-shaft-delivery": "Empty shaft delivery", - "menu.empty-shaft-entry-station": "Empty shaft entry station", - "menu.subroll-outbound": "Subroll Outbound", - "menu.point-management": "Point management", - "menu.abnormal-outbound-unlocking": "Abnormal outbound unlocking", - "menu.paper-frp-management": "Paper tube/FRP tube management", - "menu.air-traffic-control-warehousing": "Air traffic control warehousing", - "menu.air-traffic-control-outbound": "Air traffic control outbound", - "menu.finished-product-management": "Finished product management", - "menu.production-warehousing": "Production warehousing", - "menu.return-to-warehouse": "Return to warehouse", - "menu.scrap-storage": "Scrap storage", - "menu.split-receipt": "Split receipt", - "menu.production-area-shipment": "Production area shipment", - "menu.virtual-zone-shipping": "Virtual Zone Shipping", - "menu.labeling-and-bundling": "Labeling and bundling", - "menu.in-stock-management": "In stock management", - "menu.inventory-management": "Inventory management", - "menu.vehicle-management": "Vehicle management", - "menu.empty-vehicle-entering-the-warehouse": "Empty vehicle entering the warehouse", - "menu.empty-vehicle-leaving-the-warehouse": "Empty vehicle leaving the warehouse", - "menu.print-management": "Print management", - "menu.customer-label-printing": "Customer label printing", - "menu.scheduling-management": "Scheduling management", - "menu.task-management": "Task management", - "menu.rgv-status-query": "RGV status query", - "filter.area": "Area", - "filter.point": "Point", - "filter.mother-roll": "Mother roll", - "filter.state": "State", - "filter.starting-point": "Starting point", - "filter.finishing-point": "Finishing point", - "filter.device": "Device", - "filter.material": "Material", - "filter.quantity": "Quantity", - "filter.air-shaft": "Air shaft", - "filter.vehicle-code": "Vehicle code", - "filter.last-roll-down": "Last roll down", - "filter.cache-point": "Cache point", - "filter.wooden-box-code": "Wooden box code", - "filter.virtual-library": "Virtual library", - "filter.remark": "Remark", - "filter.document-type": "Document type", - "filter.keywords": "Keywords", - "filter.warehouse-area": "Warehouse area", - "grid.number": "No.", - "grid.select": "Select", - "grid.work-order-number": "Work order number", - "grid.mother-roll-number": "Mother roll number", - "grid.sub-roll-number": "Sub roll number", - "grid.start-time": "Start time", - "grid.end-time": "End time", - "grid.machine-code": "Machine code", - "grid.point-code": "Point code", - "grid.product-code": "Product code", - "grid.theoretical-length": "Theoretical length", - "grid.total-weight": "Total weight", - "grid.weight": "Weight", - "grid.total-net-weight": "total net weight", - "grid.net-weight": "Net weight", - "grid.details": "Details", - "grid.customer-code": "Customer code", - "grid.customer-name": "Customer name", - "grid.delivery-note": "Delivery note", - "grid.car-number": "Car number", - "grid.production-area": "Production area", - "grid.update-time": "Update time", - "grid.product-description": "Product description", - "grid.in-oven-time": "In oven time", - "grid.out-oven-time": "Out oven time", - "grid.is-it-baked": "Is it baked", - "grid.split-group": "Split group", - "grid.production-sequence": "Production sequence", - "grid.date-of-manufacture": "Date of manufacture", - "grid.order-number": "Order No.", - "grid.paper-FRP-tube": "Paper tube/FRP tube", - "grid.paper-tube-material-code": "Paper tube material code", - "grid.paper-tube-material-description": "Paper tube material description", - "grid.paper-tube-specifications": "Paper tube specifications", - "grid.FRP-pipe-material-code": "FRP pipe material code", - "grid.FRP-pipe-material-description": "FRP pipe material description", - "grid.FRP-pipe-specifications": "FRP pipe specifications", - "grid.place": "Place", - "grid.delivery-completed": "Delivery completed", - "grid.material-name": "Material name", - "grid.material-code": "Material code", - "grid.volume-number": "Volume number", - "grid.gross-weight-of-wooden-box": "Gross weight of wooden box", - "grid.sales-order-and-line-number": "Sales order and line number", - "grid.specifications": "Specifications", - "grid.warehousing-date": "Warehousing date", - "grid.task-number": "Task number", - "grid.pickup-point": "Pickup point", - "grid.release-point": "Release point", - "grid.task-type": "Task type", - "grid.generation-time": "Generation time", - "grid.device-code": "Device code", - "grid.device-name": "Device name", - "grid.coordinate": "Coordinate", - "grid.quantity-of-electricity": "quantity of electricity", - "grid.fault-name": "Fault name", - "grid.floor": "Floor", - "grid.is-stock": "Is there stock available", - "toast.point-not-empty": "The point cannot be empty", - "toast.select-cache-point": "Please select a cache point", - "toast.select-device": "Please select a device", - "toast.select-row": "Please select a row", - "toast.device-not-empty": "The device cannot be empty", - "toast.material-not-empty": "Material cannot be empty", - "toast.quantity-not-empty": "Quantity cannot be empty", - "toast.scan-wooden-box-code": "Please scan the wooden box code" + "title.call": "Call management", + "title.command": "Command management", + "title.task": "task management", + "call.sp": "start point", + "call.ep": "end point", + "call.toast": "The starting and ending points of the task cannot be the same", + "whole": "whole", + "ready": "ready", + "progress": "progress", + "complete": "complete", + "cancel": "cancel", + "command.revocation": "Command revocation", + "command.reissue": "Reissue", + "command.forced": "Forced completion", + "command.task-number": "task number", + "command.number": "Instruction number", + "command.steps": "Instruction execution steps", + "command.vnumber": "Vehicle number", + "command.carcode": "AGV vehicle number", + "command.priority": "Priority", + "startequip": "Starting equipment", + "targetquip": "Target equipment", + "keyword": "Keyword", + "time": "time", + "state": "state", + "regenerate": "Regenerate", + "forced-completion": "Forced completion" } \ No newline at end of file diff --git a/locale/id-1.json b/locale/id-1.json deleted file mode 100644 index 8e060d7..0000000 --- a/locale/id-1.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "button.check": "Inventar", - "button.abnormal": "Abnormal", - "button.normal": "Normal", - "filter.bill-code": "Kode dokumen", - "filter.warehouse": "gudang", - "filter.woodenbox": "Kotak kayu", - "filter.countednum": "Jumlah cakera", - "filter.uncountednum": "Titik tidak terhitung", - "grid.bill-code": "Nomor dokumen", - "grid.bill-type": "Jenis dokumen", - "grid.warehouse-name": "Nama gudang", - "grid.dtl-number": "Rincian", - "grid.status": "keadaan", - "grid.is-error": "Apakah itu abnormal", - "grid.create-man": "Pencipta", - "grid.create-time": "Waktu penciptaan", - "grid.confirm-man": "Dikonfirmasi oleh", - "grid.confirm-time": "Konfirmasi waktu", - "grid.storagevehicle-code": "Nomor kotak", - "grid.weight": "Berat jaring", - "grid.check-area": "Area penyimpanan inventaris", - "grid.check-point": "Lokasi penyimpanan inventaris", - "grid.material-code": "Kode materi", - "grid.material-name": "Nama Material", - "grid.mark": "Catatan", - "grid.rolls-num": "Jumlah gulungan", - "grid.check-result": "Hasil inventaris", - "grid.check-man": "Orang inventaris", - "grid.check-time": "Waktu inventaris" -} \ No newline at end of file diff --git a/locale/id.json b/locale/id.json deleted file mode 100644 index 0ea29ec..0000000 --- a/locale/id.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "utils.loading": "Memuatkan...", - "uni.dataSelect.placeholder": "Silakan pilih", - "uni.dataSelect.emptyTips": "Tidak ada pilihan tersedia", - "utils.read-more": "Lihat lebih", - "utils.no-more": "Tidak lagi", - "button.confirm": "OK", - "button.cancel": "Batalkan", - "button.search": "pertanyaan", - "button.confirm-receipt": "Konfirmasi penerimaan", - "button.confirm-outbound": "Konfirmasi keluar", - "button.empty-shaft-return": "Kembali shaft kosong", - "button.full-shaft-return": "Paksi penuh kembali", - "button.through-shaft-confirm": "Melalui konfirmasi shaft", - "button.pull-shaft-confirm": "Pull shaft konfirmasi", - "button.overlap-shaft-confirm": "Konfirmasi paksi Overlap", - "button.manual-call": "Panggilan manual", - "button.call": "Panggilan", - "button.vehicle-lateral-movement": "Gerakan lateral kendaraan", - "button.call-vehicle": "Panggil kendaraan", - "button.delivery-check": "Verifikasi pengiriman", - "button.delivery-confirm": "Konfirmasi pengiriman", - "button.vehicle-return": "Kembali kendaraan", - "button.upload-empty-shaft": "Memuat naik shaft kosong", - "button.scrap-foil-roll-down": "Scrap foil roll down", - "button.outbound-delivery": "Pengiriman keluar", - "button.storage-settings": "Pengaturan penyimpanan", - "button.storage-confirm": "Konfirmasi penerimaan", - "button.complement": "Tambahan", - "button.labeling": "Label", - "button.binding": "Binding", - "button.print": "Mencetak", - "button.force-complete": "Pelengkapan terpaksa", - "button.reissue": "Keluaran ulang", - "login.username": "Nama pengguna", - "login.password": "Sandi", - "login.remember": "Ingat nama pengguna", - "login.settings": "Pengaturan", - "login.upgrade": "Versi terbaik", - "login.login": "Login", - "login.text1": "Selamat datang di", - "login.text2": "Hailiang Copper Foil Handheld System!", - "setting.language": "Bahasa", - "setting.server": "Alamat server", - "setting.refresh": "Waktu segar", - "setting.customer-label-printing": "Label pelanggan", - "setting.language-change-confirm": "Menggunakan pengaturan ini akan memulai ulang aplikasi", - "upgrade.new-version": "Menemukan versi baru", - "upgrade.text1": "Hailiang Copper Foil memiliki versi baru, meningkatkan ke versi terbaru, dan menikmati fungsi dan pengalaman yang lebih kaya, lebih stabil, dan lebih cepat!", - "upgrade.text2": "Mengunduh paket pemasangan dalam proses, silakan tunggu", - "upgrade.upgrade-now": "Meningkatkan sekarang", - "home.title": "Halaman rumah", - "home.message": "Selamat datang di sistem foil tembaga!", - "home.exit": "Keluar", - "menu.production-management": "Manajemen produksi", - "menu.production-progress-of-raw-foil": "Kemajuan produksi dari folio mentah", - "menu.foil-production-process": "Proses produksi folium", - "menu.baking-process": "Proses bakar", - "menu.manual-baking": "Pembakaran manual", - "menu.semi-finished-product-management": "Manajemen produk semi-selesai", - "menu.semi-finished-product-warehousing": "Penjagaan produk semi-selesai", - "menu.semi-finished-products-outbound": "Semi produk selesai keluar", - "menu.splitting-management": "Manajemen pembagian", - "menu.cutting-and-feeding": "Memotong dan memberi makan", - "menu.hollow-shaft-sleeve": "Lengan peluru kosong", - "menu.empty-shaft-delivery": "Pengiriman shaft kosong", - "menu.empty-shaft-entry-station": "Stasiun masuk shaft kosong", - "menu.subroll-outbound": "Subroll Keluar", - "menu.point-management": "Manajemen titik", - "menu.abnormal-outbound-unlocking": "Pembukaan keluar tidak normal", - "menu.paper-frp-management": "Manajemen tabung kertas/FRP", - "menu.air-traffic-control-warehousing": "Penjagaan kendali lalu lintas udara", - "menu.air-traffic-control-outbound": "Kontrol lalu lintas udara keluar", - "menu.finished-product-management": "Manajemen produk selesai", - "menu.production-warehousing": "Gudang produksi", - "menu.return-to-warehouse": "Kembali ke gudang", - "menu.scrap-storage": "Skrap penyimpanan", - "menu.split-receipt": "Pembahagian menerima", - "menu.production-area-shipment": "Pengiriman daerah produksi", - "menu.virtual-zone-shipping": "Pengiriman Zona Virtual", - "menu.labeling-and-bundling": "Labeling dan bundling", - "menu.in-stock-management": "Dalam manajemen saham", - "menu.inventory-management": "Manajemen inventori", - "menu.vehicle-management": "Manajemen kendaraan", - "menu.empty-vehicle-entering-the-warehouse": "Kendaraan kosong masuk ke gudang", - "menu.empty-vehicle-leaving-the-warehouse": "Kendaraan kosong meninggalkan gudang", - "menu.print-management": "Manajemen Cetak", - "menu.customer-label-printing": "Cetakan label pelanggan", - "menu.scheduling-management": "Manajemen jadwal", - "menu.task-management": "Manajemen tugas", - "menu.rgv-status-query": "Pertanyaan status RGV", - "filter.area": "Daerah", - "grid.number": "Nomor", - "grid.select": "Pilihan", - "filter.keywords": "Kata kunci", - "filter.warehouse-area": "Daerah gudang", - "filter.point": "Posisi titik", - "filter.mother-roll": "Mother roll", - "filter.state": "Keadaan", - "filter.starting-point": "Titik awal", - "filter.finishing-point": "Titik akhir", - "filter.device": "Peralatan", - "filter.material": "Material", - "filter.quantity": "Jumlah", - "filter.air-shaft": "Paksi inflasi", - "filter.vehicle-code": "Kode kendaraan", - "filter.last-roll-down": "Roll terakhir turun", - "filter.cache-point": "Titik Cache", - "filter.wooden-box-code": "Kode kotak kayu", - "filter.virtual-library": "Pustaka Virtual", - "filter.remark": "komentar", - "filter.document-type": "Jenis dokumen", - "grid.work-order-number": "Nomor urutan kerja", - "grid.mother-roll-number": "Nomor roll ibu", - "grid.sub-roll-number": "Nomor sub roll", - "grid.start-time": "Waktu awal", - "grid.end-time": "Waktu akhir", - "grid.machine-code": "Koding mesin", - "grid.point-code": "Kode titik", - "grid.product-code": "Kode produk", - "grid.theoretical-length": "Panjang teori", - "grid.total-weight": "Total berat", - "grid.weight": "Berat", - "grid.total-net-weight": "Total berat neto", - "grid.net-weight": "Berat jaring", - "grid.details": "Rincian", - "grid.customer-code": "Kode pelanggan", - "grid.customer-name": "Nama Pelanggan", - "grid.delivery-note": "Catatan pengiriman", - "grid.car-number": "Nomor mobil", - "grid.production-area": "Area produksi", - "grid.update-time": "Waktu kemaskini", - "grid.product-description": "Deskripsi Produk", - "grid.in-oven-time": "Waktunya memasuki oven", - "grid.out-oven-time": "Waktunya meninggalkan oven", - "grid.is-it-baked": "Apakah sudah dipanggang", - "grid.split-group": "Grup pembagian", - "grid.production-sequence": "Jujukan produksi", - "grid.date-of-manufacture": "Tarikh produksi", - "grid.order-number": "Nomor perintah", - "grid.paper-FRP-tube": "Tuba kertas/Tuba FRP", - "grid.paper-tube-material-code": "Kode bahan tub kertas", - "grid.paper-tube-material-description": "Deskripsi material tabung kertas", - "grid.paper-tube-specifications": "Spesifikasi tabung kertas", - "grid.FRP-pipe-material-code": "Kode bahan pipa FRP", - "grid.FRP-pipe-material-description": "Deskripsi bahan pipa FRP", - "grid.FRP-pipe-specifications": "Spesifikasi pipa FRP", - "grid.place": "Tempat", - "grid.delivery-completed": "Pengiriman selesai", - "grid.material-name": "Nama Material", - "grid.material-code": "Kode materi", - "grid.volume-number": "Jumlah gulungan", - "grid.gross-weight-of-wooden-box": "Berat bruto kotak kayu", - "grid.sales-order-and-line-number": "Perintah penjualan dan nomor baris", - "grid.specifications": "Spesifikasi", - "grid.warehousing-date": "Tanggal penyimpanan", - "grid.task-number": "Nomor tugas", - "grid.pickup-point": "Titik pemilihan", - "grid.release-point": "Titik pembebasan", - "grid.task-type": "Jenis tugas", - "grid.generation-time": "Waktu generasi", - "grid.device-code": "Pengkodan peralatan", - "grid.device-name": "Nama Peranti", - "grid.coordinate": "Koordinat", - "grid.quantity-of-electricity": "Tingkat listrik", - "grid.fault-name": "Nama salah", - "grid.floor": "Lantai", - "grid.is-stock": "Apakah ada saham tersedia", - "toast.point-not-empty": "Titik tidak dapat kosong", - "toast.select-cache-point": "Silakan pilih lokasi cache", - "toast.select-device": "Silakan pilih perangkat", - "toast.select-row": "Silakan pilih baris", - "toast.device-not-empty": "Perangkat tidak dapat kosong", - "toast.material-not-empty": "Material tidak dapat kosong", - "toast.quantity-not-empty": "Kuantitas tidak dapat kosong", - "toast.scan-wooden-box-code": "Silakan imbas kode kotak kayu" -} \ No newline at end of file diff --git a/locale/index.js b/locale/index.js index d884449..9a549bd 100644 --- a/locale/index.js +++ b/locale/index.js @@ -1,14 +1,19 @@ +import Vue from 'vue' +import VueI18n from 'vue-i18n' import en from './en.json' -import en1 from './en-1.json' +import enUni from './uni-app.en.json' import zhHans from './zh-Hans.json' -import zhHans1 from './zh-Hans-1.json' -import id from './id.json' -import id1 from './id-1.json' +import zhUni from './uni-app.zh-Hans.json' +import ko from './ko.json' +import koUni from './uni-app.ko.json' + +Vue.use(VueI18n) + const messages = { - 'en': Object.assign(en, en1), - 'zh-Hans': Object.assign(zhHans, zhHans1), - 'id': Object.assign(id, id1) + 'en': Object.assign(en, enUni), + 'zh-Hans': Object.assign(zhHans, zhUni), + 'ko': Object.assign(ko, koUni) } let i18nConfig = { @@ -17,10 +22,6 @@ let i18nConfig = { messages } -import Vue from 'vue' -import VueI18n from 'vue-i18n' -Vue.use(VueI18n) - const i18n = new VueI18n(i18nConfig) export default i18n diff --git a/locale/ko.json b/locale/ko.json new file mode 100644 index 0000000..c3cc9c5 --- /dev/null +++ b/locale/ko.json @@ -0,0 +1,58 @@ +{ + "utils.loading": "로드 중...", + "uni.dataSelect.placeholder": "선택하십시오", + "uni.dataSelect.emptyTips": "옵션 없음", + "utils.read-more": "자세히 보기", + "utils.no-more": "더 이상 없음", + "button.confirm": "확인", + "button.cancel": "취소", + "button.empty": "비우기", + "button.search": "질의", + "button.handtask": "운반 임무", + "login.username": "사용자 이름", + "login.password": "암호", + "login.remember": "사용자 이름 기억하기", + "login.settings": "설치", + "login.upgrade": "업그레이드 버전", + "login.login": "로그인", + "login.text1": "두산 ACS 시스템에", + "login.text2": "오신 것을 환영합니다!", + "setting.language": "언어", + "setting.server": "서버 주소", + "setting.refresh": "刷新时间", + "setting.language-change-confirm": "이 설정을 적용하면 App이 다시 시작됩니다.", + "upgrade.new-version": "새 버전 검색", + "upgrade.text1": "한국 두산 acs 시스템은 또 새로운 버전이 있습니다. 최신 버전으로 업그레이드하여 더욱 풍부하고 안정적이며 빠른 기능과 체험을 즐길 수 있습니다!", + "upgrade.text2": "패키지 다운로드 중, 나중에", + "upgrade.upgrade-now": "지금 업그레이드", + "home.title": "첫 페이지", + "home.message": "두산 ACS 시스템에 오신 것을 환영합니다!", + "home.exit": "종료", + "title.call": "콜 관리", + "title.command": "명령 관리", + "title.task": "작업 관리", + "call.sp": "작업 시작", + "call.ep": "작업 끝", + "call.toast": "작업 시작점과 끝점은 같을 수 없습니다.", + "whole": "모두", + "ready": "준비", + "progress": "실행 중", + "complete": "완료", + "cancel": "취소", + "command.revocation": "명령 취소", + "command.reissue": "재발급", + "command.forced": "강제 완료", + "command.task-number": "작업 번호", + "command.number": "명령 번호", + "command.steps": "명령 실행 단계", + "command.vnumber": "캐리어 번호", + "command.carcode": "agv 차량 번호", + "command.priority": "우선 순위", + "startequip": "시작 장치", + "targetquip": "대상 장치", + "keyword": "키워드", + "time": "시간", + "state": "상태", + "regenerate": "재생성", + "forced-completion": "강제 완료" +} \ No newline at end of file diff --git a/locale/uni-app.ko.json b/locale/uni-app.ko.json new file mode 100644 index 0000000..6567370 --- /dev/null +++ b/locale/uni-app.ko.json @@ -0,0 +1,36 @@ +{ + "common": { + "uni.app.quit": "한 번 더 눌러서 종료하기", + "uni.async.error": "서버 연결 시간 초과, 화면을 클릭하여 다시 시도", + "uni.showActionSheet.cancel": "취소", + "uni.showToast.unpaired": "showToast와 hideToast는 반드시 쌍으로 사용해야 합니다", + "uni.showLoading.unpaired": "showLoading과 hideLoading은 쌍으로 사용해야 합니다", + "uni.showModal.cancel": "취소", + "uni.showModal.confirm": "확인", + "uni.chooseImage.cancel": "취소", + "uni.chooseImage.sourceType.album": "앨범에서 선택", + "uni.chooseImage.sourceType.camera": "촬영", + "uni.chooseVideo.cancel": "취소", + "uni.chooseVideo.sourceType.album": "앨범에서 선택", + "uni.chooseVideo.sourceType.camera": "촬영", + "uni.previewImage.cancel": "취소", + "uni.previewImage.button.save": "이미지 저장", + "uni.previewImage.save.success": "그림을 앨범에 저장했습니다", + "uni.previewImage.save.fail": "그림을 앨범에 저장하지 못했습니다", + "uni.setClipboardData.success": "컨텐트가 복사됨", + "uni.scanCode.title": "스캔", + "uni.scanCode.album": "앨범", + "uni.scanCode.fail": "확인 실패", + "uni.scanCode.flash.on": "가볍게 터치하여 밝게 비추기", + "uni.scanCode.flash.off": "가볍게 터치하여 닫기", + "uni.startSoterAuthentication.authContent": "지문 인식 중...", + "uni.picker.done": "완료", + "uni.picker.cancel": "취소", + "uni.video.danmu": "탄막", + "uni.video.volume": "볼륨", + "uni.button.feedback.title": "질문 피드백", + "uni.button.feedback.send": "발송" + }, + "ios": {}, + "android": {} +} \ No newline at end of file diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json deleted file mode 100644 index c482244..0000000 --- a/locale/zh-Hans-1.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "button.check": "盘点", - "button.abnormal": "异常", - "button.normal": "正常", - "filter.bill-code": "单据编码", - "filter.warehouse": "仓库", - "filter.woodenbox": "木箱", - "filter.countednum": "已盘点数", - "filter.uncountednum": "未盘点数", - "grid.bill-code": "单据号", - "grid.bill-type": "单据类型", - "grid.warehouse-name": "仓库名称", - "grid.dtl-number": "明细数", - "grid.status": "状态", - "grid.is-error": "是否异常", - "grid.create-man": "创建人", - "grid.create-time": "创建时间", - "grid.confirm-man": "确认人", - "grid.confirm-time": "确认时间", - "grid.storagevehicle-code": "箱号", - "grid.weight": "净重", - "grid.check-area": "盘点库区", - "grid.check-point": "盘点货位", - "grid.material-code": "物料编码", - "grid.material-name": "物料名称", - "grid.mark": "备注", - "grid.rolls-num": "卷数", - "grid.check-result": "盘点结果", - "grid.check-man": "盘点人", - "grid.check-time": "盘点时间", - "grid.expected-end-time": "预计结束时间", - "grid.remain-time": "剩余时间(分)" -} \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 6faa0ae..31599ea 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -6,32 +6,9 @@ "utils.no-more": "没有更多", "button.confirm": "确定", "button.cancel": "取消", + "button.empty": "清空", "button.search": "查询", - "button.confirm-receipt": "确认入库", - "button.confirm-outbound": "确认出库", - "button.empty-shaft-return": "空轴送回", - "button.full-shaft-return": "满轴送回", - "button.through-shaft-confirm": "穿轴确认", - "button.pull-shaft-confirm": "拔轴确认", - "button.overlap-shaft-confirm": "套轴确认", - "button.manual-call": "人工呼叫", - "button.call": "呼叫", - "button.vehicle-lateral-movement": "载具横移", - "button.call-vehicle": "呼叫载具", - "button.delivery-check": "配送校验", - "button.delivery-confirm": "配送确认", - "button.vehicle-return": "载具送回", - "button.upload-empty-shaft": "上空轴", - "button.scrap-foil-roll-down": "废箔下卷", - "button.outbound-delivery": "出站配送", - "button.storage-settings": "入库设置", - "button.storage-confirm": "入库确认", - "button.complement": "补码", - "button.labeling": "贴标", - "button.binding": "捆扎", - "button.print": "打印", - "button.force-complete": "强制完成", - "button.reissue": "重新下发", + "button.handtask": "搬运任务", "login.username": "用户名", "login.password": "密码", "login.remember": "记住用户名", @@ -39,139 +16,43 @@ "login.upgrade": "升级版本", "login.login": "登录", "login.text1": "欢迎来到", - "login.text2": "海亮铜箔手持系统！", + "login.text2": "韩国斗山acs系统！", "setting.language": "语言", "setting.server": "服务器地址", "setting.refresh": "刷新时间", - "setting.customer-label-printing": "客户标签打印", "setting.language-change-confirm": "应用此设置将重启App", "upgrade.new-version": "发现新版本", - "upgrade.text1": "海亮铜箔又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", + "upgrade.text1": "韩国斗山acs系统又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", "upgrade.text2": "安装包下载中，请稍后", "upgrade.upgrade-now": "立即升级", "home.title": "首页", - "home.message": "欢迎进入铜箔手持系统！", + "home.message": "欢迎进入韩国斗山acs系统！", "home.exit": "退出", - "menu.production-management": "生产管理", - "menu.production-progress-of-raw-foil": "生箔生产进度", - "menu.foil-production-process": "生箔工序", - "menu.baking-process": "烘烤工序", - "menu.manual-baking": "人工烘烤", - "menu.semi-finished-product-management": "半成品管理", - "menu.semi-finished-product-warehousing": "半成品入库", - "menu.semi-finished-products-outbound": "半成品出库", - "menu.splitting-management": "分切管理", - "menu.cutting-and-feeding": "分切上料", - "menu.hollow-shaft-sleeve": "空轴套管", - "menu.empty-shaft-delivery": "空轴配送", - "menu.empty-shaft-entry-station": "空轴进站", - "menu.subroll-outbound": "子卷出站", - "menu.point-management": "点位管理", - "menu.abnormal-outbound-unlocking": "异常出库解锁", - "menu.paper-frp-management": "纸管/FRP管管理", - "menu.air-traffic-control-warehousing": "空管入库", - "menu.air-traffic-control-outbound": "空管出库", - "menu.finished-product-management": "成品管理", - "menu.production-warehousing": "生产入库", - "menu.return-to-warehouse": "退货入库", - "menu.scrap-storage": "报废入库", - "menu.split-receipt": "拆分入库", - "menu.production-area-shipment": "生产区发货", - "menu.virtual-zone-shipping": "虚拟区发货", - "menu.labeling-and-bundling": "贴标捆扎", - "menu.in-stock-management": "在库管理", - "menu.inventory-management": "盘点管理", - "menu.vehicle-management": "载具管理", - "menu.empty-vehicle-entering-the-warehouse": "空载具入库", - "menu.empty-vehicle-leaving-the-warehouse": "空载具出库", - "menu.print-management": "打印管理", - "menu.customer-label-printing": "客户标签打印", - "menu.scheduling-management": "调度管理", - "menu.task-management": "任务管理", - "menu.rgv-status-query": "RGV状态查询", - "filter.area": "区域", - "filter.point": "点位", - "filter.mother-roll": "母卷", - "filter.state": "状态", - "filter.starting-point": "起点", - "filter.finishing-point": "起点", - "filter.device": "设备", - "filter.material": "物料", - "filter.quantity": "数量", - "filter.air-shaft": "气涨轴", - "filter.vehicle-code": "载具码", - "filter.last-roll-down": "末次下卷", - "filter.cache-point": "缓存点位", - "filter.wooden-box-code": "木箱码", - "filter.virtual-library": "虚拟库", - "filter.remark": "备注", - "filter.document-type": "单据类型", - "filter.keywords": "关键字", - "filter.warehouse-area": "库区", - "grid.number": "序号", - "grid.select": "选择", - "grid.work-order-number": "工单号", - "grid.mother-roll-number": "母卷号", - "grid.sub-roll-number": "子卷号", - "grid.start-time": "开始时间", - "grid.end-time": "结束时间", - "grid.machine-code": "机台编码", - "grid.point-code": "点位编码", - "grid.product-code": "产品编码", - "grid.theoretical-length": "理论长度", - "grid.total-weight": "总重量", - "grid.weight": "重量", - "grid.total-net-weight": "总净重", - "grid.net-weight": "净重", - "grid.details": "明细数", - "grid.customer-code": "客户编码", - "grid.customer-name": "客户名称", - "grid.delivery-note": "交货单", - "grid.car-number": "车号", - "grid.production-area": "生产区域", - "grid.update-time": "更新时间", - "grid.product-description": "产品描述", - "grid.in-oven-time": "入烘箱时间", - "grid.out-oven-time": "出烘箱时间", - "grid.is-it-baked": "是否烘烤", - "grid.split-group": "分切组", - "grid.production-sequence": "生产顺序", - "grid.date-of-manufacture": "生产日期", - "grid.order-number": "订单号", - "grid.paper-FRP-tube": "纸筒/FRP管", - "grid.paper-tube-material-code": "纸筒物料编码", - "grid.paper-tube-material-description": "纸筒物料描述", - "grid.paper-tube-specifications": "纸筒规格", - "grid.FRP-pipe-material-code": "FRP管物料编码", - "grid.FRP-pipe-material-description": "FRP管物料描述", - "grid.FRP-pipe-specifications": "FRP管规格", - "grid.place": "位置", - "grid.delivery-completed": "配送完成", - "grid.material-name": "物料名称", - "grid.material-code": "物料编码", - "grid.volume-number": "卷数", - "grid.gross-weight-of-wooden-box": "木箱毛重", - "grid.sales-order-and-line-number": "销售订单及行号", - "grid.specifications": "规格", - "grid.warehousing-date": "入库日期", - "grid.task-number": "任务号", - "grid.pickup-point": "取货点", - "grid.release-point": "放货点", - "grid.task-type": "任务类型", - "grid.generation-time": "生成时间", - "grid.device-code": "设备编码", - "grid.device-name": "设备名称", - "grid.coordinate": "坐标", - "grid.quantity-of-electricity": "电量", - "grid.fault-name": "故障名称", - "grid.floor": "楼层", - "grid.is-stock": "是否有货", - "toast.point-not-empty": "点位不能为空", - "toast.select-cache-point": "请选择缓存点位", - "toast.select-device": "请选择设备", - "toast.select-row": "请选择一行", - "toast.device-not-empty": "设备不能为空", - "toast.material-not-empty": "物料不能为空", - "toast.quantity-not-empty": "数量不能为空", - "toast.scan-wooden-box-code": "请扫木箱码" + "title.call": "呼叫管理", + "title.command": "指令管理", + "title.task": "任务管理", + "call.sp": "任务起点", + "call.ep": "任务终点", + "call.toast": "任务起点终点不能相同", + "whole": "全部", + "ready": "就绪", + "progress": "执行中", + "complete": "完成", + "cancel": "取消", + "command.revocation": "指令撤销", + "command.reissue": "重新下发", + "command.forced": "强制完成", + "command.task-number": "任务号", + "command.number": "指令号", + "command.steps": "指令执行步骤", + "command.vnumber": "载具号", + "command.carcode": "agv车号", + "command.priority": "优先级", + "startequip": "起始设备", + "targetquip": "目标设备", + "keyword": "关键字", + "time": "时间", + "state": "状态", + "regenerate": "重新生成", + "forced-completion": "强制完成" } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 59a237f..3559192 100644 --- a/manifest.json +++ b/manifest.json @@ -113,5 +113,5 @@ "base" : "./" } }, - "locale" : "auto" + "locale" : "ko" } diff --git a/pages.json b/pages.json index b1768ef..ad5f40f 100644 --- a/pages.json +++ b/pages.json @@ -42,22 +42,6 @@ } } - ,{ - "path" : "pages/manage/sb-point-manage", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/manage/agv-call-manage", - "style" : - { - "navigationStyle": "custom" - } - - } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index 239b12e..d45c72f 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,15 +1,15 @@