歷史報表檢視
-
+
+
-
-
diff --git a/app/src/components/Home.vue b/app/src/components/Home.vue
index 291a2e3..7b98ed3 100644
--- a/app/src/components/Home.vue
+++ b/app/src/components/Home.vue
@@ -46,9 +46,9 @@
:to="item.route"
class="px-0 pl-5"
>
-
-
-
+
+
+
-
-
+ {{ item.text }}
+
+
-
- {{item.fileName}}
-
-
-
-
- {{snackbarMessage}}.
-
+
+
+
+
+
+
+
+ mdi-pencil
+
+
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 修改
+
+
+
+
+
+ mdi-delete
+
+
+
+
+
+
+
+
+
+
- 重新產生報表
+ mdi-plus
- 以選定日期重新產生報表, 不會發送 Email 及 FTP
-
+
+
+ 新增資產群組
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 新增
+
+
+
+
-
-
+
+
+
+ 新增欄位
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 修改
+
+
+
+
+
+
+ 
+
+
+
+
diff --git a/app/src/components/Search.vue b/app/src/components/Search.vue
new file mode 100644
index 0000000..8d896a9
--- /dev/null
+++ b/app/src/components/Search.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+ mdi-magnify
+
+
+
+
+
+ 搜尋結果
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
+ mdi-file-export-outline
+
+
+
+
+
+
+ 歷史報表 -- 共 {{reports.length}} 筆
+
+
+
+
+
+
+ {{item.fileName}}
+
+
+
+
+ {{snackbarMessage}}.
+
+
+
+
diff --git a/app/src/router/index.js b/app/src/router/index.js
index f303177..746b312 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -4,6 +4,8 @@ import Login from '@/components/Login'
import Home from '../components/Home';
import AssetGroup from '../components/AssetGroup';
import Inventory from '../components/Inventory';
+// import Search from '../components/Search';
+import MockSearch from '../components/MockSearch';
Vue.use(Router);
@@ -14,20 +16,25 @@ export const constantRoutes = [
component: Login,
},
{
- path: '/home',
+ path: '/',
component: Home,
name: 'home',
children: [
{
- path: '/asset_group',
+ path: 'asset_group',
name: 'asset_group',
component: AssetGroup
},
{
- path: '/inventory/:tablename',
+ path: 'inventory/:tablename',
name: 'inventory',
component: Inventory
},
+ {
+ path: 'search',
+ name: 'search',
+ component: MockSearch
+ },
]
}
];
diff --git a/src/main/java/com/moze/rms/config/JdbiFactory.java b/src/main/java/com/moze/rms/config/JdbiFactory.java
index 608f789..b3c9630 100644
--- a/src/main/java/com/moze/rms/config/JdbiFactory.java
+++ b/src/main/java/com/moze/rms/config/JdbiFactory.java
@@ -1,8 +1,6 @@
package com.moze.rms.config;
-import com.moze.rms.dao.InventoryDAO;
-import com.moze.rms.dao.MappingColDAO;
-import com.moze.rms.dao.MappingTableDAO;
+import com.moze.rms.dao.*;
import org.jdbi.v3.core.Jdbi;
import org.jdbi.v3.core.statement.SqlLogger;
import org.jdbi.v3.core.statement.StatementContext;
@@ -66,4 +64,16 @@ public class JdbiFactory {
public InventoryDAO inventoryDAO(Jdbi jdbi) {
return jdbi.onDemand(InventoryDAO.class);
}
+
+ @Bean
+ public AccountDAO accountDAO(Jdbi jdbi) {
+ return jdbi.onDemand(AccountDAO.class);
+ }
+
+ @Bean
+ public AssertDAO assertDAO(Jdbi jdbi) {
+ return jdbi.onDemand(AssertDAO.class);
+ }
+
+
}
diff --git a/src/main/java/com/moze/rms/controller/AccountController.java b/src/main/java/com/moze/rms/controller/AccountController.java
index f9d7187..86fb9e2 100644
--- a/src/main/java/com/moze/rms/controller/AccountController.java
+++ b/src/main/java/com/moze/rms/controller/AccountController.java
@@ -1,10 +1,31 @@
package com.moze.rms.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.moze.rms.dao.AccountDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
@RestController
@RequestMapping("/api/account")
public class AccountController {
+
+ @Autowired
+ AccountDAO accountDAO;
+
+ @PostMapping("/login")
+ public JsonResult login(@RequestBody Map歷史報表檢視
+
+
+
+
+ 重新產生報表
+
+
+ 以選定日期重新產生報表, 不會發送 Email 及 FTP
+
+
+