Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

lyq 1 miesiąc temu
rodzic
commit
fe77d9ef6f

+ 4 - 4
monitor_ui/src/views/centerMonitor/camera/camerachannel.vue

@@ -96,7 +96,7 @@
       <!--<el-table-column label="数据所属部门(政或党的id)" align="center" prop="dataDeptId" />-->
       <!--<el-table-column label="摄像头ID" align="center" prop="cameraId" />-->
       <el-table-column label="摄像头编码" align="center" prop="channelCode"/>
-      <el-table-column label="通道编号" align="center" prop="channelNumber"/>
+      <el-table-column label="通道编号" align="center" prop="channelNum"/>
       <el-table-column label="通道名称" align="center" prop="channelName"/>
       <el-table-column label="通道类型" align="center" prop="channelType" :formatter="channelTypeFormat"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -148,8 +148,8 @@
         <el-form-item label="摄像头编码" prop="channelCode">
           <el-input v-model="form.channelCode" placeholder="请输入摄像头编码"/>
         </el-form-item>
-        <el-form-item label="通道编号" prop="channelNumber">
-          <el-input v-model="form.channelNumber" placeholder="请输入通道编号"/>
+        <el-form-item label="通道编号" prop="channelNum">
+          <el-input v-model="form.channelNum" placeholder="请输入通道编号"/>
         </el-form-item>
         <el-form-item label="通道名称" prop="channelName">
           <el-input v-model="form.channelName" placeholder="请输入通道名称"/>
@@ -239,7 +239,7 @@
           dataStatus: null,
           cameraId: null,
           channelCode: null,
-          channelNumber: null,
+          channelNum: null,
           channelName: null,
           channelType: null,
           deviceCode: null,