RuoYi пре 5 година
родитељ
комит
b887f1f946

+ 5 - 5
ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm

@@ -6,17 +6,17 @@ values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${business
6
 SELECT @parentId := LAST_INSERT_ID();
6
 SELECT @parentId := LAST_INSERT_ID();
7
 
7
 
8
 -- 按钮 SQL
8
 -- 按钮 SQL
9
-insert into sys_menu  (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
9
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
10
 values('${functionName}查询', @parentId, '1',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:query',        '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
10
 values('${functionName}查询', @parentId, '1',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:query',        '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
11
 
11
 
12
-insert into sys_menu  (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
12
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
13
 values('${functionName}新增', @parentId, '2',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:add',          '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
13
 values('${functionName}新增', @parentId, '2',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:add',          '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
14
 
14
 
15
-insert into sys_menu  (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
15
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
16
 values('${functionName}修改', @parentId, '3',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:edit',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
16
 values('${functionName}修改', @parentId, '3',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:edit',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
17
 
17
 
18
-insert into sys_menu  (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
18
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
19
 values('${functionName}删除', @parentId, '4',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:remove',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
19
 values('${functionName}删除', @parentId, '4',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:remove',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
20
 
20
 
21
-insert into sys_menu  (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
21
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
22
 values('${functionName}导出', @parentId, '5',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:export',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
22
 values('${functionName}导出', @parentId, '5',  '#', '', 1,  'F', '0',  '0', '${permissionPrefix}:export',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');

+ 0 - 4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -375,8 +375,6 @@ export default {
375
                 this.msgSuccess("修改成功");
375
                 this.msgSuccess("修改成功");
376
                 this.open = false;
376
                 this.open = false;
377
                 this.getList();
377
                 this.getList();
378
-              } else {
379
-                this.msgError(response.msg);
380
               }
378
               }
381
             });
379
             });
382
           } else {
380
           } else {
@@ -385,8 +383,6 @@ export default {
385
                 this.msgSuccess("新增成功");
383
                 this.msgSuccess("新增成功");
386
                 this.open = false;
384
                 this.open = false;
387
                 this.getList();
385
                 this.getList();
388
-              } else {
389
-                this.msgError(response.msg);
390
               }
386
               }
391
             });
387
             });
392
           }
388
           }

+ 0 - 4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -392,8 +392,6 @@ export default {
392
                 this.msgSuccess("修改成功");
392
                 this.msgSuccess("修改成功");
393
                 this.open = false;
393
                 this.open = false;
394
                 this.getList();
394
                 this.getList();
395
-              } else {
396
-                this.msgError(response.msg);
397
               }
395
               }
398
             });
396
             });
399
           } else {
397
           } else {
@@ -402,8 +400,6 @@ export default {
402
                 this.msgSuccess("新增成功");
400
                 this.msgSuccess("新增成功");
403
                 this.open = false;
401
                 this.open = false;
404
                 this.getList();
402
                 this.getList();
405
-              } else {
406
-                this.msgError(response.msg);
407
               }
403
               }
408
             });
404
             });
409
           }
405
           }

+ 1 - 1
ruoyi-ui/package.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "name": "ruoyi",
2
   "name": "ruoyi",
3
-  "version": "2.2.0",
3
+  "version": "2.3.0",
4
   "description": "若依管理系统",
4
   "description": "若依管理系统",
5
   "author": "若依",
5
   "author": "若依",
6
   "license": "MIT",
6
   "license": "MIT",

+ 0 - 4
ruoyi-ui/src/views/monitor/job/index.vue

@@ -438,8 +438,6 @@ export default {
438
                 this.msgSuccess("修改成功");
438
                 this.msgSuccess("修改成功");
439
                 this.open = false;
439
                 this.open = false;
440
                 this.getList();
440
                 this.getList();
441
-              } else {
442
-                this.msgError(response.msg);
443
               }
441
               }
444
             });
442
             });
445
           } else {
443
           } else {
@@ -448,8 +446,6 @@ export default {
448
                 this.msgSuccess("新增成功");
446
                 this.msgSuccess("新增成功");
449
                 this.open = false;
447
                 this.open = false;
450
                 this.getList();
448
                 this.getList();
451
-              } else {
452
-                this.msgError(response.msg);
453
               }
449
               }
454
             });
450
             });
455
           }
451
           }

+ 0 - 4
ruoyi-ui/src/views/system/config/index.vue

@@ -296,8 +296,6 @@ export default {
296
                 this.msgSuccess("修改成功");
296
                 this.msgSuccess("修改成功");
297
                 this.open = false;
297
                 this.open = false;
298
                 this.getList();
298
                 this.getList();
299
-              } else {
300
-                this.msgError(response.msg);
301
               }
299
               }
302
             });
300
             });
303
           } else {
301
           } else {
@@ -306,8 +304,6 @@ export default {
306
                 this.msgSuccess("新增成功");
304
                 this.msgSuccess("新增成功");
307
                 this.open = false;
305
                 this.open = false;
308
                 this.getList();
306
                 this.getList();
309
-              } else {
310
-                this.msgError(response.msg);
311
               }
307
               }
312
             });
308
             });
313
           }
309
           }

+ 0 - 4
ruoyi-ui/src/views/system/dept/index.vue

@@ -281,8 +281,6 @@ export default {
281
                 this.msgSuccess("修改成功");
281
                 this.msgSuccess("修改成功");
282
                 this.open = false;
282
                 this.open = false;
283
                 this.getList();
283
                 this.getList();
284
-              } else {
285
-                this.msgError(response.msg);
286
               }
284
               }
287
             });
285
             });
288
           } else {
286
           } else {
@@ -291,8 +289,6 @@ export default {
291
                 this.msgSuccess("新增成功");
289
                 this.msgSuccess("新增成功");
292
                 this.open = false;
290
                 this.open = false;
293
                 this.getList();
291
                 this.getList();
294
-              } else {
295
-                this.msgError(response.msg);
296
               }
292
               }
297
             });
293
             });
298
           }
294
           }

+ 0 - 4
ruoyi-ui/src/views/system/dict/data.vue

@@ -305,8 +305,6 @@ export default {
305
                 this.msgSuccess("修改成功");
305
                 this.msgSuccess("修改成功");
306
                 this.open = false;
306
                 this.open = false;
307
                 this.getList();
307
                 this.getList();
308
-              } else {
309
-                this.msgError(response.msg);
310
               }
308
               }
311
             });
309
             });
312
           } else {
310
           } else {
@@ -315,8 +313,6 @@ export default {
315
                 this.msgSuccess("新增成功");
313
                 this.msgSuccess("新增成功");
316
                 this.open = false;
314
                 this.open = false;
317
                 this.getList();
315
                 this.getList();
318
-              } else {
319
-                this.msgError(response.msg);
320
               }
316
               }
321
             });
317
             });
322
           }
318
           }

+ 0 - 4
ruoyi-ui/src/views/system/dict/index.vue

@@ -300,8 +300,6 @@ export default {
300
                 this.msgSuccess("修改成功");
300
                 this.msgSuccess("修改成功");
301
                 this.open = false;
301
                 this.open = false;
302
                 this.getList();
302
                 this.getList();
303
-              } else {
304
-                this.msgError(response.msg);
305
               }
303
               }
306
             });
304
             });
307
           } else {
305
           } else {
@@ -310,8 +308,6 @@ export default {
310
                 this.msgSuccess("新增成功");
308
                 this.msgSuccess("新增成功");
311
                 this.open = false;
309
                 this.open = false;
312
                 this.getList();
310
                 this.getList();
313
-              } else {
314
-                this.msgError(response.msg);
315
               }
311
               }
316
             });
312
             });
317
           }
313
           }

+ 0 - 4
ruoyi-ui/src/views/system/menu/index.vue

@@ -340,8 +340,6 @@ export default {
340
                 this.msgSuccess("修改成功");
340
                 this.msgSuccess("修改成功");
341
                 this.open = false;
341
                 this.open = false;
342
                 this.getList();
342
                 this.getList();
343
-              } else {
344
-                this.msgError(response.msg);
345
               }
343
               }
346
             });
344
             });
347
           } else {
345
           } else {
@@ -350,8 +348,6 @@ export default {
350
                 this.msgSuccess("新增成功");
348
                 this.msgSuccess("新增成功");
351
                 this.open = false;
349
                 this.open = false;
352
                 this.getList();
350
                 this.getList();
353
-              } else {
354
-                this.msgError(response.msg);
355
               }
351
               }
356
             });
352
             });
357
           }
353
           }

+ 0 - 4
ruoyi-ui/src/views/system/notice/index.vue

@@ -308,8 +308,6 @@ export default {
308
                 this.msgSuccess("修改成功");
308
                 this.msgSuccess("修改成功");
309
                 this.open = false;
309
                 this.open = false;
310
                 this.getList();
310
                 this.getList();
311
-              } else {
312
-                this.msgError(response.msg);
313
               }
311
               }
314
             });
312
             });
315
           } else {
313
           } else {
@@ -318,8 +316,6 @@ export default {
318
                 this.msgSuccess("新增成功");
316
                 this.msgSuccess("新增成功");
319
                 this.open = false;
317
                 this.open = false;
320
                 this.getList();
318
                 this.getList();
321
-              } else {
322
-                this.msgError(response.msg);
323
               }
319
               }
324
             });
320
             });
325
           }
321
           }

+ 0 - 4
ruoyi-ui/src/views/system/post/index.vue

@@ -277,8 +277,6 @@ export default {
277
                 this.msgSuccess("修改成功");
277
                 this.msgSuccess("修改成功");
278
                 this.open = false;
278
                 this.open = false;
279
                 this.getList();
279
                 this.getList();
280
-              } else {
281
-                this.msgError(response.msg);
282
               }
280
               }
283
             });
281
             });
284
           } else {
282
           } else {
@@ -287,8 +285,6 @@ export default {
287
                 this.msgSuccess("新增成功");
285
                 this.msgSuccess("新增成功");
288
                 this.open = false;
286
                 this.open = false;
289
                 this.getList();
287
                 this.getList();
290
-              } else {
291
-                this.msgError(response.msg);
292
               }
288
               }
293
             });
289
             });
294
           }
290
           }

+ 0 - 6
ruoyi-ui/src/views/system/role/index.vue

@@ -482,8 +482,6 @@ export default {
482
                 this.msgSuccess("修改成功");
482
                 this.msgSuccess("修改成功");
483
                 this.open = false;
483
                 this.open = false;
484
                 this.getList();
484
                 this.getList();
485
-              } else {
486
-                this.msgError(response.msg);
487
               }
485
               }
488
             });
486
             });
489
           } else {
487
           } else {
@@ -493,8 +491,6 @@ export default {
493
                 this.msgSuccess("新增成功");
491
                 this.msgSuccess("新增成功");
494
                 this.open = false;
492
                 this.open = false;
495
                 this.getList();
493
                 this.getList();
496
-              } else {
497
-                this.msgError(response.msg);
498
               }
494
               }
499
             });
495
             });
500
           }
496
           }
@@ -510,8 +506,6 @@ export default {
510
             this.msgSuccess("修改成功");
506
             this.msgSuccess("修改成功");
511
             this.openDataScope = false;
507
             this.openDataScope = false;
512
             this.getList();
508
             this.getList();
513
-          } else {
514
-            this.msgError(response.msg);
515
           }
509
           }
516
         });
510
         });
517
       }
511
       }

+ 0 - 6
ruoyi-ui/src/views/system/user/index.vue

@@ -572,8 +572,6 @@ export default {
572
           resetUserPwd(row.userId, value).then(response => {
572
           resetUserPwd(row.userId, value).then(response => {
573
             if (response.code === 200) {
573
             if (response.code === 200) {
574
               this.msgSuccess("修改成功,新密码是:" + value);
574
               this.msgSuccess("修改成功,新密码是:" + value);
575
-            } else {
576
-              this.msgError(response.msg);
577
             }
575
             }
578
           });
576
           });
579
         }).catch(() => {});
577
         }).catch(() => {});
@@ -588,8 +586,6 @@ export default {
588
                 this.msgSuccess("修改成功");
586
                 this.msgSuccess("修改成功");
589
                 this.open = false;
587
                 this.open = false;
590
                 this.getList();
588
                 this.getList();
591
-              } else {
592
-                this.msgError(response.msg);
593
               }
589
               }
594
             });
590
             });
595
           } else {
591
           } else {
@@ -598,8 +594,6 @@ export default {
598
                 this.msgSuccess("新增成功");
594
                 this.msgSuccess("新增成功");
599
                 this.open = false;
595
                 this.open = false;
600
                 this.getList();
596
                 this.getList();
601
-              } else {
602
-                this.msgError(response.msg);
603
               }
597
               }
604
             });
598
             });
605
           }
599
           }

+ 0 - 2
ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -59,8 +59,6 @@ export default {
59
             response => {
59
             response => {
60
               if (response.code === 200) {
60
               if (response.code === 200) {
61
                 this.msgSuccess("修改成功");
61
                 this.msgSuccess("修改成功");
62
-              } else {
63
-                this.msgError(response.msg);
64
               }
62
               }
65
             }
63
             }
66
           );
64
           );

+ 0 - 2
ruoyi-ui/src/views/system/user/profile/userAvatar.vue

@@ -122,8 +122,6 @@ export default {
122
             this.open = false;
122
             this.open = false;
123
             this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
123
             this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
124
             this.msgSuccess("修改成功");
124
             this.msgSuccess("修改成功");
125
-          } else {
126
-            this.msgError(response.msg);
127
           }
125
           }
128
           this.$refs.cropper.clearCrop();
126
           this.$refs.cropper.clearCrop();
129
         });
127
         });

+ 0 - 2
ruoyi-ui/src/views/system/user/profile/userInfo.vue

@@ -64,8 +64,6 @@ export default {
64
           updateUserProfile(this.user).then(response => {
64
           updateUserProfile(this.user).then(response => {
65
             if (response.code === 200) {
65
             if (response.code === 200) {
66
               this.msgSuccess("修改成功");
66
               this.msgSuccess("修改成功");
67
-            } else {
68
-              this.msgError(response.msg);
69
             }
67
             }
70
           });
68
           });
71
         }
69
         }