华电部署

src/components/map/index.vue

@@ -224,9 +224,10 @@ export default {
         new TileLayer({
           source: new XYZ({
             // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
-            // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
             // url: "http://10.96.137.5:9080/tiles/{z}/{x}/{y}.png", //大～#@唐
+            //url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
           }),
         }),
         new VectorLayer({

src/views/health/components/envelopecharts.vue

@@ -28,13 +28,13 @@
         </el-checkbox-group>
       </div>
       <!-- 光标 -->
-      <div v-if="BGshow" class="eigenvalue">
+      <!-- <div v-if="BGshow" class="eigenvalue">
         <el-checkbox-group v-model="checkedGB" @change="handlecursor">
           <el-checkbox v-for="(item, index) in GBcheckList" :key="index" :label="item.val" :disabled="item.disabled">
             {{ item.val }}
           </el-checkbox>
         </el-checkbox-group>
-      </div>
+      </div> -->
 
       
     </div>
@@ -390,12 +390,12 @@ export default {
               icon: `image://${require("@/assets/analyse/09.png")}`,
               onclick: () => this.nextRow(),
             },
-            myCustomTool4: {
-              show: true,
-              title: "光标",
-              icon: `image://${require("@/assets/analyse/12.png")}`,
-              onclick: () => this.Show("2"),
-            },
+            // myCustomTool4: {
+            //   show: true,
+            //   title: "光标",
+            //   icon: `image://${require("@/assets/analyse/12.png")}`,
+            //   onclick: () => this.Show("2"),
+            // },
             myCustomTool3: {
               show: true,
               title: "特征频率",

src/views/health/components/spectrogramcharts.vue

@@ -2,13 +2,13 @@
   <div>
     <div class="FD">
       <!-- 光标 -->
-      <div v-if="BGshow" class="eigenvalue">
+      <!-- <div v-if="BGshow" class="eigenvalue">
         <el-checkbox-group v-model="checkedGB" @change="handlecursor">
           <el-checkbox v-for="(item, index) in GBcheckList" :key="index" :label="item.val" :disabled="item.disabled">
             {{ item.val }}
           </el-checkbox>
         </el-checkbox-group>
-      </div>
+      </div> -->
       <!-- 特征值 -->
       <div v-if="PXshow" class="eigenvalue">
         <el-checkbox-group v-model="checkedValues" @change="handleCheckChange">
@@ -351,12 +351,12 @@ export default {
               icon: `image://${require("@/assets/analyse/09.png")}`,
               onclick: () => this.nextRow(),
             },
-            myCustomTool4: {
-              show: true,
-              title: "光标",
-              icon: `image://${require("@/assets/analyse/12.png")}`,
-              onclick: () => this.Show("2"),
-            },
+            // myCustomTool4: {
+            //   show: true,
+            //   title: "光标",
+            //   icon: `image://${require("@/assets/analyse/12.png")}`,
+            //   onclick: () => this.Show("2"),
+            // },
             myCustomTool5: {
               show: true,
               title: "特征频率",

src/views/health/vibration.vue

@@ -47,10 +47,9 @@
       <p>
         风机：
         <el-select
-            style="width: 150px"
+          style="width: 150px"
           v-model="unitvalue"
           @change="getchedian"
-
           placeholder="请选择"
         >
           <el-option
@@ -64,12 +63,7 @@
       </p>
       <p>
         测点：
-        <el-select
-          v-model="monitoringvalue"
-
-          clearable
-          placeholder="请选择"
-        >
+        <el-select v-model="monitoringvalue" clearable placeholder="请选择">
           <el-option
             v-for="item in monitoringoptions"
             :key="item.detectionPointEn"
@@ -83,7 +77,6 @@
         时间：
         <el-date-picker
           v-model="timevalue"
-
           type="datetimerange"
           range-separator="至"
           start-placeholder="开始日期"
@@ -133,17 +126,18 @@
             }"
             v-loading="item.loading"
           >
-       <!-- {{ item.rowData }} -->
+            <!-- {{ item.rowData }} -->
             <p v-if="item.name != '趋势图'">
               测点路径:{{
                 getDetectionPointCn(item?.rowData?.mesurePointName)
               }}-{{ item?.rowData?.windTurbineNumber }}
               <span>采样频率: {{ item?.rowData?.samplingFrequency }}(Hz)</span>
-              <span>发电机转速: {{ item?.rowData?.rotationalSpeed }}(rpm) </span>
+              <span
+                >发电机转速: {{ item?.rowData?.rotationalSpeed }}(rpm)
+              </span>
               <span>采样时间: {{ item?.rowData?.timeStamp }} </span>
-              <span>有效值: {{XrmsValue}} (m/s2)</span>
+              <!-- <span>有效值: {{XrmsValue}} (m/s2)</span> -->
             </p>
-  
 
             <!-- {{ samplingTime }} -->
             <div v-if="item.name === '时域图'">
@@ -163,7 +157,7 @@
             </div>
             <div v-if="item.name === '频谱图'">
               <spectrogramcharts
-               @updateXrms="handleXrmsUpdate"
+                @updateXrms="handleXrmsUpdate"
                 :spectrumListTwo="item.spectrumListTwo"
                 :currentIndex="currentIndex"
                 :tableDataList="tableDataList"
@@ -179,7 +173,7 @@
             </div>
             <div v-if="item.name === '包络谱图'">
               <envelopecharts
-                   @updateXrms="handleXrmsUpdate"
+                @updateXrms="handleXrmsUpdate"
                 :envelopeListTwo="item.envelopeListTwo"
                 :currentIndex="currentIndex"
                 :tableDataList="tableDataList"
@@ -215,9 +209,14 @@
           :row-class-name="tableRowClassName"
           id="Table1"
         >
-          <el-table-column type="index" label="排序"       fixed> </el-table-column>
-          <el-table-column prop="timeStamp" label="采样时间" width="180px"> </el-table-column>
-          <el-table-column prop="mesurePointName" label="测点名称"  width="150px">
+          <el-table-column type="index" label="排序" fixed> </el-table-column>
+          <el-table-column prop="timeStamp" label="采样时间" width="180px">
+          </el-table-column>
+          <el-table-column
+            prop="mesurePointName"
+            label="测点名称"
+            width="150px"
+          >
             <template slot-scope="scope">
               {{ getDetectionPointCn(scope.row.mesurePointName) }}
             </template>
@@ -229,14 +228,23 @@
           <el-table-column prop="windTurbineNumber" label="风机" width="120px">
           </el-table-column>
 
-          <el-table-column prop="samplingFrequency" label="采样频率(Hz)"       align="center"  width="120px">
+          <el-table-column
+            prop="samplingFrequency"
+            label="采样频率(Hz)"
+            align="center"
+            width="120px"
+          >
           </el-table-column>
-          <el-table-column prop="rotationalSpeed" label="发电机转速(rpm)"       align="center"  width="150px">
+          <el-table-column
+            prop="rotationalSpeed"
+            label="发电机转速(rpm)"
+            align="center"
+            width="150px"
+          >
           </el-table-column>
         </el-table>
       </div>
     </div>
-
   </div>
 </template>
 
@@ -326,8 +334,8 @@ export default {
   },
   methods: {
     handleXrmsUpdate(value) {
-    this.XrmsValue = value; // 更新有效值
-  },
+      this.XrmsValue = value; // 更新有效值
+    },
     handleLoading(currentRow, loading, activeIndex, params) {
       if (loading) {
         this.$set(this.fourList[activeIndex], "loading", loading);
@@ -873,7 +881,7 @@ export default {
 //   font-weight: 600;
 // }
 
-.el-input__inner{
-width: 340px;
+.el-input__inner {
+  width: 340px;
 }
 </style>

src/views/home/Index.vue

@@ -51,11 +51,7 @@ export default {
   data() {
     return {
       loading: false,
-<<<<<<< HEAD
-      isShowHd: false,//切换华电
-=======
       isShowHd: false, //true 则展示华电的菜单样式，false 则展示默认的左侧边栏菜单
->>>>>>> 055ee205f9e0fd151c91a7107661ff86dcdd6a2c
     };
   },
   methods: {

src/views/ledger/component/windsiteup.vue

@@ -71,7 +71,7 @@
         <el-upload
           class="uploaddemo2"
           :file-list="resourcefileList"
-          action="http://10.96.137.5/energy-manage-service/api/check/upload"
+          action="http://192.168.0.1:16200/energy-manage-service/api/check/upload"
           :multiple="false"
           :before-upload="resourcebeforeUpload"
           :limit="1"