异步通道刷新，优化ui效果

648540858

2022-04-12 3955e6ed53d450f8faf488d4b74ba0c0c83c5aaa

 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">
               <el-table-column label="操作" width="450" 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" v-if="scope.row.online!=0" icon="el-icon-refresh" @click="refDevice(scope.row)" @mouseover="getTooltipContent(scope.row.deviceId)">刷新</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" @click="deleteDevice(scope.row)">删除</el-button>
                     </el-button-group>
                     </template>
               </el-table-column>
@@ -70,7 +77,8 @@
               layout="total, sizes, prev, pager, next"
               :total="total">
            </el-pagination>

        <deviceEdit ref="deviceEdit" ></deviceEdit>
        <syncChannelProgress ref="syncChannelProgress" ></syncChannelProgress>
         </el-main>
      </el-container>
   </div>
@@ -78,10 +86,14 @@

<script>
   import uiHeader from './UiHeader.vue'
   import deviceEdit from './dialog/deviceEdit.vue'
   import syncChannelProgress from './dialog/SyncChannelProgress.vue'
   export default {
      name: 'app',
      components: {
         uiHeader
         uiHeader,
      deviceEdit,
      syncChannelProgress,
      },
      data() {
         return {
@@ -95,7 +107,7 @@
            currentPage:1,
            count:15,
            total:0,
            getDeviceListLoading: false
            getDeviceListLoading: false,
         };
      },
      computed: {
@@ -108,8 +120,6 @@
               });
               this.currentDeviceChannelsLenth = channels.length;
            }

            console.log("数据：" + JSON.stringify(channels));
            return channels;
         }
      },
@@ -136,31 +146,53 @@
         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) {
               console.log(res);
               console.log(res.data.list);
            }).then(function (res) {
               that.total = res.data.total;
               that.deviceList = res.data.list;
               that.getDeviceListLoading = false;
            })
            .catch(function (error) {
               console.log(error);
            }).catch(function (error) {
               console.error(error);
               that.getDeviceListLoading = false;
            });

         },
      deleteDevice: function(row) {
        let msg = "确定删除此设备？"
        if (row.online !== 0) {
          msg = "在线设备删除后仍可通过注册再次上线。<br/>如需彻底删除请先将设备离线。<br/><strong>确定删除此设备？</strong>"
        }
        this.$confirm(msg, '提示', {
          dangerouslyUseHTMLString : true,
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          center: true,
          type: 'warning'
        }).then(() => {
          this.$axios({
            method: 'delete',
            url:`/api/device/query/devices/${row.deviceId}/delete`
          }).then((res)=>{
            this.getDeviceList();
          }).catch((error) =>{
            console.error(error);
          });
        }).catch(() => {

        });


         },
         showChannelList: function(row) {
            console.log(JSON.stringify(row))
            this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
         },
         showDevicePosition: function(row) {
            console.log(JSON.stringify(row))
            this.$router.push(`/devicePosition/${row.deviceId}/0/15/1`);
         },

@@ -168,33 +200,57 @@
         //刷新设备信息
         refDevice: function(itemData) {
            console.log("刷新对应设备:" + itemData.deviceId);
            var that = this;
            that.$refs[itemData.deviceId + 'refbtn' ].loading = true;
            let that = this;
            this.$axios({
               method: 'post',
               url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
            }).then(function(res) {
            }).then((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: '请求成功',
                     type: 'success'
                  });
                  // that.$message({
                  //    showClose: true,
                  //    message: res.data.msg,
                  //    type: 'success'
                  // });
            this.$refs.syncChannelProgress.openDialog(itemData.deviceId)
               }
               that.initData()
               that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
            }).catch(function(e) {
            }).catch((e) => {
               console.error(e)
               that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
            });;
          that.$message({
            showClose: true,
            message: e,
            type: 'error'
          });
            });

         },

      getTooltipContent: async function (deviceId){
         let result = "";
         await this.$axios({
            method: 'get',
            async: false,
            url:`/api/device/query/${deviceId}/sync_status/`,
          }).then((res) => {
           if (res.data.code == 0) {
             if (res.data.data.errorMsg !== null) {
               result = res.data.data.errorMsg
             } else if (res.data.msg !== null) {
               result = res.data.msg
             } else {
               result = `同步中...[${res.data.data.current}/${res.data.data.total}]`;
             }
           }
         })
         return result;
      },
         //通知设备上传媒体流
         sendDevicePush: function(itemData) {
            // let deviceId = this.currentDevice.deviceId;
@@ -211,16 +267,27 @@
            // });
         },
      transportChange: function (row) {
        console.log(row);
        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) {
        this.$refs.deviceEdit.openDialog(row, ()=>{
          this.$refs.deviceEdit.close();
          this.$message({
            showClose: true,
            message: "设备修改成功，通道字符集将在下次更新生效",
            type: "success",
          });
          setTimeout(this.getDeviceList, 200)

        })
      }

      }