边坡弹窗表格字号调整，光伏保留两位

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue

@@ -2,19 +2,21 @@
   <Dialog
     v-model="obverseVisible"
     :title="dialogData._itemData && dialogData._itemData.title"
-    @update:close="camClose"
+    :width="isCameraMap?'1300px':'500px'"
-    :width="isCameraMap?'1300px':'500px'" top="10%">
+    top="10%" @update:close="camClose">
     <div class="panelParent" style="display:flex;">
       <div class="RoadNetworkFacilities">
         <div class="header">
-          <Video :facilityType="dialogData.facilityType" ref="refVideo" class="video-stream" @nearload="bindNearLoad" :pileNum="dialogData.stakeMark" :rangeIndex="dialogData.facilityType === 1?'all':'upCamera'" :showHeader="false" />
+          <Video ref="refVideo" :facilityType="dialogData.facilityType" :pileNum="dialogData.stakeMark" :rangeIndex="dialogData.facilityType === 1?'all':'upCamera'"
+                 :showHeader="false" class="video-stream"
+                 @nearload="bindNearLoad"/>
         </div>
         <div class="SolarEnergy">
           <ElTabs v-model="activeName" class="tabs">
             <ElTabPane v-for="item in formList" :key="item.key" :label="item.name" :name="item.key">
-              <Descriptions :labelWidth="item.labelWidth" :list="item.list" :data="data" style="gap: 12px" column="6" />
+              <Descriptions :data="data" :labelWidth="item.labelWidth" :list="item.list" column="6" style="gap: 12px"/>
             </ElTabPane>
-            <ElTabPane label="边坡测点数据" v-if="dialogData.facilityType === 9">
+            <ElTabPane v-if="dialogData.facilityType === 9" label="边坡测点数据">
               <Table :data="bianpoData" height="200px">
                 <ElTableColumn label="项目编号" prop="pro_code" width="80"></ElTableColumn>
                 <ElTableColumn label="标段编号" prop="con_code" width="80"></ElTableColumn>
@@ -23,33 +25,35 @@
                 <ElTableColumn label="测点编号" prop="meaPointNum"></ElTableColumn>
               </Table>
             </ElTabPane>
-            <ElTabPane label="测点历史数据" v-if="dialogData.facilityType === 9">
+            <ElTabPane v-if="dialogData.facilityType === 9" label="测点历史数据">
-              <el-select v-model="bindpoSelecte" placeholder="" @change="bindListAsync" transfer="true"
+              <el-select v-model="bindpoSelecte" placeholder="" style="width: 240px;" transfer="true"
-                  style="width: 240px;">
+                         @change="bindListAsync">
                 <el-option v-for="item in bianpoOptions"
                            :key="item.key" :label="item.label"
                            :value="item.key">
                 </el-option>
               </el-select>
-              <el-date-picker v-model="daterangeChangeTime" size="mini"
+              <el-date-picker v-model="daterangeChangeTime" end-placeholder="结束日期"
-                style="width: 190px;float:right;margin-bottom: 10px;" value-format="yyyy-MM-dd" type="daterange"
+                              range-separator="-" size="mini"
-                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                              start-placeholder="开始日期"
-              <div class='chart LineChart' ref="chartRef" />
+                              style="width: 190px;float:right;margin-bottom: 10px;" type="daterange" value-format="yyyy-MM-dd"></el-date-picker>
+              <div ref="chartRef" class='chart LineChart'/>
             </ElTabPane>
             <template v-if="dialogData.facilityType === 1">
-              <ElTabPane :label="'UPS'+(index+1)" :key="'UPS_'+item" :name="'UPS_'+item"  v-for="(item,index) in upsList">
+              <ElTabPane v-for="(item,index) in upsList" :key="'UPS_'+item" :label="'UPS'+(index+1)"
-                <Descriptions labelWidth="142px" :list="upsForm" :data="upsData" style="gap: 12px" column="6" />
+                         :name="'UPS_'+item">
+                <Descriptions :data="upsData" :list="upsForm" column="6" labelWidth="142px" style="gap: 12px"/>
               </ElTabPane>
             </template>
 
           </ElTabs>
         </div>
       </div>
-      <div style="margin-left:20px" v-if="isCameraMap">
+      <div v-if="isCameraMap" style="margin-left:20px">
         <div :style="'background-image:url('+imgSrc+')'" class="cameraMap">
-          <img v-for="(item,index) of cameraMaps" :key="index" @click="showCamera(item)"
+          <img v-for="(item,index) of cameraMaps" :key="index" :src="item.status===0?item.iconUn:item.icon"
                :style="'left:'+item.left+'px;top:'+item.top+'px'"
-          width="50px" height="50px" :src="item.status===0?item.iconUn:item.icon" />
+               height="50px" width="50px" @click="showCamera(item)"/>
         </div>
       </div>
     </div>
@@ -71,6 +75,7 @@ import { chartOption } from "./chart"
 import moment from "moment";
 
 import Table from "@screen/components/Table.vue";
+
 const icona = require(`@screen/images/layerb/路测设备/摄像机_active.svg`);// childType==='1-2 高清网络枪机
 const icona_f = require(`@screen/images/layerb/路测设备/摄像机_fault.svg`);
 const iconb = require(`@screen/images/deviceType/ballb_active.svg`); // childType==='1-2 高清网络球形摄像机
@@ -200,8 +205,7 @@ export default {
               {icon: icona, iconUn: icona_f, left: 30, top: 30, status: 0, iotDeviceId: '57953'}
             ]
             this.isCameraMap = true;
-          }
+          } else if (dData.facilityName === '孝里收费站') {
-          else if(dData.facilityName === '孝里收费站'){
             this.imgSrc = require('@screen/images/shoufeiz/孝里收费站.jpg')
             this.isCameraMap = true;
           }
@@ -305,15 +309,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-table .cell {
+  font-size: 14px;
+}
+
 .LineChart {
   width: 450px !important;
   height: 160px;
   overflow: hidden;
 }
+
 .panelParent {
   display: flex;
   flex-direction: row;
 }
+
 .RoadNetworkFacilities {
   width: 452px;
   color: #fff;
@@ -378,6 +388,7 @@ export default {
   height: 600px;
   background-repeat: no-repeat;
   background-size: 100% 100%;
+
   img {
     position: absolute;
     cursor: pointer;

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

@@ -265,7 +265,8 @@
               const idx = parseInt(i.substr(11,2));
               data[idx] = result.data[i];
             }
-            this.chart1Total2 = total;
+            this.chart1Total2 = parseFloat(total.toFixed(2)); // 保留两位小数
+
             option2.series[0].data = data;
             this.chart2.setOption(option2);
             this.chart2.resize();
@@ -285,7 +286,7 @@
               const idx = parseInt(i.substr(11,2));
               data[idx] = result.data[i];
             }
-            this.chart1Total3 = total;
+            this.chart1Total3 = parseFloat(total.toFixed(2)); // 保留两位小数
             option3.series[0].data = data;
             this.chart3.setOption(option3);
             this.chart3.resize()
@@ -385,4 +386,3 @@
       }
     }
   </style>
-