zhaobao 1 éve
szülő
commit
8af6de34c8

+ 1 - 1
src/settings.js

@@ -37,7 +37,7 @@ module.exports = {
   * 服务API地址
   */
   serverUrl: 'http://113.141.93.143:1888', // 正式环境
-  // devServerUrl: 'http://113.141.93.143:1688', // 开发环境
+  // devServerUrl: 'http://113.141.93.143:1888', // 开发环境
   devServerUrl: 'http://192.168.3.5:1888', // 开发环境 qu
   mqttUrl: 'ws://113.141.93.143:8894/mqtt', // mqtt地址
   /**

+ 98 - 4
src/views/bigScreen/goafCameraAlarm/index.vue

@@ -6,10 +6,57 @@
         <el-button class="tab-item" :type="tabType===0?'primary':''" @click="tabClick(0)">正常</el-button>
         <el-button class="tab-item" :type="tabType===1?'danger':''" @click="tabClick(1)">识别异常</el-button>
       </div>
+      <div class="search-block">
+        <div class="block">
+          <span class="lable">装货开始时间</span>
+          <el-date-picker
+            v-model="conditions.startLoadTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择装货开始始时间"
+            style="width:200px;"
+          />
+        </div>
+        <div class="block">
+          <span class="lable">装货结束时间</span>
+          <el-date-picker
+            v-model="conditions.endLoadTime"
+            type="datetime"
+            style="width:200px;"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择装货结束时间"
+          />
+        </div>
+        <div v-if="tabType===0" class="block">
+          <span class="lable">卸货开始时间</span>
+          <el-date-picker
+            v-model="conditions.startUnLoadTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择装货开始始时间"
+            style="width:200px;"
+          />
+        </div>
+        <div v-if="tabType===0" class="block">
+          <span class="lable">卸货结束时间</span>
+          <el-date-picker
+            v-model="conditions.endUnLoadTime"
+            type="datetime"
+            style="width:200px;"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择装货结束时间"
+          />
+        </div>
+        <div class="block">
+          <span class="lable">车牌</span>
+          <el-input v-if="tabType===0" v-model.trim="conditions.transLicense" placeholder="请输入内容车牌" style="width:150px;" />
+          <el-input v-if="tabType===1" v-model.trim="conditions.transAbnormarlLicense" placeholder="请输入内容车牌" style="width:150px;" />
+        </div>
+        <div class="block"><el-button type="primary" @click="getData">查询</el-button></div>
+      </div>
     </div>
     <template v-if="tabType===0">
       <el-table
-        ref="multipleTableRef"
         :data="dataList"
         style="width:100%"
         row-class-name="CustomRowClassName"
@@ -58,12 +105,15 @@
     </template>
     <template v-if="tabType===1">
       <el-table
+        key="transAbnormarlTable"
         :data="dataList"
         style="width:100%"
         row-class-name="CustomRowClassName"
       >
         <el-table-column type="index" width="55" label="序号" />
-        <el-table-column property="transAbnormarlLicense" label="车牌" min-width="140" />
+        <el-table-column prop="transAbnormarlTime" label="车牌" min-width="140">
+          <template #default="scope">{{ scope.row.transAbnormarlLicense }}</template>
+        </el-table-column>
         <el-table-column property="transLoadTime" label="抓拍图片" min-width="180">
           <template #default="scope">
             <div v-if="scope.row.transAbnormarlPicurl" class="snap-image__preview">
@@ -107,7 +157,13 @@ export default {
       tabType: 0,
       conditions: {
         page: 1,
-        limit: 10
+        limit: 10,
+        startLoadTime: '',
+        endLoadTime: '',
+        transLicense: '',
+        transAbnormarlLicense: '',
+        startUnLoadTime: '',
+        endUnLoadTime: ''
       },
       dataList: [],
       total: 0
@@ -119,12 +175,19 @@ export default {
   methods: {
     parseTime,
     back() {
-      this.$router.push('/')
+      this.$router.push('/bigScreen/index')
     },
     getData() {
+      for (const key in this.conditions) {
+        if (this.isNull(this.conditions[key])) {
+          delete this.conditions[key]
+        }
+      }
       if (this.tabType === 0) {
+        delete this.conditions.transAbnormarlLicense
         this.getAllinfoData()
       } else {
+        delete this.conditions.transLicense
         this.getAnomalyData()
       }
     },
@@ -142,8 +205,24 @@ export default {
         this.dataList = data
       })
     },
+    isNull(val) {
+      if (val !== undefined && val !== 'undefined' && val !== null && val !== '' && val !== ' ') {
+        return false
+      }
+      return true
+    },
     tabClick(type) {
       this.tabType = type
+      this.conditions = {
+        page: 1,
+        limit: 10,
+        startLoadTime: '',
+        endLoadTime: '',
+        transLicense: '',
+        transAbnormarlLicense: '',
+        startUnLoadTime: '',
+        endUnLoadTime: ''
+      }
       this.getData()
     },
     handleSizeChange(limit) {
@@ -202,6 +281,21 @@ export default {
                 border-radius: 0;
             }
         }
+        .search-block{
+          display: flex;
+          justify-content:flex-end;
+          align-items: center;
+          flex-wrap: wrap;
+          flex: 1;
+          .block{
+            margin-left: 10px;
+            .lable{
+              color: #fff;
+              font-size: 14px;
+              padding-right:10px;
+            }
+          }
+        }
     }
 .snap-image__preview{
     padding-top: 8px;

+ 1 - 1
src/views/bigScreen/home/index.vue

@@ -80,7 +80,7 @@ export default {
             &.camera{
                 width: 50%;
                 .container{
-                    height: 510px;
+                    height: 100%;
                 }
             }
             &.carPlateInfo{