Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/workbench/config/components/board.vue

@@ -169,11 +169,12 @@
                 </el-row>
               </el-tab-pane>
               <el-tab-pane label="在线率统计" name="third">
-                <LineChart
+                <!-- <LineChart
                   v-if="activeName === 'third'"
                   :productId="dialogData.productId"
                   style="height: 160px"
-              /></el-tab-pane>
+              /> -->
+              </el-tab-pane>
             </el-tabs>
           </el-form>
           <div
@@ -292,7 +293,7 @@ import {
 import boardData from "@/views/information/board/boardData.json";
 import editInfo from "@/views/information/board/editInfo";
 import addinfo from "@/views/information/board//addinfo";
-import LineChart from "../../LineChart/index.vue";
+// import LineChart from "../../LineChart/index.vue";
 
 import Sortable from "sortablejs";
 import {
@@ -326,7 +327,7 @@ export const deepClone = (data) => {
 export default {
   // props: ["eqInfo", "brandList", "directionList", "eqTypeDialogList"],
   components: {
-    LineChart,
+    // LineChart,
     editInfo,
     addinfo,
   },

ruoyi-ui/src/views/workbench/config/components/video.vue

@@ -157,11 +157,12 @@
             </el-row>
           </el-tab-pane>
           <el-tab-pane label="在线率统计" name="third">
-            <LineChart
+            <!-- <LineChart
               v-if="activeName === 'third'"
               :productId="dialogData.productId"
               style="height: 160px"
-          /></el-tab-pane>
+          /> -->
+        </el-tab-pane>
         </el-tabs>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -411,7 +412,7 @@ import { getInfo } from "@/api/equipment/tunnel/api.js"; //查询设备当前状
 import flvjs from "flv.js";
 import videoPlayer from "@/views/event/vedioRecord/myVideo.vue";
 import { PTZContro, getCamera } from "@/api/workbench/config.js"; //提交控制信息
-import LineChart from "../../LineChart/index.vue";
+// import LineChart from "../../LineChart/index.vue";
 
 // import { getLocalIP } from "@/api/event/vedioRecord";
 
@@ -419,7 +420,7 @@ export default {
   // props: ["eqInfo", "brandList", "directionList", "eqTypeDialogList"],
   components: {
     videoPlayer,
-    LineChart,
+    // LineChart,
   },
   data() {
     return {