更新2024-10-09需求

ruoyi-ui/src/common/menuData.js

@@ -196,12 +196,12 @@ export default [
           },
         ],
       },
-      // {
+      {
-      //   title: "边坡光伏",
+        title: "太阳能板",
-      //   name: "photovoltaic",
+        name: "solar",
-      //   path: "/maintain/photovoltaic",
+        path: "/maintain/solar",
-      //   component: "developing.vue",
+        component: "maintenanceOperations/solar/index.vue",
-      // },
+      },
       {
         title: "桥梁监测",
         name: "photovoltaic",

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

@@ -22,6 +22,11 @@
           <ElTableColumn label="管控时间" prop="operTime" width="200" />
             <ElTableColumn label="管控方式" prop="operType" width="200" />
             <ElTableColumn label="操作人" prop="operName" width="200" />
+            <ElTableColumn label="操作IP" prop="operIp" width="250">
+              <template slot-scope="scope">
+                {{ (scope.row.operIp === 'unknown' || !scope.row.operIp) ? '服务器': scope.row.operIp}}
+              </template>
+            </ElTableColumn>
             <ElTableColumn label="设备类型"  width="200">
               <template slot-scope="scope">
                 <div>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js

@@ -91,6 +91,16 @@ export const deviceType = [
     label: "智能设备箱",
     color: "#A64500",
   },
+  {
+    value: "15",
+    label: "太阳能板",
+    color: "#4e5417",
+  },
+  {
+    value: "16",
+    label: "远端机",
+    color: "#0040a6",
+  },
 ]
 export const tabMap = {
   AlarmEvents: {

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue

@@ -140,7 +140,6 @@ export default {
 </style>
 <style lang="scss" scoped>
 .DialogRecord {
-  
 }
 
 .dsort {

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue

@@ -3,7 +3,8 @@
     <div class="topdiv">
       <div class="left-div">
         <el-button size="mini" icon="el-icon-refresh-left" class="btnSearch" @click="onRefreshData">刷新</el-button>
-        <el-button v-hasPermi="['maintain:equipmentOnlineAnalysis:export']" size="mini" icon="el-icon-download" class="btnSearch" @click="SystemStatusExport">导出Excel</el-button>
+        <el-button v-hasPermi="['maintain:equipmentOnlineAnalysis:export']" size="mini" icon="el-icon-download" class="btnSearch" @click="SystemStatusExport('0')">导出Excel</el-button>
+        <el-button v-hasPermi="['maintain:equipmentOnlineAnalysis:export']" size="mini" icon="el-icon-download" class="btnSearch" @click="SystemStatusExport('1')">导出丢包</el-button>
       </div>
       <div class="right-div">
         <InputSearch 
@@ -317,7 +318,7 @@ export default {
       this.initQueryTable();
     },
     //导出
-    SystemStatusExport() {
+    SystemStatusExport(t) {
       let loadingInstance = Loading.service({
         fullscreen: true,
         background: "#00000052",
@@ -337,7 +338,9 @@ export default {
       if(this.deviceName){
         params.deviceName = this.deviceName
       }
-      
+      if(t === '1'){
+        params.exportType='1'
+      }      
       getSystemStatusExport(params)
         .then((res) => {
           const url = window.URL.createObjectURL(new Blob([res]));

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

@@ -0,0 +1,29 @@
+
+<template>
+    <div class='comp_box'>
+       
+    </div>
+</template>
+
+<script>
+import request from "@/utils/request";
+export default {
+    name: 'Solar',
+    components: {
+    },
+    data(){
+        return {
+            
+        }
+    },
+    mounted() {
+        
+    }
+}
+</script>
+
+<style lang='scss' scoped>
+.solar {
+   
+}
+</style>

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue

@@ -32,6 +32,11 @@
           </template>
         </ElTableColumn>
         <ElTableColumn label="发布时间" prop="publishTime" align="center" width="200"  header-align="center" />
+        <ElTableColumn label="操作IP" prop="operIp" align="center" width="250" header-align="center">
+          <template slot-scope="scope">
+            {{ (scope.row.operIp === 'unknown' || !scope.row.operIp) ? '服务器': scope.row.operIp}}
+          </template>
+        </ElTableColumn>
         <ElTableColumn label="位置/设备" prop="position" align="center" width="260"  header-align="center">
           <template slot-scope="scope">
             {{ scope.row.position && scope.row.position.replace(/\[/,'').replace(/\]/,'') }}