update frontend

This commit is contained in:
gerchek 2022-01-24 15:39:16 +05:00
parent 210a4e5ca2
commit e7d1ec4e7b
17 changed files with 48 additions and 30 deletions

View File

@ -1,19 +1,19 @@
{
"files": {
"main.css": "/static/css/main.f7b594f7.chunk.css",
"main.js": "/static/js/main.ec482cde.chunk.js",
"main.js.map": "/static/js/main.ec482cde.chunk.js.map",
"main.css": "/static/css/main.9da85e93.chunk.css",
"main.js": "/static/js/main.e22cbd89.chunk.js",
"main.js.map": "/static/js/main.e22cbd89.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.2cdb2292.js",
"runtime-main.js.map": "/static/js/runtime-main.2cdb2292.js.map",
"static/css/2.d555f809.chunk.css": "/static/css/2.d555f809.chunk.css",
"static/js/2.e5c28849.chunk.js": "/static/js/2.e5c28849.chunk.js",
"static/js/2.e5c28849.chunk.js.map": "/static/js/2.e5c28849.chunk.js.map",
"static/js/2.a8778389.chunk.js": "/static/js/2.a8778389.chunk.js",
"static/js/2.a8778389.chunk.js.map": "/static/js/2.a8778389.chunk.js.map",
"static/js/3.f448a7ff.chunk.js": "/static/js/3.f448a7ff.chunk.js",
"static/js/3.f448a7ff.chunk.js.map": "/static/js/3.f448a7ff.chunk.js.map",
"index.html": "/index.html",
"static/css/2.d555f809.chunk.css.map": "/static/css/2.d555f809.chunk.css.map",
"static/css/main.f7b594f7.chunk.css.map": "/static/css/main.f7b594f7.chunk.css.map",
"static/js/2.e5c28849.chunk.js.LICENSE.txt": "/static/js/2.e5c28849.chunk.js.LICENSE.txt",
"static/css/main.9da85e93.chunk.css.map": "/static/css/main.9da85e93.chunk.css.map",
"static/js/2.a8778389.chunk.js.LICENSE.txt": "/static/js/2.a8778389.chunk.js.LICENSE.txt",
"static/media/airport.9ca79b5c.jpg": "/static/media/airport.9ca79b5c.jpg",
"static/media/downArrow.0bea9b11.svg": "/static/media/downArrow.0bea9b11.svg",
"static/media/emblemLogo.80dd243c.svg": "/static/media/emblemLogo.80dd243c.svg",
@ -41,8 +41,8 @@
"entrypoints": [
"static/js/runtime-main.2cdb2292.js",
"static/css/2.d555f809.chunk.css",
"static/js/2.e5c28849.chunk.js",
"static/css/main.f7b594f7.chunk.css",
"static/js/main.ec482cde.chunk.js"
"static/js/2.a8778389.chunk.js",
"static/css/main.9da85e93.chunk.css",
"static/js/main.e22cbd89.chunk.js"
]
}

View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/><link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Etalon</title><link href="/static/css/2.d555f809.chunk.css" rel="stylesheet"><link href="/static/css/main.f7b594f7.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],c=t[1],l=t[2],s=0,p=[];s<i.length;s++)a=i[s],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&p.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(t);p.length;)p.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,i=1;i<r.length;i++){var c=r[i];0!==o[c]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"static/js/"+({}[e]||e)+"."+{3:"f448a7ff"}[e]+".chunk.js"}(e);var c=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(l);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),u=t&&t.target&&t.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,r[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="/",a.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpreact-etalon"]=this["webpackJsonpreact-etalon"]||[],c=i.push.bind(i);i.push=t,i=i.slice();for(var l=0;l<i.length;l++)t(i[l]);var f=c;r()}([])</script><script src="/static/js/2.e5c28849.chunk.js"></script><script src="/static/js/main.ec482cde.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/><link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Etalon</title><link href="/static/css/2.d555f809.chunk.css" rel="stylesheet"><link href="/static/css/main.9da85e93.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],c=t[1],l=t[2],s=0,p=[];s<i.length;s++)a=i[s],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&p.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(t);p.length;)p.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,i=1;i<r.length;i++){var c=r[i];0!==o[c]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"static/js/"+({}[e]||e)+"."+{3:"f448a7ff"}[e]+".chunk.js"}(e);var c=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(l);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),u=t&&t.target&&t.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,r[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="/",a.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpreact-etalon"]=this["webpackJsonpreact-etalon"]||[],c=i.push.bind(i);i.push=t,i=i.slice();for(var l=0;l<i.length;l++)t(i[l]);var f=c;r()}([])</script><script src="/static/js/2.a8778389.chunk.js"></script><script src="/static/js/main.e22cbd89.chunk.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -128,13 +128,14 @@ class Main extends React.Component {
<div className="slider">
<Swiper
// install Swiper modules
modules={[Navigation, Pagination, A11y, Autoplay]}
autoplay={({ delay: 3000 }, { disableOnInteraction: false })}
// modules={[Navigation, Pagination, A11y, Autoplay]}
modules={[Navigation, Pagination, A11y, ]}
// autoplay={({ delay: 3000 }, { disableOnInteraction: false })}
spaceBetween={0}
slidesPerView={1}
navigation
pagination={{ clickable: true }}
loop={true}
// navigation
// pagination={{ clickable: true }}
loop={false}
>
<SwiperSlide className="swipe-slide">
<h2>{t('Государственный эталонный центр')}</h2>
@ -142,7 +143,7 @@ class Main extends React.Component {
<img src={SliderIMG_2} alt="ETALON" />
</div>
</SwiperSlide>
<SwiperSlide className="swipe-slide">
{/* <SwiperSlide className="swipe-slide">
<h2>{t('Государственный эталонный центр')}</h2>
<div className="slider-img">
<img src={SliderIMG_2} alt="ETALON" />
@ -153,7 +154,7 @@ class Main extends React.Component {
<div className="slider-img">
<img src={SliderIMG_2} alt="ETALON" />
</div>
</SwiperSlide>
</SwiperSlide> */}
</Swiper>
</div>
</div>

View File

@ -52,11 +52,11 @@ class MeasuringRegister extends React.Component {
.then(res => {
if (this._mounted) {
this.setState({
items: res.data,
items: res.data['data'],
error: res.message || null,
DataisLoaded: true,
})
console.log(res.data)
console.log(this.state.items)
}
})

View File

@ -11,6 +11,19 @@
}
}
.table{
tr{
td{
&:first-child{
max-width: 2rem;
}
&:last-child{
max-width: 3rem;
}
}
}
}
.structure-table tbody * {
text-size-adjust: none;
-webkit-text-size-adjust: none;

View File

@ -37,9 +37,13 @@
}
.novelty-text {
padding: 0 1.5rem;
font-size: 1.8rem;
text-align: left;
line-height: 3.5rem;
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.pgraph {