Merge pull request #294 from lawrencehj/wvp-28181-2.0

648540858

2021-12-30 e53ce59166b38880db2762293cca06011b1f66a3

 web_src/src/components/DeviceList.vue

@@ -13,23 +13,21 @@
            </div>
            <!-- <devicePlayer ref="devicePlayer"></devicePlayer> -->
            <!--设备列表-->
            <el-table :data="deviceList" border style="width: 100%" :height="winHeight">
               <el-table-column prop="name" label="名称" width="180" align="center">
            <el-table :data="deviceList" border style="width: 100%;font-size: 12px;" :height="winHeight">
               <el-table-column prop="name" label="名称"  align="center">
               </el-table-column>
               <el-table-column prop="deviceId" label="设备编号" width="240" align="center">
               <el-table-column prop="deviceId" label="设备编号" width="180" align="center">
               </el-table-column>
               <el-table-column label="地址" width="180" align="center">
                  <template slot-scope="scope">
                     <div slot="reference" class="name-wrapper">
                        <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
                     </div>
                  </template>
               </el-table-column>
          <el-table-column label="地址" width="180" align="center">
            <template slot-scope="scope">
              <div slot="reference" class="name-wrapper">
                <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
              </div>
            </template>
          </el-table-column>
               <el-table-column prop="manufacturer" label="厂家" align="center">
               </el-table-column>
               <el-table-column prop="model" label="固件版本" align="center">
               </el-table-column>
               <el-table-column label="流传输模式" align="center" width="160">
               <el-table-column label="流传输模式" align="center" width="120">
            <template slot-scope="scope">
              <el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="请选择">
                <el-option key="UDP" label="UDP" value="UDP"></el-option>
@@ -40,7 +38,7 @@
               </el-table-column>
               <el-table-column prop="channelCount" label="通道数" align="center">
               </el-table-column>
               <el-table-column label="状态" width="80" align="center">
               <el-table-column label="状态" width="120" align="center">
                  <template slot-scope="scope">
                     <div slot="reference" class="name-wrapper">
                        <el-tag size="medium" v-if="scope.row.online == 1">在线</el-tag>
@@ -48,14 +46,23 @@
                     </div>
                  </template>
               </el-table-column>
          <el-table-column prop="keepaliveTime" label="最近心跳" align="center" width="140">
          </el-table-column>
          <el-table-column prop="registerTime" label="最近注册" align="center" width="140">
          </el-table-column>
          <el-table-column prop="updateTime" label="更新时间" align="center" width="140">
          </el-table-column>
          <el-table-column prop="createTime" label="创建时间" align="center" width="140">
          </el-table-column>

               <el-table-column label="操作" width="360" align="center" fixed="right">
                  <template slot-scope="scope">
                     <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' " icon="el-icon-refresh"  @click="refDevice(scope.row)">刷新</el-button>
                     <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' "  v-if="scope.row.online!=0" icon="el-icon-refresh"  @click="refDevice(scope.row)">刷新</el-button>
                     <el-button-group>
                     <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0"  type="primary" @click="showChannelList(scope.row)">通道</el-button>
                     <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0"  type="primary" @click="showDevicePosition(scope.row)">定位</el-button>
                     <el-button size="mini" icon="el-icon-s-tools" v-bind:disabled="scope.row.online==0"  type="primary">控制</el-button>
                <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0"  type="primary" @click="showChannelList(scope.row)">通道</el-button>
                <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0"  type="primary" @click="showDevicePosition(scope.row)">定位</el-button>
                <el-button size="mini" icon="el-icon-edit" type="primary" @click="edit(scope.row)">编辑</el-button>
                <el-button size="mini" icon="el-icon-delete" type="danger" v-if="scope.row.online==0"  @click="deleteDevice(scope.row)">删除</el-button>
                     </el-button-group>
                     </template>
               </el-table-column>
@@ -70,7 +77,7 @@
               layout="total, sizes, prev, pager, next"
               :total="total">
            </el-pagination>

        <deviceEdit ref="deviceEdit" ></deviceEdit>
         </el-main>
      </el-container>
   </div>
@@ -78,10 +85,12 @@

<script>
   import uiHeader from './UiHeader.vue'
   import deviceEdit from './dialog/deviceEdit.vue'
   export default {
      name: 'app',
      components: {
         uiHeader
         uiHeader,
      deviceEdit
      },
      data() {
         return {
@@ -136,22 +145,34 @@
         getDeviceList: function() {
            let that = this;
            this.getDeviceListLoading = true;
            this.$axios.get(`/api/device/query/devices`,{
            this.$axios({
               method: 'get',
               url:`/api/device/query/devices`,
               params: {
                  page: that.currentPage,
                  count: that.count
               }
            } )
            .then(function (res) {
            }).then(function (res) {
               console.log(res);
               console.log(res.data.list);
               that.total = res.data.total;
               that.deviceList = res.data.list;
               that.getDeviceListLoading = false;
            })
            .catch(function (error) {
            }).catch(function (error) {
               console.log(error);
               that.getDeviceListLoading = false;
            });

         },
      deleteDevice: function(row) {
            let that = this;
            this.$axios({
               method: 'delete',
               url:`/api/device/query/devices/${row.deviceId}/delete`
            }).then((res)=>{
          this.getDeviceList();
            }).catch((error) =>{
               console.log(error);
            });

         },
@@ -175,16 +196,16 @@
               url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
            }).then(function(res) {
               console.log("刷新设备结果："+JSON.stringify(res));
               if (!res.data.deviceId) {
               if (res.data.code !==0) {
                  that.$message({
                     showClose: true,
                     message: res.data,
                     message: res.data.msg,
                     type: 'error'
                  });
               }else{
                  that.$message({
                     showClose: true,
                     message: '请求成功',
                     message: res.data.msg,
                     type: 'success'
                  });
               }
@@ -215,12 +236,25 @@
        console.log(`修改传输方式为 ${row.streamMode}：${row.deviceId} `);
        let that = this;
        this.$axios({
          method: 'get',
          url: '/api/device/query/transport' + row.deviceId + '/' + row.streamMode
          method: 'post',
          url: '/api/device/query/transport/' + row.deviceId + '/' + row.streamMode
        }).then(function(res) {

        }).catch(function(e) {
        });
      },
      edit: function (row) {
        console.log(row);
        this.$refs.deviceEdit.openDialog(row, ()=>{
          this.$refs.deviceEdit.close();
          this.$message({
            showClose: true,
            message: "设备修改成功，通道字符集将在下次更新生效",
            type: "success",
          });
          setTimeout(this.getDeviceList, 200)

        })
      }

      }