Pre Merge pull request !43 from 阿斌/N/A

Signed-off-by: 阿斌 <38912748@qq.com>

web/src/views/device/channel/index.vue

@@ -360,7 +360,15 @@ export default {
           setTimeout(() => {
             this.initData()
           }, 1000)
-        }).finally(() => {
+        })
+        .catch((error) => {
+          console.log(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
+        })
+        .finally(() => {
           itemData.playLoading = false
         })
     },

web/src/views/dialog/chooseTimeRange.vue

@@ -12,8 +12,9 @@
       @close="close()"
     >
       <div style="width:fit-content; margin: 0 auto">
-        <el-time-picker
+        <el-date-picker
           v-model="timeRange"
+          type="datetimerange"
           is-range
           range-separator="至"
           start-placeholder="开始时间"
@@ -31,8 +32,13 @@
 
 <script>
 
+import elDragDialog from '@/directive/el-drag-dialog'
+
 export default {
   name: 'ChooseDateTimeRange',
+  directives: {
+    elDragDialog
+  },
   props: {},
   data() {
     return {

web/src/views/map/index.vue

@@ -89,7 +89,7 @@
           <div class="infobox-content" v-if="channel">
             <el-descriptions class="margin-top" :title="channel.gbName" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
               <el-descriptions-item label="编号" >{{channel.gbDeviceId}}</el-descriptions-item>
-              <el-descriptions-item label="生产厂商">{{channel.gbManufacture}}</el-descriptions-item>
+              <el-descriptions-item label="生产厂商">{{channel.gbManufacturer}}</el-descriptions-item>
               <el-descriptions-item label="安装地址" >{{channel.gbAddress == null?'未知': channel.gbAddress}}</el-descriptions-item>
             </el-descriptions>
             <div style="padding-top: 10px; margin: 0 auto; width: fit-content;">