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

ruoyi-ui/src/common/menuData.js

@@ -113,18 +113,6 @@ 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"
           }
         ],
       },
@@ -179,7 +167,19 @@ export default [
            title: "统计分析",
            name: "smartStatistic",
            path: "/maintain/smart/statistic",
-           component: "maintenanceOperations/statisticalAnalysis/index.vue",
+           component: "maintenanceOperations/smart/statisticalAnalysis/index.vue",
+          },
+          {
+            title: "网络拓扑",
+            name: "smartTopology",
+            path: "/maintain/smart/topology",
+            component: "maintenanceOperations/smart/topology/index.vue"
+          },
+          {
+            title: "设备管理",
+            name: "smartDeviceMange",
+            path: "/maintain/smart/manage",
+            component: "maintenanceOperations/smart/manage/index.vue"
           }
         ]
       }, {

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

@@ -14,33 +14,40 @@
 </style> -->
 <template>
     <div class='comp_box'>
-        <iframe class="iframe" :src="alarmUrl" frameborder="0"></iframe>
+        <iframe class="iframe" :src="url" frameborder="0"></iframe>
     </div>
 </template>
 
 <script>
 
 import { getConfigKey } from "@/api/system/config.js";
-
+import request from "@/utils/request";
 export default {
     name: 'InDevelopment',
     components: {
     },
-    props: {
+    data(){
-        text: {
+        return {
-            type: String,
+            url:""
-            default: "暂无数据"
-        },
-        alarmUrl: {
-            type: String,
-            default: "",
         }
     },
+    props: {
+    },
     mounted() {
-        // this.alarmUrl = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
+        // this.url = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
-        getConfigKey("dc.gisAndBim").then((res) => {
+        // getConfigKey("AESEncryption").then((res) => {
-            this.alarmUrl = res.msg
+        //     alert(res.msg)
-        });
+        //     this.url = res.msg
+        // });
+        request({
+            url: `/AESEncryption`,
+            method: "get",
+        }).then((res) => {
+            this.url = res.msg
+            console.log(res, "AESEncryption获取iframe url成功。。。")
+        }).catch(err => {
+            console.log(err, "AESEncryption获取iframe url失败。。。")
+        });;
     }
 }
 </script>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue → ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue

@@ -9,7 +9,7 @@
 </template>
   
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/charts";
 let chartsStatistics = chartOptions.options;

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue → ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/index.vue

@@ -13,7 +13,7 @@
 </template>
   
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import EllipseData from "./EllipseData.vue"
 export default {
   name: 'MonthlyEquipment',

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue → ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/onLineBarCharts/index.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/barCharts";
 

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js

@@ -14,20 +14,20 @@ export const searchFormList = [
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
   },
-  PresetFormItems.directionCreater("RadioGroup"),
+  // PresetFormItems.directionCreater("RadioGroup"),
   {
     label: "发布状态:",
-    key: "releaseStatus",
+    key: "status",
     type: "RadioGroup",
     default: [],
     options: {
       options: [
         {
-          key: "1",
+          key: 0,
           label: "成功",
         },
         {
-          key: "0",
+          key: 1,
           label: "失败",
         },
       ],

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue

@@ -26,7 +26,7 @@
           header-align="center" />
         <ElTableColumn label="发布时间" prop="operTime" width="280" align="center" header-align="center">
           <template slot-scope="scope">
-            {{ moment(scope.row.operTime).format("yyyy/MM/DD hh:mm") }}
+            {{ moment(scope.row.operTime).format("yyyy/MM/DD HH:mm") }}
           </template>
         </ElTableColumn>
         <ElTableColumn label="设备ID" prop="dcDeviceId" width="120" align="center" header-align="center">
@@ -34,6 +34,7 @@
             {{ JSON.parse(scope.row.dcDeviceId).join("、") }}
           </template>
         </ElTableColumn>
+        <!-- <ElTableColumn label="方向" prop="direction" width="160" align="center" header-align="center" /> -->
         <ElTableColumn label="设备名称" prop="dcDeviceName" align="center" header-align="center">
           <template slot-scope="scope">
             {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
@@ -58,7 +59,7 @@
         </ElTableColumn>
         <ElTableColumn label="发布结果" prop="status" width="140" align="center" header-align="center">
           <template slot-scope="scope">
-            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 1"></i>
+            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 0"></i>
             <i class="el-icon-error" style="font-size: 24px; color:#BBB;" v-else></i>
           </template>
         </ElTableColumn>
@@ -145,7 +146,7 @@ export default {
         ...this.searchData,
         // releaseContent: data.releaseContent || "",
         direction: data.direction || "",
-        releaseStatus: data.releaseStatus,
+        status: data.status,
         startTime,
         endTime,
         // stakeMark: stakeMark,

ruoyi-ui/vue.config.js

@@ -52,8 +52,8 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥
+        // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝