Merge branch 'xy-ly' into fly

src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue

@@ -102,6 +102,7 @@
               v-model="setForm.preset"
               :min="1"
               :max="255"
+              :disabled="true"
             ></el-input-number>
           </el-form-item>
           <el-form-item label="录制时长 s(秒)" prop="videoTime">
@@ -140,7 +141,9 @@ export default {
       ratiolist: [], //分辨率
       selaccess: "", //选中的通道
       capturenr: {}, //查询后的内容
-      setForm: {}, //设置参数
+      setForm: {
+        preset: 255
+      }, //设置参数
       rules: {
         channelId: [{ required: true, message: "请选择通道", trigger: "blur" }],
         videoTime: [
@@ -165,7 +168,9 @@ export default {
     },
     //获取设备通道
     getSingleAccess(val) {
-      this.setForm = {};
+      this.setForm = {
+        preset: 255
+      };
       console.log(val);
       this.seltermid = val.id;
       this.selcmdId = val.cmdId;
@@ -254,6 +259,7 @@ export default {
     //确认
     submitbtn(setForm) {
       this.$set(this.setForm, "cmdId", this.selcmdId);
+      // this.$set(this.setForm, "preset", 255);
       // this.$set(this.setForm, "termId", this.seltermid);
       this.$refs[setForm].validate((valid) => {
         if (valid) {

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -51,7 +51,7 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmit">查询</el-button>
-            <el-button type="primary" @click="onSubmit">重置</el-button>
+            <!-- <el-button type="primary" @click="onReset">重置</el-button> -->
           </el-form-item>
         </el-form>
       </div>
@@ -489,6 +489,7 @@ export default {
     getSearchdy() {
       getSearchInfo({ type: 1 })
         .then((res) => {
+          this.dyOptions = [{ id: -1, name: "全部" }];
           this.dyOptions = this.dyOptions.concat(res.data.list);
           this.formdata.dyId = this.dyOptions[0].id;
           this.getSearchxl();
@@ -520,6 +521,13 @@ export default {
     onSubmit() {
       this.terminalList();
     },
+    //重置
+    onReset(){
+      this.getSearchdy();
+      this.page = 1
+      this.pageSize = 20
+      this.terminalList();
+    },
     ////获取拍照装置列表数据
     terminalList() {
       this.loading = true;