修改

src/layout/rl-list-operate/rlListOperate.js

@@ -95,10 +95,11 @@ export default {
       })
     },
     // 列表请求
-    getList(params = null) {
+    getList(params = null,timeout = 30000) {
+
       const query = params ? params : this.queryParam
       this.loading=true;
-      this.$http.get(this.url, { params: query }).then(response => {
+      this.$http.get(this.url, { params: query,timeout:timeout}).then(response => {
         
         this.data = response.data
         this.handlePaginateResponse(response)

src/views/yunying/station/deviceList.vue

@@ -0,0 +1,162 @@
+<template>
+  <el-dialog title width="400" :visible.sync="logVisible" custom-class="dialogClass" :close-on-click-modal="false" v-dialogDrag>
+    <span class="fl">标签记录</span>
+     <el-button
+        type="primary"
+        icon="el-icon-refresh-right"
+        class="fr"
+        style="margin-bottom:15px"
+        size="small"
+        @click="startSearch"
+      >搜索</el-button>
+     <el-date-picker
+              v-model="queryParam.timeRange"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              class="searchbox-content-common fr"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              align="right">
+            </el-date-picker>
+     
+
+    <el-table
+      :data="data"
+      v-loading="loading"
+      tooltip-effect="dark"
+      style="width: 100%"
+      border
+      fit
+    >
+     
+      <el-table-column
+        prop="RF_FLAGID"
+        label="标签ID"
+        align="center"
+        :show-overflow-tooltip="true"
+
+      />
+      <el-table-column
+        prop="RF_DATE"
+        label="经过时间"
+        align="center"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="RF_STAT"
+        label="状态"
+        align="center"
+        :show-overflow-tooltip="true"
+      />
+     
+    </el-table>
+    <el-pagination
+      background
+      class="pagination-container"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="paginate.current"
+      :page-sizes="paginate.sizes"
+      :page-size="paginate.limit"
+      :layout="paginate.layout"
+      :total="paginate.total"
+    />
+  </el-dialog>
+</template>
+
+<script>
+import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
+
+export default {
+  name: "sendlog",
+  props: ["displayVisible", "station_code"],
+
+  mixins: [rlListOperate],
+  data() {
+    return {
+      url: "station/getdeviceListByStation",
+      queryParam: {
+        station_code: "",
+        timeRange: [new Date(new Date(new Date().toLocaleDateString()).getTime() - (7*24 * 60 * 60 * 1000)), new Date(new Date(new Date().toLocaleDateString()).getTime() + (24 * 60 * 60 * 1000)-1000)],
+      },
+      
+      defaultQueryParam: ["station_code","timeRange"],
+      pickerOptions: {
+          shortcuts: [
+           {
+            text: '12小时内',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 12);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '24小时内',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '2天内',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 2);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '3天内',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+    };
+  },
+  computed: {
+    logVisible: {
+      set(val) {
+        // console.log(val)
+        this.$emit("formCancel", val); // 表示将子组件改变的值传递给父组件
+      },
+      get() {
+        // console.log(this.logDialogVisible)
+        if (this.displayVisible) {
+          this.queryParam = { 
+            station_code: this.station_code,
+            timeRange: [new Date(new Date(new Date().toLocaleDateString()).getTime() - (7*24 * 60 * 60 * 1000)), new Date(new Date(new Date().toLocaleDateString()).getTime() + (24 * 60 * 60 * 1000)-1000)],
+          };
+          this.getList(this.queryParam,180000);
+        } else {
+          this.queryParam = {};
+        }
+        return this.displayVisible; // 表示获取父组件的值
+      }
+    }
+  },
+  methods: {
+    startSearch() {
+      this.getList(this.queryParam,180000);
+    }
+  }
+};
+</script>
+<style lang="scss">
+.dialogClass .el-dialog__body {
+  padding-top: 20px;
+}
+.dialogClass{
+  margin-top:5vh !important;
+}
+.searchbox-content-common{
+  margin-right:10px;
+  
+}
+</style>

src/views/yunying/station/index.vue

@@ -130,14 +130,34 @@
         width="200"
         sortable="custom"
       />
-      
-     
+      <!-- <el-table-column
+        prop="IS_ONLINE_TEXT"
+        label="在线状态"
+        align="center"
+        v-if="columnVisibles[4]"
+        :show-overflow-tooltip="true"
+
+      /> -->
+      <el-table-column
+        prop="IS_ONLINE"
+        label="在线状态"
+        align="center"
+        v-if="columnVisibles[4]"
+        :show-overflow-tooltip="true"
+        width="120"
+      >
+        <template slot-scope="record">
+          <el-tag type="danger" v-if="record.row.IS_ONLINE == 0">离线</el-tag>
+          <el-tag type="success" v-else-if="record.row.IS_ONLINE == 1">在线</el-tag>
+        </template>
+      </el-table-column>
+
        
       <el-table-column
         prop="UPDATE_DATE"
-        label="在线时间"
+        label="修改时间"
         align="center"
-        v-if="columnVisibles[4]"
+        v-if="columnVisibles[5]"
         :show-overflow-tooltip="true"
 
       />
@@ -145,7 +165,7 @@
         prop="DEVICE_IP"
         label="设备IP"
         align="center"
-        v-if="columnVisibles[5]"
+        v-if="columnVisibles[6]"
         :show-overflow-tooltip="true"
 
       />
@@ -153,7 +173,7 @@
         prop="DEVICE_PORT"
         label="设备端口"
         align="center"
-        v-if="columnVisibles[6]"
+        v-if="columnVisibles[7]"
         :show-overflow-tooltip="true"
 
       />
@@ -162,28 +182,29 @@
         prop="longitude"
         label="经度"
         align="center"
-        v-if="columnVisibles[7]"
+        v-if="columnVisibles[8]"
         :show-overflow-tooltip="true"
       />
        <el-table-column
         prop="latitude"
         label="纬度"
         align="center"
-        v-if="columnVisibles[8]"
+        v-if="columnVisibles[9]"
         :show-overflow-tooltip="true"
       />
-      <!-- <el-table-column
+      <el-table-column
         label="操作"
-        min-width="240"
-        v-if="columnVisibles[7]"
+       width="120"
+        v-if="columnVisibles[10]"
         align="center"
         fixed="right"
       >
         <template slot-scope="record">
-          <el-button type="primary" icon="el-icon-edit" @click="handleUpdate(record.row)"></el-button>
-          <el-button type="danger" icon="el-icon-delete" @click="handleDelete(record.row.id)"></el-button>
+          <el-button type="info" icon="el-icon-view" @click="showDeviceList(record.row)"></el-button>
+          <!-- <el-button type="primary" icon="el-icon-edit" @click="handleUpdate(record.row)"></el-button> -->
+          <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete(record.row.id)"></el-button> -->
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <el-button
       type="primary"
@@ -306,6 +327,12 @@
       :currentRecord="currentRecord"
       ref="heartLog"
     /> -->
+    <deviceList
+      :displayVisible="deviceDialogVisible"
+      @formCancel="deviceCancle"
+      :station_code="station_code"
+      ref="deviceList"
+    />
     <bmap-model @sendVal="closeBmapDialog" :bmapModelVisible="bmapVisible" />
   </div>
 </template>
@@ -316,6 +343,7 @@ import formModel from "./formModel";
 import { getToken } from "../../../utils/auth";
 import { action } from "@/directive/permission/index.js";
 // import heartLogTable from "./heartLogTable";
+import deviceList from "./deviceList";
 import bmapModel from "./bmapModel.vue";
 export default {
   name: "station",
@@ -325,6 +353,7 @@ export default {
     formModel,
     bmapModel,
     // heartLogTable
+    deviceList
   },
   data() {
     return {
@@ -358,8 +387,9 @@ export default {
       tableVisible: false,
 
       searchDisplay: true,
-
-      columnVisibles: new Array(9).fill(true), //初始为全true,并在每个列标签中使用v-if引用对应列下标的值。列下标从0开始。
+      station_code:'',
+      deviceDialogVisible:false,
+      columnVisibles: new Array(11).fill(true), //初始为全true,并在每个列标签中使用v-if引用对应列下标的值。列下标从0开始。
       columnInfos: [], // 所有列的信息
       hidenColumnIndexs: [], //初始隐藏的列的下标。列下标从 0 开始
       visibleIndexs: [], // 可见列的下标集合
@@ -377,6 +407,14 @@ export default {
      })
   },
   methods: {
+    showDeviceList(row) {
+      this.deviceDialogVisible = true;
+      this.station_code = row.LOGIN_NAME;
+      // this.authorize = row.authorize;
+    },
+    deviceCancle() {
+      this.deviceDialogVisible = false;
+    },
     changeDepart(v) {
       this.selectedDepartId = v[v.length - 1];
     },