fix:空压机表头问题

src/views/Screen/index.vue

@@ -128,11 +128,9 @@ export default {
       this.$router.push(`/screen/${val}`);
     },
     goToSys() {
-      var link = this.$router.resolve({
+      this.$router.push({
         path: "/",
       });
-      window.open(link.href);
-      return;
     },
     openVideo() {
       // window.open(this.videoData);

src/views/kongSys/kongHis/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="68px"
+    >
       <el-form-item label="" prop="deviceName">
-        <el-select v-model="queryParams.deviceName" placeholder="空压机名称" clearable>
-          <el-option v-for="dict in deviceName" :key="dict.id" :label="dict.deviceName" :value="dict.id" />
+        <el-select
+          v-model="queryParams.deviceName"
+          placeholder="空压机名称"
+          clearable
+        >
+          <el-option
+            v-for="dict in deviceName"
+            :key="dict.id"
+            :label="dict.deviceName"
+            :value="dict.id"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="">
@@ -18,43 +33,117 @@
         ></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-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 icon="el-icon-download" size="mini" type="primary" plain @click="exportData">导出</el-button> -->
       </el-form-item>
     </el-form>
 
     <el-table v-loading="loading" :data="infoList">
-      <el-table-column label="空压机名称" align="center" prop="deviceName" width="120" />
-      <el-table-column label="空压机编号" align="center" prop="deviceId" width="120" />
-      <el-table-column label="监测时间" align="center" prop="time" width="160" />
-      <el-table-column label="管道压力(Kpa)" align="center" prop="pipelinePressure" width="140" />
-      <el-table-column label="瞬时流量(m³)" align="center" prop="flowRate" width="140" />
-      <el-table-column label="瞬时流速(m³/s)" align="center" prop="velocity" width="140" />
-      <el-table-column label="气体温度(℃)" align="center" prop="gasTemperature" width="120" />
-      <el-table-column label="管道压力(假)(Kpa)" align="center" prop="pipelinePressureFalse" />
-      <el-table-column label="瞬时流量(假)(m³)" align="center" prop="flowRateFalse" />
-      <el-table-column label="瞬时流速(假)(m³/s)" align="center" prop="velocityFalse" />
-      <el-table-column label="气体温度(假)(℃)" align="center" prop="gasTemperatureFalse" />
-      <el-table-column label="状态" align="center" prop="fanRunStatus" width="140">
+      <el-table-column
+        label="空压机名称"
+        align="center"
+        prop="deviceName"
+        width="120"
+      />
+      <el-table-column
+        label="空压机编号"
+        align="center"
+        prop="deviceId"
+        width="120"
+      />
+      <el-table-column
+        label="监测时间"
+        align="center"
+        prop="time"
+        width="160"
+      />
+      <el-table-column
+        label="管道压力(Kpa)"
+        align="center"
+        prop="pipelinePressure"
+        width="140"
+      />
+      <el-table-column
+        label="瞬时流量(m³)"
+        align="center"
+        prop="flowRate"
+        width="140"
+      />
+      <el-table-column
+        label="瞬时流速(m³/s)"
+        align="center"
+        prop="velocity"
+        width="140"
+      />
+      <el-table-column
+        label="气体温度(℃)"
+        align="center"
+        prop="gasTemperature"
+        width="120"
+      />
+      <el-table-column
+        label="管道压力(Kpa)"
+        align="center"
+        prop="pipelinePressureFalse"
+      />
+      <el-table-column
+        label="瞬时流量(m³)"
+        align="center"
+        prop="flowRateFalse"
+      />
+      <el-table-column
+        label="瞬时流速(m³/s)"
+        align="center"
+        prop="velocityFalse"
+      />
+      <el-table-column
+        label="气体温度(℃)"
+        align="center"
+        prop="gasTemperatureFalse"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="fanRunStatus"
+        width="140"
+      >
         <template slot-scope="{ row }">
-          <el-tag v-if="row.fanRunStatus == 1" type="success" size="mini">启动</el-tag>
-          <el-tag v-else-if="row.fanRunStatus == 2" type="danger" size="mini">停止</el-tag>
+          <el-tag v-if="row.fanRunStatus == 1" type="success" size="mini"
+            >启动</el-tag
+          >
+          <el-tag v-else-if="row.fanRunStatus == 2" type="danger" size="mini"
+            >停止</el-tag
+          >
           <el-tag v-else-if="fanRunStatus == 3" size="mini">复位</el-tag>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
-import { listKongHis } from '@/api/tyler/kong';
-import { kongDeviceName } from '@/api/tyler/common';
+import { listKongHis } from "@/api/tyler/kong";
+import { kongDeviceName } from "@/api/tyler/common";
 
 export default {
-  name: 'Info',
+  name: "Info",
   data() {
     return {
       // 根路径
@@ -77,7 +166,7 @@ export default {
     };
   },
   created() {
-    kongDeviceName().then(res => {
+    kongDeviceName().then((res) => {
       this.deviceName = res.rows;
     });
     this.getList();
@@ -85,16 +174,22 @@ export default {
   methods: {
     /** 导出按钮操作 */
     exportData() {
-      this.download('/business/pump/history/export ', {}, `空压机运行历史数据_${new Date().getTime()}.xlsx`);
+      this.download(
+        "/business/pump/history/export ",
+        {},
+        `空压机运行历史数据_${new Date().getTime()}.xlsx`
+      );
     },
     /** 查询空压机基本信息列表 */
     getList() {
       this.loading = true;
-      listKongHis(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.infoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      listKongHis(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
+          this.infoList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -104,7 +199,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm('queryForm');
+      this.resetForm("queryForm");
       this.handleQuery();
     },
   },

src/views/kongSys/kongReal/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
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="" prop="deviceId">
-        <el-select v-model="queryParams.deviceId" placeholder="空压机名称" clearable>
-          <el-option v-for="dict in deviceName" :key="dict.id" :label="dict.deviceName" :value="dict.id" />
+        <el-select
+          v-model="queryParams.deviceId"
+          placeholder="空压机名称"
+          clearable
+        >
+          <el-option
+            v-for="dict in deviceName"
+            :key="dict.id"
+            :label="dict.deviceName"
+            :value="dict.id"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="">
@@ -18,42 +34,117 @@
         ></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-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="infoList">
-      <el-table-column label="空压机名称" align="center" prop="deviceName" width="120" />
-      <el-table-column label="空压机编号" align="center" prop="deviceId" width="120" />
-      <el-table-column label="监测时间" align="center" prop="time" width="160" />
-      <el-table-column label="管道压力(Kpa)" align="center" prop="pipelinePressure" width="140" />
-      <el-table-column label="瞬时流量(m³)" align="center" prop="flowRate" width="140" />
-      <el-table-column label="瞬时流速(m³/s)" align="center" prop="velocity" width="140" />
-      <el-table-column label="气体温度(℃)" align="center" prop="gasTemperature" width="120" />
-      <el-table-column label="管道压力(假)(Kpa)" align="center" prop="pipelinePressureFalse" />
-      <el-table-column label="瞬时流量(假)(m³)" align="center" prop="flowRateFalse" width="140" />
-      <el-table-column label="瞬时流速(假)(m³/s)" align="center" prop="velocityFalse" />
-      <el-table-column label="气体温度(假)(℃)" align="center" prop="gasTemperatureFalse" />
-      <el-table-column label="状态" align="center" prop="fanRunStatus" width="140">
+      <el-table-column
+        label="空压机名称"
+        align="center"
+        prop="deviceName"
+        width="120"
+      />
+      <el-table-column
+        label="空压机编号"
+        align="center"
+        prop="deviceId"
+        width="120"
+      />
+      <el-table-column
+        label="监测时间"
+        align="center"
+        prop="time"
+        width="160"
+      />
+      <el-table-column
+        label="管道压力(Kpa)"
+        align="center"
+        prop="pipelinePressure"
+        width="140"
+      />
+      <el-table-column
+        label="瞬时流量(m³)"
+        align="center"
+        prop="flowRate"
+        width="140"
+      />
+      <el-table-column
+        label="瞬时流速(m³/s)"
+        align="center"
+        prop="velocity"
+        width="140"
+      />
+      <el-table-column
+        label="气体温度(℃)"
+        align="center"
+        prop="gasTemperature"
+        width="120"
+      />
+      <el-table-column
+        label="管道压力(Kpa)"
+        align="center"
+        prop="pipelinePressureFalse"
+      />
+      <el-table-column
+        label="瞬时流量(m³)"
+        align="center"
+        prop="flowRateFalse"
+        width="140"
+      />
+      <el-table-column
+        label="瞬时流速(m³/s)"
+        align="center"
+        prop="velocityFalse"
+      />
+      <el-table-column
+        label="气体温度(℃)"
+        align="center"
+        prop="gasTemperatureFalse"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="fanRunStatus"
+        width="140"
+      >
         <template slot-scope="{ row }">
-          <el-tag v-if="row.fanRunStatus == 1" type="success" size="mini">启动</el-tag>
-          <el-tag v-else-if="row.fanRunStatus == 2" type="danger" size="mini">停止</el-tag>
+          <el-tag v-if="row.fanRunStatus == 1" type="success" size="mini"
+            >启动</el-tag
+          >
+          <el-tag v-else-if="row.fanRunStatus == 2" type="danger" size="mini"
+            >停止</el-tag
+          >
           <el-tag v-else-if="fanRunStatus == 3" size="mini">复位</el-tag>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
-import { listrealKong } from '@/api/tyler/kongReal';
-import { kongDeviceName } from '@/api/tyler/common';
+import { listrealKong } from "@/api/tyler/kongReal";
+import { kongDeviceName } from "@/api/tyler/common";
 
 export default {
-  name: 'Info',
+  name: "Info",
   data() {
     return {
       // 根路径
@@ -76,16 +167,20 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: 'id不能为空', trigger: 'blur' }],
-        deviceName: [{ required: true, message: '空压机名称不能为空', trigger: 'blur' }],
-        deviceId: [{ required: true, message: '空压机编号不能为空', trigger: 'blur' }],
+        id: [{ required: true, message: "id不能为空", trigger: "blur" }],
+        deviceName: [
+          { required: true, message: "空压机名称不能为空", trigger: "blur" },
+        ],
+        deviceId: [
+          { required: true, message: "空压机编号不能为空", trigger: "blur" },
+        ],
       },
       deviceName: [],
       dateRange: [],
     };
   },
   created() {
-    kongDeviceName().then(res => {
+    kongDeviceName().then((res) => {
       this.deviceName = res.rows;
     });
     this.getList();
@@ -94,11 +189,13 @@ export default {
     /** 查询空压机基本信息列表 */
     getList() {
       this.loading = true;
-      listrealKong(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.infoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      listrealKong(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
+          this.infoList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -108,7 +205,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.resetForm('queryForm');
+      this.resetForm("queryForm");
       this.handleQuery();
     },
   },

src/views/personPos/perReal/index.vue

@@ -92,8 +92,8 @@
       <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="localtion" />
+      <el-table-column label="来向" align="center" prop="" /> -->
       <el-table-column label="时间" align="center" prop="lastTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.lastTime) }}</span>