pr相关样式修改

forge
dingyongkang 5 years ago
parent 094d71231e
commit 6f86b75028

@ -1,5 +1,4 @@
{
<<<<<<< HEAD
"./static/js/0.fe96d2ba.chunk.js": "./static/js/0.fe96d2ba.chunk.js",
"./static/js/1.18dba0e3.chunk.js": "./static/js/1.18dba0e3.chunk.js",
"./static/js/10.5620e669.chunk.js": "./static/js/10.5620e669.chunk.js",
@ -361,367 +360,4 @@
"static\\media\\rc-tree.png": "static/media/rc-tree.776c7fe6.png",
"static\\media\\skzbdx.png": "static/media/skzbdx.01cb5862.png",
"static\\media\\teach_ex.jpg": "static/media/teach_ex.a415d7a9.jpg"
=======
"./static/js/0.3499dbdb.chunk.js": "./static/js/0.3499dbdb.chunk.js",
"./static/js/1.ba3dba4f.chunk.js": "./static/js/1.ba3dba4f.chunk.js",
"./static/js/10.c31bfdb0.chunk.js": "./static/js/10.c31bfdb0.chunk.js",
"./static/js/100.04603361.chunk.js": "./static/js/100.04603361.chunk.js",
"./static/js/101.f017f44e.chunk.js": "./static/js/101.f017f44e.chunk.js",
"./static/js/102.3fd09fe5.chunk.js": "./static/js/102.3fd09fe5.chunk.js",
"./static/js/103.7ac9c928.chunk.js": "./static/js/103.7ac9c928.chunk.js",
"./static/js/104.57b33ca6.chunk.js": "./static/js/104.57b33ca6.chunk.js",
"./static/js/105.425915af.chunk.js": "./static/js/105.425915af.chunk.js",
"./static/js/106.5a7f1794.chunk.js": "./static/js/106.5a7f1794.chunk.js",
"./static/js/107.e90e0fb8.chunk.js": "./static/js/107.e90e0fb8.chunk.js",
"./static/js/108.a761ed62.chunk.js": "./static/js/108.a761ed62.chunk.js",
"./static/js/109.7c4e13dd.chunk.js": "./static/js/109.7c4e13dd.chunk.js",
"./static/js/11.c18648a5.chunk.js": "./static/js/11.c18648a5.chunk.js",
"./static/js/110.cf85c660.chunk.js": "./static/js/110.cf85c660.chunk.js",
"./static/js/111.b123ff38.chunk.js": "./static/js/111.b123ff38.chunk.js",
"./static/js/112.7277a9f5.chunk.js": "./static/js/112.7277a9f5.chunk.js",
"./static/js/113.70b65335.chunk.js": "./static/js/113.70b65335.chunk.js",
"./static/js/114.8df5b49f.chunk.js": "./static/js/114.8df5b49f.chunk.js",
"./static/js/115.bf16e172.chunk.js": "./static/js/115.bf16e172.chunk.js",
"./static/js/116.baeee89f.chunk.js": "./static/js/116.baeee89f.chunk.js",
"./static/js/117.cc05f636.chunk.js": "./static/js/117.cc05f636.chunk.js",
"./static/js/118.857c2217.chunk.js": "./static/js/118.857c2217.chunk.js",
"./static/js/119.07904e71.chunk.js": "./static/js/119.07904e71.chunk.js",
"./static/js/12.6f96b71b.chunk.js": "./static/js/12.6f96b71b.chunk.js",
"./static/js/120.bf90dce4.chunk.js": "./static/js/120.bf90dce4.chunk.js",
"./static/js/121.a49174bd.chunk.js": "./static/js/121.a49174bd.chunk.js",
"./static/js/122.17b804b2.chunk.js": "./static/js/122.17b804b2.chunk.js",
"./static/js/123.995606e5.chunk.js": "./static/js/123.995606e5.chunk.js",
"./static/js/124.13b7722f.chunk.js": "./static/js/124.13b7722f.chunk.js",
"./static/js/125.cd60d55a.chunk.js": "./static/js/125.cd60d55a.chunk.js",
"./static/js/126.cdbe58e2.chunk.js": "./static/js/126.cdbe58e2.chunk.js",
"./static/js/127.88517989.chunk.js": "./static/js/127.88517989.chunk.js",
"./static/js/128.bde9db79.chunk.js": "./static/js/128.bde9db79.chunk.js",
"./static/js/129.1af889c1.chunk.js": "./static/js/129.1af889c1.chunk.js",
"./static/js/13.33b5f814.chunk.js": "./static/js/13.33b5f814.chunk.js",
"./static/js/130.dad6a32f.chunk.js": "./static/js/130.dad6a32f.chunk.js",
"./static/js/131.52e9efd9.chunk.js": "./static/js/131.52e9efd9.chunk.js",
"./static/js/132.6189ed52.chunk.js": "./static/js/132.6189ed52.chunk.js",
"./static/js/133.cd8230a4.chunk.js": "./static/js/133.cd8230a4.chunk.js",
"./static/js/134.d3ca6526.chunk.js": "./static/js/134.d3ca6526.chunk.js",
"./static/js/135.c7708f2c.chunk.js": "./static/js/135.c7708f2c.chunk.js",
"./static/js/136.1f0535b3.chunk.js": "./static/js/136.1f0535b3.chunk.js",
"./static/js/137.c2b3fdce.chunk.js": "./static/js/137.c2b3fdce.chunk.js",
"./static/js/138.714743e3.chunk.js": "./static/js/138.714743e3.chunk.js",
"./static/js/139.c9131191.chunk.js": "./static/js/139.c9131191.chunk.js",
"./static/js/14.3129051e.chunk.js": "./static/js/14.3129051e.chunk.js",
"./static/js/140.f300f141.chunk.js": "./static/js/140.f300f141.chunk.js",
"./static/js/141.148aa7ee.chunk.js": "./static/js/141.148aa7ee.chunk.js",
"./static/js/142.87d7a1ae.chunk.js": "./static/js/142.87d7a1ae.chunk.js",
"./static/js/143.c7359bf6.chunk.js": "./static/js/143.c7359bf6.chunk.js",
"./static/js/144.ab25100c.chunk.js": "./static/js/144.ab25100c.chunk.js",
"./static/js/145.9e977cc1.chunk.js": "./static/js/145.9e977cc1.chunk.js",
"./static/js/146.e623a54e.chunk.js": "./static/js/146.e623a54e.chunk.js",
"./static/js/147.114cf540.chunk.js": "./static/js/147.114cf540.chunk.js",
"./static/js/148.32825ae6.chunk.js": "./static/js/148.32825ae6.chunk.js",
"./static/js/149.8f818a63.chunk.js": "./static/js/149.8f818a63.chunk.js",
"./static/js/15.777d35a0.chunk.js": "./static/js/15.777d35a0.chunk.js",
"./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js",
"./static/js/151.3cbd58d9.chunk.js": "./static/js/151.3cbd58d9.chunk.js",
"./static/js/152.25096064.chunk.js": "./static/js/152.25096064.chunk.js",
"./static/js/153.0579404a.chunk.js": "./static/js/153.0579404a.chunk.js",
"./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js",
"./static/js/155.3185ccd2.chunk.js": "./static/js/155.3185ccd2.chunk.js",
"./static/js/156.114acd0e.chunk.js": "./static/js/156.114acd0e.chunk.js",
"./static/js/157.01fef202.chunk.js": "./static/js/157.01fef202.chunk.js",
"./static/js/158.bfe089a5.chunk.js": "./static/js/158.bfe089a5.chunk.js",
"./static/js/159.456c280b.chunk.js": "./static/js/159.456c280b.chunk.js",
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
"./static/js/160.cf5a19f0.chunk.js": "./static/js/160.cf5a19f0.chunk.js",
"./static/js/161.1a1a88fa.chunk.js": "./static/js/161.1a1a88fa.chunk.js",
"./static/js/162.4a3db237.chunk.js": "./static/js/162.4a3db237.chunk.js",
"./static/js/163.3b0f2188.chunk.js": "./static/js/163.3b0f2188.chunk.js",
"./static/js/164.29b4fe7a.chunk.js": "./static/js/164.29b4fe7a.chunk.js",
"./static/js/165.13f04d92.chunk.js": "./static/js/165.13f04d92.chunk.js",
"./static/js/166.1b56ef09.chunk.js": "./static/js/166.1b56ef09.chunk.js",
"./static/js/167.a991482c.chunk.js": "./static/js/167.a991482c.chunk.js",
"./static/js/168.e890d0c2.chunk.js": "./static/js/168.e890d0c2.chunk.js",
"./static/js/169.04ceadc5.chunk.js": "./static/js/169.04ceadc5.chunk.js",
"./static/js/17.eaa7969b.chunk.js": "./static/js/17.eaa7969b.chunk.js",
"./static/js/170.f52e6f5d.chunk.js": "./static/js/170.f52e6f5d.chunk.js",
"./static/js/171.4b98ee6a.chunk.js": "./static/js/171.4b98ee6a.chunk.js",
"./static/js/172.6b0207aa.chunk.js": "./static/js/172.6b0207aa.chunk.js",
"./static/js/173.2709a7bb.chunk.js": "./static/js/173.2709a7bb.chunk.js",
"./static/js/174.9c9c4f81.chunk.js": "./static/js/174.9c9c4f81.chunk.js",
"./static/js/175.1c50cd8c.chunk.js": "./static/js/175.1c50cd8c.chunk.js",
"./static/js/176.6ccf4497.chunk.js": "./static/js/176.6ccf4497.chunk.js",
"./static/js/177.5c7bfa2d.chunk.js": "./static/js/177.5c7bfa2d.chunk.js",
"./static/js/178.7c69aa3a.chunk.js": "./static/js/178.7c69aa3a.chunk.js",
"./static/js/179.d9a714d5.chunk.js": "./static/js/179.d9a714d5.chunk.js",
"./static/js/18.7e6684c8.chunk.js": "./static/js/18.7e6684c8.chunk.js",
"./static/js/180.abba8537.chunk.js": "./static/js/180.abba8537.chunk.js",
"./static/js/181.b3f1bcbc.chunk.js": "./static/js/181.b3f1bcbc.chunk.js",
"./static/js/182.2ed4f280.chunk.js": "./static/js/182.2ed4f280.chunk.js",
"./static/js/183.b34ed057.chunk.js": "./static/js/183.b34ed057.chunk.js",
"./static/js/184.c7d63100.chunk.js": "./static/js/184.c7d63100.chunk.js",
"./static/js/185.9c6c47a4.chunk.js": "./static/js/185.9c6c47a4.chunk.js",
"./static/js/186.ddb826e1.chunk.js": "./static/js/186.ddb826e1.chunk.js",
"./static/js/187.24d4cbd0.chunk.js": "./static/js/187.24d4cbd0.chunk.js",
"./static/js/188.c0498792.chunk.js": "./static/js/188.c0498792.chunk.js",
"./static/js/189.8cfa165e.chunk.js": "./static/js/189.8cfa165e.chunk.js",
"./static/js/19.7c4f80e8.chunk.js": "./static/js/19.7c4f80e8.chunk.js",
"./static/js/190.ae0f7daa.chunk.js": "./static/js/190.ae0f7daa.chunk.js",
"./static/js/191.d911f73d.chunk.js": "./static/js/191.d911f73d.chunk.js",
"./static/js/192.14c7d860.chunk.js": "./static/js/192.14c7d860.chunk.js",
"./static/js/193.28c25d4a.chunk.js": "./static/js/193.28c25d4a.chunk.js",
"./static/js/194.996d34c8.chunk.js": "./static/js/194.996d34c8.chunk.js",
"./static/js/195.4ab7e4b1.chunk.js": "./static/js/195.4ab7e4b1.chunk.js",
"./static/js/196.589ce802.chunk.js": "./static/js/196.589ce802.chunk.js",
"./static/js/197.4459eb3a.chunk.js": "./static/js/197.4459eb3a.chunk.js",
"./static/js/198.3f1fe6b4.chunk.js": "./static/js/198.3f1fe6b4.chunk.js",
"./static/js/199.cdc117e7.chunk.js": "./static/js/199.cdc117e7.chunk.js",
"./static/js/2.e76a0be2.chunk.js": "./static/js/2.e76a0be2.chunk.js",
"./static/js/20.c414c0cd.chunk.js": "./static/js/20.c414c0cd.chunk.js",
"./static/js/200.aedf4681.chunk.js": "./static/js/200.aedf4681.chunk.js",
"./static/js/201.67de5466.chunk.js": "./static/js/201.67de5466.chunk.js",
"./static/js/202.8dd9f7bd.chunk.js": "./static/js/202.8dd9f7bd.chunk.js",
"./static/js/203.319c605d.chunk.js": "./static/js/203.319c605d.chunk.js",
"./static/js/204.2149b491.chunk.js": "./static/js/204.2149b491.chunk.js",
"./static/js/205.424a329b.chunk.js": "./static/js/205.424a329b.chunk.js",
"./static/js/206.547aeeb8.chunk.js": "./static/js/206.547aeeb8.chunk.js",
"./static/js/207.b05232b2.chunk.js": "./static/js/207.b05232b2.chunk.js",
"./static/js/208.0f479a47.chunk.js": "./static/js/208.0f479a47.chunk.js",
"./static/js/209.77c8bcf8.chunk.js": "./static/js/209.77c8bcf8.chunk.js",
"./static/js/21.2f814f4e.chunk.js": "./static/js/21.2f814f4e.chunk.js",
"./static/js/210.2fb25a6f.chunk.js": "./static/js/210.2fb25a6f.chunk.js",
"./static/js/211.d11d4a8e.chunk.js": "./static/js/211.d11d4a8e.chunk.js",
"./static/js/212.ad235f49.chunk.js": "./static/js/212.ad235f49.chunk.js",
"./static/js/213.e56234a5.chunk.js": "./static/js/213.e56234a5.chunk.js",
"./static/js/214.c24d9bbe.chunk.js": "./static/js/214.c24d9bbe.chunk.js",
"./static/js/215.3f681e33.chunk.js": "./static/js/215.3f681e33.chunk.js",
"./static/js/216.8e1da5ad.chunk.js": "./static/js/216.8e1da5ad.chunk.js",
"./static/js/217.3cf5ac1f.chunk.js": "./static/js/217.3cf5ac1f.chunk.js",
"./static/js/218.01790dac.chunk.js": "./static/js/218.01790dac.chunk.js",
"./static/js/219.8f881b85.chunk.js": "./static/js/219.8f881b85.chunk.js",
"./static/js/22.4c8bb333.chunk.js": "./static/js/22.4c8bb333.chunk.js",
"./static/js/220.476d3205.chunk.js": "./static/js/220.476d3205.chunk.js",
"./static/js/221.e07afe2c.chunk.js": "./static/js/221.e07afe2c.chunk.js",
"./static/js/222.2dd41e75.chunk.js": "./static/js/222.2dd41e75.chunk.js",
"./static/js/223.133697da.chunk.js": "./static/js/223.133697da.chunk.js",
"./static/js/224.87ac7213.chunk.js": "./static/js/224.87ac7213.chunk.js",
"./static/js/225.60513ed2.chunk.js": "./static/js/225.60513ed2.chunk.js",
"./static/js/226.f24ef2b5.chunk.js": "./static/js/226.f24ef2b5.chunk.js",
"./static/js/227.c95f4494.chunk.js": "./static/js/227.c95f4494.chunk.js",
"./static/js/228.a3590254.chunk.js": "./static/js/228.a3590254.chunk.js",
"./static/js/229.b06fc465.chunk.js": "./static/js/229.b06fc465.chunk.js",
"./static/js/23.aebb159d.chunk.js": "./static/js/23.aebb159d.chunk.js",
"./static/js/230.1466387c.chunk.js": "./static/js/230.1466387c.chunk.js",
"./static/js/231.e729eb6c.chunk.js": "./static/js/231.e729eb6c.chunk.js",
"./static/js/232.ada6d07a.chunk.js": "./static/js/232.ada6d07a.chunk.js",
"./static/js/233.53ed68fe.chunk.js": "./static/js/233.53ed68fe.chunk.js",
"./static/js/234.b7b097d6.chunk.js": "./static/js/234.b7b097d6.chunk.js",
"./static/js/235.5b4a016d.chunk.js": "./static/js/235.5b4a016d.chunk.js",
"./static/js/236.e66dee6e.chunk.js": "./static/js/236.e66dee6e.chunk.js",
"./static/js/237.5e3e8f76.chunk.js": "./static/js/237.5e3e8f76.chunk.js",
"./static/js/238.9ce1b135.chunk.js": "./static/js/238.9ce1b135.chunk.js",
"./static/js/239.d22322bb.chunk.js": "./static/js/239.d22322bb.chunk.js",
"./static/js/24.22ef380a.chunk.js": "./static/js/24.22ef380a.chunk.js",
"./static/js/240.035fb15e.chunk.js": "./static/js/240.035fb15e.chunk.js",
"./static/js/241.ec5be75d.chunk.js": "./static/js/241.ec5be75d.chunk.js",
"./static/js/242.3234f588.chunk.js": "./static/js/242.3234f588.chunk.js",
"./static/js/243.b191f470.chunk.js": "./static/js/243.b191f470.chunk.js",
"./static/js/244.f056cbd6.chunk.js": "./static/js/244.f056cbd6.chunk.js",
"./static/js/245.bd0e380e.chunk.js": "./static/js/245.bd0e380e.chunk.js",
"./static/js/246.d2f9e8b1.chunk.js": "./static/js/246.d2f9e8b1.chunk.js",
"./static/js/247.6987bd76.chunk.js": "./static/js/247.6987bd76.chunk.js",
"./static/js/248.24cc4b10.chunk.js": "./static/js/248.24cc4b10.chunk.js",
"./static/js/249.f79eeb77.chunk.js": "./static/js/249.f79eeb77.chunk.js",
"./static/js/25.77a31c58.chunk.js": "./static/js/25.77a31c58.chunk.js",
"./static/js/250.6645f8b5.chunk.js": "./static/js/250.6645f8b5.chunk.js",
"./static/js/251.419ffe18.chunk.js": "./static/js/251.419ffe18.chunk.js",
"./static/js/252.ffc4dcb6.chunk.js": "./static/js/252.ffc4dcb6.chunk.js",
"./static/js/253.ebbeb4bd.chunk.js": "./static/js/253.ebbeb4bd.chunk.js",
"./static/js/254.863c48fc.chunk.js": "./static/js/254.863c48fc.chunk.js",
"./static/js/255.7fee5b41.chunk.js": "./static/js/255.7fee5b41.chunk.js",
"./static/js/256.cf5ef9a6.chunk.js": "./static/js/256.cf5ef9a6.chunk.js",
"./static/js/257.d4fdfb46.chunk.js": "./static/js/257.d4fdfb46.chunk.js",
"./static/js/258.94dc05e4.chunk.js": "./static/js/258.94dc05e4.chunk.js",
"./static/js/259.cc34b705.chunk.js": "./static/js/259.cc34b705.chunk.js",
"./static/js/26.8629bf8a.chunk.js": "./static/js/26.8629bf8a.chunk.js",
"./static/js/260.a2449e25.chunk.js": "./static/js/260.a2449e25.chunk.js",
"./static/js/261.4869bc3c.chunk.js": "./static/js/261.4869bc3c.chunk.js",
"./static/js/262.b49c1dfe.chunk.js": "./static/js/262.b49c1dfe.chunk.js",
"./static/js/263.7754f522.chunk.js": "./static/js/263.7754f522.chunk.js",
"./static/js/264.cc552723.chunk.js": "./static/js/264.cc552723.chunk.js",
"./static/js/265.32511fba.chunk.js": "./static/js/265.32511fba.chunk.js",
"./static/js/266.0a917fe9.chunk.js": "./static/js/266.0a917fe9.chunk.js",
"./static/js/267.1810bd59.chunk.js": "./static/js/267.1810bd59.chunk.js",
"./static/js/268.ed711356.chunk.js": "./static/js/268.ed711356.chunk.js",
"./static/js/269.97095b2d.chunk.js": "./static/js/269.97095b2d.chunk.js",
"./static/js/27.d9b546ab.chunk.js": "./static/js/27.d9b546ab.chunk.js",
"./static/js/270.c5795190.chunk.js": "./static/js/270.c5795190.chunk.js",
"./static/js/271.b5f939a0.chunk.js": "./static/js/271.b5f939a0.chunk.js",
"./static/js/272.6cd7ccc1.chunk.js": "./static/js/272.6cd7ccc1.chunk.js",
"./static/js/28.d40ce852.chunk.js": "./static/js/28.d40ce852.chunk.js",
"./static/js/29.4131983c.chunk.js": "./static/js/29.4131983c.chunk.js",
"./static/js/3.de444263.chunk.js": "./static/js/3.de444263.chunk.js",
"./static/js/30.bc14daba.chunk.js": "./static/js/30.bc14daba.chunk.js",
"./static/js/31.42d39ddd.chunk.js": "./static/js/31.42d39ddd.chunk.js",
"./static/js/32.fedb209c.chunk.js": "./static/js/32.fedb209c.chunk.js",
"./static/js/33.100ad33d.chunk.js": "./static/js/33.100ad33d.chunk.js",
"./static/js/34.4291681f.chunk.js": "./static/js/34.4291681f.chunk.js",
"./static/js/35.32a9f338.chunk.js": "./static/js/35.32a9f338.chunk.js",
"./static/js/36.cc9fadd2.chunk.js": "./static/js/36.cc9fadd2.chunk.js",
"./static/js/37.f93f5966.chunk.js": "./static/js/37.f93f5966.chunk.js",
"./static/js/38.c76fe557.chunk.js": "./static/js/38.c76fe557.chunk.js",
"./static/js/39.a01f0a61.chunk.js": "./static/js/39.a01f0a61.chunk.js",
"./static/js/4.0958c04a.chunk.js": "./static/js/4.0958c04a.chunk.js",
"./static/js/40.c50d2381.chunk.js": "./static/js/40.c50d2381.chunk.js",
"./static/js/41.ec606539.chunk.js": "./static/js/41.ec606539.chunk.js",
"./static/js/42.7b2def1b.chunk.js": "./static/js/42.7b2def1b.chunk.js",
"./static/js/43.7976cb68.chunk.js": "./static/js/43.7976cb68.chunk.js",
"./static/js/44.78e0c1d6.chunk.js": "./static/js/44.78e0c1d6.chunk.js",
"./static/js/45.3436b289.chunk.js": "./static/js/45.3436b289.chunk.js",
"./static/js/46.c33d233d.chunk.js": "./static/js/46.c33d233d.chunk.js",
"./static/js/47.17d47062.chunk.js": "./static/js/47.17d47062.chunk.js",
"./static/js/48.24657b0c.chunk.js": "./static/js/48.24657b0c.chunk.js",
"./static/js/49.e46d5cc5.chunk.js": "./static/js/49.e46d5cc5.chunk.js",
"./static/js/5.cd01e110.chunk.js": "./static/js/5.cd01e110.chunk.js",
"./static/js/50.b8619ef3.chunk.js": "./static/js/50.b8619ef3.chunk.js",
"./static/js/51.4e4c388a.chunk.js": "./static/js/51.4e4c388a.chunk.js",
"./static/js/52.8b8e5e72.chunk.js": "./static/js/52.8b8e5e72.chunk.js",
"./static/js/53.91568a63.chunk.js": "./static/js/53.91568a63.chunk.js",
"./static/js/54.90cc8cd1.chunk.js": "./static/js/54.90cc8cd1.chunk.js",
"./static/js/55.b2b3350f.chunk.js": "./static/js/55.b2b3350f.chunk.js",
"./static/js/56.626808d5.chunk.js": "./static/js/56.626808d5.chunk.js",
"./static/js/57.02b743ad.chunk.js": "./static/js/57.02b743ad.chunk.js",
"./static/js/58.e28554c1.chunk.js": "./static/js/58.e28554c1.chunk.js",
"./static/js/59.efe01636.chunk.js": "./static/js/59.efe01636.chunk.js",
"./static/js/6.c1f79042.chunk.js": "./static/js/6.c1f79042.chunk.js",
"./static/js/60.d8f242f9.chunk.js": "./static/js/60.d8f242f9.chunk.js",
"./static/js/61.e224f9b4.chunk.js": "./static/js/61.e224f9b4.chunk.js",
"./static/js/62.6820bcac.chunk.js": "./static/js/62.6820bcac.chunk.js",
"./static/js/63.9173054f.chunk.js": "./static/js/63.9173054f.chunk.js",
"./static/js/64.13689266.chunk.js": "./static/js/64.13689266.chunk.js",
"./static/js/65.1d7f188b.chunk.js": "./static/js/65.1d7f188b.chunk.js",
"./static/js/66.be555ba2.chunk.js": "./static/js/66.be555ba2.chunk.js",
"./static/js/67.1a7c23f3.chunk.js": "./static/js/67.1a7c23f3.chunk.js",
"./static/js/68.8ee585ac.chunk.js": "./static/js/68.8ee585ac.chunk.js",
"./static/js/69.e2ef8b25.chunk.js": "./static/js/69.e2ef8b25.chunk.js",
"./static/js/7.770ff8da.chunk.js": "./static/js/7.770ff8da.chunk.js",
"./static/js/70.3383729d.chunk.js": "./static/js/70.3383729d.chunk.js",
"./static/js/71.79702eb4.chunk.js": "./static/js/71.79702eb4.chunk.js",
"./static/js/72.a6b7aea4.chunk.js": "./static/js/72.a6b7aea4.chunk.js",
"./static/js/73.d6726eb5.chunk.js": "./static/js/73.d6726eb5.chunk.js",
"./static/js/74.0c9dea9c.chunk.js": "./static/js/74.0c9dea9c.chunk.js",
"./static/js/75.df65888e.chunk.js": "./static/js/75.df65888e.chunk.js",
"./static/js/76.83b711d5.chunk.js": "./static/js/76.83b711d5.chunk.js",
"./static/js/77.f8e2311e.chunk.js": "./static/js/77.f8e2311e.chunk.js",
"./static/js/78.07c4d87a.chunk.js": "./static/js/78.07c4d87a.chunk.js",
"./static/js/79.71c1aaec.chunk.js": "./static/js/79.71c1aaec.chunk.js",
"./static/js/8.a7a7f0a8.chunk.js": "./static/js/8.a7a7f0a8.chunk.js",
"./static/js/80.ea6ef0c8.chunk.js": "./static/js/80.ea6ef0c8.chunk.js",
"./static/js/81.5ba1a813.chunk.js": "./static/js/81.5ba1a813.chunk.js",
"./static/js/82.3628e27a.chunk.js": "./static/js/82.3628e27a.chunk.js",
"./static/js/83.5140a660.chunk.js": "./static/js/83.5140a660.chunk.js",
"./static/js/84.72687a0e.chunk.js": "./static/js/84.72687a0e.chunk.js",
"./static/js/85.3a8dc8fb.chunk.js": "./static/js/85.3a8dc8fb.chunk.js",
"./static/js/86.00b6db75.chunk.js": "./static/js/86.00b6db75.chunk.js",
"./static/js/87.9a6684a6.chunk.js": "./static/js/87.9a6684a6.chunk.js",
"./static/js/88.d20bd270.chunk.js": "./static/js/88.d20bd270.chunk.js",
"./static/js/89.e8e3931d.chunk.js": "./static/js/89.e8e3931d.chunk.js",
"./static/js/9.a81e59fa.chunk.js": "./static/js/9.a81e59fa.chunk.js",
"./static/js/90.a33a0439.chunk.js": "./static/js/90.a33a0439.chunk.js",
"./static/js/91.35d08100.chunk.js": "./static/js/91.35d08100.chunk.js",
"./static/js/92.811d754b.chunk.js": "./static/js/92.811d754b.chunk.js",
"./static/js/93.9ca807cb.chunk.js": "./static/js/93.9ca807cb.chunk.js",
"./static/js/94.36dbd878.chunk.js": "./static/js/94.36dbd878.chunk.js",
"./static/js/95.0f6c972b.chunk.js": "./static/js/95.0f6c972b.chunk.js",
"./static/js/96.fe75753a.chunk.js": "./static/js/96.fe75753a.chunk.js",
"./static/js/97.3b4d4096.chunk.js": "./static/js/97.3b4d4096.chunk.js",
"./static/js/98.cc855f0c.chunk.js": "./static/js/98.cc855f0c.chunk.js",
"./static/js/99.a470bc24.chunk.js": "./static/js/99.a470bc24.chunk.js",
"main.css": "./static/css/main.c0718fb6.css",
"main.js": "./static/js/main.8a8db6c5.js",
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
"static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",
"static/media/KaTeX_Caligraphic-Bold.ttf": "static/media/KaTeX_Caligraphic-Bold.021dd4dc.ttf",
"static/media/KaTeX_Caligraphic-Bold.woff": "static/media/KaTeX_Caligraphic-Bold.1e802ca9.woff",
"static/media/KaTeX_Caligraphic-Bold.woff2": "static/media/KaTeX_Caligraphic-Bold.4ec58bef.woff2",
"static/media/KaTeX_Caligraphic-Regular.ttf": "static/media/KaTeX_Caligraphic-Regular.d49f2d55.ttf",
"static/media/KaTeX_Caligraphic-Regular.woff": "static/media/KaTeX_Caligraphic-Regular.d3b46c3a.woff",
"static/media/KaTeX_Caligraphic-Regular.woff2": "static/media/KaTeX_Caligraphic-Regular.7edb53b6.woff2",
"static/media/KaTeX_Fraktur-Bold.ttf": "static/media/KaTeX_Fraktur-Bold.a31e7cba.ttf",
"static/media/KaTeX_Fraktur-Bold.woff": "static/media/KaTeX_Fraktur-Bold.c4c8cab7.woff",
"static/media/KaTeX_Fraktur-Bold.woff2": "static/media/KaTeX_Fraktur-Bold.d5b59ec9.woff2",
"static/media/KaTeX_Fraktur-Regular.ttf": "static/media/KaTeX_Fraktur-Regular.a48dad4f.ttf",
"static/media/KaTeX_Fraktur-Regular.woff": "static/media/KaTeX_Fraktur-Regular.b7d9c46b.woff",
"static/media/KaTeX_Fraktur-Regular.woff2": "static/media/KaTeX_Fraktur-Regular.32a5339e.woff2",
"static/media/KaTeX_Main-Bold.ttf": "static/media/KaTeX_Main-Bold.9ceff51b.ttf",
"static/media/KaTeX_Main-Bold.woff": "static/media/KaTeX_Main-Bold.22086eb5.woff",
"static/media/KaTeX_Main-Bold.woff2": "static/media/KaTeX_Main-Bold.8e1e01c4.woff2",
"static/media/KaTeX_Main-BoldItalic.ttf": "static/media/KaTeX_Main-BoldItalic.e8b44b99.ttf",
"static/media/KaTeX_Main-BoldItalic.woff": "static/media/KaTeX_Main-BoldItalic.4c57dbc4.woff",
"static/media/KaTeX_Main-BoldItalic.woff2": "static/media/KaTeX_Main-BoldItalic.284a17fe.woff2",
"static/media/KaTeX_Main-Italic.ttf": "static/media/KaTeX_Main-Italic.29c86397.ttf",
"static/media/KaTeX_Main-Italic.woff": "static/media/KaTeX_Main-Italic.99be0e10.woff",
"static/media/KaTeX_Main-Italic.woff2": "static/media/KaTeX_Main-Italic.e533d5a2.woff2",
"static/media/KaTeX_Main-Regular.ttf": "static/media/KaTeX_Main-Regular.5c94aef4.ttf",
"static/media/KaTeX_Main-Regular.woff": "static/media/KaTeX_Main-Regular.b741441f.woff",
"static/media/KaTeX_Main-Regular.woff2": "static/media/KaTeX_Main-Regular.5c734d78.woff2",
"static/media/KaTeX_Math-BoldItalic.ttf": "static/media/KaTeX_Math-BoldItalic.9a2834a9.ttf",
"static/media/KaTeX_Math-BoldItalic.woff": "static/media/KaTeX_Math-BoldItalic.b13731ef.woff",
"static/media/KaTeX_Math-BoldItalic.woff2": "static/media/KaTeX_Math-BoldItalic.d747bd1e.woff2",
"static/media/KaTeX_Math-Italic.ttf": "static/media/KaTeX_Math-Italic.291e76b8.ttf",
"static/media/KaTeX_Math-Italic.woff": "static/media/KaTeX_Math-Italic.f0303906.woff",
"static/media/KaTeX_Math-Italic.woff2": "static/media/KaTeX_Math-Italic.4ad08b82.woff2",
"static/media/KaTeX_SansSerif-Bold.ttf": "static/media/KaTeX_SansSerif-Bold.7dc027cb.ttf",
"static/media/KaTeX_SansSerif-Bold.woff": "static/media/KaTeX_SansSerif-Bold.3fb41955.woff",
"static/media/KaTeX_SansSerif-Bold.woff2": "static/media/KaTeX_SansSerif-Bold.6e0830be.woff2",
"static/media/KaTeX_SansSerif-Italic.ttf": "static/media/KaTeX_SansSerif-Italic.4059868e.ttf",
"static/media/KaTeX_SansSerif-Italic.woff": "static/media/KaTeX_SansSerif-Italic.727a9b0d.woff",
"static/media/KaTeX_SansSerif-Italic.woff2": "static/media/KaTeX_SansSerif-Italic.fba01c9c.woff2",
"static/media/KaTeX_SansSerif-Regular.ttf": "static/media/KaTeX_SansSerif-Regular.5c58d168.ttf",
"static/media/KaTeX_SansSerif-Regular.woff": "static/media/KaTeX_SansSerif-Regular.2555754a.woff",
"static/media/KaTeX_SansSerif-Regular.woff2": "static/media/KaTeX_SansSerif-Regular.d929cd67.woff2",
"static/media/KaTeX_Script-Regular.ttf": "static/media/KaTeX_Script-Regular.d12ea9ef.ttf",
"static/media/KaTeX_Script-Regular.woff": "static/media/KaTeX_Script-Regular.d524c9a5.woff",
"static/media/KaTeX_Script-Regular.woff2": "static/media/KaTeX_Script-Regular.755e2491.woff2",
"static/media/KaTeX_Size1-Regular.ttf": "static/media/KaTeX_Size1-Regular.7342d45b.ttf",
"static/media/KaTeX_Size1-Regular.woff": "static/media/KaTeX_Size1-Regular.08b5f00e.woff",
"static/media/KaTeX_Size1-Regular.woff2": "static/media/KaTeX_Size1-Regular.048c39cb.woff2",
"static/media/KaTeX_Size2-Regular.ttf": "static/media/KaTeX_Size2-Regular.eb130dcc.ttf",
"static/media/KaTeX_Size2-Regular.woff": "static/media/KaTeX_Size2-Regular.af24b0e4.woff",
"static/media/KaTeX_Size2-Regular.woff2": "static/media/KaTeX_Size2-Regular.81d6b8d5.woff2",
"static/media/KaTeX_Size3-Regular.ttf": "static/media/KaTeX_Size3-Regular.7e02a40c.ttf",
"static/media/KaTeX_Size3-Regular.woff": "static/media/KaTeX_Size3-Regular.0d892640.woff",
"static/media/KaTeX_Size3-Regular.woff2": "static/media/KaTeX_Size3-Regular.b311ca09.woff2",
"static/media/KaTeX_Size4-Regular.ttf": "static/media/KaTeX_Size4-Regular.ad767252.ttf",
"static/media/KaTeX_Size4-Regular.woff": "static/media/KaTeX_Size4-Regular.68895bb8.woff",
"static/media/KaTeX_Size4-Regular.woff2": "static/media/KaTeX_Size4-Regular.6a3255df.woff2",
"static/media/KaTeX_Typewriter-Regular.ttf": "static/media/KaTeX_Typewriter-Regular.25702356.ttf",
"static/media/KaTeX_Typewriter-Regular.woff": "static/media/KaTeX_Typewriter-Regular.3fe216d2.woff",
"static/media/KaTeX_Typewriter-Regular.woff2": "static/media/KaTeX_Typewriter-Regular.6cc31ea5.woff2",
"static/media/auth.png": "static/media/auth.43f1c749.png",
"static/media/banner_list.png": "static/media/banner_list.ad510bee.png",
"static/media/banner_sub.png": "static/media/banner_sub.c6034810.png",
"static/media/beian.png": "static/media/beian.d0289dc0.png",
"static/media/beijintulogontwo.png": "static/media/beijintulogontwo.245dc9e1.png",
"static/media/bg.jpg": "static/media/bg.88a774b5.jpg",
"static/media/firefox_icon.png": "static/media/firefox_icon.cfd87a8f.png",
"static/media/guihome1.png": "static/media/guihome1.eca5276e.png",
"static/media/guihome2.jpg": "static/media/guihome2.c65f40bf.jpg",
"static/media/guihome3.jpg": "static/media/guihome3.0e1dc34b.jpg",
"static/media/guihome4.jpg": "static/media/guihome4.6cc0d72b.jpg",
"static/media/guihome5.jpg": "static/media/guihome5.1ac2c872.jpg",
"static/media/guihome6.jpg": "static/media/guihome6.7fc4fe9d.jpg",
"static/media/internet-explorer@2x.png": "static/media/internet-explorer@2x.f122e0ab.png",
"static/media/job.png": "static/media/job.b2881c7d.png",
"static/media/logo.svg": "static/media/logo.c72d4a3b.svg",
"static/media/match_ad.jpg": "static/media/match_ad.4e957369.jpg",
"static/media/message.svg": "static/media/message.e7922cf2.svg",
"static/media/messagegrey.svg": "static/media/messagegrey.80d0b058.svg",
"static/media/mytc.png": "static/media/mytc.4ef5faf4.png",
"static/media/oj_banner.jpg": "static/media/oj_banner.25ca233e.jpg",
"static/media/passall.png": "static/media/passall.46817e26.png",
"static/media/passpart.png": "static/media/passpart.4aaf3e6b.png",
"static/media/rc-tree.png": "static/media/rc-tree.776c7fe6.png",
"static/media/skzbdx.png": "static/media/skzbdx.01cb5862.png",
"static/media/teach_ex.jpg": "static/media/teach_ex.a415d7a9.jpg"
>>>>>>> 406f8f17f6d8e53723c5921455fa4ef0715e3c50
}

@ -24,11 +24,7 @@
_host = 'https://ali-cdn.educoder.net/react/build/'
}
document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
<<<<<<< HEAD
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.9229803d.js"><\/script>');
=======
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.8a8db6c5.js"><\/script>');
>>>>>>> 406f8f17f6d8e53723c5921455fa4ef0715e3c50
})()
</script>
<script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>

File diff suppressed because one or more lines are too long

@ -155,10 +155,10 @@ class MessageCount extends Component{
prmerge=()=>{
const {projectsId} = this.props.match.params;
const {data,title,body,mergekey} = this.state;
const url = `/projects/${projectsId}/pull_requests/${data.issue.id}/pr_merge.json`;
const url = `/projects/${projectsId}/pull_requests/${data.pull_request.id}/pr_merge.json`;
axios.post(url,{
project_id:projectsId,
id:data.issue.id,
id:data.pull_request.id,
do:mergekey,
body:body,
title:title,
@ -418,7 +418,7 @@ class MessageCount extends Component{
<p>
{
data ?
<span className="font-20">{ data.issue.tracker}</span>
<span className="font-20">{ data.issue.issue_classify==='issue'?data.issue.tracker:"合并"}</span>
:
""
}
@ -426,7 +426,7 @@ class MessageCount extends Component{
</p>
<p className="mt10 color-grey-c">
<span className={data&&data.issue.issue_status==="关闭"?"closedetail":"opendetail"}>{data&&data.issue.issue_status==="关闭"?"关闭中":"开启中"} </span>
<span className={data&&data.issue.issue_status==="关闭"?"closedetail":data&&data.pull_request.status===0?"opendetail":"prdetail"}>{data&&data.issue.issue_status==="关闭"?"关闭中":data&&data.pull_request.status===0?"开启中":"已合并"} </span>
<span className="ml10 lineH32">
{ data && data.issue.author_name} { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
</span>
@ -461,26 +461,30 @@ class MessageCount extends Component{
</Spin>
{ Paginations }
<div className="df">
<div className="df" style={{display:this.state.data&&this.state.data.pull_request.status===1?'none':'flex'}}>
<Link to={``}><img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/></Link>
<div className="new_context">
<div className="new_context" >
<p>该合并请求可以进行自动合并操作</p>
<p style={{display:this.state.mergekey==='rebase'?this.state.buttonshow==='none'?"block":"none":this.state.ismesrge==='none'?"block":"none"}}>
<button className="topmerge_btn" onClick={this.submitmerge} >{this.state.mergename}</button>
<Dropdown style={{marginBottom:5}} overlay={menu} trigger={['click']} >
<Icon type="caret-down" className="topWrapper_btn" style={{marginLeft:-3,marginBottom:2}}/>
</Dropdown>
<p style={{marginTop:15,display:this.state.mergekey==='rebase'?this.state.buttonshow==='none'?"block":"none":this.state.ismesrge==='none'?"block":"none"}}>
{/* <button className="topmerge_btn" onClick={this.submitmerge} >{this.state.mergename}</button> */}
{/* <Dropdown style={{marginBottom:5}} overlay={menu} trigger={['click']} > */}
<Dropdown.Button overlay={menu} type="primary" onClick={this.submitmerge} icon={<Icon type="caret-down"/>}>
{this.state.mergename}
</Dropdown.Button>
{/* </Dropdown> */}
</p>
<div style={{display:this.state.ismesrge}}>
<div style={{display:this.state.ismesrge,marginTop:15}}>
<Input placeholder="标题" value={this.state.title} onChange={this.changtitlepr}/>
<TextArea placeholder="请输入工单的描述..." style={{height:"300px",marginTop:15}} value={this.state.body} onChange={this.changbodypr} />
<TextArea placeholder="=描述..." style={{height:"300px",marginTop:15}} value={this.state.body} onChange={this.changbodypr} />
</div>
<p className="clearfix mt15" style={{display:this.state.buttonshow}}>
<a className="topWrapper_btn " type="submit" onClick={()=>this.prmerge()}>合并请求</a>
<a className="a_btn cancel_btn " type="submit" style={{marginLeft:15}} onClick={this.nonemerge}>取消</a>
</p>
</div>
</div>
<div className="order_line" style={{marginLeft:80}}></div>
<div className="df">
@ -499,19 +503,13 @@ class MessageCount extends Component{
<UploadComponent load={this.UploadFunc} isComplete={showFiles}></UploadComponent>
<p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
<a className="Closeor_btn fr" type="submit"
<a className="Closeor_btn fr" type="submit" style={{display:data&&data.pull_request.status===0?'block':'none'}}
onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>
</p>
</div>
</div>
</div>
<div className="list-left DetailRight mt10">
<p>
<span className="span_title">分支</span>
<span>{
data && data.issue.branch_name ? data.issue.branch_name : "--"
}</span>
</p>
<p>
<span className="span_title">标签</span>
<span>{
@ -524,30 +522,10 @@ class MessageCount extends Component{
data && data.issue.version ? data.issue.version : "--"
}</span>
</p>
<p>
<span className="span_title">当前状态</span>
<span>{
data && data.issue.issue_status ? data.issue.issue_status : "--"
}</span>
</p>
<p>
<span className="span_title">分类</span>
<span>{
data && data.issue.tracker ? data.issue.tracker : "--"
}</span>
</p>
<p>
<span className="span_title">指派给</span>
<span>{data && data.issue.assign_user_name ? data.issue.assign_user_name : "--"}</span>
</p>
<p>
<span className="span_title">优先级</span>
<span>{data && data.issue.priority ? data.issue.priority : "--"}</span>
</p>
<p>
<span className="span_title">完成度</span>
<span>{data && data.issue.done_ratio ? data.issue.done_ratio : "--"}</span>
</p>
</div>
</div>

@ -143,7 +143,9 @@ class NewMerge extends Component{
const url = `/projects/${projectsId}/pull_requests.json`;
if(values.issue_tag_ids.length > 0){
values.issue_tag_ids = [values.issue_tag_ids]
values.issue_tag_ids = [parseInt(values.issue_tag_ids)]
}else{
values.issue_tag_ids = []
}
axios.post(url,{

@ -216,25 +216,7 @@ class UpdateMerge extends Component{
</div>
<div className="list-left" style={{paddingRight:"0px",paddingLeft:"15px",paddingTop:"10px"}}>
<div className="list-l-panel">
<Form.Item
label="分支"
>
{getFieldDecorator('branch_name', {
initialValue: branch_name,
rules: [],
})(
<Select>
<Option value={''}>分支未指定</Option>
{
branches && branches.length >0 && branches.map((item,key)=>{
return(
<Option value={item}>{item}</Option>
)
})
}
</Select>
)}
</Form.Item>
<Form.Item
label="标签"
>
@ -261,34 +243,7 @@ class UpdateMerge extends Component{
</Select>
)}
</Form.Item>
<Form.Item
label="状态"
>
{getFieldDecorator('status_id', {
initialValue:status_id,
rules: [{
required: true, message: '请选择完成状态'
}],
})(
<Select >
{ this.renderSelect(issue_chosen && issue_chosen.issue_status) }
</Select>
)}
</Form.Item>
<Form.Item
label="分类"
>
{getFieldDecorator('tracker_id', {
initialValue:tracker_id,
rules: [{
required: true, message: '请选择分类'
}],
})(
<Select>
{ this.renderSelect(issue_chosen && issue_chosen.tracker) }
</Select>
)}
</Form.Item>
<Form.Item
label="指派成员"
>
@ -301,35 +256,7 @@ class UpdateMerge extends Component{
</Select>
)}
</Form.Item>
<Form.Item
label="优先度"
>
{getFieldDecorator('priority_id', {
initialValue:priority_id,
rules: [{
required: true, message: '请选择优先度'
}],
})(
<Select>
{ this.renderSelect(issue_chosen && issue_chosen.priority) }
</Select>
)}
</Form.Item>
<Form.Item
label="完成度"
>
{getFieldDecorator('done_ratio', {
initialValue:done_ratio,
rules: [{
required: true, message: '请选择完成度'
}],
})(
<Select value={done_ratio}>
{ this.renderSelect(issue_chosen && issue_chosen.done_ratio) }
</Select>
)}
</Form.Item>
</div>
</div>
</div>

@ -19,4 +19,16 @@
height: 36px;
line-height: 32px;
border-radius: 4px;
}
.prdetail{
display: inline-block;
background: #a333c8;
color: #ffffff!important;
padding:0px 12px;
text-align: center;
height: 32px;
/*width: 110px;*/
border-radius: 4px;
line-height: 32px;
}
Loading…
Cancel
Save