2 years ago · 38d89c26e7
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,4 +25,8 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				-    }</style><link href=./static/css/app.64d1797c2c9d773087b5beef6df742e7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.5381b06bfaaab9dbd007.js></script><script type=text/javascript src=./static/js/app.7ca96b9829cf80c441d5.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
 
				+<<<<<<< HEAD
			
 
				+    }</style><link href=./static/css/app.64d1797c2c9d773087b5beef6df742e7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.5381b06bfaaab9dbd007.js></script><script type=text/javascript src=./static/js/app.7ca96b9829cf80c441d5.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.64d1797c2c9d773087b5beef6df742e7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.093df9138434d51e559a.js></script><script type=text/javascript src=./static/js/vendor.5381b06bfaaab9dbd007.js></script><script type=text/javascript src=./static/js/app.7ca96b9829cf80c441d5.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
 
				+>>>>>>> c44aaed2931a5d74c4e648926a11ea2bf6ab58bd
			
--- a/dist/static/css/app.64d1797c2c9d773087b5beef6df742e7.css
+++ b/dist/static/css/app.64d1797c2c9d773087b5beef6df742e7.css
--- a/dist/static/css/app.64d1797c2c9d773087b5beef6df742e7.css.map
+++ b/dist/static/css/app.64d1797c2c9d773087b5beef6df742e7.css.map
--- a/dist/static/fonts/element-icons.535877f.woff
+++ b/dist/static/fonts/element-icons.535877f.woff
--- a/dist/static/fonts/element-icons.732389d.ttf
+++ b/dist/static/fonts/element-icons.732389d.ttf
--- a/dist/static/img/avatar.3282a78.png
+++ b/dist/static/img/avatar.3282a78.png
--- a/dist/static/img/checkNo.7203312.png
+++ b/dist/static/img/checkNo.7203312.png
--- a/dist/static/img/checkedIs.a486b96.png
+++ b/dist/static/img/checkedIs.a486b96.png
--- a/dist/static/img/e_picture.9e664a5.png
+++ b/dist/static/img/e_picture.9e664a5.png
--- a/dist/static/img/image.11b625a.png
+++ b/dist/static/img/image.11b625a.png
--- a/dist/static/img/kc1.1b8c4f6.png
+++ b/dist/static/img/kc1.1b8c4f6.png
--- a/dist/static/img/portal.b3cf7fa.png
+++ b/dist/static/img/portal.b3cf7fa.png
--- a/dist/static/img/pptImg.9367c4a.png
+++ b/dist/static/img/pptImg.9367c4a.png
--- a/dist/static/img/projectName.8270c53.png
+++ b/dist/static/img/projectName.8270c53.png
--- a/dist/static/img/sp1.92bfd5a.png
+++ b/dist/static/img/sp1.92bfd5a.png
--- a/dist/static/img/tup1.6b2e0bd.png
+++ b/dist/static/img/tup1.6b2e0bd.png
--- a/dist/static/img/video.9ca79f0.png
+++ b/dist/static/img/video.9ca79f0.png
--- a/dist/static/img/videoH.3ef9db9.png
+++ b/dist/static/img/videoH.3ef9db9.png
--- a/dist/static/img/wheel.a7903d6.png
+++ b/dist/static/img/wheel.a7903d6.png
--- a/dist/static/img/word.573c848.png
+++ b/dist/static/img/word.573c848.png
--- a/dist/static/img/yp1.d5f2ef7.png
+++ b/dist/static/img/yp1.d5f2ef7.png
--- a/dist/static/js/0.86cbf9c691e3dc53b304.js
+++ b/dist/static/js/0.86cbf9c691e3dc53b304.js
--- a/dist/static/js/0.86cbf9c691e3dc53b304.js.map
+++ b/dist/static/js/0.86cbf9c691e3dc53b304.js.map
--- a/dist/static/js/1.994623639438b244a74c.js
+++ b/dist/static/js/1.994623639438b244a74c.js
--- a/dist/static/js/1.994623639438b244a74c.js.map
+++ b/dist/static/js/1.994623639438b244a74c.js.map
--- a/dist/static/js/app.7ca96b9829cf80c441d5.js
+++ b/dist/static/js/app.7ca96b9829cf80c441d5.js
--- a/dist/static/js/app.7ca96b9829cf80c441d5.js.map
+++ b/dist/static/js/app.7ca96b9829cf80c441d5.js.map
--- a/dist/static/js/manifest.85f48b0184f614b2b8d9.js
+++ b/dist/static/js/manifest.85f48b0184f614b2b8d9.js
@@ -1,2 +0,0 @@
 
				-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"86cbf9c691e3dc53b304",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
			
 
				-//# sourceMappingURL=manifest.85f48b0184f614b2b8d9.js.map
			
--- a/dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
+++ b/dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
--- a/dist/static/js/vendor.5381b06bfaaab9dbd007.js
+++ b/dist/static/js/vendor.5381b06bfaaab9dbd007.js
--- a/dist/static/js/vendor.5381b06bfaaab9dbd007.js.map
+++ b/dist/static/js/vendor.5381b06bfaaab9dbd007.js.map
--- a/dist/static/logo.ico
+++ b/dist/static/logo.ico