修改检索显示的摄像机地址,调整上报页面的查询

zhangzengfei

2022-10-08 ba50073d4aeda7a1e30243e6469be9c2cec472b3

 src/views/dataPush/components/device.vue

@@ -1,5 +1,18 @@
<template>
  <div class="sub-account" v-if="!isShowAdd">
    <div class="search">
      <div class="left">
        <div class="id">
          设备名称/IP/编码
          <el-input v-model="inputText" placeholder="请输入" clearable></el-input>
        </div>
      </div>

      <div class="right">
        <div class="button searchBtn" @click="fetchDevicesList(1)">搜索</div>
        <!-- <div class="button resetBtn" @click="reset">重置</div> -->
      </div>
    </div>
    <div class="btns">
      <div class="button add" @click="addDevice">
        <span class="iconfont">&#xe614;</span>
@@ -13,13 +26,19 @@
        ref="multipleTable"
        :data="dataList"
        :fit="true"
        :default-sort="{ prop: 'createTime', order: 'descending' }"
        :default-sort="{ prop: 'devCode', order: 'ascending' }"
      >
        <el-table-column prop="devName" label="设备名称" show-overflow-tooltip></el-table-column>
        <el-table-column prop="devId" label="设备ID" show-overflow-tooltip></el-table-column>
        <!-- <el-table-column prop="devId" label="设备ID" show-overflow-tooltip></el-table-column> -->
        <el-table-column prop="devIp" label="设备IP" show-overflow-tooltip></el-table-column>
        <el-table-column prop="devCode" label="设备编码" show-overflow-tooltip></el-table-column>
        <el-table-column prop="companyCode" label="企业编码" show-overflow-tooltip></el-table-column>
        <el-table-column prop="state" label="状态" show-overflow-tooltip>
          <template slot-scope="scope">
            <div v-if="scope.row.state == 0" class="status">离线</div>
            <div v-else class="status green">在线</div>
          </template>
        </el-table-column>

        <el-table-column label="操作" align="center" width="100px">
          <template slot-scope="scope">
@@ -86,6 +105,8 @@
export default {
  data() {
    return {
      query: {},
      inputText: "", //输入框内容
      isShowAdd: false, //是否展示新增弹窗
      dataList: [],
      tip: 1,
@@ -114,19 +135,31 @@
      total: 0 //总数,
    }
  },
  created() {
    this.fetchDevicesList()
  async created() {
    let query = { pageIndex: this.page, pageSize: this.size, keyword: this.inputText }
    this.query = query
    let res = await getDevicesList(query)
    this.dataList = res.data
    this.total = res.total
  },
  mounted() {},
  methods: {
    async fetchDevicesList() {
      let res = await getDevicesList({ pageIndex: this.page, pageSize: this.size })
      this.dataList = res.data
      this.total = res.total
    async fetchDevicesList(val) {
      if (val === 1) {
        let query = { pageIndex: this.page, pageSize: this.size, keyword: this.inputText }
        this.query = query
        let res = await getDevicesList(query)
        this.dataList = res.data
        this.total = res.total
      } else {
        let res = await getDevicesList(this.query)
        this.dataList = res.data
        this.total = res.total
      }
    },
    delUser(row) {
      console.log(row, "row")
      this.$confirm("确认要删除该用户吗, 是否继续?", "提示", {
      this.$confirm("确认要删除设备吗, 是否继续?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
@@ -193,6 +226,7 @@
                  message: res.data
                })
                this.goback()
                this.fetchDevicesList()
              }
            })
          } else if (this.tip === 2) {
@@ -215,6 +249,7 @@
                  message: res.msg
                })
                this.goback()
                this.fetchDevicesList()
              }
            })
          }
@@ -226,7 +261,7 @@
    goback() {
      this.isShowAdd = false
    },
    async editUser(row) {
    editUser(row) {
      this.tip = 2
      this.isShowAdd = true
      this.ruleForm.devName = row.devName