From 6af1471521fb4f83b789838a6e5806b1d996f6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Wed, 9 Oct 2024 21:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B02024-10-09=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               | 12 ++++----
 .../pages/control/device/record/index.vue     |  5 ++++
 .../smart/statisticalAnalysis/query/data.js   | 10 +++++++
 .../query/dialogRecord.vue                    |  1 -
 .../smart/statisticalAnalysis/query/index.vue |  9 ++++--
 .../maintenanceOperations/solar/index.vue     | 29 +++++++++++++++++++
 .../publicService/components/record/index.vue |  5 ++++
 7 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index a8f75e43..0c016b16 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -196,12 +196,12 @@ export default [
           },
         ],
       },
-      // {
-      //   title: "边坡光伏",
-      //   name: "photovoltaic",
-      //   path: "/maintain/photovoltaic",
-      //   component: "developing.vue",
-      // },
+      {
+        title: "太阳能板",
+        name: "solar",
+        path: "/maintain/solar",
+        component: "maintenanceOperations/solar/index.vue",
+      },
       {
         title: "桥梁监测",
         name: "photovoltaic",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue
index 50cd367d..31717ae3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue
+++ b/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>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
index 2f6d6c5b..b6eee20f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
+++ b/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: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue
index 63b20e99..bed6cace 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue
+++ b/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 {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue
index 28a76241..45a491fd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue
+++ b/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]));
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index.vue
new file mode 100644
index 00000000..91d15542
--- /dev/null
+++ b/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>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
index 64ab3e6c..0a37caab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
+++ b/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(/\]/,'') }}