diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index c5cedd9..082490c 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -282,7 +282,6 @@
           <imageCapture ref="imageCaptureref" :rowdata="rowData"></imageCapture>
         </div>
       </el-tab-pane>
-
       <el-tab-pane label="视频采集参数" name="6">
         <div class="tabsBox">
           <videoCapture ref="videoCaptureref" :rowdata="rowData"></videoCapture>
@@ -400,6 +399,187 @@
           </el-tabs>
         </div>
       </el-tab-pane>
+      <el-tab-pane label="OSD参数" name="11">
+        <div class="tabsBox">
+          <el-tabs v-model="tabsActive" type="card" @tab-click="uphandleClick">
+            <el-tab-pane label="查询实际参数" name="first">
+              <div class="queryParam osdParam">
+                <div class="channelBox">
+                  <span class="title">通道</span>
+                  <el-select
+                    v-model="channelId"
+                    placeholder="请选择"
+                    class="mr20"
+                  >
+                    <el-option
+                      v-for="item in accesslist"
+                      :key="item.channelid"
+                      :label="
+                        item.alias !== null && item.alias !== ''
+                          ? item.alias
+                          : item.channelname
+                      "
+                      :value="item.channelid"
+                    >
+                      {{
+                        item.alias !== null && item.alias !== ""
+                          ? item.alias
+                          : item.channelname
+                      }}
+                    </el-option>
+                  </el-select>
+                </div>
+                <el-form
+                  :model="osdParams"
+                  label-position="right"
+                  label-width="124px"
+                >
+                  <el-form-item label="预置位">
+                    <el-input
+                      v-model="osdParams.preset"
+                      :disabled="true"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="时间标识" prop="timeMark">
+                    <el-select
+                      v-model="osdParams.timeMark"
+                      placeholder="请选择"
+                      class="mr20"
+                      :disabled="true"
+                    >
+                      <el-option
+                        v-for="item in timelist"
+                        :key="item.id"
+                        :label="item.id + '  (' + item.name + ')'"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="文本标识" prop="textMark">
+                    <el-select
+                      v-model="osdParams.textMark"
+                      placeholder="请选择"
+                      class="mr20"
+                      :disabled="true"
+                    >
+                      <el-option
+                        v-for="item in textlist"
+                        :key="item.id"
+                        :label="item.id + '  (' + item.name + ')'"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="文本内容" prop="textInfo">
+                    <el-input
+                      type="textarea"
+                      :rows="3"
+                      placeholder="请输入内容"
+                      v-model="osdParams.textarea"
+                      :disabled="true"
+                    >
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      @click="osdSearch"
+                      :loading="osdLoading"
+                      >查询</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="设置参数" name="second">
+              <div class="queryParam osdParam">
+                <div class="channelBox">
+                  <span class="title">通道</span>
+                  <el-select
+                    v-model="channelId"
+                    placeholder="请选择"
+                    class="mr20"
+                  >
+                    <el-option
+                      v-for="item in accesslist"
+                      :key="item.channelid"
+                      :label="
+                        item.alias !== null && item.alias !== ''
+                          ? item.alias
+                          : item.channelname
+                      "
+                      :value="item.channelid"
+                    >
+                      {{
+                        item.alias !== null && item.alias !== ""
+                          ? item.alias
+                          : item.channelname
+                      }}
+                    </el-option>
+                  </el-select>
+                </div>
+                <el-form
+                  :model="osdParams"
+                  label-position="right"
+                  label-width="124px"
+                >
+                  <el-form-item label="预置位">
+                    <el-input
+                      v-model="osdParams.preset"
+                      :disabled="true"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="时间标识" prop="timeMark">
+                    <el-select
+                      v-model="osdParams.timeMark"
+                      placeholder="请选择"
+                      class="mr20"
+                    >
+                      <el-option
+                        v-for="item in timelist"
+                        :key="item.id"
+                        :label="item.id + '  (' + item.name + ')'"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="文本标识" prop="textMark">
+                    <el-select
+                      v-model="osdParams.textMark"
+                      placeholder="请选择"
+                      class="mr20"
+                    >
+                      <el-option
+                        v-for="item in textlist"
+                        :key="item.id"
+                        :label="item.id + '  (' + item.name + ')'"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="文本内容" prop="textInfo">
+                    <el-input
+                      type="textarea"
+                      :rows="3"
+                      placeholder="请输入内容"
+                      v-model="osdParams.textarea"
+                    >
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      @click="osdSet"
+                      :loading="osdSetLoading"
+                      >设置</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-tab-pane>
       <el-tab-pane label="装置运行状态报" name="8">
         <div class="runform">
           <el-form :model="runStatusForm" :inline="true" label-width="150px">
@@ -604,6 +784,12 @@ export default {
       idSetLoading: false,
       //水印（安徽）
       waterForm: {},
+      //osd参数
+      osdParams: {},
+      textlist: [],
+      timelist: [],
+      osdLoading: false,
+      osdSetLoading: false,
       accesslist: [], //通道选择器
       channelId: 1,
       waterLoading: false,
@@ -1038,6 +1224,9 @@ export default {
       this.waterLoading = false;
       this.waterSetLoading = false;
     },
+    //查询设置osd
+    osdSearch() {},
+    osdSet() {},
     //装置状态报
     //--act=runningstatus [0xEA] --cmdid=[CMD_ID]
     runstatusSearch() {
@@ -1324,6 +1513,15 @@ export default {
         text-align: right;
       }
     }
+    .osdParam {
+      .channelBox {
+        .title {
+          width: 38px;
+          display: inline-block;
+          padding: 0 12px 0 0;
+        }
+      }
+    }
   }
 }
 </style>
diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index a6f4d25..4c27857 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -17,6 +17,7 @@
           :src="currentPicPath + '!1366x768'"
           :preview-src-list="srcList"
           @load="loadImage"
+          @error="setDefaultImage"
           ref="picJpg"
         >
           <template slot="error">
@@ -353,6 +354,11 @@ export default {
       this.getPointList(data);
     },
     loadImage() {
+      console.log("loading");
+      this.picLoading = false;
+    },
+    setDefaultImage(e) {
+      e.target.src = defaultImage;
       this.picLoading = false;
     },
     //鼠标滚动