diff --git a/src/utils/api/reportApi.js b/src/utils/api/reportApi.js
index ac22dd4..de4dcbf 100644
--- a/src/utils/api/reportApi.js
+++ b/src/utils/api/reportApi.js
@@ -42,3 +42,12 @@ export function gettermAllList(data) {
     params: data,
   });
 }
+
+//规约版本
+export function getProtocolList(data) {
+  return request({
+    url: "/xymanager/getProtocolList",
+    method: "get",
+    params: data,
+  });
+}
diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index 50718a4..cd098cf 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -4,7 +4,7 @@
     title="通道设置"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="640px"
+    width="850px"
     @close="handleclose"
   >
     <div class="zzinfo">
@@ -88,7 +88,9 @@
           </el-form-item>
         </div>
 
-        <el-form-item label="参数设置">
+       
+        <div class="isoDiv">
+          <el-form-item label="参数设置">
           <el-checkbox
             label="USB接口"
             v-model="channelForm.usbchecked"
@@ -103,7 +105,6 @@
             @change="bgchange"
           ></el-checkbox>
         </el-form-item>
-        <div class="isoDiv">
           <el-form-item label="曝光时间">
             <el-input v-model="channelForm.bgsj" :disabled="bgflag"></el-input>
             <span class="infoSpan">(毫秒)</span>
@@ -112,7 +113,9 @@
             <el-input v-model="channelForm.iso" :disabled="bgflag"></el-input>
           </el-form-item>
         </div>
-        <el-form-item label="模式选择">
+      
+        <div class="roteAiBox">
+          <el-form-item label="模式选择">
           <el-checkbox
             label="HDR模式"
             v-model="channelForm.hdrchecked"
@@ -122,7 +125,6 @@
             v-model="channelForm.ywchecked"
           ></el-checkbox>
         </el-form-item>
-        <div class="roteAiBox">
           <el-form-item label="旋转角度">
             <el-select v-model="channelForm.roteval" placeholder="请选择">
               <el-option
@@ -146,33 +148,38 @@
             </el-select>
           </el-form-item>
         </div>
-
+        <div class="textAreabox">
         <el-form-item label="左上OSD">
-          <el-input v-model="channelForm.ltosd"></el-input>
+          <el-input type="textarea" rows="4" v-model="channelForm.ltosd"></el-input>
           <span class="infoSpan">(多行使用\n换行)</span>
+          
         </el-form-item>
         <el-form-item label="右上OSD">
-          <el-input v-model="channelForm.rtosd"></el-input>
+          <el-input type="textarea" rows="4" v-model="channelForm.rtosd"></el-input>
           <span class="infoSpan">(多行使用\n换行)</span>
+          
         </el-form-item>
-        <el-form-item label="左下OSD">
-          <el-input v-model="channelForm.lbosd"></el-input>
+        <el-form-item  label="左下OSD">
+          <el-input type="textarea" rows="4" v-model="channelForm.lbosd"></el-input>
           <span class="infoSpan">(多行使用\n换行)</span>
+         
         </el-form-item>
         <el-form-item label="右下OSD">
-          <el-input v-model="channelForm.rbosd"></el-input>
+          <el-input type="textarea" rows="4" v-model="channelForm.rbosd"></el-input>
           <span class="infoSpan">(多行使用\n换行)</span>
         </el-form-item>
+      </div>
       </el-form>
     </div>
     <div slot="footer" class="dialog-footer">
+     
       <el-button @click="handleclose" :disabled="channelsetLoading"
         >取 消</el-button
       >
       <el-button
         type="primary"
         :disabled="channelsetLoading"
-        @click="handleConfim"
+        @click="handleConfim(true)"
         :loading="channelLoading"
         >确 定</el-button
       >
@@ -383,6 +390,7 @@ export default {
       this.searchBtn();
     },
     handleConfim() {
+      
       console.log("点击了确定");
       console.log(this.channelForm);
       this.channelLoading = true;
@@ -609,7 +617,7 @@ export default {
             window.clearInterval(this.setTimer);
             this.setTimer = null;
             this.setNum = 0;
-            this.isShow = false;
+            //this.isShow = false;
             this.channelLoading = false;
             this.$message({
               duration: 1500,
@@ -710,7 +718,8 @@ export default {
               decodeURIComponent(escape(window.atob(resultData.content)))
             );
             console.log(resultContent);
-
+            this.channelForm.resolutionCX = resultContent.resolutionCX;
+            this.channelForm.resolutionCY = resultContent.resolutionCY;
             this.channelForm.ysl = resultContent.quality;
             this.channelForm.usbchecked =
               resultContent.usbCamera == 1 ? true : false;
@@ -728,10 +737,10 @@ export default {
               resultContent.nightMode == 1 ? true : false;
             this.channelForm.aival = resultContent.recognization;
             this.channelForm.roteval = resultContent.orientation;
-            this.channelForm.rtosd = resultContent.osd.rightTop;
-            this.channelForm.ltosd = resultContent.osd.leftTop;
-            this.channelForm.lbosd = resultContent.osd.leftBottom;
-            this.channelForm.rbosd = resultContent.osd.rightBottom;
+            this.channelForm.rtosd = resultContent.osd.rightTop!="null"?resultContent.osd.rightTop:"";
+            this.channelForm.ltosd = resultContent.osd.leftTop!="null"?resultContent.osd.leftTop:"";
+            this.channelForm.lbosd = resultContent.osd.leftBottom!="null"?resultContent.osd.leftBottom:"";
+            this.channelForm.rbosd = resultContent.osd.rightBottom!="null"?resultContent.osd.rightBottom:"";
             // this.channelForm.videoSize = resultContent.;
             this.channelForm.videoCX = resultContent.videoCX;
             this.channelForm.videoCY = resultContent.videoCY;
@@ -921,8 +930,22 @@ export default {
       display: flex;
 
       .el-input {
-        width: 140px;
+        width: 90px;
       }
+      .el-form-item{
+        &:last-child{
+          .el-form-item__label{
+            width: 60px!important;
+          }
+          .el-form-item__content{
+            margin-left: 60px!important;
+          }
+        }
+      }
+    }
+    .textAreabox{
+      display: flex;
+      flex-wrap: wrap;
     }
     .videoclass {
       // .el-form-item__content {
diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue
index 4d50357..77e222c 100644
--- a/src/views/reportData/equipmentStatus/index.vue
+++ b/src/views/reportData/equipmentStatus/index.vue
@@ -34,7 +34,26 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        
+        <el-form-item label="是否在线" class="isonLineClass">
+            <el-select v-model="formdata.isonline" filterable>
+              <el-option
+                v-for="item in onlineOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        <el-form-item label="规约" class="isonLineClass">
+            <el-select v-model="formdata.protocol" filterable>
+              <el-option
+                v-for="item in protocolOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
         <el-form-item label="开始日期" class="dateclass">
           <el-date-picker
             v-model="formdata.starttime"
@@ -99,7 +118,13 @@
           >
         </el-table-column>
         <el-table-column prop="sim" label="SIM卡号" min-width="180"> </el-table-column>
-        <el-table-column prop="netType" label="网络类型"> </el-table-column>
+        <el-table-column prop="netType" label="网络类型">
+          <template slot-scope="scope">
+          <span v-if="scope.row.netType == 1">移动</span>
+          <span v-else-if="scope.row.netType == 2">联通</span>  
+          <span v-else-if="scope.row.netType == 3">电信</span>  
+          </template>
+        </el-table-column>
         <el-table-column prop="onlinestatus" label="状态"> 
           <template slot-scope="scope">
              
@@ -202,7 +227,7 @@
   </div>
 </template>
 <script>
-import { gettermAllList, getSearchInfo } from "@/utils/api/reportApi";
+import { gettermAllList, getSearchInfo , getProtocolList,} from "@/utils/api/reportApi";
 // import ipDialog from "./components/ipDialog";
 // import photoDialog from "./components/termAllList";
 export default {
@@ -222,11 +247,18 @@ export default {
       dyOptions: [{ id: -1, name: "全部" }], //电压数据
       xlOptions: [{ id: -1, name: "全部" }], //线路数据
       gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
-    
+      onlineOptions: [
+        { id: -1, name: "全部" },
+        { id: 1, name: "在线" },
+        { id: 0, name: "离线" },
+      ],
+      protocolOptions: [{ id: -1, name: "全部" }], //规约数据
       formdata: {
         dyid: -1,
         lineid: -1,
         towerid: -1,
+        isonline:-1,
+        protocol:-1,
         starttime: new Date(new Date().setHours(0, 0, 0, 0)).getTime(), // 设置开始时间为当天凌晨00:00:00的时间戳
         endtime: new Date(new Date().setHours(23, 59, 59, 0)).getTime(), // 设置结束时间为当天夜晚23:59:59的时间戳
         search: "",
@@ -242,6 +274,7 @@ export default {
   created() {},
   mounted() {
     this.getSearchdy();
+    this.getProtocol();
   },
   watch: {},
   methods: {
@@ -273,6 +306,16 @@ export default {
         })
         .catch((err) => {});
     },
+    getProtocol() {
+      //获取规约版本
+      getProtocolList()
+        .then((res) => {
+          console.log(res);
+          this.protocolOptions = this.protocolOptions.concat(res.data.list);
+          this.formdata.protocol = this.protocolOptions[0].id;
+        })
+        .catch((err) => {});
+    },
     onSubmit() {
       if (this.formdata.starttime > this.formdata.endtime) {
         return this.$message({
@@ -306,8 +349,11 @@ export default {
       if (this.formdata.towerid !== -1) {
         params.towerId = this.formdata.towerid;
       }
-      if (this.formdata.channelid !== -1) {
-        params.channelId = this.formdata.channelid;
+      if (this.formdata.isonline !== -1) {
+        params.isonline = this.formdata.isonline;
+      }
+      if (this.formdata.protocol !== -1) {
+        params.protocol = this.formdata.protocol;
       }
       if (this.formdata.search !== "") {
         params.search = this.formdata.search;
@@ -397,6 +443,11 @@ export default {
         width: 190px;
       }
     }
+    .isonLineClass {
+      .el-form-item__content {
+        width: 120px;
+      }
+    }
   }
   .deviceTable {
     height: calc(100% - 32px);