diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
index 27c434e..38810e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
@@ -82,7 +82,7 @@ public class KpiController extends BaseController {
* @return 货位分析数据
*/
@GetMapping("/spaceAnalysis")
- public AjaxResult getSpaceAnalysis(@RequestParam("warehouseId") String warehouseId) {
+ public AjaxResult getSpaceAnalysis(@RequestParam(value = "warehouseId",required = false) String warehouseId) {
return success(kpiService.getSpaceAnalysis(warehouseId));
}
diff --git a/ruoyi-ui/src/components/DictData/index.js b/ruoyi-ui/src/components/DictData/index.js
index 556d3d6..745e6cc 100644
--- a/ruoyi-ui/src/components/DictData/index.js
+++ b/ruoyi-ui/src/components/DictData/index.js
@@ -37,7 +37,7 @@ function install() {
...item,
dictLabel: i18n.t(item.dictLabel) || item.dictLabel
}))
- //console.log(translatedData)
+ console.log(translatedData)
store.dispatch('dict/setDict', { key: dictMeta.type, value: translatedData })
resolve(translatedData)
}).catch(error => {
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index 6a2b260..6f20f57 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -40,10 +40,10 @@
@change="handleQuery"
>
@@ -282,8 +282,6 @@ export default {
return {
// 仓库选项列表
warehouseOptions: [],
- // 单据状态字典
- statusOptions: [],
// 遮罩层
loading: true,
detailLoading: true,
@@ -520,12 +518,6 @@ export default {
this.getList()
})
},
- /** 获取字典数据 */
- getDictList() {
- getDicts("receive_bill_status").then(response => {
- this.statusOptions = response.data;
- });
- },
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse(this.queryWarehouseParams).then(response => {
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index b0cf1a7..190cc08 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -107,8 +107,8 @@
- {{ scope.row.dictLabel }}
- {{ scope.row.dictLabel }}
+ {{ $t(scope.row.dictLabel) }}
+ {{ $t(scope.row.dictLabel) }}