修改单位

ruoyi-ui/src/api/MonthlyEquipment/index.js

@@ -68,6 +68,11 @@ export function getSystemStatusExport(query) {
         url += "&deviceIp=" +
         query.deviceIp
       }
+      
+      if(query.exportType){
+        url += "&exportType=" +
+        query.exportType
+      }
   return request.post(
     url,
     {},

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

@@ -79,11 +79,11 @@
     data() {
       return {
         titles:[
-          {icon:'total.png',label:'当年累计发电量',unit:'万度',value:'-'},
+          {icon:'total.png',label:'当年累计发电量',unit:'度',value:'-'},
-          {icon:'used.png',label:'当年累计用电量',unit:'万度',value:'-'},
+          {icon:'used.png',label:'当年累计用电量',unit:'度',value:'-'},
-          {icon:'CO2.png',label:'CO₂减排',unit:'吨',value:'-'},
+          {icon:'CO2.png',label:'CO₂减排',unit:'kg',value:'-'},
           {icon:'tree.png',label:'等效植树',unit:'棵',value:'-'},
-          {icon:'coal.png',label:'节约标准煤',unit:'吨',value:'-'},
+          {icon:'coal.png',label:'节约标准煤',unit:'kg',value:'-'},
           {icon:'error.png',label:'放电异常设备',unit:'个',value:'-'},
         ],
         chart1:null,
@@ -123,21 +123,10 @@
       initQueryTable() {
         this.loading = true;
         this.loading = false;
-        this.total = 1000;
+        this.total = 0;
         this.tableData = [
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
-          {stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
         ]
+        //{stakeNumber:'1',state:1,s1:1,s2:1,s3:1,s4:1,s5:1,s6:1,s7:1,s8:1},
         // request({
         //   url: "/system/status/tablist",
         //   method: "get",

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

@@ -32,7 +32,7 @@
           </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">
+        <ElTableColumn label="操作IP" prop="ip" align="center" width="250" header-align="center">
           <template slot-scope="scope">
             {{ (scope.row.operIp === 'unknown' || !scope.row.operIp) ? '服务器': scope.row.operIp}}
           </template>