Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/bundle/bundleMonitorTable/index.vue

@@ -26,13 +26,13 @@
           <div id="barChart" class="bar-chart"></div>
           <div class="data-content">
             <div class="title">煤自燃阶段统计分析</div>
-            <div class="explain">测点共计{{ combustionCount + selfHeatingCount + latentCount }}个</div>
-            <div class="progress-label">潜伏期阶段：{{ latentCount }}</div>
-            <Progress :percent="latentPercent" size="default" strokeColor="green" :show-info="true" :format="() => latentCount" />
+            <div class="explain">测点共计{{ total }}个</div>
+            <div class="progress-label">潜伏期阶段：{{ qfqCount }}</div>
+            <Progress :percent="qfqPercent" size="default" strokeColor="green" :show-info="true" :format="() => qfqCount" />
             <div class="progress-label">缓慢氧化阶段：{{ latentCount }}</div>
-            <Progress :percent="latentPercent" size="default" strokeColor="green" :show-info="true" :format="() => latentCount" />
+            <Progress :percent="latentPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => latentCount" />
             <div class="progress-label">加速氧化阶段：{{ selfHeatingCount }}</div>
-            <Progress :percent="selfHeatingPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => selfHeatingCount" />
+            <Progress :percent="selfHeatingPercent" size="default" strokeColor="orange‌" :show-info="true" :format="() => selfHeatingCount" />
             <div class="progress-label">剧烈氧化阶段：{{ combustionCount }}</div>
             <Progress :percent="combustionPercent" size="default" strokeColor="red" :show-info="true" :format="() => combustionCount" />
           </div>
@@ -49,7 +49,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, shallowRef, reactive, nextTick } from 'vue';
+import { ref, onMounted, computed, shallowRef, reactive, nextTick } from 'vue';
 import { columns } from './bundle-table.data';
 import { getBundleInfoList, getAllFileList } from './bundle-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
@@ -58,6 +58,7 @@ import BlastDelta from './modal/blastDelta.vue';
 import BlastDelta1 from './modal/blastDelta1.vue';
 import * as echarts from 'echarts';
 import { Progress } from 'ant-design-vue';
+import { useGlobSetting } from '/@/hooks/setting';
 // import 'ant-design-vue/dist/antd.css'; // 引入样式
 let selectList = ref<any[]>([]);
 let jcddArr = ref<any[]>([]);
@@ -67,9 +68,13 @@ let formSearch = reactive({
   fileId: '',
   fileName: '',
 });
+const total = ref(0);
+const { sysOrgCode } = useGlobSetting();
+const qfqCount = ref(0); // 潜伏期
 const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
 const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
 const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
+const qfqPercent = ref(0); // 潜伏期(潜伏期)
 const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
 const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
 const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
@@ -230,14 +235,39 @@ async function getTableList(params: any) {
   let res = await getBundleInfoList({ type: 'bundle', ...params });
   const content = res.content;
   let contentArr = JSON.parse(content);
-  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段（潜伏期）').length;
-  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段（自热期）').length;
-  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段（燃烧期）').length;
-  const total = contentArr.length;
-  latentPercent.value = (latentCount.value / total) * 100;
-  selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
-  combustionPercent.value = (combustionCount.value / total) * 100;
-  tableData.value = contentArr;
+  const contentNewArr = computed(() => {
+    return contentArr.map((item) => {
+      let internalFireWarnLevel = '';
+
+      const co = item.co_ave;
+      const co2 = item.co2_ave;
+      const c2h4 = item.c2h4_ave;
+      const c2h2 = item.c2h2_ave;
+      const coRatio = co / co2;
+
+      if (co >= 0 && co <= 13.75) {
+        internalFireWarnLevel = '潜伏期阶段';
+      } else if (co > 13.75 && co < 67.2 && coRatio < 0.095) {
+        internalFireWarnLevel = '缓慢氧化升温阶段';
+      } else if ((co >= 67.2 && co < 1606.3) || (coRatio >= 0.095 && coRatio < 0.322) || c2h4 < 2) {
+        internalFireWarnLevel = '加速氧化阶段';
+      } else if (co >= 1606.3 || coRatio >= 0.322 || c2h4 >= 2 || c2h2 > 0) {
+        internalFireWarnLevel = '剧烈氧化阶段';
+      }
+
+      return { ...item, internalFireWarnLevel };
+    });
+  });
+  total.value = contentArr.length;
+  qfqCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '潜伏期阶段').length;
+  latentCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化升温阶段').length;
+  selfHeatingCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段').length;
+  combustionCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段').length;
+  qfqPercent.value = (qfqCount.value / total.value) * 100;
+  latentPercent.value = (latentCount.value / total.value) * 100;
+  selfHeatingPercent.value = (selfHeatingCount.value / total.value) * 100;
+  combustionPercent.value = (combustionCount.value / total.value) * 100;
+  tableData.value = contentNewArr.value;
   nextTick(() => {
     updateChart(contentArr);
   });

src/views/vent/bundleSpy/bundleSpyTable/index.vue

@@ -15,24 +15,19 @@
             <template v-if="column.dataIndex === 'action'">
               <a class="action-link" @click="toDetail(record)">数据分析</a>
             </template>
-            <template v-else>
-              <template v-if="record[column.dataIndex] === null">
-                <span>-</span>
-              </template>
-            </template>
           </template>
         </a-table>
         <div class="data-container">
           <div id="lineChart" class="line-chart"></div>
           <div class="data-content">
             <div class="title">煤自燃阶段统计分析</div>
-            <div class="explain">测点共计{{ combustionCount + selfHeatingCount + latentCount }}个</div>
-            <div class="progress-label">潜伏期阶段：{{ latentCount }}</div>
-            <Progress :percent="latentPercent" size="default" strokeColor="green" :show-info="true" :format="() => latentCount" />
+            <div class="explain">测点共计{{ total }}个</div>
+            <div class="progress-label">潜伏期阶段：{{ qfqCount }}</div>
+            <Progress :percent="qfqPercent" size="default" strokeColor="green" :show-info="true" :format="() => qfqCount" />
             <div class="progress-label">缓慢氧化阶段：{{ latentCount }}</div>
-            <Progress :percent="latentPercent" size="default" strokeColor="green" :show-info="true" :format="() => latentCount" />
+            <Progress :percent="latentPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => latentCount" />
             <div class="progress-label">加速氧化阶段：{{ selfHeatingCount }}</div>
-            <Progress :percent="selfHeatingPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => selfHeatingCount" />
+            <Progress :percent="selfHeatingPercent" size="default" strokeColor="orange‌" :show-info="true" :format="() => selfHeatingCount" />
             <div class="progress-label">剧烈氧化阶段：{{ combustionCount }}</div>
             <Progress :percent="combustionPercent" size="default" strokeColor="red" :show-info="true" :format="() => combustionCount" />
           </div>
@@ -48,13 +43,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, reactive, shallowRef } from 'vue';
+import { ref, onMounted, computed, reactive, shallowRef } from 'vue';
 import { columns } from './bundleSpy-table.data';
 import { getbundleSpyInfoList, getAllFileList } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import * as echarts from 'echarts';
 import BlastDelta from './modal/blastDelta.vue';
 import { Progress } from 'ant-design-vue';
+import { useGlobSetting } from '/@/hooks/setting';
 // import 'ant-design-vue/dist/antd.css'; // 引入样式
 let selectList = ref<any[]>([]);
 
@@ -64,9 +60,13 @@ let formSearch = reactive({
   fileId: '',
   fileName: '',
 });
+const total = ref(0);
+const { sysOrgCode } = useGlobSetting();
+const qfqCount = ref(0); // 潜伏期
 const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
 const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
 const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
+const qfqPercent = ref(0); // 潜伏期(潜伏期)
 const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
 const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
 const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
@@ -79,16 +79,42 @@ async function getTableList(params: any) {
   let res = await getbundleSpyInfoList({ type: 'bundleSpy', ...params });
   const content = res.content;
   let contentArr = JSON.parse(content);
-  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段（潜伏期）').length;
-  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段（自热期）').length;
-  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段（燃烧期）').length;
-  const total = contentArr.length;
-  latentPercent.value = (latentCount.value / total) * 100;
-  selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
-  combustionPercent.value = (combustionCount.value / total) * 100;
-  tableData.value = contentArr;
+  const contentNewArr = computed(() => {
+    return contentArr.map((item) => {
+      let internalFireWarnLevel = '';
+
+      const co = item.co_ave;
+      const co2 = item.co2_ave;
+      const c2h4 = item.c2h4_ave;
+      const c2h2 = item.c2h2_ave;
+      const coRatio = co / co2;
+
+      if (co >= 0 && co <= 13.75) {
+        internalFireWarnLevel = '潜伏期阶段';
+      } else if (co > 13.75 && co < 67.2 && coRatio < 0.095) {
+        internalFireWarnLevel = '缓慢氧化升温阶段';
+      } else if ((co >= 67.2 && co < 1606.3) || (coRatio >= 0.095 && coRatio < 0.322) || c2h4 < 2) {
+        internalFireWarnLevel = '加速氧化阶段';
+      } else if (co >= 1606.3 || coRatio >= 0.322 || c2h4 >= 2 || c2h2 > 0) {
+        internalFireWarnLevel = '剧烈氧化阶段';
+      }
+
+      return { ...item, internalFireWarnLevel };
+    });
+  });
+  total.value = contentArr.length;
+  qfqCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '潜伏期阶段').length;
+  latentCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化升温阶段').length;
+  selfHeatingCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段').length;
+  combustionCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段').length;
+  qfqPercent.value = (qfqCount.value / total.value) * 100;
+  latentPercent.value = (latentCount.value / total.value) * 100;
+  selfHeatingPercent.value = (selfHeatingCount.value / total.value) * 100;
+  combustionPercent.value = (combustionCount.value / total.value) * 100;
+  tableData.value = contentNewArr.value;
   updateChart(contentArr);
 }
+
 //跳转到爆炸三角形
 function toDetail(record: any) {
   posMonitor.value = record;

src/views/vent/dust/dustMonitorTable/dust-table.data.ts

@@ -128,6 +128,127 @@ export const columns = [
     ],
   },
 ];
+export const Dltcolumns = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '总尘(短时间监测浓度，单位：mg/m³)',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '作业工序-生产',
+        dataIndex: 'sc_zcds',
+        key: 'sc_zcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '作业工序-检修',
+        dataIndex: 'jx_zcds',
+        key: 'jx_zcds',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '呼尘(短时间监测浓度，单位：mg/m³)',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '作业工序-生产',
+        dataIndex: 'sc_hcds',
+        key: 'sc_hcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '作业工序-检修',
+        dataIndex: 'jx_hcds',
+        key: 'jx_hcds',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '总尘(时间加权平均浓度，单位：mg/m³)',
+    dataIndex: 'zcjqpj',
+    key: 'zcjqpj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '呼尘(时间加权平均浓度，单位：mg/m³)',
+    dataIndex: 'hcjqpj',
+    key: 'hcjqpj',
+    width: 100,
+    align: 'center',
+  },
+];
+export const Swcolumns = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '工作场所',
+    dataIndex: 'gzcs',
+    key: 'gzcs',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '总尘(时间加权平均浓度，单位：mg/m³)',
+    dataIndex: 'zcjqpj',
+    key: 'zcjqpj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '呼尘(时间加权平均浓度，单位：mg/m³)',
+    dataIndex: 'hcjqpj',
+    key: 'hcjqpj',
+    width: 100,
+    align: 'center',
+  },
+];
 export const fieldMapping = {
   sc_zcds: '总尘-作业工序-生产(短时间监测浓度，mg/m³)',
   jx_zcds: '总尘-作业工序-检修(短时间监测浓度，mg/m³)',
@@ -140,6 +261,18 @@ export const fieldMapping = {
   hcrxd_ds: '呼尘容许浓度(短时间监测浓度，mg/m³)',
   hcrxd_jqpj: '呼尘容许浓度(时间加权平均浓度，mg/m³)',
 };
+export const fieldDltMapping = {
+  sc_zcds: '总尘-作业工序-生产(短时间监测浓度，mg/m³)',
+  jx_zcds: '总尘-作业工序-检修(短时间监测浓度，mg/m³)',
+  sc_hcds: '呼尘-作业工序-生产(短时间监测浓度，mg/m³)',
+  jx_hcds: '呼尘-作业工序-检修(短时间监测浓度，mg/m³)',
+  zcjqpj: '总尘(时间加权平均浓度，mg/m³)',
+  hcjqpj: '呼尘(时间加权平均浓度，mg/m³)',
+};
+export const fieldSwMapping = {
+  zcjqpj: '总尘(时间加权平均浓度，mg/m³)',
+  hcjqpj: '呼尘(时间加权平均浓度，mg/m³)',
+};
 
 export const dataColumns = [
   {
@@ -179,6 +312,68 @@ export const dataColumns = [
     key: 'fczl',
   },
 ];
+export const dataDltColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldDltMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '检测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+  },
+];
+export const dataSwColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldSwMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '检测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+  },
+];
 
 export const AllDataColumns = [
   {
@@ -225,3 +420,72 @@ export const AllDataColumns = [
     key: 'fczl',
   },
 ];
+export const AllDataDltColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldDltMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '检测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+  },
+];
+export const AllDataSwColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldSwMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    title: '工作场所',
+    dataIndex: 'gzcs',
+    align: 'center',
+    key: 'gzcs',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '检测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+  },
+];

src/views/vent/dust/dustMonitorTable/index.vue

@@ -10,7 +10,7 @@
         </ul>
       </div>
       <div class="table-container">
-        <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 250 }" class="tableW">
+        <a-table :columns="computedColumns" :data-source="tableData" size="small" :scroll="{ y: 250 }" class="tableW">
           <template #bodyCell="{ record, column }">
             <template v-if="record[column.dataIndex] === null">
               <span>-</span>
@@ -22,6 +22,7 @@
             <a-tab-pane key="workplace" class="tab1" tab="监测地点粉尘情况分析">
               <div class="filter-container" v-if="workplaceList.length > 0">
                 <a-select
+                  v-if="sysOrgCode != 'sdmtjtdltmk'"
                   :key="DefaultValue"
                   :default-value="DefaultValue"
                   v-model="selectedWorkplace"
@@ -37,7 +38,7 @@
               <a-table :columns="dataColumns" :data-source="filteredResultByWorkplace" size="small" :scroll="{ y: 260 }" class="tableW" />
             </a-tab-pane>
             <a-tab-pane key="overall" class="tab2" tab="当日粉尘情况分析">
-              <a-table :columns="AllDataColumns" :data-source="AllMaxValues" size="small" :scroll="{ y: 300 }" class="tableW" />
+              <a-table :columns="AllDataComputedColumns" :data-source="AllMaxValues" size="small" :scroll="{ y: 300 }" class="tableW" />
             </a-tab-pane>
           </a-tabs>
         </div>
@@ -48,12 +49,12 @@
 
 <script setup lang="ts">
 import { ref, onMounted, reactive, computed, watch, nextTick } from 'vue';
-import { columns, dataColumns, AllDataColumns } from './dust-table.data';
+import { columns, Dltcolumns, Swcolumns, dataColumns, AllDataColumns, AllDataDltColumns, AllDataSwColumns } from './dust-table.data';
 import { getDustInfoList, getAllFileList } from './dsut-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import { result } from 'lodash-es';
 // import { nextTick } from 'process';
-
+import { useGlobSetting } from '/@/hooks/setting';
 let tableData = ref<any[]>([]);
 let selectList = ref<any[]>([]);
 let resultByWorkplace = ref<any[]>([]);
@@ -64,13 +65,38 @@ let activeTab = ref<string>('workplace');
 let selectedFileId = ref<string | null>(null);
 let selectedWorkplace = ref<string | null>(null);
 let DefaultValue = ref<string | null>(null);
+const { sysOrgCode } = useGlobSetting();
 let formSearch = reactive({
   pageNum: 1,
   pageSize: 1000,
   fileId: '',
   fileName: '',
 });
-
+//获取粉尘监测列展示数据
+const computedColumns = computed(() => {
+  switch (sysOrgCode) {
+    case 'sdmtjtbetmk':
+      return columns; // 布尔台对应的列配置
+    case 'sdmtjtdltmk':
+      return Dltcolumns; // 布尔台对应的列配置
+    case 'sdmtjtswmk':
+      return Swcolumns; // 上湾对应的列配置
+    default:
+      return columns; // 默认情况下返回的列配置
+  }
+});
+const AllDataComputedColumns = computed(() => {
+  switch (sysOrgCode) {
+    case 'sdmtjtbetmk':
+      return AllDataColumns; // 布尔台对应的列配置
+    case 'sdmtjtdltmk':
+      return AllDataDltColumns; // 布尔台对应的列配置
+    case 'sdmtjtswmk':
+      return AllDataSwColumns; // 上湾对应的列配置
+    default:
+      return AllDataColumns; // 默认情况下返回的列配置
+  }
+});
 //获取粉尘监测结果数据
 async function getTableList(params: any) {
   let res = await getDustInfoList({ type: 'smoke', ...params });

src/views/vent/monitorManager/alarmMonitor/common/measurePoint.vue

@@ -43,7 +43,7 @@
         <div class="text-center">
           {{ item.label }}
         </div>
-        <PredictionCurve :style="{ width: chartWidth || '474px' }" style="height: 300px; margin: 15px" :chart="item" />
+        <PredictionCurve :style="{ width: chartWidth || '470px' }" style="height: 300px; margin: 15px" :chart="item" />
       </div>
     </div>
   </div>

src/views/vent/monitorManager/comment/AlarmHistoryTable.vue

@@ -4,6 +4,15 @@
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
+
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.dataIndex === 'nwartype'">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+        </template>
+      </template>
     </BasicTable>
   </div>
 </template>
@@ -17,6 +26,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import dayjs from 'dayjs';
   import { getAutoScrollContainer } from '/@/utils/common/compUtils';
+  import { render } from '/@/utils/common/renderUtils';
 
   const props = defineProps({
     columnsType: {

src/views/vent/monitorManager/compressor/components/nitrogenHome_dltj.vue

@@ -8,7 +8,15 @@
     <a-spin :spinning="loading" />
     <div v-for="groupNum in monitorDataGroupNum" :key="groupNum" class="modal-monitor">
       <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
-        <div class="title">空压机{{ groupNum }} </div>
+        <!-- <div class="title">空压机{{ groupNum }} </div> -->
+        <div class="title">
+          {{ monitorData ? monitorData['strname' + groupNum] : '-' }}
+          （
+          <span :style="{ color: monitorData && monitorData['Status' + groupNum] == '1' ? '#67fc00' : '#e9170b' }">
+            {{ monitorData && monitorData['Status' + groupNum] == '1' ? '运行' : '停止' }}
+          </span>
+          ）
+        </div>
         <template v-for="(preMonitor, preMonitorIndex) in preMonitorListData" :key="preMonitorIndex">
           <div v-if="preMonitor.code !== 'signal'" class="monitor-item">
             <span class="monitor-title">{{ preMonitor.title }}:</span>
@@ -100,7 +108,7 @@
           <div class="item item-l" v-for="groupNum in monitorDataGroupNum" :key="groupNum">
             <ventBox1>
               <template #title>
-                <div>空压机{{ groupNum }}</div>
+                <div>{{ monitorData['strname' + groupNum] }}</div>
               </template>
               <template #container>
                 <div class="monitor-box">
@@ -180,13 +188,7 @@
           <span class="monitor-title">{{ data.title }} :</span>
           <span class="monitor-val" v-if="!refresh"
             ><span class="val">
-              {{
-                monitorData.length > 0 && monitorData[0][data.code]
-                  ? data.raw
-                    ? monitorData[0][data.code]
-                    : parseFloat(monitorData[0][data.code]).toFixed(2)
-                  : '-'
-              }}
+              {{ monitorData && monitorData[data.code] ? (data.raw ? monitorData[data.code] : parseFloat(monitorData[data.code]).toFixed(2)) : '-' }}
             </span>
             <span class="unit">{{ data.unit }}</span></span
           >
@@ -312,7 +314,7 @@
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     if (res) {
       const result = res;
-      debugger;
+
       // const result = {
       //   cmd: 'monitordata',
       //   msgTxt: [
@@ -489,6 +491,9 @@
       //             LeakageLock1: '0',
       //             MainMotor_Current1: '95',
       //             OpenFail1: '0',
+      //             o2Val: '20.23',
+      //             temperature: '19.5',
+      //             fumes_str: '0.2',
       //           },
       //           readDataDes: null,
       //           summaryHour: [],
@@ -572,13 +577,14 @@
       if (!result || result.msgTxt.length < 1) return;
       let dataSoreDatas = {};
       let netStatus = 0;
-      result.msgTxt.forEach((item) => {
+      result.msgTxt.forEach((item, index) => {
         if (item.type && item.type.startsWith('nitrogen')) {
           airCompressorState.length = 0;
 
           if (item.type.startsWith('nitrogen_52507')) {
             if (deviceType.value !== 'nitrogen_52507') deviceType.value = 'nitrogen_52507';
             dataSoreDatas = Object.assign(dataSoreDatas, item['datalist'][0], item['datalist'][0]['readData']);
+            dataSoreDatas['strname' + (index + 1)] = item['datalist'][0]['strname'];
             if (item['datalist'][0]['netStatus']) {
               netStatus = 1;
             }

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.three.bk.ts

@@ -278,7 +278,8 @@ export const addCssText = () => {
       fanLocalCSS3D.name = 'text2';
       fanLocalCSS3D.scale.set(0.1, 0.1, 0.1);
       fanLocalCSS3D.rotation.y = -Math.PI / 2;
-      fanLocalCSS3D.position.set(74.63, 13.54, 3.84);
+      // fanLocalCSS3D.position.set(74.63, 13.54, 3.84);
+      fanLocalCSS3D.position.set(57.84, 10.54, 0.08);
       group.add(fanLocalCSS3D);
     }
   }

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.base.ts

@@ -448,9 +448,9 @@ class ModelContext {
       if (element) {
         const fanLocalCSS3D = new CSS3DObject(element);
         fanLocalCSS3D.name = 'text2';
-        fanLocalCSS3D.scale.set(0.1, 0.1, 0.1);
+        fanLocalCSS3D.scale.set(0.15, 0.15, 0.15);
         fanLocalCSS3D.rotation.y = -Math.PI / 2;
-        fanLocalCSS3D.position.set(57.84, 10.54, 0.08);
+        fanLocalCSS3D.position.set(85.62, 17.65, 7.71);
         this.group.add(fanLocalCSS3D);
       }
     }
@@ -595,15 +595,15 @@ class ModelContext {
       }
       setTimeout(async () => {
         if (childGroup) this.group?.add(childGroup);
-        const oldCameraPosition = { x: 615, y: 275, z: 744 };
-        await animateCamera(
-          oldCameraPosition,
-          { x: 0, y: 0, z: 0 },
-          { x: 0.08, y: 21.73, z: 78.45 },
-          { x: 0.13, y: -0.82, z: 0.236 },
-          this.model,
-          0.8
-        );
+        // const oldCameraPosition = { x: 615, y: 275, z: 744 };
+        // await animateCamera(
+        //   oldCameraPosition,
+        //   { x: 0, y: 0, z: 0 },
+        //   { x: 0.08, y: 21.73, z: 78.45 },
+        //   { x: 0.13, y: -0.82, z: 0.236 },
+        //   this.model,
+        //   0.8
+        // );
         resolve(null);
       }, 300);
     });

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.ts

@@ -4,6 +4,7 @@ import FanLocal from './fanLocal.threejs.base';
 import FanLocalDual from './fanLocalDual.threejs.base';
 import { animateCamera } from '/@/utils/threejs/util';
 import useEvent from '../../../../utils/threejs/useEvent';
+import { modal } from 'vxe-table';
 
 /** 模型总控制器 */
 let model: UseThree;
@@ -24,6 +25,7 @@ const { mouseDownFn } = useEvent();
 function dispatchMouseEvent(event) {
   if (event.button == 0 && model && group) {
     mouseDownFn(model, group, event, () => {});
+    console.log(model.camera, model.orbitControls);
   }
 }
 
@@ -93,16 +95,20 @@ export function setModelType(modelType: 'fanLocal' | 'fanLocalDual' | string, su
           group.children.forEach((e) => {
             e.visible = true;
           });
-          const oldCameraPosition = { x: -693, y: 474, z: 398 };
-          const position = { x: 14.826074594663222, y: 16.901762713393836, z: 36.459944037951004 };
-          await animateCamera(
-            oldCameraPosition,
-            { x: 0, y: 0, z: 0 },
-            { x: position.x, y: position.y, z: position.z },
-            { x: 0, y: 0, z: 0 },
-            model,
-            0.8
-          );
+          // const oldCameraPosition = { x: -693, y: 474, z: 398 };
+          // const position = { x: 14.826074594663222, y: 16.901762713393836, z: 36.459944037951004 };
+          // await animateCamera(
+          //   oldCameraPosition,
+          //   { x: 0, y: 0, z: 0 },
+          //   { x: position.x, y: position.y, z: position.z },
+          //   { x: 0, y: 0, z: 0 },
+          //   model,
+          //   0.8
+          // );
+
+          // 模型不同需要不同的初始角度与位置
+          const oldCameraPosition = { x: 615, y: 275, z: 744 };
+          await animateCamera(oldCameraPosition, { x: 0, y: 0, z: 0 }, { x: -1.85, y: 13.58, z: 37.39 }, { x: -1.83, y: 2.58, z: -0.75 }, model, 0.8);
           resolve(null);
         }, 400);
       }
@@ -130,10 +136,11 @@ export function mountedThree(sceneSelctor: string, cssSelectors: string[]) {
     });
     const model2 = new FanLocalDual(model);
     await model2.mountedThree();
-    modelContextList.push({
-      type: 'fanLocalDual',
-      context: model2,
-    });
+    // 暂时先不加双行
+    // modelContextList.push({
+    //   type: 'fanLocalDual',
+    //   context: model2,
+    // });
 
     initEventListender();
     setCamera();

src/views/vent/monitorManager/windowMonitor/shuangdaoFcSw.threejs.ts

@@ -284,7 +284,7 @@ class doubleWindow {
 
   mountedThree(playerDom) {
     return new Promise((resolve) => {
-      this.model.setGLTFModel('ddFc').then((gltf) => {
+      this.model.setGLTFModel('ddFc_sw').then((gltf) => {
         const fcModal = gltf[0];
         fcModal.name = 'ddFc';
         this.group?.add(fcModal);