ifream嵌套

api/.vscode/launch.json

@@ -21,7 +21,7 @@
             "-g postgres://FashionAdmin:123456@10.8.30.156:5432/POMS",
             "-k 10.8.30.72:29092,10.8.30.73:29092,10.8.30.74:29092",
             "--iotaProxy http://10.8.30.157:17007",
-            "--redisHost 10.8.30.112",
+            "--redisHost localhost",
             "--redisPort 6379",
             "--apMergeDeVeAnxinProjectId 1,2,3",
             "--axyApiUrl http://127.0.0.1:4100",
@@ -57,7 +57,7 @@
             // 测试
             "--clickHouseAnxincloud anxinyun1",
             "--clickHousePepEmis pepca8",
-            "--clickHouseProjectManage peppm",
+            "--clickHouseProjectManage peppm8",
             "--clickHouseVcmp video_access_dev",
             "--clickHouseDataAlarm default",
             "--clickHouseIot iot",

web/client/src/sections/facility/containers/monitor.jsx

@@ -14,7 +14,9 @@ const Server = (props) => {
    return (
       <>
          <div>
-            <img src="/assets/images/install/watting.png" alt="" style={{ width: 'calc(100% + 16px)', position: "relative", top: -12, left: -8, }} />
+            {/* <img src="/assets/images/install/watting.png" alt="" style={{ width: 'calc(100% + 16px)', position: "relative", top: -12, left: -8, }} /> */}
+            {/* <iframe frameborder="0" src={`/_api/https://monitor.anxinyun.cn/login`} style={{height: '100%', width: '100%'}} /> */}
+            <iframe frameBorder="0" src={`https://monitor.anxinyun.cn`} style={{height: 'calc(100vh - 30px)', width: 'calc(100%)'}} />
          </div>
       </>
    )

web/client/src/sections/service/containers/reportManagement.jsx

@@ -13,8 +13,9 @@ const Rest = (props) => {
 
    return (
       <>
+      {/* style={{height: '100%', width: '100%',margin: '8px 12px', padding: '20px 20px 0px 20px'}} */}
          <div >
-            <img src="/assets/images/install/watting.png" alt="" style={{ width: 'calc(100% + 16px)', position: "relative", top: -12, left: -8, }} />
+            <iframe frameBorder="0" src={`https://fsiot-oamss.anxinyun.cn/dataService/download?pcode=`} style={{height: 'calc(100vh - 30px)', width: 'calc(100%)'}} />
          </div>
       </>
    )