202104221700

app/src/components/AssetGroup.vue

@@ -117,6 +117,7 @@
                     >
                         <template v-slot:activator='{ on, attrs }'>
                             <v-btn
+                                v-if="level === 0"
                                     v-bind='attrs'
                                     v-on='on'
                                     icon
@@ -202,12 +203,14 @@
                             </template>
                             <template v-slot:item.actions='{ item }'>
                                 <v-btn
+                                    v-if="level === 0"
                                         icon
                                         @click='openDialogModifyCol(item)'
                                 >
                                     <v-icon>mdi-pencil</v-icon>
                                 </v-btn>
                                 <v-icon
+                                        v-if="level === 0"
                                         small
                                         @click='deleteCol(item)'
                                 >
@@ -226,6 +229,7 @@
                                     >
                                         <template v-slot:activator='{ on, attrs }'>
                                             <v-btn
+                                                    v-if="level === 0"
                                                     v-bind='attrs'
                                                     v-on='on'
                                                     color='primary'
@@ -824,7 +828,7 @@
                 this.optionIconShow = index;
             },
             async deleteAssertGroup(item) {
-                let yes = confirm('確認刪除此群組?');
+                let yes = confirm(`確認刪除${item.text}類資產清冊?`);
                 if (yes) {
                     await this.$axios.delete(`/assert/assertGroups?tablename=${item.value}`).then(() => {
                         // this.getTabs();

app/src/components/Inventory.vue

@@ -20,6 +20,7 @@
             </v-card>
         </v-dialog>
         <v-data-table class="" :headers="headers" :items="items"
+
                       disable-sort
                       fixed-header
                       :footer-props="{'items-per-page-options': [30, 40, 50, 60]}"
@@ -285,6 +286,9 @@
                     </v-icon>
                 </div>
             </template>
+          <template v-slot:item.id="{ item }">
+            {{items.indexOf(item) + 1}}
+          </template>
         </v-data-table>
         <!--修改對話-->
         <v-dialog

src/main/java/com/moze/rms/controller/AccountController.java

@@ -6,6 +6,7 @@ import com.moze.rms.entity.model.Account;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 
@@ -18,7 +19,7 @@ public class AccountController {
 
     @PostMapping("/login")
     public JsonResult login(@RequestBody Map<String, String> data) {
-        Optional<Map<String, Object>> user = accountDAO.findUser(data.get("account"));
+        Optional<Map<String, Object>> user = accountDAO.findUser(data.get("account").toLowerCase());
         if (user.isPresent() && user.get().get("pwd").equals(data.get("password"))) {
             return new JsonResult(StatusCode.SUCCESS, user);
         } else {

src/main/java/com/moze/rms/dao/AccountDAO.java

@@ -15,7 +15,7 @@ public interface AccountDAO extends SqlObject {
     @RegisterBeanMapper(Object.class)
     default Optional<Map<String, Object>> findUser(String account) {
         Handle handle = this.getHandle();
-        String sql = "select * from account where account = '" + account + "'";
+        String sql = "select * from account where lower(account) = '" + account + "'";
         return handle.createQuery(sql).mapToMap().findOne();
     }
 

src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=pro
+#spring.profiles.active=dev
+spring.profiles.active=pro
 
 server.servlet.context-path=/rms
 spring.servlet.multipart.max-file-size=100MB