浏览代码

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

lxh 3 月之前
父节点
当前提交
65bd0928a1
共有 25 个文件被更改,包括 311 次插入87 次删除
  1. 2 0
      src/views/vent/bundle/bundleMonitorTable/bundle-table.api.ts
  2. 1 1
      src/views/vent/bundle/bundleMonitorTable/bundle-table.data.ts
  3. 114 18
      src/views/vent/bundle/bundleMonitorTable/index.vue
  4. 0 10
      src/views/vent/bundle/bundleMonitorTable/modal/blastDelta.vue
  5. 2 0
      src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.api.ts
  6. 1 1
      src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.data.ts
  7. 103 9
      src/views/vent/bundleSpy/bundleSpyTable/index.vue
  8. 1 1
      src/views/vent/dust/dustMonitorTable/dust-table.data.ts
  9. 61 23
      src/views/vent/dust/dustMonitorTable/index.vue
  10. 4 3
      src/views/vent/monitorManager/compressor/components/nitrogenHome_bet.vue
  11. 3 3
      src/views/vent/monitorManager/compressor/components/nitrogenHome_blt.vue
  12. 2 1
      src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts
  13. 1 1
      src/views/vent/monitorManager/safetyMonitor/index.vue
  14. 1 1
      src/views/vent/monitorManager/windowMonitor/dandaoFc.threejs.ts
  15. 1 1
      src/views/vent/monitorManager/windowMonitor/dandaoFcBet.threejs.ts
  16. 1 1
      src/views/vent/monitorManager/windowMonitor/dandaoFcXk.threejs.ts
  17. 1 1
      src/views/vent/monitorManager/windowMonitor/dandaoFcYjl.threejs.ts
  18. 2 2
      src/views/vent/monitorManager/windowMonitor/shuangdaoFc.threejs.ts
  19. 2 2
      src/views/vent/monitorManager/windowMonitor/shuangdaoFcBlt.threejs.ts
  20. 2 2
      src/views/vent/monitorManager/windowMonitor/shuangdaoFcSw.threejs.ts
  21. 2 2
      src/views/vent/monitorManager/windowMonitor/shuangdaoFcYjl.threejs.ts
  22. 1 1
      src/views/vent/monitorManager/windowMonitorBet/dandaoFc.threejs.ts
  23. 1 1
      src/views/vent/monitorManager/windowMonitorBet/dandaoFcBet.threejs.ts
  24. 1 1
      src/views/vent/monitorManager/windowMonitorBet/dandaoFcBetZh.threejs.ts
  25. 1 1
      src/views/vent/monitorManager/windowMonitorBet/shuangdaoFc.threejs.ts

+ 2 - 0
src/views/vent/bundle/bundleMonitorTable/bundle-table.api.ts

@@ -2,9 +2,11 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   getBundleInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
+  getFileList = '/ventanaly-device/safety/reportLocalData/list',
 }
 /**
  *
  * @param params
  */
 export const getBundleInfoList = (params) => defHttp.post({ url: Api.getBundleInfo, params });
+export const getAllFileList = (params) => defHttp.get({ url: Api.getFileList, params });

+ 1 - 1
src/views/vent/bundle/bundleMonitorTable/bundle-table.data.ts

@@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [
     title: '测点名称',
     dataIndex: 'jcdd',
     key: 'jcdd',
-    width: 150,
+    width: 130,
     align: 'center',
   },
   {

+ 114 - 18
src/views/vent/bundle/bundleMonitorTable/index.vue

@@ -1,13 +1,24 @@
 <template>
   <div class="dustMonitor">
     <customHeader>束管日报分析</customHeader>
-    <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW">
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex === 'action'">
-          <a class="action-link" @click="toDetail(record)">数据分析</a>
-        </template>
-      </template>
-    </a-table>
+    <div class="content-container">
+      <div class="file-list">
+        <ul>
+          <li v-for="item in selectList" :key="item.fileId" :class="{ selected: item.fileId === selectedFileId }" @click="handleFileClick(item)">
+            {{ item.fileName }}
+          </li>
+        </ul>
+      </div>
+      <div class="table-container">
+        <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.dataIndex === 'action'">
+              <a class="action-link" @click="toDetail(record)">数据分析</a>
+            </template>
+          </template>
+        </a-table>
+      </div>
+    </div>
     <a-modal style="width: 24%; height: 600px" title="爆炸三角形" v-model:visible="modalVisible" :draggable="true" :footer="null">
       <blastDelta :posMonitor="posMonitor" />
     </a-modal>
@@ -15,40 +26,125 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, shallowRef } from 'vue';
+import { ref, onMounted, shallowRef, reactive } from 'vue';
 import { columns } from './bundle-table.data';
-import { getBundleInfoList } from './bundle-table.api';
+import { getBundleInfoList, getAllFileList } from './bundle-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 // import { blastDelta } from './modal/blastDelta.vue';
 import blastDelta from './modal/blastDelta.vue';
-
+let selectList = ref<any[]>([]);
+let formSearch = reactive({
+  pageNum: 1,
+  pageSize: 1000,
+  fileId: '',
+  fileName: '',
+});
 let tableData = ref<any[]>([]);
 let modalVisible = ref(false);
+let selectedFileId = ref<string | null>(null);
 const posMonitor = shallowRef({});
-async function getTableList() {
-  let res = await getBundleInfoList({ type: 'bundle' });
+
+function toDetail(record: any) {
+  posMonitor.value = record;
+  console.log(posMonitor.value, '爆炸三角形');
+  modalVisible.value = true;
+}
+
+//获取色谱仪报表
+async function getTableList(params: any) {
+  let res = await getBundleInfoList({ type: 'bundle', ...params });
   const content = res.content;
   let contentArr = JSON.parse(content);
   tableData.value = contentArr;
 }
 
-function toDetail(record: any) {
-  posMonitor.value = record;
-  console.log(posMonitor.value, 'posMonitor');
-  modalVisible.value = true;
+//获取所有文件列表
+async function getAllFile() {
+  let res = await getAllFileList({ type: 'bundle' });
+  selectList.value = res.records.map((item: any) => ({
+    fileId: item.fileId,
+    fileName: item.fileName,
+  }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
+  }
+}
+// 处理文件点击事件
+function handleFileClick(item: any) {
+  formSearch.fileId = item.fileId;
+  formSearch.fileName = item.fileName;
+  selectedFileId.value = item.fileId;
+  getSearch();
+}
+//查询
+function getSearch() {
+  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  const params = {
+    fileId: formSearch.fileId,
+    fileName: selectedFile ? selectedFile.fileName : '',
+  };
+  getTableList(params);
 }
 onMounted(() => {
-  getTableList();
+  getTableList({ type: 'bundle' });
+  getAllFile().then(() => {
+    if (selectList.value.length > 0) {
+      formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
+      getSearch();
+    }
+  });
 });
 </script>
 
 <style lang="less" scoped>
 @import '/@/design/theme.less';
 
+.content-container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
+
+.file-list {
+  width: 20%;
+  padding: 10px;
+  margin-right: 10px;
+  margin-bottom: 50px;
+  border: 1px solid #99e8ff66;
+  background: #27546e1a;
+  box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
+}
+
+.file-list ul {
+  list-style: none;
+  padding: 0;
+}
+
+.file-list li {
+  color: #fff;
+  padding: 5px;
+  cursor: pointer;
+}
+
+.file-list li:hover,
+.file-list li.selected {
+  background: #26adfc1a;
+}
+
+.table-container {
+  margin-top: 10px;
+  width: 80%;
+  box-sizing: border-box;
+}
+
 .dustMonitor {
   width: 100%;
   height: 100%;
-  padding: 80px 10px 15px 10px;
+  padding: 10px 10px 15px 10px;
   box-sizing: border-box;
   position: relative;
 }

+ 0 - 10
src/views/vent/bundle/bundleMonitorTable/modal/blastDelta.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="blastDelta">
-    <!-- <div class="blast-title">爆炸三角形</div> -->
     <div ref="coord" class="coords">
       <div class="coord-lineY">
         <div :style="{ width: '5px', height: `${lengY}px`, 'border-top': '1px solid #0079ff' }" v-for="item in 10" :key="item"></div>
@@ -412,15 +411,6 @@ onMounted(() => {
   width: 100%;
   height: 450px;
 
-  // .blast-title {
-  //   position: absolute;
-  //   left: 50%;
-  //   top: 24px;
-  //   transform: translate(-50%, 0);
-  //   font-size: 12px;
-  //   color: #fff;
-  // }
-
   .line-legend {
     position: absolute;
     left: 50%;

+ 2 - 0
src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.api.ts

@@ -2,9 +2,11 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   getbunudleSpyInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
+  getFileList = '/ventanaly-device/safety/reportLocalData/list',
 }
 /**
  *
  * @param params
  */
 export const getbundleSpyInfoList = (params) => defHttp.post({ url: Api.getbunudleSpyInfo, params });
+export const getAllFileList = (params) => defHttp.get({ url: Api.getFileList, params });

+ 1 - 1
src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.data.ts

@@ -18,7 +18,7 @@ export const columns: BasicColumn[] = [
     title: '采样地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
-    width: 140,
+    width: 100,
     align: 'center',
   },
   {

+ 103 - 9
src/views/vent/bundleSpy/bundleSpyTable/index.vue

@@ -1,37 +1,131 @@
 <template>
   <div class="dustMonitor">
-    <customHeader>束管色谱仪报表</customHeader>
-    <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW"> </a-table>
+    <customHeader>色谱仪报表分析</customHeader>
+    <div class="content-container">
+      <div class="file-list">
+        <ul>
+          <li v-for="item in selectList" :key="item.fileId" :class="{ selected: item.fileId === selectedFileId }" @click="handleFileClick(item)">
+            {{ item.fileName }}
+          </li>
+        </ul>
+      </div>
+      <div class="table-container">
+        <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW"> </a-table>
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, reactive } from 'vue';
 import { columns } from './bundleSpy-table.data';
-import { getbundleSpyInfoList } from './bundleSpy-table.api';
+import { getbundleSpyInfoList, getAllFileList } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
+let selectList = ref<any[]>([]);
 
+let formSearch = reactive({
+  pageNum: 1,
+  pageSize: 1000,
+  fileId: '',
+  fileName: '',
+});
 let tableData = ref<any[]>([]);
-
-async function getTableList() {
-  let res = await getbundleSpyInfoList({ type: 'bundleSpy' });
+let selectedFileId = ref<string | null>(null);
+//获取色谱仪报表
+async function getTableList(params: any) {
+  let res = await getbundleSpyInfoList({ type: 'bundleSpy', ...params });
   const content = res.content;
   let contentArr = JSON.parse(content);
   tableData.value = contentArr;
 }
 
+//获取所有文件列表
+async function getAllFile() {
+  let res = await getAllFileList({ type: 'bundleSpy' });
+  selectList.value = res.records.map((item: any) => ({
+    fileId: item.fileId,
+    fileName: item.fileName,
+  }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
+  }
+}
+// 处理文件点击事件
+function handleFileClick(item: any) {
+  formSearch.fileId = item.fileId;
+  formSearch.fileName = item.fileName;
+  selectedFileId.value = item.fileId;
+  getSearch();
+}
+//查询
+function getSearch() {
+  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  const params = {
+    fileId: formSearch.fileId,
+    fileName: selectedFile ? selectedFile.fileName : '',
+  };
+  getTableList(params);
+}
 onMounted(() => {
-  getTableList();
+  getTableList({ type: 'bundleSpy' });
+  getAllFile().then(() => {
+    if (selectList.value.length > 0) {
+      formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
+      getSearch();
+    }
+  });
 });
 </script>
 
 <style lang="less" scoped>
 @import '/@/design/theme.less';
 
+.content-container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
+
+.file-list {
+  width: 20%;
+  padding: 10px;
+  margin-right: 10px;
+  margin-bottom: 50px;
+  border: 1px solid #99e8ff66;
+  background: #27546e1a;
+  box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
+}
+
+.file-list ul {
+  list-style: none;
+  padding: 0;
+}
+
+.file-list li {
+  color: #fff;
+  padding: 5px;
+  cursor: pointer;
+}
+
+.file-list li:hover,
+.file-list li.selected {
+  background: #26adfc1a;
+}
+
+.table-container {
+  margin-top: 10px;
+  width: 80%;
+  box-sizing: border-box;
+}
+
 .dustMonitor {
   width: 100%;
   height: 100%;
-  padding: 80px 10px 15px 10px;
+  padding: 10px 10px 15px 10px;
   box-sizing: border-box;
   position: relative;
 }

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

@@ -9,7 +9,7 @@ export const columns = [
     title: '工作场所',
     dataIndex: 'gzcs',
     key: 'gzcs',
-    width: 130,
+    width: 100,
     align: 'center',
   },
   {

+ 61 - 23
src/views/vent/dust/dustMonitorTable/index.vue

@@ -1,14 +1,18 @@
 <template>
   <div class="dustMonitor">
-    <customHeader>粉尘日常监测报表</customHeader>
-    <div class="select-container">
-      <span class="select-label">选择文件:</span>
-      <a-select v-model:value="formSearch.fileId" style="width: 220px" size="small" placeholder="请选择...">
-        <a-select-option v-for="item in selectList" :key="item.fileId">{{ item.fileName }}</a-select-option>
-      </a-select>
-      <a-button type="primary" style="margin-left: 10px" @click="getSearch">查询</a-button>
+    <customHeader>粉尘监测报表分析</customHeader>
+    <div class="content-container">
+      <div class="file-list">
+        <ul>
+          <li v-for="item in selectList" :key="item.fileId" :class="{ selected: item.fileId === selectedFileId }" @click="handleFileClick(item)">
+            {{ item.fileName }}
+          </li>
+        </ul>
+      </div>
+      <div class="table-container">
+        <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW"> </a-table>
+      </div>
     </div>
-    <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 500 }" class="tableW"> </a-table>
   </div>
 </template>
 
@@ -27,6 +31,7 @@ let formSearch = reactive({
   fileId: '',
   fileName: '',
 });
+let selectedFileId = ref<string | null>(null);
 //获取粉尘监测结果数据
 async function getTableList(params: any) {
   let res = await getDustInfoList({ type: 'smoke', ...params });
@@ -41,8 +46,19 @@ async function getAllFile() {
     fileId: item.fileId,
     fileName: item.fileName,
   }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
+  }
 }
 //查询
+// 处理文件点击事件
+function handleFileClick(item: any) {
+  formSearch.fileId = item.fileId;
+  formSearch.fileName = item.fileName;
+  selectedFileId.value = item.fileId;
+  getSearch();
+}
 function getSearch() {
   const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
   const params = {
@@ -53,41 +69,63 @@ function getSearch() {
 }
 onMounted(() => {
   getTableList({ type: 'smoke' });
-  getAllFile();
+  getAllFile().then(() => {
+    if (selectList.value.length > 0) {
+      formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
+      getSearch();
+    }
+  });
 });
 </script>
 
 <style lang="less" scoped>
 @import '/@/design/theme.less';
 
-.dustMonitor {
+.content-container {
+  display: flex;
   width: 100%;
   height: 100%;
-  padding: 80px 10px 15px 10px;
-  box-sizing: border-box;
-  position: relative;
 }
 
-.select-container {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
+.file-list {
+  width: 20%;
+  padding: 10px;
+  margin-right: 10px;
+  margin-bottom: 50px;
+  border: 1px solid #99e8ff66;
+  background: #27546e1a;
+  box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
 }
 
-.select-label {
-  margin-right: 10px;
-  color: white;
+.file-list ul {
+  list-style: none;
+  padding: 0;
 }
 
-.action-link {
-  color: #1890ff;
+.file-list li {
+  color: #fff;
+  padding: 5px;
   cursor: pointer;
 }
 
+.file-list li:hover,
+.file-list li.selected {
+  background: #26adfc1a;
+}
+
+.table-container {
+  margin-top: 10px;
+  width: 80%;
+  box-sizing: border-box;
+}
+
 .dustMonitor {
   width: 100%;
   height: 100%;
-  padding: 80px 10px 15px 10px;
+  padding: 10px 10px 15px 10px;
   box-sizing: border-box;
   position: relative;
 }

+ 4 - 3
src/views/vent/monitorManager/compressor/components/nitrogenHome_bet.vue

@@ -352,7 +352,7 @@
       timer = await setTimeout(
         async () => {
           if (props.deviceId) {
-            await getDataSource(props.deviceId);
+            await getDataSource(props.deviceId, flag);
           }
           if (timer) {
             timer = null;
@@ -364,7 +364,7 @@
     }
   }
 
-  async function getDataSource(systemID) {
+  async function getDataSource(systemID, flag = false) {
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     if (res) {
       const result = res;
@@ -405,7 +405,7 @@
           echartData.value = dataArr;
         }
       });
-      monitorDataGroupNum.value = monitorData.value.length;
+      if (flag) monitorDataGroupNum.value = monitorData.value.length;
       refresh.value = true;
       nextTick(() => {
         refresh.value = false;
@@ -487,6 +487,7 @@
     async (deviceId) => {
       if (deviceId) {
         await getCamera(deviceId, playerRef.value, 'nitrogen');
+        getDataSource(props.deviceId, true);
       }
     }
   );

+ 3 - 3
src/views/vent/monitorManager/compressor/components/nitrogenHome_blt.vue

@@ -228,7 +228,7 @@
       timer = await setTimeout(
         async () => {
           if (props.deviceId) {
-            await getDataSource(props.deviceId);
+            await getDataSource(props.deviceId, flag);
           }
           if (timer) {
             timer = null;
@@ -240,7 +240,7 @@
     }
   }
 
-  async function getDataSource(systemID) {
+  async function getDataSource(systemID, flag?) {
     const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
     console.log(res, 'res---------------');
 
@@ -281,7 +281,7 @@
           echartData.value = dataArr;
         }
       });
-      monitorDataGroupNum.value = monitorData.value.length;
+      if (flag) monitorDataGroupNum.value = monitorData.value.length;
       refresh.value = true;
       nextTick(() => {
         refresh.value = false;

+ 2 - 1
src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -63,7 +63,8 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));
   }
   const BundleModal = defineAsyncComponent(() => import('./modal/bundle.modal.vue'));
   const FiremonModal = defineAsyncComponent(() => import('./modal/firemon.modal.vue'));

+ 1 - 1
src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -358,7 +358,7 @@
 
   function updateSubstation() {
     if (subStation.value) {
-      initSubStation(subStation.value).then(() => {
+      initSubStation({ substationID: subStation.value }).then(() => {
         message.success('分站同步完成!');
       });
     } else {

+ 1 - 1
src/views/vent/monitorManager/windowMonitor/dandaoFc.threejs.ts

@@ -78,7 +78,7 @@ class singleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree || selectData.OpenDegree1 ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree || selectData.OpenDegree1 ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitor/dandaoFcBet.threejs.ts

@@ -70,7 +70,7 @@ class singleWindowBet {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitor/dandaoFcXk.threejs.ts

@@ -59,7 +59,7 @@ class singleWindowXk {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitor/dandaoFcYjl.threejs.ts

@@ -54,7 +54,7 @@ class singleWindowYjl {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 2 - 2
src/views/vent/monitorManager/windowMonitor/shuangdaoFc.threejs.ts

@@ -71,7 +71,7 @@ class doubleWindow {
         y: 97,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -91,7 +91,7 @@ class doubleWindow {
         y: 150,
       },
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 2 - 2
src/views/vent/monitorManager/windowMonitor/shuangdaoFcBlt.threejs.ts

@@ -54,7 +54,7 @@ class doubleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -74,7 +74,7 @@ class doubleWindow {
         y: 145,
       },
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 2 - 2
src/views/vent/monitorManager/windowMonitor/shuangdaoFcSw.threejs.ts

@@ -76,7 +76,7 @@ class doubleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -97,7 +97,7 @@ class doubleWindow {
       },
 
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 2 - 2
src/views/vent/monitorManager/windowMonitor/shuangdaoFcYjl.threejs.ts

@@ -56,7 +56,7 @@ class doubleWindowYjl {
         y: 97,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(%)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -76,7 +76,7 @@ class doubleWindowYjl {
         y: 150,
       },
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(%)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitorBet/dandaoFc.threejs.ts

@@ -54,7 +54,7 @@ class singleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitorBet/dandaoFcBet.threejs.ts

@@ -54,7 +54,7 @@ class singleWindowBet {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitorBet/dandaoFcBetZh.threejs.ts

@@ -55,7 +55,7 @@ class singleWindowBetZh {
         y: 95,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

+ 1 - 1
src/views/vent/monitorManager/windowMonitorBet/shuangdaoFc.threejs.ts

@@ -49,7 +49,7 @@ class doubleWindow {
         y: 97,
       },
       {
-        text: `${selectData.OpenDegree ? '开度值(%)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree ? '开度值(°)' : selectData.forntArea ? '过风面积(㎡)' : '过风面积(㎡)'}:`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',