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

src/components/chart/BarAndLine.vue

@@ -142,9 +142,9 @@
               } else if (max < 0.9) {
                 yMax = 1.5;
               } else if (max < 5) {
+                yMax = 5;
+              } else if (max < 10) {
                 yMax = 10;
-              } else {
-                yMax = 15;
               }
             } else if (digitCount < 3) {
               const n = Number((Number(max.toFixed(0)) / 10).toFixed(0));
@@ -177,14 +177,12 @@
             }
 
             if (minDigitCount < 2) {
-              if (min > 0.5) {
-                yMin = 0.5;
-              } else if (min > 1.5) {
+              if (min > 1.5) {
                 yMin = 1.0;
-              } else if (min > 10) {
+              } else if (min > 5) {
                 yMin = 5;
               } else {
-                yMin = 15;
+                yMin = 0;
               }
             } else if (minDigitCount < 3) {
               const n = Number((Number(min.toFixed(0)) / 10).toFixed(0));
@@ -216,14 +214,11 @@
               }
             }
 
-            if (yMax != 0 && yMax !== propType?.ymax) {
-              propType.ymax = yMax;
-            }
-            if (yMin != 0 && yMin !== propType?.yMin) {
-              propType.ymin = yMin;
-            }
+            propType.ymax = yMax;
+            propType.ymin = yMin;
             return true;
           });
+          debugger;
           // 根据sort分组
           const groupedBy = {};
           for (const item of chartsColumns) {
@@ -254,7 +249,7 @@
               tempYmax[index] = ymax;
               isFresh = true;
             }
-            if (!tempYmin[index] || tempYmin[index] != ymin) {
+            if (tempYmin[index] != ymin) {
               tempYmin[index] = ymin;
               isFresh = true;
             }
@@ -280,6 +275,7 @@
             // console.log('echarts监测列表数据', option.xAxis[0].data);
             setOptions(option, isRefresh);
           }
+          setOptions(option, isRefresh);
         }
       }
       setTimeout(() => {

src/utils/echartsUtil.ts

@@ -254,18 +254,28 @@ export default class echartsUtil {
     if (!this.option.grid) {
       let rightnum = 0,
         leftnum = 0;
+      let max = 0;
       yAxis.forEach((item) => {
         if (item.position == 'right') {
           ++rightnum;
         } else if (item.position == 'left') {
           ++leftnum;
         }
+        if (item['ymax'] > max) max = item['ymax'];
       });
+      let yWidth = 30;
+      if (max < 100) {
+        yWidth = 15;
+      } else if (max < 1000) {
+        yWidth = 20;
+      } else {
+        yWidth = 30;
+      }
       const grid = {
         top: '60px',
         bottom: type == 'history' ? '40px' : '15px',
-        right: rightnum * 30 + 20 + 'px',
-        left: leftnum * 40 + 'px',
+        right: rightnum * yWidth + 20 + 'px',
+        left: leftnum * (yWidth + 10) + 'px',
         containLabel: true,
       };
       return grid;

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

@@ -795,91 +795,109 @@ function updateChart(data: any) {
             name: 'O₂最大值',
             data: o2MaxValues,
             type: 'bar',
+            yAxisIndex: 0,
           },
           {
             name: 'O₂最小值',
             data: o2MinValues,
             type: 'bar',
+            yAxisIndex: 0,
           },
           {
             name: 'O₂平均值',
             data: o2AveValues,
             type: 'bar',
+            yAxisIndex: 0,
           },
           {
             name: 'CO最大值',
             data: coMaxValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'CO最小值',
             data: coMinValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'CO平均值',
             data: coAveValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'CO₂最大值',
             data: co2MaxValues,
             type: 'bar',
+            yAxisIndex: 0,
           },
           {
             name: 'CO₂最小值',
             data: co2MinValues,
             type: 'bar',
+            yAxisIndex: 0,
           },
           {
             name: 'CO₂平均值',
             data: co2AveValues,
             type: 'bar',
+            yAxisIndex: 0,
           },
           {
             name: 'CH₄最大值',
             data: ch4MaxValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'CH₄最小值',
             data: ch4MinValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'CH₄平均值',
             data: ch4AveValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'C₂H₄最大值',
             data: c2h4MaxValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'C₂H₄最小值',
             data: c2h4MinValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'C₂H₄平均值',
             data: c2h4AveValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'C₂H₂最大值',
             data: c2h2MaxValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'C₂H₂最小值',
             data: c2h2MinValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
           {
             name: 'C₂H₂平均值',
             data: c2h2AveValues,
             type: 'bar',
+            yAxisIndex: 1,
           },
         ];
       default:
@@ -969,7 +987,6 @@ function updateChart(data: any) {
   };
 
   const seriesConfig = getSeriesConfig(sysOrgCode);
-
   const option = {
     tooltip: {
       trigger: 'axis',
@@ -1012,8 +1029,8 @@ function updateChart(data: any) {
     yAxis: [
       {
         type: 'value',
-        max: 100,
-        name: 'O₂/N₂',
+        max: 25,
+        name: '%',
         splitLine: { show: true, lineStyle: { color: 'rgba(28, 72, 105, 0.5)' } },
         axisLabel: {
           color: '#ffffff',
@@ -1021,7 +1038,9 @@ function updateChart(data: any) {
       },
       {
         type: 'value',
-        name: '其他气体',
+        min: 0,
+        max: 25,
+        name: 'ppm',
         splitLine: { show: true, lineStyle: { color: 'rgba(21,80,126,.5)' } },
         axisLabel: {
           color: '#ffffff',

src/views/vent/gas/gasAssessment/threejs/gasAssessmen.threejs.ts

@@ -161,7 +161,7 @@ export const mountedThree = (pageType: Ref<string>, activeUnitId: Ref<string>) =
   activeId = activeUnitId;
   return new Promise(async (resolve) => {
     model = new UseThree('#workFace3D', '#workFace3DCSS');
-    model.setEnvMap('test1');
+    model.setEnvMap('test1.hdr');
     model.renderer.toneMappingExposure = 1.0;
     // model.renderer = 1;
     workFaceObj = new GasAssessmen(model);

src/views/vent/monitorManager/balancePressMonitor/balancePress.threejs.ts

@@ -79,7 +79,7 @@ export const setModelType = (type) => {
 export const mountedThree = () => {
   return new Promise(async (resolve) => {
     model = new UseThree('#balancePress3D');
-    model.setEnvMap('test1');
+    model.setEnvMap('test1.hdr');
     model.renderer.toneMappingExposure = 1.0;
     balancePressBaseObj = new balancePressBase(model);
     await balancePressBaseObj.mountedThree();

src/views/vent/monitorManager/balancePressMonitor1/balancePress.three.ts

@@ -471,7 +471,7 @@ export const mountedThree = (playerVal1) => {
   player1 = playerVal1;
   return new Promise((resolve) => {
     model = new UseThree('#fanLocal3D', '#fanLocal3DCSS');
-    model.setEnvMap('test1');
+    model.setEnvMap('test1.hdr');
 
     resetCamera();
     model.setGLTFModel([modelName]).then(async (gltf) => {

src/views/vent/monitorManager/beltTunMonitor/beltTun.threejs.ts

@@ -84,7 +84,7 @@ export const setModelType = (type) => {
 export const mountedThree = () => {
   return new Promise(async (resolve) => {
     model = new UseThree('#beltTun3D', '#beltTun3DCSS');
-    model.setEnvMap('test1');
+    model.setEnvMap('test1.hdr');
     model.renderer.toneMappingExposure = 1.0;
     model.camera.position.set(100, 0, 1000);
     beltTunObj = new BeltFace(model);

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

@@ -361,7 +361,6 @@
                   strtype: device.deviceType,
                   interval: historyParams.interval,
                   column: 'createTime',
-                  deviceNum: 'Fan2',
                 });
                 if (res && res.records && res.records.length > 0) {
                   resultDataSource.value = res.records.map((item) => Object.assign(item, item.readData));

src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -161,7 +161,7 @@
         grid: {
           top: '29%',
           left: '3',
-          right: '20',
+          right: '9%',
           bottom: '3%',
           containLabel: true,
         },

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

@@ -3595,10 +3595,10 @@ export const option = reactive<EChartsOption>({
 });
 export const echatsOption = {
   legend: {
-    top: -10,
+    top: 5,
   },
   grid: {
-    top: '18%',
+    top: '35',
     left: '30',
     right: '35',
     bottom: '10%',

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;
     });

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 = 'sdmtjtltmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     // 这里判断白家渠还是五当沟
     if (deviceType == 'fanmain_bjq') {
@@ -837,12 +837,16 @@ 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') {
     yMax = 600;
   } else if (sysOrgCode == 'sdmtjtwlmlmk') {
     yMax = 4000;
+  } else if (sysOrgCode == 'sdmtjtltmk') {
+    yMax = 4000;
   } else {
     yMax = 4500;
   }
@@ -1154,7 +1158,7 @@ export const initData1 = () => {
 // 大柳塔武当沟
 export const initData = (deviceType?) => {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtwlmlmk';
+  // const sysOrgCode = 'sdmtjtltmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     return initDataDlt(deviceType);
   } else if (sysOrgCode == 'sdmtjtswmk') {
@@ -1169,16 +1173,55 @@ 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') {
     return initDataCctr();
   } else if (sysOrgCode == 'sdmtjtwlmlmk') {
     return initDataWlml();
+  } else if (sysOrgCode == 'sdmtjtltmk') {
+    return initDataLt();
   } else {
     return initData1();
   }
 };
+// 柳塔
+const initDataLt = () => {
+  const data: any[] = [];
+  data.push({
+    angle: -6,
+    Hz: -6,
+    a: -0.1154,
+    b: 17.723,
+    c: 2433.2,
+    min: 155,
+    max: 210,
+  });
+
+  data.push({
+    angle: -3,
+    Hz: -3,
+    a: -0.2064,
+    b: 57.303,
+    c: -1156.1,
+    min: 155,
+    max: 230,
+  });
+
+  data.push({
+    angle: 3,
+    Hz: 3,
+    a: -0.1228,
+    b: 35.838,
+    c: 541.83,
+    min: 155,
+    max: 266,
+  });
+
+  return data;
+};
 // 乌兰木伦
 const initDataWlml = () => {
   const data: any[] = [];

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;
           }

src/views/vent/monitorManager/windrectMonitor/components/modalTable.vue

@@ -2,9 +2,10 @@
   <BasicTable @register="registerTable" :rowSelection="rowSelection" :scroll="{ y: 450 }" />
 </template>
 <script lang="ts">
+  import { defineComponent, onMounted, ref, watch } from 'vue';
   import { BasicTable } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { deviceList } from '/@/views/vent/monitorManager/windrectMonitor/windrect.api';
+  import { list } from '/@/views/vent/monitorManager/windrectMonitor/windrect.api';
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
 
   export default {
@@ -16,15 +17,17 @@
         required: true,
       },
     },
+
     setup(props) {
       const columns = getTableHeaderColumns(props.deviceType);
-
+      const dataTableSource = ref<any[]>([]);
       // 列表页面公共参数、方法
       const { tableContext, onExportXls } = useListPage({
         designScope: 'windrect_list',
         tableProps: {
           title: '',
-          api: deviceList.bind(null, { pageSize: 1000 }),
+          dataSource: dataTableSource,
+          rowKey: 'deviceID',
           columns: columns,
           size: 'small',
           actionColumn: {
@@ -42,9 +45,23 @@
           },
         },
       });
-
       //注册table数据
       const [registerTable, { clearSelectedRowKeys, setSelectedRowKeys }, { rowSelection, selectedRowKeys }] = tableContext;
+      onMounted(() => {
+        list({ devicetype: 'windrect', pagetype: 'normal', pageSize: 1000 }).then((res) => {
+          if (res && res.msgTxt[0]) {
+            const dataList: any[] = [];
+            if (res.msgTxt[0].datalist && res.msgTxt[0].datalist.length > 0) {
+              res.msgTxt[0].datalist.forEach((data: any) => {
+                const readData = data.readData;
+                data = Object.assign(data, readData);
+                dataList.push(data);
+              });
+              dataTableSource.value = dataList;
+            }
+          }
+        });
+      });
       return {
         registerTable,
         onExportXls,

src/views/vent/sys/setting/setting.data.ts

@@ -99,6 +99,14 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    field: 'loginBack',
+    label: '登录背景图',
+    component: 'JImageUpload',
+    componentProps: {
+      fileMax: 1,
+    },
+  },
+  {
     field: 'dataType',
     label: '矿井数据来源',
     component: 'RadioGroup',
@@ -121,14 +129,6 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'loginBack',
-    label: '登录背景图',
-    component: 'JImageUpload',
-    componentProps: {
-      fileMax: 1,
-    },
-  },
-  {
     field: 'voiceAlarmType',
     label: '语音报警协议类型',
     component: 'Input',
@@ -138,4 +138,9 @@ export const formSchema: FormSchema[] = [
     label: '语音报警服务地址',
     component: 'Input',
   },
+  {
+    field: 'airDensity',
+    label: '矿井空气密度',
+    component: 'Input',
+  },
 ];