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

ruoyi-ui/src/common/menuData.js

@@ -36,12 +36,6 @@ export default [
         path: "/perception/trafficSituation",
         name: "perceptionTrafficSituation",
         component: "perception/trafficSituation/index.vue",
-      },
-      {
-        title: "网络拓扑",
-        name: "perceptionTopology",
-        path: "/perception/topology",
-        component: "perception/topology/index.vue"
       }
     ],
   },
@@ -119,6 +113,18 @@ export default [
             path: "/control/device/strategy",
             name: "controlDeviceStrategy",
             component: "control/device/strategy/index.vue",
+          },
+          {
+            title: "网络拓扑",
+            name: "controlDeviceTopology",
+            path: "/control/device/topology",
+            component: "control/device/topology/index.vue"
+          },
+          {
+            title: "设备管理",
+            name: "controlDeviceMange",
+            path: "/control/device/manage",
+            component: "control/device/manage/index.vue"
           }
         ],
       },

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/manage/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class='developing'>
+    <p>功能开发中...</p>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'InDevelopment',
+  components: {
+  },
+  mounted() {
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.developing {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 6;
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  p {
+    font-size: 24px;
+  }
+}
+</style>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/_index.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="TrafficFlow">
+    <section class="foot">
+      <div class="content">
+        <div class="content-l">
+          <RoadNetwork />
+          <LaneTolls />
+        </div>
+        <div class="content-l">
+          <VehicleTolls />
+          <TruckLaneTolls />
+        </div>
+        <RoadSectionTolls class="content-r" />
+      </div>
+    </section>
+    <section class="foot">
+      <div class="content" style="position: relative; top: -10px">
+        <AccessAnalysis class="content-m" />
+        <AuxiliaryFlowcharts class="content-rm" />
+      </div>
+    </section>
+    <section class="foot">
+      <div class="content">
+        <MonthlyAnalysis class="content-mi" />
+        <DaylyAnalysis class="content-mi" />
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+import RoadNetwork from "./components/roadNetworkTraffic";
+import LaneTolls from "./components/laneTolls";
+import VehicleTolls from "./components/vehicleTolls";
+import TruckLaneTolls from "./components/truckLaneTolls";
+import RoadSectionTolls from "./components/RoadSectionTolls";
+import AccessAnalysis from "./components/accessAnalysis";
+import AuxiliaryFlowcharts from "./components/auxiliaryFlowcharts";
+import MonthlyAnalysis from "./components/monthlyAnalysis";
+import DaylyAnalysis from "./components/daylyAnalysis";
+
+export default {
+  name: "publicService",
+  components: {
+    RoadNetwork,
+    LaneTolls,
+    VehicleTolls,
+    TruckLaneTolls,
+    RoadSectionTolls,
+    AccessAnalysis,
+    AuxiliaryFlowcharts,
+    MonthlyAnalysis,
+    DaylyAnalysis,
+  },
+  data() {
+    return {
+      activeName: "first",
+    };
+  },
+  methods: {
+    changeTabs() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-tabs__item {
+  display: inline-flex;
+  justify-content: center;
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  color: #ffffff;
+  min-width: 128px;
+  position: relative;
+  left: 10px;
+}
+
+::v-deep .el-tabs__active-bar {
+  min-width: 128px;
+}
+
+::v-deep .el-tabs__nav-wrap::after {
+  background-color: #133242;
+  opacity: 0.1;
+}
+
+.footTabs {
+  display: inline;
+  width: 100%;
+}
+
+.TrafficFlow {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 6;
+  color: white;
+  padding-top: 15px;
+
+  .header-shot {
+    width: 98%;
+    margin: auto;
+    margin-top: 15px;
+    height: 160px;
+  }
+
+  .content {
+    width: 100%;
+    margin: auto;
+    display: flex;
+    flex: 1;
+    pointer-events: none;
+    margin-top: 0px;
+
+    > div {
+      pointer-events: auto;
+    }
+
+    .content-l {
+      width: calc(32.2%);
+      margin-right: 20px;
+      display: inline-flex;
+      flex-direction: column;
+
+      > div {
+        margin-bottom: 15px;
+      }
+    }
+
+    .content-r {
+      width: calc(33%);
+      display: inline-flex;
+    }
+
+    .content-rm {
+      width: calc(33%);
+      margin-right: 10px;
+    }
+
+    .content-mi {
+      width: calc(50%);
+
+      margin-right: 20px;
+    }
+
+    .content-mi:last-child {
+      margin-right: 10px;
+    }
+
+    .content-m {
+      display: inline-flex;
+      width: 66%;
+      margin-right: 20px;
+    }
+  }
+
+  .foot {
+    width: 98%;
+    margin: auto;
+    display: flex;
+    justify-content: space-between;
+    flex: 1;
+    pointer-events: none;
+    margin-top: 8px;
+    > div {
+      pointer-events: auto;
+    }
+
+    .foot-w {
+      width: 100%;
+    }
+
+    .foot-l {
+      width: 726px;
+    }
+    .foot-m {
+      width: 613px;
+    }
+    .foot-r {
+      width: 493px;
+    }
+  }
+}
+</style>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue

@@ -1,185 +1,67 @@
-<template>
-  <div class="TrafficFlow">
-    <section class="foot">
-      <div class="content">
-        <div class="content-l">
-          <RoadNetwork />
-          <LaneTolls />
-        </div>
-        <div class="content-l">
-          <VehicleTolls />
-          <TruckLaneTolls />
-        </div>
-        <RoadSectionTolls class="content-r" />
-      </div>
-    </section>
-    <section class="foot">
-      <div class="content" style="position: relative; top: -10px">
-        <AccessAnalysis class="content-m" />
-        <AuxiliaryFlowcharts class="content-rm" />
+<!-- <template>
+    <div>
+        <img class="img" src="@screen/images/digital/gisAndBim.jpg" />
     </div>
-    </section>
-    <section class="foot">
-      <div class="content">
-        <MonthlyAnalysis class="content-mi" />
-        <DaylyAnalysis class="content-mi" />
-      </div>
-    </section>
+</template>
+<script>
+
+</script>
+<style lang='scss' scoped>
+    .img {
+        height: 1030px;
+        width: 1920px;
+    }
+</style> -->
+<template>
+    <div class='comp_box'>
+        <iframe class="iframe" :src="alarmUrl" frameborder="0"></iframe>
     </div>
 </template>
 
 <script>
-import RoadNetwork from "./components/roadNetworkTraffic";
-import LaneTolls from "./components/laneTolls";
-import VehicleTolls from "./components/vehicleTolls";
-import TruckLaneTolls from "./components/truckLaneTolls";
-import RoadSectionTolls from "./components/RoadSectionTolls";
-import AccessAnalysis from "./components/accessAnalysis";
-import AuxiliaryFlowcharts from "./components/auxiliaryFlowcharts";
-import MonthlyAnalysis from "./components/monthlyAnalysis";
-import DaylyAnalysis from "./components/daylyAnalysis";
+
+import { getConfigKey } from "@/api/system/config.js";
 
 export default {
-  name: "publicService",
+    name: 'InDevelopment',
     components: {
-    RoadNetwork,
-    LaneTolls,
-    VehicleTolls,
-    TruckLaneTolls,
-    RoadSectionTolls,
-    AccessAnalysis,
-    AuxiliaryFlowcharts,
-    MonthlyAnalysis,
-    DaylyAnalysis,
     },
-  data() {
-    return {
-      activeName: "first",
-    };
+    props: {
+        text: {
+            type: String,
+            default: "暂无数据"
         },
-  methods: {
-    changeTabs() {},
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-::v-deep .el-tabs__item {
-  display: inline-flex;
-  justify-content: center;
-  font-size: 16px;
-  font-family: PingFang SC, PingFang SC;
-  font-weight: 500;
-  color: #ffffff;
-  min-width: 128px;
-  position: relative;
-  left: 10px;
-}
-
-::v-deep .el-tabs__active-bar {
-  min-width: 128px;
+        alarmUrl: {
+            type: String,
+            default: "",
         }
-
-::v-deep .el-tabs__nav-wrap::after {
-  background-color: #133242;
-  opacity: 0.1;
+    },
+    mounted() {
+        // this.alarmUrl = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
+        getConfigKey("dc.gisAndBim").then((res) => {
+            this.alarmUrl = res.msg
+        });
     }
-
-.footTabs {
-  display: inline;
-  width: 100%;
 }
+</script>
 
-.TrafficFlow {
+<style lang='scss' scoped>
+.comp_box {
+    // padding-top:160px;
     width: 100%;
     height: 100%;
-  position: relative;
-  z-index: 6;
-  color: white;
-  padding-top: 15px;
-
-  .header-shot {
-    width: 98%;
-    margin: auto;
-    margin-top: 15px;
-    height: 160px;
-  }
-
-  .content {
-    width: 100%;
-    margin: auto;
+    color: #8A9EAA;
     display: flex;
-    flex: 1;
-    pointer-events: none;
-    margin-top: 0px;
-
-    > div {
-      pointer-events: auto;
-    }
-
-    .content-l {
-      width: calc(32.2%);
-      margin-right: 20px;
-      display: inline-flex;
-      flex-direction: column;
-
-      > div {
-        margin-bottom: 15px;
-      }
-    }
-
-    .content-r {
-      width: calc(33%);
-      display: inline-flex;
-    }
-
-    .content-rm {
-      width: calc(33%);
-      margin-right: 10px;
-    }
-
-    .content-mi {
-      width: calc(50%);
-
-      margin-right: 20px;
-    }
-
-    .content-mi:last-child {
-      margin-right: 10px;
-    }
-
-    .content-m {
-      display: inline-flex;
-      width: 66%;
-      margin-right: 20px;
-    }
-  }
-
-  .foot {
-    width: 98%;
-    margin: auto;
-    display: flex;
-    justify-content: space-between;
-    flex: 1;
-    pointer-events: none;
-    margin-top: 8px;
-    > div {
-      pointer-events: auto;
-    }
+    justify-content: center;
+    align-items: center;
+    position: relative;
 
-    .foot-w {
+    .iframe {
+        position: absolute;
+        left: 0;
+        top: 0;
         width: 100%;
-    }
-
-    .foot-l {
-      width: 726px;
-    }
-    .foot-m {
-      width: 613px;
-    }
-    .foot-r {
-      width: 493px;
-    }
+        height: 100%;
     }
 }
 </style>