Browse Source

[Mod 0000] 解决一键测风接口参数错误、替换柳塔注浆模型

hongrunxia 2 days ago
parent
commit
b7e8f1b65e

+ 2 - 2
src/views/vent/monitorManager/groutMonitor/components/groutHomelt.vue

@@ -173,8 +173,8 @@
     });
     loading.value = true;
     mountedThree().then(async () => {
-      await setModelType('groutBase');
-      //   await setModelType('bertaiBase');
+      // await setModelType('groutBase');
+      await setModelType('bertaiBase');
       loading.value = false;
       timer = null;
     });

+ 5 - 1
src/views/vent/monitorManager/mainFanMonitor/main.data.ts

@@ -813,7 +813,7 @@ export const assistanceData = {
 export const setOption = (deviceType?) => {
   let yMax = 4500;
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtwlmlmk';
+  // const sysOrgCode = 'sdmtjthlgmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     // 这里判断白家渠还是五当沟
     if (deviceType == 'fanmain_bjq') {
@@ -837,6 +837,8 @@ export const setOption = (deviceType?) => {
     yMax = 6000;
   } else if (sysOrgCode == 'sdmtjtsgtmk') {
     yMax = 3000;
+  } else if (sysOrgCode == 'sdmtjthlgmk') {
+    yMax = 3000;
   } else if (sysOrgCode == 'sdmtjtdltmkhjtj') {
     yMax = 3000;
   } else if (sysOrgCode == 'sdmtjtcctrk') {
@@ -1169,6 +1171,8 @@ export const initData = (deviceType?) => {
     return initDataHjt();
   } else if (sysOrgCode == 'sdmtjtsgtmk') {
     return initDataSgt();
+  } else if (sysOrgCode == 'sdmtjthlgmk') {
+    return initDataSgt();
   } else if (sysOrgCode == 'sdmtjtyjlmk') {
     return initDataJj();
   } else if (sysOrgCode == 'sdmtjtcctrk') {

+ 9 - 4
src/views/vent/monitorManager/windowMonitor/index.vue

@@ -316,10 +316,15 @@
       timer = setTimeout(
         async () => {
           const data = await getDataSource();
-          currentData.value = data;
-          selectData.value = data;
-          playAnimation(selectData.value, selectData.value.maxarea);
-          addMonitorText(selectData.value);
+          if (data) {
+            currentData.value = data;
+            selectData.value = data;
+            if (data.maxarea) {
+              playAnimation(selectData.value, selectData.value.maxarea);
+            }
+            addMonitorText(selectData.value);
+          }
+
           if (timer) {
             timer = null;
           }

+ 1 - 1
src/views/vent/monitorManager/windrectMonitor/components/modalTable.vue

@@ -27,7 +27,7 @@
         tableProps: {
           title: '',
           dataSource: dataTableSource,
-          rowKey: 'id',
+          rowKey: 'deviceID',
           columns: columns,
           size: 'small',
           actionColumn: {