Merge branch 'dev-cjw' into shenzhen-dev

2024-03-22 10:36:58 +08:00 · 2024-03-22 10:36:58 +08:00 · c65da100ee
commit c65da100ee
parent 306f6b95ca aa51505cd8
6 changed files with 203 additions and 152 deletions
--- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
+++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
@ -30,13 +30,15 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <el-table class="tables" v-loading="loading" :data="tableData">
-        <el-table-column label="序号" align="center" type="index" width="200" />
-        <el-table-column label="机械设备名称" align="center" prop="equipmentName" />
-        <el-table-column label="设备序号" align="center" prop="devSn" />
-        <el-table-column label="报警时间" align="center" prop="alarmTime" />
-        <el-table-column label="报警信息" align="center" prop="alarmInfo" width="600"/>
-      </el-table>
+      <vue-scroll style="height: 80%">
+        <el-table class="tables" v-loading="loading" :data="tableData">
+          <el-table-column label="序号" align="center" type="index" width="200" />
+          <el-table-column label="机械设备名称" align="center" prop="equipmentName" />
+          <el-table-column label="设备序号" align="center" prop="devSn" />
+          <el-table-column label="报警时间" align="center" prop="alarmTime" />
+          <el-table-column label="报警信息" align="center" prop="alarmInfo" width="600"/>
+        </el-table>
+      </vue-scroll>
      <el-pagination
        class="pagerBox"
        @size-change="SizeChange"
@ -140,7 +142,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .tables{
-  min-height: 0;
+  // min-height: 0;
 }
 .tables2 {
  min-height: auto;
--- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
+++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
@ -29,38 +29,40 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <el-table class="tables" v-loading="loading" :data="tableData">
-        <el-table-column label="机械设备名称" align="center" prop="equipmentName" />
-        <el-table-column label="设备序号" align="center" prop="devSn" width="180"/>
-        <el-table-column label="当前位置" align="center" width="180">
-          <template slot-scope="scope">
-            {{ '经度：' + scope.row.longitude + ' 纬度：' + scope.row.latitude }}
-          </template>
-        </el-table-column>
-        <el-table-column label="速度" align="center" prop="speed" />
-        <el-table-column label="工作状态" align="center" prop="workStatus">
-          <template slot-scope="scope">
-            <span v-if="scope.row.workStatus === 1">工作状态</span>
-            <span v-if="scope.row.workStatus === 2">怠速状态</span>
-            <span v-if="scope.row.workStatus === 3">静止状态</span>
-            <span v-if="scope.row.workStatus === 4">离线状态</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="设备电量" align="center" prop="equipmentPower">
-          <template slot-scope="scope">
-            {{scope.row.equipmentPower}}%
-            <!-- <span style="color: #67C23A" v-if="scope.row.equipmentPower >= 80">{{scope.row.equipmentPower}}%</span>
-            <span style="color: #E6A23C" v-else-if="scope.row.equipmentPower < 80 && scope.row.equipmentPower > 20">{{scope.row.equipmentPower}}%</span>
-            <span style="color: #be0505" v-else-if="scope.row.equipmentPower <= 20">{{scope.row.equipmentPower}}%</span> -->
-          </template>
-        </el-table-column>
-        <el-table-column label="设备电压" align="center" prop="equipmentVoltage">
-          <template slot-scope="scope">
-            {{ scope.row.equipmentVoltage + ' '}}伏特
-          </template>
-        </el-table-column>
-        <el-table-column label="上传时间" align="center" prop="uploadTime" width="180"/>
-      </el-table>
+      <vue-scroll style="height: 80%">
+        <el-table class="tables" v-loading="loading" :data="tableData">
+          <el-table-column label="机械设备名称" align="center" prop="equipmentName" />
+          <el-table-column label="设备序号" align="center" prop="devSn" width="180"/>
+          <el-table-column label="当前位置" align="center" width="180">
+            <template slot-scope="scope">
+              {{ '经度：' + scope.row.longitude + ' 纬度：' + scope.row.latitude }}
+            </template>
+          </el-table-column>
+          <el-table-column label="速度" align="center" prop="speed" />
+          <el-table-column label="工作状态" align="center" prop="workStatus">
+            <template slot-scope="scope">
+              <span v-if="scope.row.workStatus === 1">工作状态</span>
+              <span v-if="scope.row.workStatus === 2">怠速状态</span>
+              <span v-if="scope.row.workStatus === 3">静止状态</span>
+              <span v-if="scope.row.workStatus === 4">离线状态</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="设备电量" align="center" prop="equipmentPower">
+            <template slot-scope="scope">
+              {{scope.row.equipmentPower}}%
+              <!-- <span style="color: #67C23A" v-if="scope.row.equipmentPower >= 80">{{scope.row.equipmentPower}}%</span>
+              <span style="color: #E6A23C" v-else-if="scope.row.equipmentPower < 80 && scope.row.equipmentPower > 20">{{scope.row.equipmentPower}}%</span>
+              <span style="color: #be0505" v-else-if="scope.row.equipmentPower <= 20">{{scope.row.equipmentPower}}%</span> -->
+            </template>
+          </el-table-column>
+          <el-table-column label="设备电压" align="center" prop="equipmentVoltage">
+            <template slot-scope="scope">
+              {{ scope.row.equipmentVoltage + ' '}}伏特
+            </template>
+          </el-table-column>
+          <el-table-column label="上传时间" align="center" prop="uploadTime" width="180"/>
+        </el-table>
+      </vue-scroll>
      <el-pagination
        class="pagerBox"
        @size-change="SizeChange"
@ -165,7 +167,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .tables{
-  min-height: 0;
+  // min-height: 0;
 }
 .tables2 {
  min-height: auto;
--- a/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue
+++ b/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue
@ -21,26 +21,28 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="tableData">
-        <el-table-column prop="equipmentName" align="center" label="机械设备名称" width="280"></el-table-column>
-        <el-table-column prop="devSn" align="center" label="设备序号"></el-table-column>
-        <el-table-column prop="driverName" align="center" label="司机"></el-table-column>
-        <el-table-column prop="createTime" align="center" label="新增时间"></el-table-column>
-        <el-table-column align="center" label="操作" width="280">
-          <template slot-scope="scope">
-            <div class="tableBtns">
-              <div @click="edit(scope.row)" class="operationText">
-                <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
-                <span style="white-space: nowrap;">编辑</span>
+      <vue-scroll style="height: 80%">
+        <el-table class="tables" :data="tableData">
+          <el-table-column prop="equipmentName" align="center" label="机械设备名称" width="280"></el-table-column>
+          <el-table-column prop="devSn" align="center" label="设备序号"></el-table-column>
+          <el-table-column prop="driverName" align="center" label="司机"></el-table-column>
+          <el-table-column prop="createTime" align="center" label="新增时间"></el-table-column>
+          <el-table-column align="center" label="操作" width="280">
+            <template slot-scope="scope">
+              <div class="tableBtns">
+                <div @click="edit(scope.row)" class="operationText">
+                  <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
+                  <span style="white-space: nowrap;">编辑</span>
+                </div>
+                <div @click="deleteDev(scope.row)" class="operationText">
+                  <img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
+                  <span style="white-space: nowrap;">删除</span>
+                </div>
              </div>
-              <div @click="deleteDev(scope.row)" class="operationText">
-                <img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
-                <span style="white-space: nowrap;">删除</span>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+        </el-table>
+      </vue-scroll>
      <el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange"
        :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize"
        layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background >
@ -237,7 +239,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .tables{
-  min-height: 0;
+  // min-height: 0;
 }
 .tables2 {
  min-height: auto;
--- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
+++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
@ -30,13 +30,15 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <el-table class="tables" v-loading="loading" :data="tableData">
-        <el-table-column label="序号" align="center" type="index" width="200" />
-        <el-table-column label="人员名称" align="center" prop="workerName" />
-        <el-table-column label="设备序号" align="center" prop="devSn" />
-        <el-table-column label="报警时间" align="center" prop="alarmTime" />
-        <el-table-column label="报警信息" align="center" prop="alarmInfo" />
-      </el-table>
+      <vue-scroll style="height: 80%">
+        <el-table class="tables" v-loading="loading" :data="tableData">
+          <el-table-column label="序号" align="center" type="index" width="200" />
+          <el-table-column label="人员名称" align="center" prop="workerName" />
+          <el-table-column label="设备序号" align="center" prop="devSn" />
+          <el-table-column label="报警时间" align="center" prop="alarmTime" />
+          <el-table-column label="报警信息" align="center" prop="alarmInfo" />
+        </el-table>
+      </vue-scroll>
      <el-pagination
        class="pagerBox"
        @size-change="SizeChange"
@ -161,7 +163,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .tables{
-  min-height: 0;
+  // min-height: 0;
 }
 .tables2 {
  min-height: auto;
--- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
+++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
@ -1,25 +1,57 @@
 <template>
  <div class="fullHeight">
    <div class="searchBox whiteBlock">
-      <el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
+      <el-form
+        :inline="true"
+        ref="searchForm"
+        :model="searchForm"
+        size="medium"
+      >
        <!-- 人员名称 -->
        <el-form-item label="人员名称" prop="workerInfoId">
-          <el-select v-model="searchForm.workerInfoId" placeholder="请选择" clearable :style="{ width: '100%' }" >
-            <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option>
+          <el-select
+            v-model="searchForm.workerInfoId"
+            placeholder="请选择"
+            clearable
+            :style="{ width: '100%' }"
+          >
+            <el-option
+              v-for="(item, index) in workerList"
+              :key="index"
+              :label="item.workerName"
+              :value="item.id"
+            ></el-option>
          </el-select>
        </el-form-item>
        <!-- 设备序号 -->
        <el-form-item label="设备序号" prop="devSn">
-          <el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
-            <el-option v-for="(item, index) in devSnList" :key="index" :label="item.devSn" :value="item.devSn" ></el-option>
+          <el-select
+            v-model="searchForm.devSn"
+            placeholder="请选择"
+            clearable
+            :style="{ width: '100%' }"
+          >
+            <el-option
+              v-for="(item, index) in devSnList"
+              :key="index"
+              :label="item.devSn"
+              :value="item.devSn"
+            ></el-option>
          </el-select>
        </el-form-item>
        <!-- 时间 -->
        <el-form-item label="时间">
-          <el-date-picker size="medium" v-model="daterange" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
-            range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
-            :start-placeholder="'开始日期'" :end-placeholder="'结束日期'"
-            @change="changeDate">
+          <el-date-picker
+            size="medium"
+            v-model="daterange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            range-separator="至"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :start-placeholder="'开始日期'"
+            :end-placeholder="'结束日期'"
+            @change="changeDate"
+          >
          </el-date-picker>
        </el-form-item>
        <!-- 条件查询按钮 -->
@ -30,16 +62,21 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <el-table class="tables" v-loading="loading" :data="tableData">
-        <el-table-column label="人员名称" align="center" prop="workerName" />
-        <el-table-column label="设备序号" align="center" prop="devSn" />
-        <el-table-column label="当前位置" align="center" prop="">
-          <template slot-scope="scope">
-            {{ '经度：' + scope.row.longitude + ' 纬度：' + scope.row.latitude }}
-          </template>
-        </el-table-column>
-        <el-table-column label="上传时间" align="center" prop="uploadTime" />
-      </el-table>
+      <vue-scroll style="height: 80%">
+        <el-table class="tables" v-loading="loading" :data="tableData">
+          <el-table-column label="人员名称" align="center" prop="workerName" />
+          <el-table-column label="设备序号" align="center" prop="devSn" />
+          <el-table-column label="当前位置" align="center" prop="">
+            <template slot-scope="scope">
+              {{
+                "经度：" + scope.row.longitude + " 纬度：" + scope.row.latitude
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="上传时间" align="center" prop="uploadTime" />
+        </el-table>
+      </vue-scroll>
+
      <el-pagination
        class="pagerBox"
        @size-change="SizeChange"
@ -55,38 +92,42 @@
  </div>
 </template>
 <script>
-import { getSafeHatPayDataPageApi,getDevSnListApi,getWorkerInfoListApi } from '@/assets/js/api/smartSafeHat/smartSafeHat.js'
+import {
+  getSafeHatPayDataPageApi,
+  getDevSnListApi,
+  getWorkerInfoListApi,
+} from "@/assets/js/api/smartSafeHat/smartSafeHat.js";
 export default {
  mounted() {},
  created() {
-    this.getPage()
-    this.getDevSnList()
-    this.getWorkerInfoList()
+    this.getPage();
+    this.getDevSnList();
+    this.getWorkerInfoList();
  },
  data() {
    return {
-      devSn: '',
+      devSn: "",
      // 遮罩层
      loading: false,
      daterange: [],
      pageInfo: {
        pageNo: 1, //页数
        pageSize: 10, //条数
-        total: 0 //总条数
+        total: 0, //总条数
      },
      searchForm: {
        pageNo: 1,
        pageSize: 10,
-        projectSn: '', // 项目SN
-        workerInfoId: '',
-        devSn: '',
-        uploadTime_begin: '',
-        uploadTime_end: '',
+        projectSn: "", // 项目SN
+        workerInfoId: "",
+        devSn: "",
+        uploadTime_begin: "",
+        uploadTime_end: "",
      },
      workerList: [],
      devSnList: [],
      tableData: [],
-    }
+    };
  },
  methods: {
    //查询列表
@ -99,69 +140,69 @@ export default {
        workerInfoId: this.searchForm.workerInfoId,
        uploadTime_begin: this.searchForm.uploadTime_begin,
        uploadTime_end: this.searchForm.uploadTime_end,
-      }).then(result => {
+      }).then((result) => {
        if (result.success) {
-          this.tableData = result.result.records
-          this.pageInfo.total = result.result.total
+          this.tableData = result.result.records;
+          this.pageInfo.total = result.result.total;
        }
-      })
+      });
    },
    async getDevSnList() {
-      await getDevSnListApi().then(result => {
+      await getDevSnListApi().then((result) => {
        if (result.success) {
-          this.devSnList = result.result
+          this.devSnList = result.result;
        }
-      })
+      });
    },
-    async getWorkerInfoList(){
+    async getWorkerInfoList() {
      await getWorkerInfoListApi({
        pageNo: 1,
        // pageSize: this.pagInfo.pageSize,
        pageSize: 100000,
        projectSn: this.$store.state.projectSn,
-        personType: 1
-      }).then(result => {
+        personType: 1,
+      }).then((result) => {
        if (result.success) {
-          this.workerList = result.result.records
+          this.workerList = result.result.records;
        }
-      })
+      });
    },
    SizeChange(val) {
-      this.pageInfo.pageSize = val
-      this.getPage()
+      this.pageInfo.pageSize = val;
+      this.getPage();
    },
    CurrentChange(val) {
-      this.pageInfo.pageNo = val
-      this.getPage()
+      this.pageInfo.pageNo = val;
+      this.getPage();
    },
    searchList() {
-      this.pageInfo.pageNo = 1 //页数
-      this.getPage()
+      this.pageInfo.pageNo = 1; //页数
+      this.getPage();
    },
    refresh() {
-      this.searchForm = {}
-      this.pageInfo.pageNo = 1 //页数
-      this.pageInfo.pageSize = 10 //条数
-      this.getPage()
-      this.getDevSnList()
-      this.getWorkerInfoList()
+      this.searchForm = {};
+      this.pageInfo.pageNo = 1; //页数
+      this.pageInfo.pageSize = 10; //条数
+      this.getPage();
+      this.getDevSnList();
+      this.getWorkerInfoList();
    },
    changeDate() {
      if (this.daterange) {
-        this.searchForm.uploadTime_begin = this.daterange[0]
-        this.searchForm.uploadTime_end = this.daterange[1]
-        console.log(this.daterange)
+        this.searchForm.uploadTime_begin = this.daterange[0];
+        this.searchForm.uploadTime_end = this.daterange[1];
+        console.log(this.daterange);
      } else {
-        this.searchForm.uploadTime_begin = ''
-        this.searchForm.uploadTime_end = ''
+        this.searchForm.uploadTime_begin = "";
+        this.searchForm.uploadTime_end = "";
      }
    },
-  }
-}
+  },
+};
 </script>
 <style lang="less" scoped>
-.tables{
-  min-height: 0;
+.tables {
+  // min-height: 0;
 }
 .tables2 {
  min-height: auto;
--- a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
+++ b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
@ -21,25 +21,27 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="tableData">
-        <el-table-column prop="workerName" align="center" label="人员名称" width="280"></el-table-column>
-        <el-table-column prop="devSn" align="center" label="设备序号"></el-table-column>
-        <el-table-column prop="createTime" align="center" label="新增时间"></el-table-column>
-        <el-table-column align="center" label="操作" width="280">
-          <template slot-scope="scope">
-            <div class="tableBtns">
-              <div @click="edit(scope.row)" class="operationText">
-                <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
-                <span style="white-space: nowrap;">编辑</span>
+      <vue-scroll style="height: 80%">
+        <el-table class="tables" :data="tableData">
+          <el-table-column prop="workerName" align="center" label="人员名称" width="280"></el-table-column>
+          <el-table-column prop="devSn" align="center" label="设备序号"></el-table-column>
+          <el-table-column prop="createTime" align="center" label="新增时间"></el-table-column>
+          <el-table-column align="center" label="操作" width="280">
+            <template slot-scope="scope">
+              <div class="tableBtns">
+                <div @click="edit(scope.row)" class="operationText">
+                  <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
+                  <span style="white-space: nowrap;">编辑</span>
+                </div>
+                <div @click="deleteDev(scope.row)" class="operationText">
+                  <img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
+                  <span style="white-space: nowrap;">删除</span>
+                </div>
              </div>
-              <div @click="deleteDev(scope.row)" class="operationText">
-                <img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
-                <span style="white-space: nowrap;">删除</span>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+        </el-table>
+      </vue-scroll>
      <el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange"
        :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize"
        layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background >
@ -232,7 +234,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .tables{
-  min-height: 0;
+  // min-height: 0;
 }
 .tables2 {
  min-height: auto;