mo 2 jaren geleden
bovenliggende
commit
6f533e173c
68 gewijzigde bestanden met toevoegingen van 7 en 27 verwijderingen
  1. 1 5
      dist/index.html
  2. 0 0
      dist/static/css/app.13811f3825122d3a7000993759cc1b92.css
  3. 0 0
      dist/static/css/app.13811f3825122d3a7000993759cc1b92.css.map
  4. 0 0
      dist/static/js/10.95811e13a2d3b3a0e181.js
  5. 0 0
      dist/static/js/10.95811e13a2d3b3a0e181.js.map
  6. 0 0
      dist/static/js/10.cb2a3e966579a732185b.js
  7. 0 0
      dist/static/js/10.cb2a3e966579a732185b.js.map
  8. 0 0
      dist/static/js/29.765d88e5a30114bccb3e.js
  9. 0 0
      dist/static/js/29.765d88e5a30114bccb3e.js.map
  10. 0 0
      dist/static/js/3.57ca91c506e332bf6d26.js
  11. 0 0
      dist/static/js/3.57ca91c506e332bf6d26.js.map
  12. 0 0
      dist/static/js/30.dee30979b651086bc827.js
  13. 0 0
      dist/static/js/30.dee30979b651086bc827.js.map
  14. 2 2
      dist/static/js/31.cec44c31f3619acccce9.js
  15. 0 0
      dist/static/js/31.cec44c31f3619acccce9.js.map
  16. 0 0
      dist/static/js/32.8e45314b725c3033163a.js
  17. 0 0
      dist/static/js/32.8e45314b725c3033163a.js.map
  18. 0 0
      dist/static/js/33.4d756e25227f36454b07.js
  19. 0 0
      dist/static/js/33.4d756e25227f36454b07.js.map
  20. 0 0
      dist/static/js/34.f8d9b911c0023a5f930b.js
  21. 0 0
      dist/static/js/34.f8d9b911c0023a5f930b.js.map
  22. 0 0
      dist/static/js/35.869cb8b049fa8e2a34b4.js
  23. 0 0
      dist/static/js/35.869cb8b049fa8e2a34b4.js.map
  24. 0 0
      dist/static/js/36.6b9aff518a24537b29c7.js
  25. 0 0
      dist/static/js/36.6b9aff518a24537b29c7.js.map
  26. 2 2
      dist/static/js/37.5d43f7760981a3df5be6.js
  27. 0 0
      dist/static/js/37.5d43f7760981a3df5be6.js.map
  28. 0 0
      dist/static/js/38.398635393e39ec2b32ab.js
  29. 0 0
      dist/static/js/38.398635393e39ec2b32ab.js.map
  30. 0 0
      dist/static/js/39.41f16520c6d571932c11.js
  31. 0 0
      dist/static/js/39.41f16520c6d571932c11.js.map
  32. 0 0
      dist/static/js/4.89a8b6b4c2a27b966e22.js
  33. 0 0
      dist/static/js/4.89a8b6b4c2a27b966e22.js.map
  34. 2 2
      dist/static/js/40.d38070a1d8b8d95188d8.js
  35. 0 0
      dist/static/js/40.d38070a1d8b8d95188d8.js.map
  36. 0 1
      dist/static/js/41.5968e654b19db4c75fd6.js
  37. 0 1
      dist/static/js/41.5968e654b19db4c75fd6.js.map
  38. 0 0
      dist/static/js/41.61b4738fd50892cc1536.js
  39. 0 0
      dist/static/js/41.61b4738fd50892cc1536.js.map
  40. 0 0
      dist/static/js/41.faab243fa6c3e9f49464.js
  41. 0 0
      dist/static/js/41.faab243fa6c3e9f49464.js.map
  42. 0 1
      dist/static/js/42.9b8d50819b9fe60fa0c0.js
  43. 0 1
      dist/static/js/42.9b8d50819b9fe60fa0c0.js.map
  44. 0 1
      dist/static/js/42.a07e04b5105c5050e909.js
  45. 0 1
      dist/static/js/42.a07e04b5105c5050e909.js.map
  46. 0 0
      dist/static/js/43.b42570492034f1970c77.js.map
  47. 0 1
      dist/static/js/43.f3a8773f8e6cb59bdc78.js
  48. 0 1
      dist/static/js/43.f3a8773f8e6cb59bdc78.js.map
  49. 0 0
      dist/static/js/7.0495c2dc3f65705de308.js
  50. 0 0
      dist/static/js/7.0495c2dc3f65705de308.js.map
  51. 0 0
      dist/static/js/8.a723af01450bcb7c1a51.js
  52. 0 0
      dist/static/js/8.a723af01450bcb7c1a51.js.map
  53. 0 0
      dist/static/js/9.9711215e8c02442f8a9b.js
  54. 0 0
      dist/static/js/9.9711215e8c02442f8a9b.js.map
  55. 0 0
      dist/static/js/9.fb66fa235c948e0d4216.js
  56. 0 0
      dist/static/js/9.fb66fa235c948e0d4216.js.map
  57. 0 0
      dist/static/js/app.232ddbd39778e9ba453c.js
  58. 0 0
      dist/static/js/app.232ddbd39778e9ba453c.js.map
  59. 0 1
      dist/static/js/app.c64b2d71eda4ac34b590.js
  60. 0 1
      dist/static/js/app.c64b2d71eda4ac34b590.js.map
  61. 0 1
      dist/static/js/app.dde52268e2c25c572cdb.js
  62. 0 1
      dist/static/js/app.dde52268e2c25c572cdb.js.map
  63. 0 1
      dist/static/js/manifest.a1e4263309742ef1d6ef.js
  64. 0 1
      dist/static/js/manifest.a1e4263309742ef1d6ef.js.map
  65. 0 0
      dist/static/js/manifest.cbcf88de6e24484c488f.js
  66. 0 0
      dist/static/js/manifest.cbcf88de6e24484c488f.js.map
  67. 0 1
      dist/static/js/manifest.d85f59c595e66af4a618.js
  68. 0 1
      dist/static/js/manifest.d85f59c595e66af4a618.js.map

+ 1 - 5
dist/index.html

@@ -7,8 +7,4 @@
         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
         var s = document.getElementsByTagName("script")[0];
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
         s.parentNode.insertBefore(hm, s);
-<<<<<<< HEAD
-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.1783749f583d7fcf13ee15ed3370ad6c.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.a1e4263309742ef1d6ef.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.c64b2d71eda4ac34b590.js></script></body></html>
-=======
-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.9d4c966d970ae2eac94282b5ddad9149.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.d85f59c595e66af4a618.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.dde52268e2c25c572cdb.js></script></body></html>
->>>>>>> main
+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.13811f3825122d3a7000993759cc1b92.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.cbcf88de6e24484c488f.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.232ddbd39778e9ba453c.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.13811f3825122d3a7000993759cc1b92.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.13811f3825122d3a7000993759cc1b92.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/10.95811e13a2d3b3a0e181.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/10.95811e13a2d3b3a0e181.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/10.cb2a3e966579a732185b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/10.cb2a3e966579a732185b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/29.765d88e5a30114bccb3e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/29.765d88e5a30114bccb3e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/3.57ca91c506e332bf6d26.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/3.57ca91c506e332bf6d26.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/30.dee30979b651086bc827.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/30.dee30979b651086bc827.js.map


+ 2 - 2
dist/static/js/30.8cfaed86350832fba20d.js → dist/static/js/31.cec44c31f3619acccce9.js

@@ -1,2 +1,2 @@
-webpackJsonp([30],{N3DD:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={name:"addProduct",components:{ProductDetail:n("CmKi").a}},a={render:function(){var e=this.$createElement;return(this._self._c||e)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var c=n("VU/8")(r,a,!1,function(e){n("m88z")},null,null);t.default=c.exports},m88z:function(e,t){}});
-//# sourceMappingURL=30.8cfaed86350832fba20d.js.map
+webpackJsonp([31],{N3DD:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={name:"addProduct",components:{ProductDetail:n("CmKi").a}},a={render:function(){var e=this.$createElement;return(this._self._c||e)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var c=n("VU/8")(r,a,!1,function(e){n("m88z")},null,null);t.default=c.exports},m88z:function(e,t){}});
+//# sourceMappingURL=31.cec44c31f3619acccce9.js.map

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/31.cec44c31f3619acccce9.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/32.8e45314b725c3033163a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/32.8e45314b725c3033163a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/33.4d756e25227f36454b07.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/33.4d756e25227f36454b07.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/34.f8d9b911c0023a5f930b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/34.f8d9b911c0023a5f930b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/35.869cb8b049fa8e2a34b4.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/35.869cb8b049fa8e2a34b4.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/36.6b9aff518a24537b29c7.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/36.6b9aff518a24537b29c7.js.map


+ 2 - 2
dist/static/js/36.9aeb2e8ca9169d0f4e72.js → dist/static/js/37.5d43f7760981a3df5be6.js

@@ -1,2 +1,2 @@
-webpackJsonp([36],{jHNE:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r={name:"updateProduct",components:{ProductDetail:n("CmKi").a}},o={render:function(){var t=this.$createElement;return(this._self._c||t)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var u=n("VU/8")(r,o,!1,function(t){n("oLCt")},null,null);e.default=u.exports},oLCt:function(t,e){}});
-//# sourceMappingURL=36.9aeb2e8ca9169d0f4e72.js.map
+webpackJsonp([37],{jHNE:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r={name:"updateProduct",components:{ProductDetail:n("CmKi").a}},o={render:function(){var t=this.$createElement;return(this._self._c||t)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var u=n("VU/8")(r,o,!1,function(t){n("oLCt")},null,null);e.default=u.exports},oLCt:function(t,e){}});
+//# sourceMappingURL=37.5d43f7760981a3df5be6.js.map

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/37.5d43f7760981a3df5be6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/38.398635393e39ec2b32ab.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/38.398635393e39ec2b32ab.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/39.41f16520c6d571932c11.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/39.41f16520c6d571932c11.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/4.89a8b6b4c2a27b966e22.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/4.89a8b6b4c2a27b966e22.js.map


+ 2 - 2
dist/static/js/39.69808d0995e0ebd6b56f.js → dist/static/js/40.d38070a1d8b8d95188d8.js

@@ -1,2 +1,2 @@
-webpackJsonp([39],{l84a:function(e,t){},lfyr:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n("c/Tr"),a=n.n(r),i=n("lHA8"),l=n.n(i),s=n("bUp0"),c=n("STSY"),o={name:"allocMenu",data:function(){return{menuTreeList:[],defaultProps:{children:"children",label:"title"},roleId:null}},created:function(){this.roleId=this.$route.query.roleId,this.treeList(),this.getRoleMenu(this.roleId)},methods:{treeList:function(){var e=this;Object(s.d)().then(function(t){e.menuTreeList=t.data})},getRoleMenu:function(e){var t=this;Object(c.g)(e).then(function(e){var n=e.data,r=[];if(null!=n&&n.length>0)for(var a=0;a<n.length;a++){var i=n[a];0!==i.parentId&&r.push(i.id)}t.$refs.tree.setCheckedKeys(r)})},handleSave:function(){var e=this,t=this.$refs.tree.getCheckedNodes(),n=new l.a;if(null!=t&&t.length>0)for(var r=0;r<t.length;r++){var i=t[r];n.add(i.id),0!==i.parentId&&n.add(i.parentId)}this.$confirm("是否分配菜单?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){var t={menuIds:a()(n).join(","),roleId:e.roleId};Object(c.a)(t).then(function(t){e.$message({message:"分配成功",type:"success",duration:1e3}),e.$router.back()})})},handleClear:function(){this.$refs.tree.setCheckedKeys([])}}},d={render:function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"form-container",attrs:{shadow:"never"}},[n("el-tree",{ref:"tree",attrs:{data:e.menuTreeList,"show-checkbox":"","default-expand-all":"","node-key":"id","highlight-current":"",props:e.defaultProps}}),e._v(" "),n("div",{staticStyle:{"margin-top":"20px"},attrs:{align:"center"}},[n("el-button",{attrs:{type:"primary"},on:{click:function(t){e.handleSave()}}},[e._v("保存")]),e._v(" "),n("el-button",{on:{click:function(t){e.handleClear()}}},[e._v("清空")])],1)],1)},staticRenderFns:[]};var u=n("VU/8")(o,d,!1,function(e){n("l84a")},"data-v-69c4c24c",null);t.default=u.exports}});
-//# sourceMappingURL=39.69808d0995e0ebd6b56f.js.map
+webpackJsonp([40],{l84a:function(e,t){},lfyr:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n("c/Tr"),a=n.n(r),i=n("lHA8"),l=n.n(i),s=n("bUp0"),c=n("STSY"),o={name:"allocMenu",data:function(){return{menuTreeList:[],defaultProps:{children:"children",label:"title"},roleId:null}},created:function(){this.roleId=this.$route.query.roleId,this.treeList(),this.getRoleMenu(this.roleId)},methods:{treeList:function(){var e=this;Object(s.d)().then(function(t){e.menuTreeList=t.data})},getRoleMenu:function(e){var t=this;Object(c.g)(e).then(function(e){var n=e.data,r=[];if(null!=n&&n.length>0)for(var a=0;a<n.length;a++){var i=n[a];0!==i.parentId&&r.push(i.id)}t.$refs.tree.setCheckedKeys(r)})},handleSave:function(){var e=this,t=this.$refs.tree.getCheckedNodes(),n=new l.a;if(null!=t&&t.length>0)for(var r=0;r<t.length;r++){var i=t[r];n.add(i.id),0!==i.parentId&&n.add(i.parentId)}this.$confirm("是否分配菜单?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){var t={menuIds:a()(n).join(","),roleId:e.roleId};Object(c.a)(t).then(function(t){e.$message({message:"分配成功",type:"success",duration:1e3}),e.$router.back()})})},handleClear:function(){this.$refs.tree.setCheckedKeys([])}}},d={render:function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"form-container",attrs:{shadow:"never"}},[n("el-tree",{ref:"tree",attrs:{data:e.menuTreeList,"show-checkbox":"","default-expand-all":"","node-key":"id","highlight-current":"",props:e.defaultProps}}),e._v(" "),n("div",{staticStyle:{"margin-top":"20px"},attrs:{align:"center"}},[n("el-button",{attrs:{type:"primary"},on:{click:function(t){e.handleSave()}}},[e._v("保存")]),e._v(" "),n("el-button",{on:{click:function(t){e.handleClear()}}},[e._v("清空")])],1)],1)},staticRenderFns:[]};var u=n("VU/8")(o,d,!1,function(e){n("l84a")},"data-v-69c4c24c",null);t.default=u.exports}});
+//# sourceMappingURL=40.d38070a1d8b8d95188d8.js.map

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/40.d38070a1d8b8d95188d8.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/41.5968e654b19db4c75fd6.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/41.5968e654b19db4c75fd6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/41.61b4738fd50892cc1536.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/41.61b4738fd50892cc1536.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/41.faab243fa6c3e9f49464.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/41.faab243fa6c3e9f49464.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/42.9b8d50819b9fe60fa0c0.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/42.9b8d50819b9fe60fa0c0.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/42.a07e04b5105c5050e909.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/42.a07e04b5105c5050e909.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/43.b42570492034f1970c77.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/43.f3a8773f8e6cb59bdc78.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/43.f3a8773f8e6cb59bdc78.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/7.0495c2dc3f65705de308.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/7.0495c2dc3f65705de308.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/8.a723af01450bcb7c1a51.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/8.a723af01450bcb7c1a51.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/9.9711215e8c02442f8a9b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/9.9711215e8c02442f8a9b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/9.fb66fa235c948e0d4216.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/9.fb66fa235c948e0d4216.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.232ddbd39778e9ba453c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.232ddbd39778e9ba453c.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.c64b2d71eda4ac34b590.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.c64b2d71eda4ac34b590.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.dde52268e2c25c572cdb.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.dde52268e2c25c572cdb.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.a1e4263309742ef1d6ef.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.a1e4263309742ef1d6ef.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.cbcf88de6e24484c488f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.cbcf88de6e24484c488f.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.d85f59c595e66af4a618.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.d85f59c595e66af4a618.js.map


Some files were not shown because too many files changed in this diff