Merge remote-tracking branch 'origin/b-master' into b-master

src/dataJson/Remote/RemoteModules.js

+export const remoteModules={
+    "data": [
+        {
+            "moduleId": "ca869cdc-9f97-4288-8d8d-a939cfb4b5d1",
+            "moduleCode": "RemoteTransferStatus",
+            "moduleName": "远程设备状态",
+            "navigateUrl": "/Remote/RemoteTransferStatus",
+            "orderNum": 1
+        },
+        {
+            "moduleId": "0a3f7030-f1c2-4e13-999f-10bab405281a",
+            "moduleCode": "RemoteTransferReg",
+            "moduleName": "远程寄存器值",
+            "navigateUrl": "/Remote/RemoteTransferReg",
+            "orderNum": 2
+        },
+        {
+            "moduleId": "75bc8007-1274-42fd-b2c2-55528517e701",
+            "moduleCode": "HolidayControl",
+            "moduleName": "节假日参数设定",
+            "navigateUrl": "/Remote/HolidayControl",
+            "orderNum": 3
+        },
+        {
+            "moduleId": "a47b0543-09dc-49ad-8f69-1e3e6de188f9",
+            "moduleCode": "NightControl",
+            "moduleName": "夜间降温参数组",
+            "navigateUrl": "/Remote/NightControl",
+            "orderNum": 4
+        },
+        {
+            "moduleId": "d9eb1695-b135-42e6-a0ee-6369e04660cb",
+            "moduleCode": "SecTempControl",
+            "moduleName": "二次网供水温度参数组",
+            "navigateUrl": "/Remote/SecTempControl",
+            "orderNum": 5
+        },
+        {
+            "moduleId": "106f63fe-aa2a-4b2e-b84f-eac17191647d",
+            "moduleCode": "WeatherControl",
+            "moduleName": "气象仪参数组",
+            "navigateUrl": "/Remote/WeatherControl",
+            "orderNum": 7
+        },
+        {
+            "moduleId": "1edfbffb-21b4-4f58-83a6-cd39b92387de",
+            "moduleCode": "LimitControl",
+            "moduleName": "温度上下限",
+            "navigateUrl": "/Remote/LimitControl",
+            "orderNum": 8
+        },
+        {
+            "moduleId": "547b1832-9cf0-4f41-8f71-5fba8030e52b",
+            "moduleCode": "TransferPumpPressure",
+            "moduleName": "循环泵压差控制",
+            "navigateUrl": "/Remote/TransferPump",
+            "orderNum": 11
+        },
+        {
+            "moduleId": "2de9cbc4-54a0-4d10-b165-fcf94f12aec7",
+            "moduleCode": "SecPlan",
+            "moduleName": "二次网供水温度参数组",
+            "navigateUrl": "/Remote/SecPlan",
+            "orderNum": 13
+        },
+        {
+            "moduleId": "45320b16-0a19-4497-a5a6-c36b4d4bbf50",
+            "moduleCode": "SecondTemp",
+            "moduleName": "二次网方案",
+            "navigateUrl": "/Remote/CtrlSecondTemp",
+            "orderNum": 14
+        },
+        {
+            "moduleId": "8c7c2e8e-00ab-49d8-a517-b3d4871e16fb",
+            "moduleCode": "AIStationRemote",
+            "moduleName": "AI无人站参数组",
+            "navigateUrl": "/Remote/AIStationRemote",
+            "orderNum": 15
+        },
+        {
+            "moduleId": "09fdb44b-5fdc-4223-bbaa-30d279892239",
+            "moduleCode": "BoilerRemote",
+            "moduleName": "锅炉远程控制",
+            "navigateUrl": "/Remote/Boiler",
+            "orderNum": 36
+        },
+        {
+            "moduleId": "1234d172-618f-4010-b69d-77c0d95c2761",
+            "moduleCode": "WeatherManage",
+            "moduleName": "气象干预",
+            "navigateUrl": "/Scheduling/WeatherManage",
+            "orderNum": 50
+        },
+        {
+            "moduleId": "ec80421e-259a-4b71-8348-86c18aecbd4a",
+            "moduleCode": "ConfigBoiler",
+            "moduleName": "锅炉参数配置",
+            "navigateUrl": "/Scheduling/ConfigBoiler",
+            "orderNum": 53
+        },
+        {
+            "moduleId": "d6911397-7626-444a-a04e-7d7af4be0ee5",
+            "moduleCode": "WindManage",
+            "moduleName": "风力配置管理",
+            "navigateUrl": "/Scheduling/WindManage",
+            "orderNum": 56
+        },
+        {
+            "moduleId": "24532aaf-5a43-422e-ae96-64d5bd9ce5a4",
+            "moduleCode": "AnnualParam",
+            "moduleName": "年度参数管理",
+            "navigateUrl": "/Scheduling/AnnualParam",
+            "orderNum": 57
+        }
+    ]
+}

src/views/RemotePage/OnekeyStartStopPage.vue

@@ -8,8 +8,10 @@
 
   <el-dialog @close="onClose" :close-on-click-modal="false" v-model="dialogFormVisible" width="30%" title="请选择进行一键启动的循环泵：" center>
     <div style="display: flex;justify-content: center;align-items: center; height: 150px;">
-      <el-button type="primary" :loading="isLoading" @click="OneKeyStart(1)" style="margin-right: 50px;">一号循环泵</el-button>
-      <el-button type="primary" :loading="isLoading" @click="OneKeyStart(2)">二号循环泵</el-button>
+<!--  删除  @click="OneKeyStart(1)"   不进行操作-->
+      <el-button type="primary" :loading="isLoading" style="margin-right: 50px;">一号循环泵</el-button>
+<!--  删除@click="OneKeyStart(2)"   不进行操作 -->
+      <el-button type="primary" :loading="isLoading">二号循环泵</el-button>
     </div>
   </el-dialog>
   <el-card class="remoteTitle">
@@ -32,9 +34,11 @@
         <el-input v-model="limit" v-text="limit" style="width: 150px;" v-float-number></el-input>（米）
       </div>
       <div class="demo-button">
-        <el-button type="primary" :loading="isLoading" @click="TransferOpen" >一键启动</el-button>
+<!-- 删除  @click="TransferOpen"   不进行操作   -->
+        <el-button type="primary" :loading="isLoading" >一键启动</el-button>
         <!--        <el-button type="primary" :loading="isLoading" @click="OnekeyStopEnd" >一键停止</el-button>-->
-        <el-button type="primary" :loading="isLoading" @click="TransferClose" >一键停止</el-button>
+<!-- 删除  @click="TransferClose"   不进行操作   -->
+        <el-button type="primary" :loading="isLoading" >一键停止</el-button>
       </div>
     </div>
   </el-card>
@@ -103,7 +107,7 @@ import { ElMessage,ElMessageBox  } from "element-plus";
 import { vFloatNumber } from "../../utils/directives.js";
 import { fa } from 'element-plus/es/locale';
 import {useRoute} from "vue-router";
-import {selectOneStartStop, selectIsScheduleByUserId, setOneStartStop} from '../../api/oneKeyStartStop/index.js'
+//import {selectOneStartStop, selectIsScheduleByUserId, setOneStartStop} from '../../api/oneKeyStartStop/index.js'
 const enterpriseId = ref(null);
 const cascaderRef = ref(null);
 const isLoading= ref(false);

src/views/RemotePage/TransControlPage.vue

@@ -77,7 +77,7 @@
   import HeatControl from '../../components/Remote/HeatControl.vue';
   //import OutdoorTempControl from '../../components/Remote/OutdoorTempControl.vue';
   import NightFrequency from '../../components/Remote/NightFrequency.vue';
-
+import {remoteModules} from '@/dataJson/Remote/RemoteModules';
   const radioTitle = ref('供热站');
   const options = reactive([]);
   const enterpriseId = ref(null);
@@ -132,11 +132,52 @@
   }
 
   //根据权限初始化远程控制页列表
+  // function initRomateList(){
+  //   http.post("/api/module/RemoteModules", '').then((result) => {
+  //     if(result.data !== null){
+  //       //console.log(result.data);
+  //       result.data.forEach(item =>{
+  //         if(item.moduleCode ==="RemoteTransferStatus"){
+  //           isTransferStatus.value = true;
+  //         }
+  //         if(item.moduleCode ==="RemoteTransferReg"){
+  //           isTransferRegControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="HolidayControl"){
+  //           isHolidayControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="NightControl"){
+  //           isNightControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="SecTempControl"){
+  //           isSecTempControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="CurveControl"){
+  //           isCurveControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="WeatherControl"){
+  //           isWeatherControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="LimitControl"){
+  //           isLimitControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="WinDirectionControl"){
+  //           isWinDirectionControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="HeatControl"){
+  //           isHeatControl.value = true;
+  //         }
+  //         if(item.moduleCode ==="NightFrequency"){
+  //           isNightFrequency.value = true;
+  //         }
+  //       })
+  //     }
+  //   });
+  // }
   function initRomateList(){
-    http.post("/api/module/RemoteModules", '').then((result) => {
-      if(result.data !== null){
+
         //console.log(result.data);
-        result.data.forEach(item =>{
+        remoteModules.data.forEach(item =>{
           if(item.moduleCode ==="RemoteTransferStatus"){
             isTransferStatus.value = true;
           }
@@ -171,8 +212,6 @@
             isNightFrequency.value = true;
           }
         })
-      }
-    });
   }
 
   initPage();
@@ -189,7 +228,7 @@
   display: flex;
   width: 100%;
   height: 50px;
-  align-items: center; 
+  align-items: center;
   vertical-align: middle;
   margin: 0;
   padding: 0;
@@ -207,4 +246,4 @@
   height: 100%;
 }
 
-</style>
+</style>
\ No newline at end of file

src/views/StatusPage/BoilerStatusPage.vue

@@ -362,7 +362,7 @@ import DataForm from '../../components/DataForm.vue';
 import { useRoute } from 'vue-router'
 import http from '../../api/http'
 import store from "../../store/index";
-import {boilerStatus} from "@/dataJson/RealPage/RealPipePage.js";
+import {boilerStatus,boilerStatus2,boilerStatus3} from "@/dataJson/RealPage/RealPipePage.js";
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import {
     Search,
@@ -632,26 +632,23 @@ function makeFormsData(realData) {
 }
 //获取静态数据
 async function getForms(NenterpriseId, deviceType, supplyIdList, boilerIdList, sortList) {
-  try {
-    // 设置加载状态为 true
-    loading.value = true;
-    // 使用已定义的 boilerStatus 更新表单标题和数据
-    if (boilerStatus && boilerStatus.title && boilerStatus.realData) {
-      makeFormsTitle(boilerStatus.title);
-      titleData.value = boilerStatus.title;
-      makeFormsData(boilerStatus.realData);
-    } else {
-      console.error('boilerStatus is not properly defined or lacks necessary properties.');
-      makeFormsData([]); // 如果 boilerStatus 不完整，则初始化表单数据为空数组
-    }
-  } catch (error) {
-    // 捕获并处理任何发生的错误
-    console.error('Error processing forms data:', error);
-    makeFormsData([]); // 在发生错误时初始化表单数据为空数组
-  } finally {
-    // 无论请求成功与否，最后都将加载状态设置为 false
-    loading.value = false;
+    // enterpriseId: NenterpriseId,supplyIdList:selectList,transferName:transferName, pageIndex: pageIndex, pageCount: pageCount,sortList:sortList
+    loading.value = true
+  console.log(JSON.stringify(boilerIdList))
+  if(boilerIdList == "af3616fd-ac99-4de4-8b92-7e2eab9a5a90"){
+        makeFormsTitle(boilerStatus2.title);
+        titleData.value = boilerStatus2.title;
+        makeFormsData(boilerStatus2.realData);
+  }else if(boilerIdList == "0d4ad9f6-75ee-4914-929a-bedfe13b2560") {
+    makeFormsTitle(boilerStatus3.title);
+    titleData.value = boilerStatus3.title;
+    makeFormsData(boilerStatus3.realData);
+  }else{
+    makeFormsTitle(boilerStatus.title);
+    titleData.value = boilerStatus.title;
+    makeFormsData(boilerStatus.realData);
   }
+    loading.value = false
 }
 //获取动态数据
 // async function getForms(NenterpriseId, deviceType, supplyIdList, boilerIdList, sortList) {

src/views/StatusPage/PipeStatusPage.vue

@@ -578,26 +578,17 @@ function makeFormsData(realData) {
 
 //使用静态数据
 async function getForms(NenterpriseId, deviceType, supplyIdList, sortList) {
-  try {
-    // 设置加载状态为 true
+  // enterpriseId: NenterpriseId,supplyIdList:selectList,transferName:transferName, pageIndex: pageIndex, pageCount: pageCount,sortList:sortList
     loading.value = true;
-    // 使用已定义的 pipeStatus 更新表单标题和数据
-    if (pipeStatus && pipeStatus.title && pipeStatus.realData) {
-      makeFormsTitle(pipeStatus.title);
-      titleData.value = pipeStatus.title;
-      makeFormsData(pipeStatus.realData);
-    } else {
-      console.error('pipeStatus is not properly defined or lacks necessary properties.');
-      makeFormsData([]); // 如果 pipeStatus 不完整，则初始化表单数据为空数组
-    }
-  } catch (error) {
-    // 捕获并处理任何发生的错误
-    console.error('Error processing forms data:', error);
-    makeFormsData([]); // 在发生错误时初始化表单数据为空数组
-  } finally {
-    // 无论请求成功与否，最后都将加载状态设置为 false
-    loading.value = false;
-  }
+      if ( supplyIdList == 'b354f45b-23e5-42be-a210-0fb92394f457') {
+            makeFormsTitle(pipeStatus.title);
+            titleData.value = pipeStatus.title;
+        makeFormsData(pipeStatus.realData);
+        }else{
+        makeFormsData([]);
+      }
+        // console.log(tableInfo)
+    loading.value = false
 }
 // 使用动态数据
 // async function getForms(NenterpriseId, deviceType, supplyIdList, sortList) {
@@ -607,11 +598,11 @@ async function getForms(NenterpriseId, deviceType, supplyIdList, sortList) {
 //       if (result.status === 0) {
 //             makeFormsTitle(result.data.title);
 //             titleData.value = result.data.title;
-
-
-
+//
+//
+//
 //         makeFormsData(result.data.realData);
-
+//
 //         } else {
 //             makeFormsData([]);
 //         }