update solar

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

@@ -20,9 +20,9 @@
         <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
           header-align="center" />
           <ElTableColumn label="管控时间" prop="operTime" width="200" />
-            <ElTableColumn label="管控方式" prop="operType" width="200" />
+            <ElTableColumn label="管控方式" prop="operType" width="160" />
-            <ElTableColumn label="操作人" prop="operName" width="200" />
+            <ElTableColumn label="操作人" prop="operName" width="130" />
-            <ElTableColumn label="操作IP" prop="operIp" width="250">
+            <ElTableColumn label="操作IP" prop="ip" width="160">
               <template slot-scope="scope">
                 {{ (scope.row.operIp === 'unknown' || !scope.row.operIp) ? '服务器': scope.row.operIp}}
               </template>

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

@@ -338,8 +338,10 @@ export default {
       if(this.deviceName){
         params.deviceName = this.deviceName
       }
+      let fileName = '设备统计信息.xlsx'
       if(t === '1'){
         params.exportType='1'
+        fileName = '设备丢包信息.xlsx'
       }        
       getSystemStatusExport(params)
         .then((res) => {
@@ -347,7 +349,7 @@ export default {
           let link = document.createElement("a");
           link.style.display = "none";
           link.href = url;
-          link.setAttribute("download", "设备统计信息.xlsx");
+          link.setAttribute("download", fileName);
           document.body.appendChild(link);
           link.click();
           URL.revokeObjectURL(link.href); // 释放URL 对象

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

@@ -35,7 +35,7 @@
           </div>
         </div>
         <div class="right">
-          <Table style="width:65vw" :data="tableData" v-loading="loading"  height="calc(100vh - 220px)" >
+          <Table style="width:65vw" :data="tableData" v-loading="loading"  height="calc(100vh - 300px)" >
             <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
                 header-align="center" />
             <ElTableColumn prop="stakeNumber"  width="120" label="设备桩号"></ElTableColumn>
@@ -111,7 +111,7 @@
         //翻页时不刷新序号
         indexMethod(index) {
           return (
-            index + (this.queryParams.pageNum - 1) * this.queryParams.pageSize + 1
+            index + (this.searchData.pageNum - 1) * this.searchData.pageSize + 1
           );
         },
       onSizeChange(pageSize) {
@@ -250,7 +250,7 @@
           }).then(result => {
             if (result.code != 200) return;
             const data = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-            const total = 0;
+            let total = 0;
             for(let i in result.data){
               total += result.data[i]
               const idx = parseInt(i.substr(11,2));
@@ -270,7 +270,7 @@
           }).then(result => {
             if (result.code != 200) return;
             const data = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-            const total = 0;
+            let total = 0;
             for(let i in result.data){
               total += result.data[i]
               const idx = parseInt(i.substr(11,2));
@@ -290,7 +290,7 @@
           }).then(result => {
             if (result.code != 200) return;
             const data = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-            const total = 0;
+            let total = 0;
             for(let i in result.data){
               total += result.data[i]
               const idx = parseInt(i.substr(11,2));
@@ -321,7 +321,6 @@
       flex-direction: column;
       align-items: center;
       .solarCont{
-        height:calc(100vh - 160px);
         display: flex;
         flex-direction: row;
         gap:10px;
@@ -331,6 +330,7 @@
           display: flex;
           flex-direction: column;
           gap:10px;
+          height: calc(100vh - 300px);
           .chartPanel{
             flex:1;
             background:  linear-gradient(to top, #064151, #042b34);

ruoyi-ui/vue.config.js

@@ -38,14 +38,14 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:8087`,
         // target:`http://localhost:3001`,
-        target:`http://10.0.111.11:8097`,
+        // target:`http://10.0.111.11:8097`,
         // target:`http://10.0.111.11:8097`,
         // target: `http://10.168.66.196: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.79.46:8089`, //王家宝
-        // target: `http://10.168.77.128:8087`, //王兴琳
+        target: `http://10.168.77.128:8087`, //王兴琳
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",