add：新增修改

928b6033 · lei · 2c241633 · 928b6033 · 928b6033 · 928b6033
Commit 928b6033 authored Jul 15, 2025 by lei
13 changed files
--- a/src/api/tyler/dlxt.js
+++ b/src/api/tyler/dlxt.js
 import request from "@/utils/request";

-// 发送数据格式
+// 获取电力系统数据
 export function updateSelectEleHistoryData(query) {
  return request({
    url: '/business/screen/ele/all',
    method: 'get',
    params: query,
  })
-}
\ No newline at end of file
+}
+
+//获取温度湿度数据
+export function getTemperAndHumidityData(query) {
+  return request({
+    url: '/business/screen/ele/wenShiDu',
+    method: 'get',
+
+    params: query,
+
+  })
+}
--- a/src/api/tyler/hoistCollection.js
+++ b/src/api/tyler/hoistCollection.js
+import request from "@/utils/request";
+
+// 查询提升机采集项数据
+export function getData(query) {
+  return request({
+    url: "/business/elevator/item/query",
+    method: "get",
+    params: query,
+  });
+}
+
+// 新增提升机采集项
+export function addData(query) {
+  return request({
+    url: "/business/elevator/item/insert",
+    method: "post",
+    data: query,
+  });
+}
+
+// 修改提升机采集项
+export function updateData(query) {
+  return request({
+    url: "/business/elevator/item/update",
+    method: "put",
+    data: query,
+  });
+}
+
+// 删除提升机采集项
+export function deleteData(query) {
+  return request({
+    url: "/business/elevator/item/delete",
+    method: "delete",
+    params: query,
+  });
+}
--- a/src/api/tyler/realtimeDataodHoist.js
+++ b/src/api/tyler/realtimeDataodHoist.js
+import request from "@/utils/request";
+
+// 查询运行实时数据
+export function getDraData(query) {
+  return request({
+    url: "/business/elevator/real/left",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询运行状态数据
+export function getRunStatusData(query) {
+  return request({
+    url: "/business/elevator/real/right",
+    method: "get",
+    params: query,
+  });
+}
--- a/src/views/Screen/items/dlxt.vue
+++ b/src/views/Screen/items/dlxt.vue
--- a/src/views/Screen/items/hjjc.vue
+++ b/src/views/Screen/items/hjjc.vue
@@ -760,7 +760,12 @@ export default {
    });
    //初始化获取左侧环境监测实施数据
    getRealData().then((res) => {
-      this.tableData1 = res.data;
+      this.tableData1 = res.data.map((el) => {
+        return {
+          ...el,
+          value: el.value,
+        };
+      });
    });
    //初始化highCharts
    getDeviceStatusNum().then((res) => {
@@ -1215,9 +1220,21 @@ export default {
  },
  filters: {
    capitalize: function (value) {
-      if (!value) return "";
-      value = value.slice(0, 2);
-      return value;
+      if (value === null || value === undefined) return "--";
+      console.log(value);
+
+      if (value == "开" || value == "关") {
+        return value;
+      }
+      const parsedValue = Number(value);
+      if (isNaN(parsedValue)) return "--";
+
+      // 整数判断
+      if (Number.isInteger(parsedValue)) {
+        return parsedValue.toFixed(1);
+      }
+      // 小数保留两位
+      return parsedValue.toFixed(1);
    },
  },
  watch: {
@@ -1730,6 +1747,7 @@ export default {
  background-size: 1377px 501px;
  box-shadow: 0px 15px 11px 2px rgba(0, 20, 39, 0.31);
  padding: 28px 37px;
+  z-index: 999;
  p {
    width: 1271px;
    height: 37px;
@@ -1761,7 +1779,6 @@ export default {
    }
  }
  .date-title {
-    width: 118px;
    height: 18px;
    font-weight: 500;
    font-size: 22px;

--- a/src/views/Screen/items/home.vue
+++ b/src/views/Screen/items/home.vue
@@ -72,19 +72,15 @@ export default {

      // 加载3D Tileset
      Cesium.Cesium3DTileset.fromUrl("/terra_b3dms_yd/tileset.json", {
-        maximumScreenSpaceError: 8, // 从默认16改为8（值越小越清晰）
-        maximumMemoryUsage: 1024, // 增加内存限制到1024MB
-        skipLevelOfDetail: false, // 禁用LOD跳过
-        preferLeaves: true, // 优先加载叶子节点
-        skipScreenSpaceErrorFactor: 16, // 降低跳过系数
-        loadSiblings: true, // 加载相邻节点
+        maximumScreenSpaceError: 1,
+        pickable: true,
      })
        .then((tileset) => {
          this.tileset = tileset; // 存储tileset供后续使用
          this.viewer.scene.primitives.add(tileset);

          // 调整模型高度
-          var heightOffset = 0;
+          var heightOffset = -230;
          var boundingSphere = tileset.boundingSphere;
          var cartographic = Cesium.Cartographic.fromCartesian(
            boundingSphere.center

--- a/src/views/Screen/items/psxt.vue
+++ b/src/views/Screen/items/psxt.vue
@@ -70,12 +70,46 @@
                      : 'dwr'
                  "
                >
-                  <p>水泵前温：{{ item.pumpFrontTemp | decimalFilter }}℃</p>
-                  <p>水泵后温：{{ item.pumpRearTemp | decimalFilter }}℃</p>
-                  <p>电机前温：{{ item.motorFrontTemp | decimalFilter }}℃</p>
-                  <p>电机后温：{{ item.motorRearTemp | decimalFilter }}℃</p>
-                  <p>出水压力：{{ item.outletPressure | decimalFilter }}Mpa</p>
-                  <p>吸水负压：{{ item.inletVacuum | decimalFilter }}Mpa</p>
+                  <p>
+                    <span>水泵前温</span>：{{
+                      item.pumpFrontTemp | decimalFilter
+                    }}℃
+                  </p>
+                  <p>
+                    <span>水泵后温</span>：{{
+                      item.pumpRearTemp | decimalFilter
+                    }}℃
+                  </p>
+                  <p>
+                    <span>电机前温</span>：{{
+                      item.motorFrontTemp | decimalFilter
+                    }}℃
+                  </p>
+                  <p>
+                    <span>电机后温</span>：{{
+                      item.motorRearTemp | decimalFilter
+                    }}℃
+                  </p>
+                  <p>
+                    <span>出水压力</span>：{{
+                      item.outletPressure | decimalFilter
+                    }}Mpa
+                  </p>
+                  <p>
+                    <span>吸水负压</span>：{{
+                      item.inletVacuum | decimalFilter
+                    }}Mpa
+                  </p>
+                  <p>
+                    <span>前振动</span>：{{
+                      item.frontVibration | decimalFilter
+                    }}mm/s
+                  </p>
+                  <p>
+                    <span>后振动</span>：{{
+                      item.rearVibration | decimalFilter
+                    }}mm/s
+                  </p>
                </div>
              </div>
              <p>
@@ -133,12 +167,18 @@ export default {
      sumpData: [],
      pumpList: [],
      pumpStatus: 0, //水泵状态
+      timer: null, // 新增定时器引用
    };
  },
  created() {
    this.initPumpList();
  },
-  mounted() {},
+  mounted() {
+    // 初始化定时器
+    this.timer = setInterval(() => {
+      this.initPumpList();
+    }, 10000);
+  },
  methods: {
    initPumpList() {
      getDraData().then((res) => {
@@ -202,6 +242,13 @@ export default {
      return item?.[key] || "--";
    },
  },
+  beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  },
 };
 </script>

@@ -344,7 +391,7 @@ export default {
            position: relative;
            .tip-box {
              width: 192px;
-              height: 156px;
+              height: 206px;
              background: #0a1e36;
              border: 2px solid #00deff;
              padding: 7px 13px 15px 10px;
@@ -359,8 +406,19 @@ export default {
              }
              &.dw {
                position: absolute;
-                top: -26px;
+                top: -80px;
                left: 131px;
+                span {
+                  display: inline-block;
+                  width: 70px;
+                  text-align: justify;
+                  text-align-last: justify;
+                  color: #11e0ff;
+                  background: #11e0ff;
+                  -webkit-background-clip: text;
+                  -webkit-text-fill-color: transparent;
+                  background-clip: text;
+                }
              }
            }
          }
@@ -389,7 +447,7 @@ export default {
          }
          .tip-box {
            width: 192px;
-            height: 156px;
+            height: 206px;
            background: #0a1e36;
            border: 2px solid #00deff;
            padding: 7px 13px 15px 10px;
@@ -405,8 +463,19 @@ export default {
            }
            &.dwr {
              position: absolute;
-              top: 48px;
-              left: -189px;
+              top: 0px;
+              left: -199px;
+              span {
+                display: inline-block;
+                width: 70px;
+                text-align: justify;
+                text-align-last: justify;
+                color: #11e0ff;
+                background: #11e0ff;
+                -webkit-background-clip: text;
+                -webkit-text-fill-color: transparent;
+                background-clip: text;
+              }
            }
          }
        }

--- a/src/views/Screen/items/rydw.vue
+++ b/src/views/Screen/items/rydw.vue
@@ -8,7 +8,7 @@
        <div class="sub-con sub-con1">
          <div class="sub-con-left por">
            <div>
-              <p>带班领导：{{ subStaStatus.leader || 0 }}</p>
+              <p>带班领导：{{ subStaStatus.leader | leaderFilter }}</p>
            </div>
          </div>
          <div class="sub-con-right">
@@ -375,38 +375,39 @@ export default {
      ],

      stationPositions: {
-        1: { left: "84px", top: "206px" },
-        2: { left: "480px", top: "230px" },
-        4: { left: "84px", top: "327px" },
-        5: { left: "148px", top: "335px" },
-        6: { left: "194px", top: "342px" },
-        7: { left: "84px", top: "448px" },
-        8: { left: "200px", top: "470px" },
-        9: { left: "816px", top: "70px" }, //东风井井口
+        1: { left: "84px", top: "185px" },
+        2: { left: "480px", top: "214px" },
+        4: { left: "84px", top: "315px" },
+        5: { left: "148px", top: "322px" },
+        6: { left: "194px", top: "329px" },
+        7: { left: "84px", top: "440px" },
+        8: { left: "200px", top: "460px" },
+        9: { left: "850px", top: "70px" }, //东风井井口
        10: { left: "136px", top: "713px" },
        11: { left: "84px", top: "573px" },
        12: { left: "84px", top: "703px" },
-        13: { left: "152px", top: "212px" },
+        13: { left: "152px", top: "190px" },
        14: { left: "74px", top: "88px" }, //小高尖井口
-        15: { left: "342px", top: "230px" },
-        16: { left: "640px", top: "220px" },
-        17: { left: "730px", top: "20px" },
-        18: { left: "265px", top: "344px" },
-        19: { left: "234px", top: "377px" },
-        20: { left: "534px", top: "356px" },
-        21: { left: "675px", top: "343px" },
-        22: { left: "400px", top: "479px" },
-        23: { left: "317px", top: "528px" },
-        24: { left: "500px", top: "518px" },
-        25: { left: "580px", top: "500px" },
+        15: { left: "342px", top: "202px" },
+        16: { left: "640px", top: "203px" },
+        17: { left: "763px", top: "20px" },
+        18: { left: "265px", top: "331px" },
+        19: { left: "247px", top: "364px" },
+        20: { left: "534px", top: "343px" },
+        21: { left: "675px", top: "333px" },
+        22: { left: "400px", top: "470px" },
+        23: { left: "335px", top: "526px" },
+        24: { left: "500px", top: "510px" },
+        25: { left: "580px", top: "478px" },
        26: { left: "350px", top: "609px" },
        27: { left: "252px", top: "599px" },
-        28: { left: "766px", top: "206px" },
+        28: { left: "766px", top: "188px" },
      },
      //中段基站数据
      stationData: [
        { value: 5, name: "一中基站数", itemStyle: { color: "#007BFF" } },
      ],
+      timer: null,
    };
  },
  mounted() {
@@ -422,6 +423,19 @@ export default {
    this.perStationInfoList();
    this.getrydwMidStation();
    this.getMonthlyRankings();
+
+    // 初始化定时器
+    this.timer = setInterval(() => {
+      this.perStationInfoList();
+      this.subStationObj();
+    }, 10000);
+  },
+  beforeDestroy() {
+    this.clearAnimation();
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null; // 新增清理引用
+    }
  },
  methods: {
    //当月人员下井次数排行榜数据
@@ -840,6 +854,12 @@ export default {
      //当data的name等于value时，返回data的value
      return data.find((item) => item.name === value)?.value + "个" || 0;
    },
+    leaderFilter(value) {
+      if (value == "暂无排班") {
+        return "暂无排班";
+      }
+      return (value || []).join("、");
+    },
  },
 };
 </script>

--- a/src/views/Screen/items/tfxt.vue
+++ b/src/views/Screen/items/tfxt.vue
@@ -19,7 +19,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -42,18 +42,44 @@
          远程控制
        </div>
        <div class="fengji-msg">
-          <p>电源电压：{{ item.powerSupplyVoltage | decimalFilter }}V</p>
-          <p>电机电流：{{ item.motorCurrent | decimalFilter }}A</p>
-          <p>运行频率：{{ item.operatingFrequency | decimalFilter }}HZ</p>
-          <p>设定频率：{{ item.setFrequency | decimalFilter }}HZ</p>
-          <p>风压：{{ item.windPressure | decimalFilter }}KPa</p>
-          <p>风速：{{ item.windSpeed | decimalFilter }}m/s</p>
-          <p>风量：{{ item.airVolume | decimalFilter }}m³/s</p>
-          <p>电机温度：{{ item.frontAxisTemperature | decimalFilter }}℃</p>
-          <p>电机温度：{{ item.rearAxisTemperature | decimalFilter }}℃</p>
-          <p>环境温度：{{ item.motorTemperature | decimalFilter }}℃</p>
-          <p>电机振动1：{{ item.frontVibration | decimalFilter }}mm/s</p>
-          <p>电机振动2：{{ item.rearVibration | decimalFilter }}mm/s</p>
+          <p>
+            <span>电源电压</span>：{{
+              item.powerSupplyVoltage | decimalFilter
+            }}V
+          </p>
+          <p><span>电机电流</span>：{{ item.motorCurrent | decimalFilter }}A</p>
+          <p>
+            <span>运行频率</span>：{{
+              item.operatingFrequency | decimalFilter
+            }}HZ
+          </p>
+          <p>
+            <span>设定频率</span>：{{ item.setFrequency | decimalFilter }}HZ
+          </p>
+          <p><span>风压</span>：{{ item.windPressure | decimalFilter }}KPa</p>
+          <p><span>风速</span>：{{ item.windSpeed | decimalFilter }}m/s</p>
+          <p><span>风量</span>：{{ item.airVolume | decimalFilter }}m³/s</p>
+          <p>
+            <span>电机温度</span>：{{
+              item.frontAxisTemperature | decimalFilter
+            }}℃
+          </p>
+          <p>
+            <span>电机温度</span>：{{
+              item.rearAxisTemperature | decimalFilter
+            }}℃
+          </p>
+          <p>
+            <span>环境温度</span>：{{ item.motorTemperature | decimalFilter }}℃
+          </p>
+          <p>
+            <span>电机振动1</span>：{{
+              item.frontVibration | decimalFilter
+            }}mm/s
+          </p>
+          <p>
+            <span>电机振动2</span>：{{ item.rearVibration | decimalFilter }}mm/s
+          </p>
        </div>
      </div>
      <div class="arrow-psition" style="top: 132px; left: 300px">
@@ -83,7 +109,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -142,7 +168,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -178,18 +204,49 @@
          远程控制
        </div>
        <div class="fengji-msg" style="position: absolute; right: -30px">
-          <p>电源电压：{{ item.powerSupplyVoltage | decimalFilter }}V</p>
-          <p>电机电流：{{ item.motorCurrent | decimalFilter }}A</p>
-          <p>运行频率：{{ item.operatingFrequency | decimalFilter }}HZ</p>
-          <p>设定频率：{{ item.setFrequency | decimalFilter }}HZ</p>
-          <p>风压：{{ item.windPressure | decimalFilter }}KPa</p>
-          <p>风速：{{ item.windSpeed | decimalFilter }}m/s</p>
-          <p>风量：{{ item.airVolume | decimalFilter }}m³/s</p>
-          <p>电机温度：{{ item.frontAxisTemperature | decimalFilter }}℃</p>
-          <p>电机温度：{{ item.rearAxisTemperature | decimalFilter }}℃</p>
-          <p>环境温度：{{ item.motorTemperature | decimalFilter }}℃</p>
-          <p>电机振动1：{{ item.frontVibration | decimalFilter }}mm/s</p>
-          <p>电机振动2：{{ item.rearVibration | decimalFilter }}mm/s</p>
+          <p>
+            <span>电源电压</span>：{{
+              item.powerSupplyVoltage | decimalFilter
+            }}V
+          </p>
+          <p>
+            <span>电机电流1</span>：{{ item.motorCurrent | decimalFilter }}A
+          </p>
+          <p>
+            <span>电机电流2</span>：{{ item.motorCurrentTwo | decimalFilter }}A
+          </p>
+          <p>
+            <span>运行频率</span>：{{
+              item.operatingFrequency | decimalFilter
+            }}HZ
+          </p>
+          <p>
+            <span>设定频率</span>：{{ item.setFrequency | decimalFilter }}HZ
+          </p>
+          <p><span>风压</span>：{{ item.windPressure | decimalFilter }}KPa</p>
+          <p><span>风速</span>：{{ item.windSpeed | decimalFilter }}m/s</p>
+          <p><span>风量</span>：{{ item.airVolume | decimalFilter }}m³/s</p>
+          <p>
+            <span>电机温度</span>：{{
+              item.frontAxisTemperature | decimalFilter
+            }}℃
+          </p>
+          <p>
+            <span>电机温度</span>：{{
+              item.rearAxisTemperature | decimalFilter
+            }}℃
+          </p>
+          <p>
+            <span>环境温度</span>：{{ item.motorTemperature | decimalFilter }}℃
+          </p>
+          <p>
+            <span>电机振动1</span>：{{
+              item.frontVibration | decimalFilter
+            }}mm/s
+          </p>
+          <p>
+            <span>电机振动2</span>：{{ item.rearVibration | decimalFilter }}mm/s
+          </p>
        </div>
      </div>
      <div class="arrow-psition" style="top: 302px; left: 558px">
@@ -228,7 +285,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -304,7 +361,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -346,7 +403,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -422,7 +479,7 @@
          <div class="fengji-control">
            <div
              class="fengji-icon"
-              :class="item.fanIsRun != 0 ? '' : 'runing'"
+              :class="item.fanRunStatus == 0 ? '' : 'runing'"
            ></div>
            <div
              class="fengji-lamp"
@@ -492,6 +549,7 @@ export default {
      upWindowShow: false,
      windowTitle: "", // 新增标题字段
      currentDevice: null, // 新增当前设备字段
+      timer: null, // 新增定时器引用
    };
  },
  computed: {},
@@ -499,7 +557,12 @@ export default {
  created() {
    this.getData();
  },
-  mounted() {},
+  mounted() {
+    // 初始化定时器
+    this.timer = setInterval(() => {
+      this.getData();
+    }, 10000);
+  },
  methods: {
    getData() {
      fenshanQuery().then((res) => {
@@ -549,6 +612,13 @@ export default {
        : Number(value).toFixed(2);
    },
  },
+  beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  },
 };
 </script>

@@ -677,14 +747,19 @@ export default {
        line-height: 28px;
        background: #05162b;
        margin-top: 15px;
-        margin-left: -15px;
        p {
          margin: 0%;
+          span {
+            display: inline-block;
+            width: 85px;
+            text-align: justify;
+            text-align-last: justify;
+          }
        }
        &.msg-postion {
          position: absolute;
          top: 30px;
-          left: -160px;
+          left: -180px;
        }
      }
    }
@@ -706,7 +781,7 @@ export default {
      .kongya-msg {
        position: absolute;
        top: -18px;
-        right: -171px;
+        right: -253px;
        padding: 5px 17px;
        border: 2px solid #00ccff;
        font-weight: 400;

--- a/src/views/Screen/items/tsj.vue
+++ b/src/views/Screen/items/tsj.vue
@@ -314,7 +314,7 @@ export default {
      this.clearAnimation();
      this.getdata();

-      this.timer = setInterval(this.getdata, 30000);
+      this.timer = setInterval(this.getdata, 2000);
    },

    // 获取数据

--- a/src/views/hoistSys/hoistCollection/index.vue
+++ b/src/views/hoistSys/hoistCollection/index.vue
@@ -10,7 +10,7 @@
    >
      <el-form-item prop="deviceName">
        <el-input
-          v-model="queryParams.deviceName"
+          v-model="queryParams.name"
          placeholder="请输入采集设备名称"
          clearable
          @keyup.enter.native="handleQuery"
@@ -78,14 +78,10 @@
    >
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="采集项名称" align="center" prop="deviceName" />
-      <el-table-column label="寄存器位置" align="center" prop="deviceId" />
-      <el-table-column
-        label="数据类型"
-        align="center"
-        prop="installationLocation"
-      />
-      <el-table-column label="单位" align="center" prop="powerSupplyVoltage" />
+      <el-table-column label="采集项名称" align="center" prop="name" />
+      <el-table-column label="寄存器位置" align="center" prop="address" />
+      <el-table-column label="数据类型" align="center" prop="type" />
+      <el-table-column label="单位" align="center" prop="unit" />
      <el-table-column
        label="操作"
        align="center"
@@ -122,17 +118,17 @@
    <!-- 添加或修改风机基本信息对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="采集项名称" prop="deviceName">
-          <el-input v-model="form.deviceName" placeholder="请输入风机名称" />
+        <el-form-item label="采集项名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入采集项名称" />
        </el-form-item>
-        <el-form-item label="寄存器位置" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入风机编号" />
+        <el-form-item label="寄存器位置" prop="address">
+          <el-input v-model="form.address" placeholder="请输入风机编号" />
        </el-form-item>
-        <el-form-item label="数据类型" prop="installationLocation">
-          <el-input v-model="form.installationLocation" placeholder="" />
+        <el-form-item label="数据类型" prop="type">
+          <el-input v-model="form.type" placeholder="" />
        </el-form-item>
-        <el-form-item label="单位" prop="installationLocation">
-          <el-input v-model="form.installationLocation" placeholder="" />
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -145,12 +141,11 @@

 <script>
 import {
-  getFanInfo,
-  listFanInfo,
-  addFanInfo,
-  updateFanInfo,
-  delFanInfo,
-} from "@/api/tyler/fanDev";
+  getData,
+  addData,
+  updateData,
+  deleteData,
+} from "@/api/tyler/hoistCollection";

 export default {
  name: "Info",
@@ -180,33 +175,23 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        deviceName: null,
-        deviceId: null,
-        installationLocation: null,
-        powerSupplyVoltage: null,
-        motorCurrent: null,
-        operatingFrequency: null,
-        setFrequency: null,
-        windPressure: null,
-        windSpeed: null,
-        airVolume: null,
-        frontAxisTemperature: null,
-        rearAxisTemperature: null,
-        motorTemperature: null,
-        frontVibration: null,
-        rearVibration: null,
+        name: null,
+        address: null,
+        type: null,
+        unit: null,
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
-        id: [{ required: true, message: "id不能为空", trigger: "blur" }],
-        deviceName: [
-          { required: true, message: "风机名称不能为空", trigger: "blur" },
+        name: [
+          { required: true, message: "请输入采集项名称", trigger: "blur" },
        ],
-        deviceId: [
-          { required: true, message: "风机编号不能为空", trigger: "blur" },
+        address: [
+          { required: true, message: "请输入寄存器位置", trigger: "blur" },
        ],
+        type: [{ required: true, message: "请输入数据类型", trigger: "blur" }],
+        unit: [{ required: true, message: "请输入单位", trigger: "blur" }],
      },
    };
  },
@@ -217,8 +202,8 @@ export default {
    /** 查询风机基本信息列表 */
    getList() {
      this.loading = true;
-      listFanInfo(this.queryParams).then((response) => {
-        this.infoList = [];
+      getData(this.queryParams).then((response) => {
+        this.infoList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
@@ -230,24 +215,7 @@ export default {
    },
    // 表单重置
    reset() {
-      this.form = {
-        id: null,
-        deviceName: null,
-        deviceId: null,
-        installationLocation: null,
-        powerSupplyVoltage: null,
-        motorCurrent: null,
-        operatingFrequency: null,
-        setFrequency: null,
-        windPressure: null,
-        windSpeed: null,
-        airVolume: null,
-        frontAxisTemperature: null,
-        rearAxisTemperature: null,
-        motorTemperature: null,
-        frontVibration: null,
-        rearVibration: null,
-      };
+      this.form = {};
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
@@ -270,16 +238,16 @@ export default {
    handleAdd() {
      this.reset();
      this.open = true;
-      this.title = "添加风机基本信息";
+      this.title = "添加采集项基本信息";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids;
-      getFanInfo(id).then((response) => {
+      getData(id).then((response) => {
        this.form = response.data;
        this.open = true;
-        this.title = "修改风机基本信息";
+        this.title = "修改采集项基本信息";
      });
    },
    /** 提交按钮 */
@@ -287,13 +255,13 @@ export default {
      this.$refs["form"].validate((valid) => {
        if (valid) {
          if (this.form.id != null) {
-            updateFanInfo(this.form).then((response) => {
+            updateData(this.form).then((response) => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
-            addFanInfo(this.form).then((response) => {
+            addData(this.form).then((response) => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
@@ -308,7 +276,7 @@ export default {
      this.$modal
        .confirm('是否确认删除风机基本信息编号为"' + ids + '"的数据项？')
        .then(function () {
-          return delFanInfo(ids);
+          return deleteData(ids);
        })
        .then(() => {
          this.getList();

--- a/src/views/hoistSys/realtimeDataofHoist/index.vue
+++ b/src/views/hoistSys/realtimeDataofHoist/index.vue
 <template>
  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
-    </el-form>
-
-    <!-- <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="主控速度m/s" align="center" prop="mainSpeed" />
-      <el-table-column label="编码器速度m/s" align="center" prop="coderSpeed" />
-      <el-table-column label="给定速度m/s" align="center" prop="givenSpeed" />
-      <el-table-column
-        label="从编码器速度m/s"
-        align="center"
-        prop="slaveSpeed"
-      />
-      <el-table-column label="主罐位置m" align="center" prop="position" />
-      <el-table-column
-        label="位置偏差m"
-        align="center"
-        prop="locationDeviation"
-      />
-      <el-table-column label="电枢电流A" align="center" prop="motorCurrent" />
-      <el-table-column
-        label="磁场电流A"
-        align="center"
-        prop="runningPressure"
-      />
-      <el-table-column
-        label="运行油压MPa"
-        align="center"
-        prop="controlPosition"
-      />
-      <el-table-column
-        label="记录时间"
-        align="center"
-        prop="recordedAt"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.recordedAt) }}</span>
-        </template>
-      </el-table-column>
-    </el-table> -->
    <el-row :gutter="20">
      <el-col :span="14">
        <el-divider content-position="left">运行实时数据</el-divider>
-        <el-table
-          :data="dataList"
-          style="width: 100%"
-          border
-          size="mini"
-          :row-key="getRowKey"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table :data="dataListLeft" style="width: 100%" border size="mini">
          <el-table-column
            label="序号"
            type="index"
            width="55"
            align="center"
          />
-          <el-table-column label="运行数据项" align="center" prop="mainSpeed" />
-          <el-table-column label="值" align="center" prop="coderSpeed" />
-          <el-table-column label="单位" align="center" prop="givenSpeed" />
-          <el-table-column label="时间" align="center" prop="slaveSpeed" />
+          <el-table-column label="运行数据项" align="center" prop="comment" />
+          <el-table-column label="值" align="center" prop="value">
+            <template slot-scope="scope">
+              <span v-if="scope.row.comment == '当前动作'">
+                {{ scope.row.value == "1" ? "正常" : "异常" }}
+              </span>
+              <span v-else>
+                {{ scope.row.value }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="单位" align="center" prop="unit" />
+          <el-table-column label="时间" align="center" prop="recordedAt" />
        </el-table>
      </el-col>
      <el-col :span="10">
        <el-divider content-position="left">运行实时状态</el-divider>
-        <el-table
-          :data="dataList"
-          style="width: 100%"
-          border
-          size="mini"
-          :row-key="getRowKey"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table :data="dataListRight" style="width: 100%" border size="mini">
          <el-table-column
            label="序号"
            type="index"
            width="55"
            align="center"
          />
-          <el-table-column label="状态名称" align="center" prop="mainSpeed" />
-          <el-table-column label="状态" align="center" prop="coderSpeed" />
-          <el-table-column label="时间" align="center" prop="slaveSpeed" />
+          <el-table-column label="状态名称" align="center" prop="comment" />
+          <el-table-column label="状态" align="center" prop="value">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.value == '1' ? 'success' : 'danger'">
+                {{ scope.row.value == "1" ? "正常" : "异常" }}
+              </el-tag>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="时间" align="center" prop="recordedAt" />
        </el-table>
      </el-col>
    </el-row>
@@ -119,7 +51,7 @@
 </template>

 <script>
-import { queryHoistHisData, listHoistSelectData } from "@/api/tyler/hoistSys";
+import { getDraData, getRunStatusData } from "@/api/tyler/realtimeDataodHoist";

 export default {
  name: "Data",
@@ -139,8 +71,10 @@ export default {
      showSearch: true,
      // 总条数
      total: 0,
-      // 提升机历史数据表格数据
-      dataList: [],
+      // 提升机实时数据
+      dataListLeft: [],
+      // 提升机状态表格数据
+      dataListRight: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -171,38 +105,20 @@ export default {
    /** 查询提升机历史数据列表 */
    getList() {
      this.loading = true;
-      queryHoistHisData(
+      getDraData(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
+          this.dataListLeft = response.rows;
+        }
+      );
+      getRunStatusData(
        this.addDateRange(this.queryParams, this.dateRange)
      ).then((response) => {
-        this.dataList = [];
+        this.dataListRight = response.rows;
      });
    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {};
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        cageSection: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
+  },
+  mounted() {
+    this.getList();
  },
 };
 </script>
--- a/src/views/personPos/perReal/index.vue
+++ b/src/views/personPos/perReal/index.vue
 <template>
  <div class="app-container">
    <el-card class="top-leader" shadow="never">
-        <div class="now-leader" >
-          <div>带班领导:{{leaderList.leader}}</div>
-          <div>系统监控总人数:{{leaderList.systemMonitorAllCount}} 人</div>
-          <div>下井总人数:{{total}} 人</div>
-          <div>地面井口人数:{{leaderList.groundWellCount}} 人</div>
-          <div>重点区域人数:{{leaderList.keyAreaPopulation}} 人</div>
-          <!-- <div>部门:{{ findLabelByValue(deptList,'deptId',leaderList.department,'deptName')  }}</div>
+      <div class="now-leader">
+        <div>带班领导:{{ leaderList.leader | leaderFilter }}</div>
+        <div>系统监控总人数:{{ leaderList.systemMonitorAllCount }} 人</div>
+        <div>下井总人数:{{ total }} 人</div>
+        <div>地面井口人数:{{ leaderList.groundWellCount }} 人</div>
+        <div>重点区域人数:{{ leaderList.keyAreaPopulation }} 人</div>
+        <!-- <div>部门:{{ findLabelByValue(deptList,'deptId',leaderList.department,'deptName')  }}</div>
          <div>是否下井:{{ leaderList.whether==0?'是':'否' }}</div>
          <div>下井时间:{{ parseTime(leaderList.downholeTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</div>
          <div>上井时间:{{ parseTime(leaderList.upholeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</div> -->
-        </div>
-    
+      </div>
    </el-card>
    <el-divider></el-divider>
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
      <el-form-item label="" prop="perName">
        <el-input
          v-model="queryParams.perName"
@@ -24,9 +30,13 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-     
+
      <el-form-item label="" prop="departId">
-        <el-select v-model="queryParams.departId" placeholder="请选择部门" clearable>
+        <el-select
+          v-model="queryParams.departId"
+          placeholder="请选择部门"
+          clearable
+        >
          <el-option
            v-for="dict in DepartmentList"
            :key="dict.value"
@@ -36,7 +46,11 @@
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="addressId">
-        <el-select v-model="queryParams.addressId" placeholder="请选择分站" clearable>
+        <el-select
+          v-model="queryParams.addressId"
+          placeholder="请选择分站"
+          clearable
+        >
          <el-option
            v-for="dict in StationList"
            :key="dict.value"
@@ -46,7 +60,11 @@
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="areaId">
-        <el-select v-model="queryParams.areaId" placeholder="请选择区域" clearable>
+        <el-select
+          v-model="queryParams.areaId"
+          placeholder="请选择区域"
+          clearable
+        >
          <el-option
            v-for="dict in AreaList"
            :key="dict.value"
@@ -54,29 +72,36 @@
            :value="dict.value"
          />
        </el-select>
-        
      </el-form-item>
-   
+
      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
      </el-form-item>
    </el-form>
-    <el-table v-loading="loading" :data="perList" >
+    <el-table v-loading="loading" :data="perList">
      <el-table-column label="姓名" align="center" prop="perName" />
      <el-table-column label="卡号" align="center" prop="cardNumber" />
      <el-table-column label="部门" align="center" prop="departName" />
      <el-table-column label="分站名称" align="center" prop="locationName" />
      <el-table-column label="到达位置" align="center" prop="localtion" />
      <el-table-column label="来向" align="center" prop="" />
-      <el-table-column label="时间" align="center" prop="lastTime" >
+      <el-table-column label="时间" align="center" prop="lastTime">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.lastTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="进入区域" align="center" prop="areaName"/>
-     
-      <el-table-column label="入井时间" align="center" prop="entryTime" >
+      <el-table-column label="进入区域" align="center" prop="areaName" />
+
+      <el-table-column label="入井时间" align="center" prop="entryTime">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.entryTime) }}</span>
        </template>
@@ -84,7 +109,7 @@
      <el-table-column label="距离分站（m）" align="center" prop="distance" />
    </el-table>
    <pagination
-      v-show="total>0"
+      v-show="total > 0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
@@ -101,7 +126,14 @@

 <script>
 import { listPer } from "@/api/tyler/perReal";
-import { baseInfoDepartment, baseInfoArea, baseInfoStation, baseInfoWorkType, baseInfoPosition, baseInfoCardNumber } from "@/api/tyler/common";
+import {
+  baseInfoDepartment,
+  baseInfoArea,
+  baseInfoStation,
+  baseInfoWorkType,
+  baseInfoPosition,
+  baseInfoCardNumber,
+} from "@/api/tyler/common";
 import sec from "./sec.vue";
 export default {
  name: "Per",
@@ -134,7 +166,7 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        perName:null,
+        perName: null,
        cardNumber: null,
        monitoringStation1: null,
        monitoringStation2: null,
@@ -157,7 +189,7 @@ export default {
        distance: null,
        xCoord: null,
        yCoord: null,
-        zCoord: null
+        zCoord: null,
      },
      // 表单参数
      form: {},
@@ -170,7 +202,6 @@ export default {
      StationList: [],
      //区域列表
      AreaList: [],
-     
    };
  },
  created() {
@@ -181,31 +212,55 @@ export default {
      this.getList();
    }, 60000); // 60000 毫秒
  },
+  filters: {
+    leaderFilter(value) {
+      if (value === null || value === undefined) return "--";
+      if (value === "开" || value === "关") {
+        return value;
+      }
+      const parsedValue = Number(value);
+      if (isNaN(parsedValue)) return "--";
+
+      // 整数判断
+      if (Number.isInteger(parsedValue)) {
+        return parsedValue;
+      }
+      return value;
+    },
+  },
+  filters: {
+    leaderFilter(value) {
+      if (value == "暂无排班") {
+        return "暂无排班";
+      }
+      return (value || []).join("、");
+    },
+  },
  methods: {
    // common
-    
-    getCommon(){
+
+    getCommon() {
      //卡号
-      baseInfoCardNumber().then(res=>{
+      baseInfoCardNumber().then((res) => {
        this.cardNoList = res.data;
-      })
+      });
      //部门
-      baseInfoDepartment().then(res=>{
+      baseInfoDepartment().then((res) => {
        this.DepartmentList = res.data;
-      })
+      });
      //分站
-      baseInfoStation().then(res=>{
+      baseInfoStation().then((res) => {
        this.StationList = res.data;
-      })
+      });
      //区域
-      baseInfoArea().then(res=>{
+      baseInfoArea().then((res) => {
        this.AreaList = res.data;
-      })
+      });
    },
    /** 查询人员定位实时数据列表 */
    getList() {
      this.loading = true;
-      listPer(this.queryParams).then(response => {
+      listPer(this.queryParams).then((response) => {
        this.perList = response.rows;
        this.leaderList = response.remark;
        this.total = response.total;
@@ -238,14 +293,17 @@ export default {
      this.resetForm("queryForm");
      this.handleQuery();
    },
- 

    /** 导出按钮操作 */
    handleExport() {
-      this.download('business/per/export', {
-        ...this.queryParams
-      }, `per_${new Date().getTime()}.xlsx`)
-    }
+      this.download(
+        "business/per/export",
+        {
+          ...this.queryParams,
+        },
+        `per_${new Date().getTime()}.xlsx`
+      );
+    },
  },
  beforeDestroy() {
    // 清除定时器，避免内存泄漏
@@ -254,12 +312,11 @@ export default {
      this.timerId = null;
    }
  },
-
 };
 </script>
 <style lang="scss" scoped>
-.now-leader{
+.now-leader {
  display: flex;
  justify-content: space-between;
 }
-</style>
\ No newline at end of file
+</style>