From 03b9230d80aeff0337749d2659c42fd4be1c190b Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Mon, 25 Mar 2024 11:06:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=9A=E4=BD=8D=E5=92=8C=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E6=A8=A1=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                         |  4 +--
 .../dataPay/dataModule/dataPayAlarmRecord.vue |  5 +--
 .../dataModule/dataPayRealTimeData.vue        | 33 ++++++++-----------
 .../dataPay/dataModule/dataPayAlarmRecord.vue |  6 ++--
 .../dataModule/dataPayRealTimeData.vue        | 30 ++++-------------
 5 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index b5c2c766..fd882353 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -85,10 +85,10 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
-  axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
+  // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
-  // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+  axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
   // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
 
diff --git a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
index 978a0542..e66a9ee6 100644
--- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
+++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
@@ -4,8 +4,8 @@
       <el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
         <!-- 机械设备名称 -->
         <el-form-item label="机械设备名称" prop="equipmentName">
-          <el-select v-model="searchForm.equipmentName" placeholder="请选择" clearable :style="{ width: '100%' }" >
-            <el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.equipmentName" ></el-option>
+          <el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
+            <el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.devSn" ></el-option>
           </el-select>
         </el-form-item>
         <!-- 设备序号 -->
@@ -123,6 +123,7 @@ export default {
     },
     refresh() {
       this.searchForm = {}
+      this.daterange = []
       this.pageInfo.pageNo = 1 //页数
       this.pageInfo.pageSize = 10 //条数
       this.getPage()
diff --git a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
index 79b333c7..83df3b36 100644
--- a/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
+++ b/src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
@@ -4,21 +4,21 @@
       <el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
         <!-- 机械设备名称 -->
         <el-form-item label="机械设备名称" prop="equipmentName">
-          <el-select v-model="searchForm.equipmentName" placeholder="请选择" clearable :style="{ width: '100%' }" >
-            <el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.equipmentName" ></el-option>
+          <el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }">
+            <el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.devSn"></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 equipmentList" :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 equipmentList" :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>
         <!-- 条件查询按钮 -->
@@ -32,7 +32,7 @@
       <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" prop="devSn" width="180" />
           <el-table-column label="当前位置" align="center" width="180">
             <template slot-scope="scope">
               {{ '经度：' + scope.row.longitude + ' 纬度：' + scope.row.latitude }}
@@ -60,20 +60,12 @@
               {{ scope.row.equipmentVoltage + ' '}}伏特
             </template>
           </el-table-column>
-          <el-table-column label="上传时间" align="center" prop="uploadTime" width="180"/>
+          <el-table-column label="上传时间" align="center" prop="uploadTime" width="180" />
         </el-table>
       </vue-scroll>
-      <el-pagination
-        class="pagerBox"
-        @size-change="SizeChange"
-        @current-change="CurrentChange"
-        :current-page="pageInfo.pageNo"
-        :page-sizes="$store.state.PAGESIZRS"
-        :page-size="pageInfo.pageSize"
-        layout="total, sizes, prev, pager, next"
-        :total="Number(pageInfo.total)"
-        background
-      ></el-pagination>
+      <el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange"
+        :current-page="pageInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pageInfo.pageSize"
+        layout="total, sizes, prev, pager, next" :total="Number(pageInfo.total)" background></el-pagination>
     </div>
   </div>
 </template>
@@ -149,6 +141,7 @@ export default {
     },
     refresh() {
       this.searchForm = {}
+      this.daterange = []
       this.pageInfo.pageNo = 1 //页数
       this.pageInfo.pageSize = 10 //条数
       this.getPage()
diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
index f9dbaf2b..ba594cb7 100644
--- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
+++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
@@ -4,8 +4,9 @@
       <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.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
+            <!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
+            <el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
           </el-select>
         </el-form-item>
         <!-- 设备序号 -->
@@ -143,6 +144,7 @@ export default {
     },
     refresh() {
       this.searchForm = {}
+      this.daterange = []
       this.pageInfo.pageNo = 1 //页数
       this.pageInfo.pageSize = 10 //条数
       this.getPage()
diff --git a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
index 109b9564..60063f95 100644
--- a/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
+++ b/src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
@@ -9,34 +9,15 @@
       >
         <!-- 人员名称 -->
         <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.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
+            <!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
+            <el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></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>
         <!-- 时间 -->
@@ -181,6 +162,7 @@ export default {
     },
     refresh() {
       this.searchForm = {};
+      this.daterange = []
       this.pageInfo.pageNo = 1; //页数
       this.pageInfo.pageSize = 10; //条数
       this.getPage();