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

2 years ago · c2b7eeee16
2 changed files with 4 additions and 3 deletions
--- a/code/VideoAccess-VCMP/web/client/index.ejs
+++ b/code/VideoAccess-VCMP/web/client/index.ejs
@ -7,11 +7,12 @@
   <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy">
   <link rel="shortcut icon" href="/assets/images/favicon.ico">
   <script src="/assets/js/jessibuca/jessibuca.js"></script>
-   <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"></script>
+   <script
      src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"></script>
 </head>
 <body>
-   <div id='VcmpApp'></div>
+   <div id='VcmpApp' style="height: 100%;"></div>
 </body>
 </html>
--- a/code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx
@ -1156,7 +1156,7 @@ const MirroringDetail = (props) => {
                                                    <div style={{ color: 'rgba(0,0,0,0.65)' }}>
                                                        {
                                                            labelEditNum == item.num ? (
-                                                                <Input value={item.name} onBlur={() => { toChangeLabel(item.num, item.name, addLabelNum) }} onChange={(value) => toEditLabel(value, index)} style={{ width: 120 }} maxLength={8} className='inputpadding' size='small'></Input>
+                                                                <Input value={item.name} onBlur={() => { toChangeLabel(item.num, item.name, addLabelNum) }} onChange={(value) => toEditLabel(value, index)} style={{ width: 120 }} maxLength={6} className='inputpadding' size='small'></Input>
                                                            ) : (item.name)
                                                        }
                                                    </div>