Merge remote-tracking branch 'origin/master'

src/views/data/photo/index.vue

@@ -12,14 +12,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="开始时间">
+      <!-- <el-form-item label="开始时间">
         <el-date-picker v-model="queryParams.startTime" type="datetime" placeholder="选择开始时间" class="w200">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间">
         <el-date-picker v-model="queryParams.endTime" type="datetime" placeholder="选择结束时间" class="w200">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-date-picker v-model="timeStage" type="datetimerange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" @change="chooseTimeRange" :picker-options="setDateRange">
@@ -30,7 +30,9 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <div v-show="showSearch" class="showSearch">
+      {{searchInfo}}
+    </div>
     <div class="monitor">
       <div class="card" v-for="item in currdataList" :key="item.stnmId">
         <!-- <img src="../../../assets/images/water.jpg" @click="show('http://localhost:81/control/static/img/water.8d19122d.jpg')"> -->
@@ -98,6 +100,7 @@ export default {
       open: false,
       showImg: '',
       srcList: [],
+      
       //时间参数
       timeStage: [],
       // 设置可选择的时间段，*** 必须在 data 返回数据 ***
@@ -125,7 +128,8 @@ export default {
             return (time.getTime() > (choiceDateTime + 7*24*3600*1000)) || (time.getTime() < (choiceDateTime - 7*24*3600*1000));
           }
         },
-      }
+      },
+      
     }
   },
 
@@ -140,14 +144,19 @@ export default {
 
     /** 查询实时数据列表 */
     getList() {
+      if(this.timeStage == null || this.timeStage.length == 0 ){
+        this.$modal.msg("请选择时间");
+        return;
+      }
       this.loading = true;
-      if (this.queryParams.endTime != null)
-        this.queryParams.endTime = formatDate(this.queryParams.endTime, 'yyyy-MM-dd hh:mm:ss')
-      if (this.queryParams.startTime != null)
-        this.queryParams.startTime = formatDate(this.queryParams.startTime, 'yyyy-MM-dd hh:mm:ss')
       queryPhotoList(this.queryParams).then(response => {
         this.currdataList = response.data;
         this.total = response.count;
+        if(this.total==0){
+          this.showSearch=true
+          this.searchInfo='暂无数据'
+        }else
+          this.showSearch=false
         this.currdataList.forEach(function (e, index) {
           if (e.imgName == '' || e.imgName == null) {
 
@@ -189,10 +198,9 @@ export default {
       this.timeStage[1]=this.queryParams.endTime
     },
     chooseTimeRange() {
-
+      if (this.timeStage != null && this.timeStage.length > 0) {
-      if (this.timeStage != null) {
+        this.queryParams.startTime = formatDate(this.timeStage[0], 'yyyy-MM-dd hh:mm:ss');
-        this.logform.queryForm.startTime = formatDate(this.timeStage[0], 'yyyy-MM-dd hh:mm:ss');
+        this.queryParams.endTime = formatDate(this.timeStage[1], 'yyyy-MM-dd hh:mm:ss');
-        this.logform.queryForm.endTime = formatDate(this.timeStage[1], 'yyyy-MM-dd hh:mm:ss');
       }
 
     },
@@ -240,4 +248,9 @@ img {
 .value {
   text-align: center;
 }
+.showSearch{
+  text-align: center;
+  line-height: 200px;
+  font-size: 25px;
+}
 </style>

src/views/web/camera/index.vue

@@ -667,7 +667,7 @@ export default {
     //发送自动重启配置表单
     async restartcfgConfirm() {
 
-      console.log(this.restartcfg.form)
+      
       this.restartcfg.form.bEnable = this.restartcfg.run ? 1 : 0;
       this.restartcfg.form.uHour = this.restartcfg.form.uHour.substring(0, 2)
       let res = await this.$axiosPost('/web/camera/setautocfg', this.restartcfg.form);
@@ -777,10 +777,15 @@ export default {
 
     },
     async handleAutoQuery() {
+     if(this.timeStage == null || this.timeStage.length == 0 ){
+        this.$modal.msg("请选择时间");
+        return;
+      }
       let res = await this.$axiosGet('/web/camera/getloginfo', this.logform.queryForm);
 
       if (res.code === 0) {
         this.logInfoList = res.data;
+        this.$modal.msgSuccess("查询成功");
       }
     },
     async register() {