Browse Source

去除多余的代码

tags/v2.0
RuoYi 5 years ago
parent
commit
b887f1f946
  1. 10
      ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm
  2. 4
      ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
  3. 4
      ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
  4. 2
      ruoyi-ui/package.json
  5. 4
      ruoyi-ui/src/views/monitor/job/index.vue
  6. 4
      ruoyi-ui/src/views/system/config/index.vue
  7. 4
      ruoyi-ui/src/views/system/dept/index.vue
  8. 4
      ruoyi-ui/src/views/system/dict/data.vue
  9. 4
      ruoyi-ui/src/views/system/dict/index.vue
  10. 4
      ruoyi-ui/src/views/system/menu/index.vue
  11. 4
      ruoyi-ui/src/views/system/notice/index.vue
  12. 4
      ruoyi-ui/src/views/system/post/index.vue
  13. 6
      ruoyi-ui/src/views/system/role/index.vue
  14. 6
      ruoyi-ui/src/views/system/user/index.vue
  15. 2
      ruoyi-ui/src/views/system/user/profile/resetPwd.vue
  16. 2
      ruoyi-ui/src/views/system/user/profile/userAvatar.vue
  17. 2
      ruoyi-ui/src/views/system/user/profile/userInfo.vue

10
ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm

@ -6,17 +6,17 @@ values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${business
SELECT @parentId := LAST_INSERT_ID(); SELECT @parentId := LAST_INSERT_ID();
-- 按钮 SQL -- 按钮 SQL
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) 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)
values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
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) 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)
values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
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) 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)
values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
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) 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)
values('${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); values('${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
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) 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)
values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');

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

@ -375,8 +375,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -385,8 +383,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -392,8 +392,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -402,8 +400,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

2
ruoyi-ui/package.json

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

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

@ -438,8 +438,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -448,8 +446,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -296,8 +296,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -306,8 +304,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -281,8 +281,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -291,8 +289,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -305,8 +305,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -315,8 +313,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -300,8 +300,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -310,8 +308,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -340,8 +340,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -350,8 +348,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -308,8 +308,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -318,8 +316,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -277,8 +277,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -287,8 +285,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -482,8 +482,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -493,8 +491,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }
@ -510,8 +506,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.openDataScope = false; this.openDataScope = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

@ -572,8 +572,6 @@ export default {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, value).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功,新密码是:" + value); this.msgSuccess("修改成功,新密码是:" + value);
} else {
this.msgError(response.msg);
} }
}); });
}).catch(() => {}); }).catch(() => {});
@ -588,8 +586,6 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} else { } else {
@ -598,8 +594,6 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else {
this.msgError(response.msg);
} }
}); });
} }

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

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

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

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

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

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

Loading…
Cancel
Save