Browse Source

feat:宁录更新

yf_elsa.cui 1 month ago
parent
commit
488b4e6bf6

File diff suppressed because it is too large
+ 2 - 2
dist/index.html


File diff suppressed because it is too large
+ 1 - 1
dist/static/css/app.39bf4fc0e58e916ec14f04cc84bbfcde.css


BIN
dist/static/css/app.39bf4fc0e58e916ec14f04cc84bbfcde.css.gz


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/26.db6d37a9286ca8249066.js


BIN
dist/static/js/26.db6d37a9286ca8249066.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/26.e16541eb77e82f204ee6.js


BIN
dist/static/js/26.e16541eb77e82f204ee6.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/8.5738651a7fe22289080e.js


BIN
dist/static/js/8.5738651a7fe22289080e.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/6.0e4a8399034b070ac237.js


BIN
dist/static/js/6.0e4a8399034b070ac237.js.gz


BIN
dist/static/js/7.f1d59d677eeb41f30d96.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/7.f1d59d677eeb41f30d96.js


BIN
dist/static/js/8.cd8c05de01d39331a3b4.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/app.8f4e893d88e120b3cefb.js


BIN
dist/static/js/app.8f4e893d88e120b3cefb.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/manifest.3f3720034aa23ca71bea.js


BIN
dist/static/js/manifest.211d88e0ef1f5c373cb1.js.gz


BIN
dist/static/js/manifest.3f3720034aa23ca71bea.js.gz


+ 1 - 1
src/pages/bigdata/combine/comp/DiseaseMonitor.vue

@@ -322,7 +322,7 @@ export default {
       text-align: center;
       font-size: 16px;
       color: #d0deee;
-      font-weight: bold;
+      // font-weight: bold;
       margin-bottom: 12px;
       .text {
         height: 24px;

+ 1 - 1
src/pages/bigdata/combine/comp/SoilIntro.vue

@@ -290,7 +290,7 @@ export default {
       text-align: center;
       font-size: 16px;
       color: #d0deee;
-      font-weight: bold;
+      // font-weight: bold;
       margin-bottom: 12px;
       .text {
         height: 24px;

+ 1 - 1
src/pages/monitor-dgp/monitorSystem/Monitor.vue

@@ -1070,7 +1070,7 @@ export default {
       })
     },
     viewPhoto(id, gbId) {
-      this.$router.push('/index/photoViewDgp/' + this.Idlist[this.activeIndex].device_id)
+      this.$router.push('/index/photoViewDetail/' + this.Idlist[this.activeIndex].device_id)
     },
     // 获取视频列表
     getJkList() {

+ 13 - 13
src/pages/monitor-dgp/monitorSystem/PhotoView.vue

@@ -6,7 +6,7 @@
     </el-breadcrumb>
     <div class="opt-box">
       <div>
-        <el-button type="primary" size="mini" @click="getImageList()">刷新</el-button>
+        <!-- <el-button type="primary" size="mini" @click="getImageList()">刷新</el-button> -->
         <template v-if="userType == 1">
           <!-- <el-button type="primary" size="mini" @click="delPhoto()"
             >批量删除</el-button
@@ -26,7 +26,7 @@
       </el-date-picker>
     </div>
     <div class="photo-list-content">
-      <viewer :images="images" class="images clearfix">
+      <viewer v-if="images.length > 0" :images="images" class="images clearfix">
         <template slot-scope="scope">
           <el-row :gutter="10" class="photo-list-box">
             <el-col
@@ -80,14 +80,14 @@ export default {
       end: '',
       pageSize: 8,
       // 分页
-      total: null,
+      total: 0
     }
   },
   computed: {
     userType: function () {
       // 获取用户类型
       return window.sessionStorage.getItem('myuser_type')
-    },
+    }
   },
   mounted() {
     this.getImageList()
@@ -113,8 +113,8 @@ export default {
           page: this.page,
           page_size: 8,
           start_time: this.begin,
-          end_time: this.end,
-        }),
+          end_time: this.end
+        })
       })
         .then((res) => {
           if (res.data.data !== null) {
@@ -150,24 +150,24 @@ export default {
       this.$confirm('此操作将删除该图片, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           var ad = JSON.stringify(arr)
           ad = ad.replace('[', '')
           ad = ad.replace(']', '')
           let postData = this.qs.stringify({
-            photo_id_list: ad,
+            photo_id_list: ad
           })
           this.$axios({
             method: 'POST',
             url: '/api/api_gateway?method=camera.camera_manage.del_camera_photo',
-            data: postData,
+            data: postData
           })
             .then((res) => {
               this.$message({
                 type: 'success',
-                message: '删除成功!',
+                message: '删除成功!'
               })
               this.images = []
               this.getImageList()
@@ -176,7 +176,7 @@ export default {
               // console.log(err);
               this.$message({
                 type: 'info',
-                message: '已取消删除',
+                message: '已取消删除'
               })
             })
         })
@@ -191,8 +191,8 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val
       this.getImageList()
-    },
-  },
+    }
+  }
 }
 </script>
 

+ 8 - 0
src/router/index.js

@@ -455,6 +455,10 @@ const PhotoViewDgp = () =>
   import(
     /* webpackChunkName: "monitor" */ '@/pages/monitor-dgp/monitorSystem/PhotoViewDetail'
   );
+const PhotoViewDetail = () =>
+    import(
+      /* webpackChunkName: "monitor" */ '@/pages/monitor-dgp/monitorSystem/PhotoView'
+    );
 const playbackDgp = () =>
   import(/* webpackChunkName: "monitor" */ '@/pages/monitor-dgp/playback');
 
@@ -1618,6 +1622,10 @@ export default new Router({
         },
 
         {
+          path: 'photoViewDetail/:id',
+          component: PhotoViewDetail
+        },
+        {
           path: 'playbackDgp',
           component: playbackDgp,
           meta: {