Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/remarksModal.jsx

@@ -94,13 +94,13 @@ function remarksModal (props) {
             >
                 <div style={{margin:"2px 14px 18px 29px",display:'flex'}}>
                     <div style={{width:394}}>
-                        <div style={{display:'flex'}}>
+                        <div style={{display:'flex',marginBottom:8,marginTop:11}}>
                             <div style={{color:'#1859C1',fontWeight: 600}}>请添加备注信息</div>
                             <div>（{showValueNum}/3）</div>
                         </div>
                         <div style={{marginTop:8}}>
                             {ScrollList.map((item, index) => (
-                                <div key={index} style={{marginTop:12}}>
+                                <div key={index} style={{marginTop:19}}>
                                     <Input 
                                         prefix={<div style={{color: 'rgba(0, 0, 0, 0.75)',margin:'0px 12px'}}>{item.num}</div>}
                                         value={item.value}
@@ -114,7 +114,7 @@ function remarksModal (props) {
                             ))}
                         </div>
                     </div>
-                    <div style={{width:306,marginLeft:20,position: ""}}>
+                    <div style={{width:306,marginLeft:20}}>
                             <div style={{ position: "absolute",background:'rgba(0, 0, 0, 0.15)',width:306}}>
                                 <TextScroll content={showScrollList} roll={roll} duration={6} />
                             </div>