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

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

web/src/views/device/common/ptzPresetConfig.vue

@@ -21,6 +21,7 @@
       border
       stripe
       max-height="100%"
+      height="100%"
       style="flex: 1"
     >
       <el-table-column prop="presetId" label="序号" align="center" />

web/src/views/device/list.vue

@@ -132,7 +132,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作" min-width="240" fixed="right">
+      <el-table-column label="操作" min-width="260" fixed="right">
         <template v-slot:default="scope">
           <el-button
             type="text"

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;">