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

src/views/vent/gas/gasVerify/index.vue

@@ -138,7 +138,7 @@
   } from './gasPumpSetting.data';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicModal, useModal } from '/@/components/Modal';
-  import { get, inRange, isNil, min } from 'lodash-es';
+  import { get, inRange, isNil } from 'lodash-es';
 
   const actived = ref<'extract' | 'product'>('product');
 
@@ -386,20 +386,11 @@
     });
   }
 
-  function getNum(data, path, defaultValue) {
-    const r = get(data, path);
+  // function getNum(data, path, defaultValue) {
+  //   const r = get(data, path);
 
-    return isNil(r) ? defaultValue : parseFloat(r);
-  }
-
-  /** 瓦斯抽采能力 */
-  const extractValue = computed(() => {
-    return min([getNum(data, 'gasExtractionMainPipelineCapacitySmall', 0), getNum(data, 'gasExtractionPumpStationCapacitySmall', 0)]);
-  });
-  /** 瓦斯抽采达标生产能力 */
-  const productValue = computed(() => {
-    return min([getNum(data, 'gasExtractionMainPipelineCapacitySmall', 0), getNum(data, 'gasExtractionPumpStationCapacitySmall', 0)]);
-  });
+  //   return isNil(r) ? defaultValue : parseFloat(r);
+  // }
 
   const productChartData = computed(() => {
     return [

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

@@ -70,6 +70,7 @@ export function setModelType(modelType: 'fanLocal' | 'fanLocalDual' | string, su
     if (!model) return reject('模型控制器未初始化');
     // 判断是否是同一个/类模型
     if (cacheKey === `${modelType}-${subModelType}`) return resolve(null);
+    const isUpdate = cacheKey.startsWith(modelType);
     cacheKey = `${modelType}-${subModelType}`;
 
     modelContextList.forEach(({ type, context }) => {
@@ -86,42 +87,28 @@ export function setModelType(modelType: 'fanLocal' | 'fanLocalDual' | string, su
         group = context?.group as THREE.Object3D;
         context.setModelType(subModelType, data);
 
-        setTimeout(async () => {
-          // 还没添加到控制器的添加进去
-          if (!model.scene?.getObjectByName(group.name) && group) {
-            model.scene?.add(group);
-          }
-          group.visible = true;
-          group.children.forEach((e) => {
-            e.visible = true;
-          });
-
-          // 模型不同需要不同的初始角度与位置
-          if (type == 'fanLocal') {
-            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
-            );
-          } else {
+        // 还没添加到控制器的添加进去
+        if (!model.scene?.getObjectByName(group.name) && group) {
+          model.scene?.add(group);
+        }
+        group.visible = true;
+        group.children.forEach((e) => {
+          e.visible = true;
+        });
+
+        // 模型发生了替换，需要使用摄像头动画// 模型不同需要不同的初始角度与位置
+        if (type == 'fanLocal') {
+          const oldCameraPosition = { x: 615, y: 275, z: 744 };
+          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);
+        }
+        if (type == 'fanLocalDual') {
+          if (!isUpdate) {
             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
-            );
+            animateCamera(oldCameraPosition, { x: 0, y: 0, z: 0 }, { x: 14.83, y: 16.9, z: 36.46 }, { x: 0, y: 0, z: 0 }, model, 0.8);
           }
+        }
 
-          resolve(null);
-        }, 400);
+        resolve(null);
       }
     });
   });
@@ -170,10 +157,11 @@ export const destroy = () => {
 };
 
 // 为了兼容性而添加的方法导出
-export function addText(d) {
+export function addText(d, e) {
   if (modelContextList[0]) {
     // @ts-ignore
     modelContextList[0].context?.addText(d);
+    modelContextList[1].context?.addText(e);
   }
 }
 export function addCssText() {

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

@@ -1,8 +1,10 @@
 import * as THREE from 'three';
 // import { setModalCenter } from '/@/utils/threejs/util';
 import Smoke from '../../comment/threejs/Smoke';
-import { CSS3DObject, CSS3DSprite } from 'three/examples/jsm/renderers/CSS3DRenderer';
-import * as dat from 'dat.gui';
+import { CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer';
+import { get } from 'lodash-es';
+import { getTextCanvas } from '/@/utils/threejs/util';
+// import * as dat from 'dat.gui';
 // const gui = new dat.GUI();
 // gui.domElement.style = 'position:absolute;top:100px;left:10px;z-index:99999999999999';
 
@@ -33,9 +35,32 @@ class ModelContext {
   }
 
   /** 设置模型类型并切换，不同的类型通常对应不同的具体模型，在模型总控制器下的具体模型会根据传入的参数彼此交互、切换 */
-  setModelType(modelType: string, data: any) {
+  setModelType(modelType: 'inner' | 'outer' | string, data: any[]) {
+    const fanOuter1Run = get<string>(data[0], 'Fan1StartStatus', '0') == '1';
+    const fanInner1Run = get<string>(data[1], 'Fan1StartStatus', '0') == '1';
+    if (modelType === 'inner') {
+      this.execute('fanLeftStrong');
+    }
+    if (modelType === 'outer') {
+      this.execute('fanRightStrong');
+    }
+    if (fanOuter1Run && fanInner1Run) {
+      this.execute('fan1RightOpen&fan1LeftOpen');
+    }
+    if (fanOuter1Run && !fanInner1Run) {
+      this.execute('fan1RightOpen&fan2LeftOpen');
+    }
+    if (!fanOuter1Run && fanInner1Run) {
+      this.execute('fan2RightOpen&fan1LeftOpen');
+    }
+    if (!fanOuter1Run && !fanInner1Run) {
+      this.execute('fan2RightOpen&fan2LeftOpen');
+    }
+  }
+
+  execute(cmdname: string) {
     this.modules.forEach(({ name, context, behavior }) => {
-      if (name === modelType) {
+      if (name === cmdname) {
         behavior(context);
       }
     });
@@ -46,6 +71,20 @@ class ModelContext {
       this.model.setGLTFModel([this.modelName]).then(async (gltf) => {
         this.group = gltf[0];
         if (this.group) {
+          // const material = new THREE.MeshBasicMaterial({
+          //   color: '#000',
+          //   transparent: true,
+          //   opacity: 0.3,
+          //   side: THREE.DoubleSide, // 这里是双面渲染的意思
+          // });
+          // [
+          //   this.group.getObjectByName('Cylinder1054'),
+          //   this.group.getObjectByName('BuErTaiJuBuFengJi_shupailie_baiseziti'),
+          //   this.group.getObjectByName('pCylinder1'),
+          // ].forEach((e: THREE.Mesh) => {
+          //   e.material = material;
+          //   // e.renderOrder = 300;
+          // });
           // this.group.scale.set(2, 2, 2);
           // setModalCenter(this.group);
           this.addLight();
@@ -93,7 +132,7 @@ class ModelContext {
         g.oldOpacityFactor = 0.4;
       }
       if (g instanceof CSS3DObject) {
-        g.element.style.setProperty('opacity', '0.5');
+        g.element.style.setProperty('opacity', '0.3');
       }
     });
   }
@@ -178,44 +217,44 @@ class ModelContext {
     await smokeTunnelMajor.setPoints();
     this.group?.add(smokeTunnelMajor.points);
 
-    const fanRightSelectors = [
+    const fanLeftSelectors = [
       {
         query: '#inputBox2',
-        position: [-70, 0, -15],
+        position: [-85, 8, -16],
         scale: 0.1,
       },
       {
         query: '#T1_1',
-        position: [100, 15, -42],
+        position: [93, 18, -65],
         scale: 0.2,
       },
       {
         query: '#T1_2',
-        position: [30, 15, -37],
+        position: [35, 16, -59],
         scale: 0.175,
       },
     ];
-    const fanLeftSelectors = [
+    const fanRightSelectors = [
       {
         query: '#inputBox3',
-        position: [-70, 0, 36],
+        position: [-85, 8, 24],
         scale: 0.1,
       },
       {
         query: '#T2_1',
-        position: [110, 15, -80],
+        position: [93, 18, -98],
         scale: 0.2,
       },
       {
         query: '#T2_2',
-        position: [47, 15, -74],
+        position: [35, 16, -92],
         scale: 0.175,
       },
     ];
     const commonSelectors = [
       {
         query: '#T3',
-        position: [-40, 15, -65],
+        position: [-26, 14, -86],
         scale: 0.15,
       },
     ];
@@ -321,19 +360,16 @@ class ModelContext {
 
   /** 初始化css元素，将css元素选择器传入，该方法会将这些元素按顺序放入传入的锚点中 */
   initCssElement(selectors: { query: string; position: number[]; scale: number }[]) {
-    const arr: CSS3DSprite[] = [];
+    const arr: CSS3DObject[] = [];
     selectors.forEach(({ query, position, scale }) => {
       const element = document.querySelector(query) as HTMLElement;
       if (element) {
-        const css3D = new CSS3DSprite(element);
+        const css3D = new CSS3DObject(element);
         this.elements.push(css3D);
         arr.push(css3D);
         css3D.name = query;
         css3D.scale.set(scale, scale, scale);
-        // const ff = gui.addFolder(`css元素${query}`);
-        // ff.add(css3D.position, 'x', -100, 100);
-        // ff.add(css3D.position, 'y', -100, 100);
-        // ff.add(css3D.position, 'z', -100, 100);
+        css3D.rotation.y = -Math.PI / 2;
         css3D.position.set(position[0], position[1], position[2]);
         this.group?.add(css3D);
       }
@@ -358,6 +394,7 @@ class ModelContext {
         path1,
         isSpread: false,
         spreadDirection: 0,
+        spreadRang: -10,
       };
       if (airIn) {
         // 首个线段需要扩散，由大变小
@@ -377,5 +414,142 @@ class ModelContext {
     }
     return result;
   }
+
+  /** 添加风机描述，右侧风机是arr的第一项，左侧风机是第二项 */
+  addText(arr) {
+    const positions = [
+      [-84.79, 0.82, 20.3],
+      [-84.79, 0.82, 7.6],
+    ];
+    arr.forEach((e, i) => {
+      this.addTextByData(e, positions[i], `text${i}`);
+    });
+  }
+
+  // 从 .fanLocal.threejs.base 复制
+  addTextByData(selectData, position, name) {
+    if (!this.group) {
+      return;
+    }
+    // @ts-ignore
+    const screenDownText = get(VENT_PARAM, 'modalText', History_Type['type'] == 'remote' ? '国能神东煤炭集团监制' : '煤炭科学技术研究院有限公司研制');
+
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const textArr = [
+      {
+        text: `智能局部通风机监测与控制系统`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 20,
+        y: 108,
+      },
+      {
+        text: `供风距离(m):`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 0,
+        y: 152,
+      },
+      {
+        text: `${
+          selectData.airSupplyDistence_merge
+            ? selectData.airSupplyDistence_merge
+            : selectData.fchimenylength
+            ? selectData.fchimenylength
+            : selectData.airSupplyDistence_merge
+            ? selectData.airSupplyDistence_merge
+            : '-'
+        }`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 228,
+        y: 152,
+      },
+      {
+        text: `风筒直径(mm): `,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 0,
+        y: 200,
+      },
+      {
+        text: ` ${selectData.fchimenydiamlimit ? selectData.fchimenydiamlimit : selectData.ductDiameter_merge ? selectData.ductDiameter_merge : '-'}`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 220,
+        y: 200,
+      },
+      {
+        text: `故障诊断:`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 0,
+        y: 245,
+      },
+      {
+        text: `${selectData.warnLevel_str ? selectData.warnLevel_str : '-'}`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 220,
+        y: 245,
+      },
+      {
+        text: `型号功率:`,
+        font: 'normal 30px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 0,
+        y: 285,
+      },
+      {
+        text: `${selectData.model_Power_merge ? selectData.model_Power_merge : '-'}`,
+        font: 'normal 26px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: 220,
+        y: 285,
+      },
+      {
+        text: screenDownText,
+        font: 'normal 28px Arial',
+        color: '#009900',
+        strokeStyle: '#002200',
+        x: screenDownTextX,
+        y: 325,
+      },
+    ];
+
+    getTextCanvas(526, 346, textArr, '').then((canvas: HTMLCanvasElement) => {
+      const textMap = new THREE.CanvasTexture(canvas); // 关键一步
+      const textMaterial = new THREE.MeshBasicMaterial({
+        // 关于材质并未讲解 实操即可熟悉                 这里是漫反射类似纸张的材质,对应的就有高光类似金属的材质.
+        map: textMap, // 设置纹理贴图
+        transparent: true,
+        side: THREE.FrontSide, // 这里是双面渲染的意思
+      });
+      textMaterial.blending = THREE.CustomBlending;
+      const monitorPlane = this.group?.getObjectByName(name);
+
+      if (monitorPlane) {
+        // @ts-ignore-next-line
+        monitorPlane.material = textMaterial;
+      } else {
+        const planeGeometry = new THREE.PlaneGeometry(526, 346); // 平面3维几何体PlaneGeometry
+        const planeMesh = new THREE.Mesh(planeGeometry, textMaterial);
+        planeMesh.name = name;
+        planeMesh.scale.set(0.0135, 0.0135, 0.0135);
+        planeMesh.rotation.y = -Math.PI / 2;
+        planeMesh.position.set(position[0], position[1], position[2]);
+        this.group?.add(planeMesh);
+      }
+    });
+  }
 }
 export default ModelContext;

src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -130,14 +130,85 @@
           </div>
         </div>
         <!-- 双巷风机右侧风机详情框 -->
-        <div class="elementTag" id="inputBox2"> <div class="elementContent">RIGHT_BOX</div> </div>
+        <div class="elementTag" id="inputBox2">
+          <div class="elementContent">
+            <p v-if="fanDualArray[0].windInputSpeed1 || fanDualArray[0].windInputSpeed_merge">
+              局扇工作面风速：
+              <span class="value">{{ fanDualArray[0].windInputSpeed1 || fanDualArray[0].windInputSpeed_merge || '-' }}</span>
+              <span class="unit"> m/s</span>
+            </p>
+            <p v-if="fanDualArray[0].windQuantity1 || fanDualArray[0].inletAirVolume_merge">
+              风筒入口风量：
+              <span class="value">{{ fanDualArray[0].windQuantity1 || fanDualArray[0].inletAirVolume_merge || '-' }}</span>
+              <span class="unit"> m³/min</span>
+            </p>
+          </div>
+        </div>
         <!-- 双巷风机左侧风机详情框 -->
-        <div class="elementTag" id="inputBox3"> <div class="elementContent">LEFT_BOX</div> </div>
-        <div class="elementTag" id="T1_1"> <div class="elementContent">T1_1</div> </div>
-        <div class="elementTag" id="T1_2"> <div class="elementContent">T1_2</div> </div>
-        <div class="elementTag" id="T2_1"> <div class="elementContent">T2_1</div> </div>
-        <div class="elementTag" id="T2_2"> <div class="elementContent">T2_2</div> </div>
-        <div class="elementTag" id="T3"> <div class="elementContent">T3z</div> </div>
+        <div class="elementTag" id="inputBox3">
+          <div class="elementContent">
+            <p v-if="fanDualArray[1].windInputSpeed1 || fanDualArray[1].windInputSpeed_merge">
+              局扇工作面风速：
+              <span class="value">{{ fanDualArray[1].windInputSpeed1 || fanDualArray[1].windInputSpeed_merge || '-' }}</span>
+              <span class="unit"> m/s</span>
+            </p>
+            <p v-if="fanDualArray[1].windQuantity1 || fanDualArray[1].inletAirVolume_merge">
+              风筒入口风量：
+              <span class="value">{{ fanDualArray[1].windQuantity1 || fanDualArray[1].inletAirVolume_merge || '-' }}</span>
+              <span class="unit"> m³/min</span>
+            </p>
+          </div>
+        </div>
+        <div class="elementTag" id="T1_1">
+          <div class="elementContent" v-if="fanDualArray[0].gasT1">
+            <!-- <div class="elementContent"> -->
+            <p v-if="fanDualArray[0].gasT1">
+              掘进工作面混合风流处甲烷传感器T₁：
+              <span class="value">{{ fanDualArray[0].gasT1 }}</span>
+              <span class="unit">(%)</span>
+            </p>
+          </div>
+        </div>
+        <div class="elementTag" id="T1_2">
+          <div class="elementContent" v-if="fanDualArray[1].gasT1">
+            <!-- <div class="elementContent"> -->
+            <p v-if="fanDualArray[1].gasT1">
+              掘进工作面混合风流处甲烷传感器T₁：
+              <span class="value">{{ fanDualArray[1].gasT1 }}</span>
+              <span class="unit">(%)</span>
+            </p>
+          </div>
+        </div>
+        <div class="elementTag" id="T2_1">
+          <div class="elementContent" v-if="fanDualArray[0].gasT2">
+            <!-- <div class="elementContent"> -->
+            <p v-if="fanDualArray[0].gasT2">
+              掘进工作面回风流处甲烷传感器T₂：
+              <span class="value">{{ fanDualArray[0].gasT2 }}</span>
+              <span class="unit">(%)</span>
+            </p>
+          </div>
+        </div>
+        <div class="elementTag" id="T2_2">
+          <div class="elementContent" v-if="fanDualArray[1].gasT2">
+            <!-- <div class="elementContent"> -->
+            <p v-if="fanDualArray[1].gasT2">
+              掘进工作面回风流处甲烷传感器T₂：
+              <span class="value">{{ fanDualArray[1].gasT2 }}</span>
+              <span class="unit">(%)</span>
+            </p>
+          </div>
+        </div>
+        <div class="elementTag" id="T3">
+          <div class="elementContent" v-if="fanDualArray[1].gasT3">
+            <!-- <div class="elementContent"> -->
+            <p v-if="fanDualArray[1].gasT3">
+              掘进工作面进风流处甲烷传感器T₃：
+              <span class="value">{{ fanDualArray[1].gasT3 }}</span>
+              <span class="unit">(%)</span>
+            </p>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -1176,7 +1247,7 @@
               Object.assign(selectData, dataSource.value[selectRowIndex.value]);
             }
             playSmoke(selectData);
-            addText(selectData);
+            addText(selectData, fanDualArray.value);
           }
           historySource.value = selectData.history;
 
@@ -1241,14 +1312,17 @@
         if (data['install_kind']) {
           const keymap = {
             single: ['fanLocal', modalType.value],
-            dual_inner: ['fanLocalDual', 'fan1RightOpen'],
-            dual_outer: ['fanLocalDual', 'fan1RightOpen&fan1LeftOpen'],
+            dual_inner: ['fanLocalDual', 'inner'],
+            dual_outer: ['fanLocalDual', 'outer'],
           };
           mainModelType.value = keymap[data['install_kind']][0];
           modalType.value = keymap[data['install_kind']][1];
+        } else {
+          // 为了兼容没有添加 install_kind 的旧的单巷
+          mainModelType.value = 'fanLocal';
         }
       }
-      setModelType(mainModelType.value, modalType.value);
+      setModelType(mainModelType.value, modalType.value, fanDualArray.value);
     });
 
     await getCamera(id, playerRef.value);
@@ -1661,14 +1735,21 @@
     });
   }
 
-  const associatedData = computed<Record<string, any>>(() => {
+  /** 双巷风机数组，第一项是外侧风机，第二项是内侧风机 */
+  const fanDualArray = computed<Record<string, any>[]>(() => {
     const inx = selectRowIndex.value;
     const data: any = dataSource.value[inx];
-    if (data && data.associated_id) {
-      return dataSource.value.find((e: any) => e.deviceId == data.associated_id) || {};
-    } else {
-      return {};
+
+    // 一个外侧风机理论上对应一个内侧的风机
+    if (data && data.install_kind && data.install_kind === 'dual_outer') {
+      const dualInner = dataSource.value.find((e: any) => e.deviceId == data.associated_id) || {};
+      return [data, dualInner];
+    }
+    if (data && data.install_kind && data.install_kind === 'dual_inner') {
+      const dualOuter = dataSource.value.find((e: any) => e.deviceId == data.associated_id) || {};
+      return [dualOuter, data];
     }
+    return [{}, {}];
   });
 
   onBeforeMount(() => {

src/views/vent/safetyList/common/operateRecord.vue

@@ -12,7 +12,7 @@
                 <a-col :span="4">
                     <div class="area-item">
                         <div class="item-text">所选分站：</div>
-                        <a-select v-model:value="searchData.stationId" style="width: 220px" placeholder="请选择分站">
+                        <a-select v-model:value="searchData.stationId" style="width: 220px" placeholder="请选择分站" >
                             <a-select-option v-for="(item, index) in stationList" :key="index" :value="item.value">{{
                                 item.label
                                 }}</a-select-option>
@@ -22,7 +22,7 @@
                 <a-col :span="4">
                     <div class="area-item">
                         <div class="item-text">所选设备：</div>
-                        <a-select v-model:value="searchData.deviceId" style="width: 220px" placeholder="请选择设备">
+                        <a-select v-model:value="searchData.deviceId" style="width: 220px" placeholder="请选择设备" @dropdownVisibleChange="dropdownVisibleChange">
                             <a-select-option v-for="(item, index) in deviceList" :key="index" :value="item.value">{{
                                 item.label
                                 }}</a-select-option>
@@ -48,6 +48,7 @@
 import { ref, reactive,watch, onMounted } from 'vue'
 import { columnsOperate } from '../safetyList.data';
 import { subStationList, get158StationDevices } from '../safetyList.api'
+import { useMessage } from '/@/hooks/web/useMessage';
 
 let props=defineProps({
     operationData:{
@@ -67,6 +68,7 @@ let deviceList = ref<any[]>([])
 
 let tableData = ref<any[]>([])
 let $emit = defineEmits(['getSearchRecord'])
+const { createMessage } = useMessage();
 
 //获取分站信息
 async function getSubStationList() {
@@ -93,6 +95,17 @@ async function get158StationDevicesList() {
         })
     }
 }
+function dropdownVisibleChange(open){
+    if(open){
+        if(searchData.stationId){
+            get158StationDevicesList()
+        }else {
+            createMessage.warning('请选择对应分站!');
+        }   
+    }else {
+        return 
+    }
+}
 //查询
 function getSearchRecord() {
     $emit('getSearchRecord', searchData)
@@ -111,7 +124,7 @@ onMounted(() => {
     //获取分站列表
     getSubStationList()
     //获取设备列表
-    get158StationDevicesList()
+    // get158StationDevicesList()
 })
 </script>
 

src/views/vent/safetyList/safetyList.api.ts

@@ -41,6 +41,6 @@ export const set158StationRead = (params) => defHttp.post({ url: Api.set158Stati
 //删除158分站及其关联传感器
 export const remove158Substation = (params) => defHttp.post({ url: Api.remove158Substation, params }, { joinParamsToUrl: true });
 //158分站操作记录
-export const get158SetLog = (params) => defHttp.post({ url: Api.get158SetLog,params });
+export const get158SetLog = (params) => defHttp.post({ url: Api.get158SetLog,params }, { joinParamsToUrl: true });
 //删除158分站传感器
 export const remove158Device = (params) => defHttp.post({ url: Api.remove158Device, params });