wangtao 2 tahun lalu
induk
melakukan
47207b5b7c

+ 2 - 2
public/static/config.js

@@ -10,8 +10,8 @@
 // api 请求路径
 var PLATFROM_CONFIG = {};
 // PLATFROM_CONFIG.baseUrl = "http://172.16.120.49/securityapi/" //测试服务器
-// PLATFROM_CONFIG.baseUrl = "http://172.16.120.85:8082/"
-PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
+PLATFROM_CONFIG.baseUrl = "http://172.16.120.85:8082/"
+    // PLATFROM_CONFIG.baseUrl = "http://10.21.39.1:8082" //生产
     //alarming WEBSOCKET
 let userInfo = window.localStorage.getItem("key");
 var PLATFROM_WEBSOCKET = {};

+ 1 - 0
src/assets/styles/index.scss

@@ -24,6 +24,7 @@ html {
 
 #app {
     height: 100%;
+    overflow-y: auto;
 }
 
 *,

+ 18 - 6
src/views/MochaITOM/record/index.vue

@@ -164,8 +164,8 @@
       @current-change="handleCurrentChange"
       :page-sizes="[10, 15, 20, 30]"
       @size-change="handleSizeChange"
-      :current-page="queryParams.pageNo"
-      :page-size="queryParams.pageSize"
+      :current-page="queryParams.current"
+      :page-size="queryParams.size"
       layout="sizes,prev, pager, next"
       :total="totalCount"
     >
@@ -219,8 +219,6 @@ export default {
         startTime: undefined,
         endTime: undefined,
         status: undefined,
-        pageSize: 15,
-        pageNo: 1,
       },
       // 表单参数
       form: {},
@@ -266,8 +264,6 @@ export default {
         name: undefined,
         current: 1,
         size: 15,
-        pageSize: 15,
-        pageNo: 1,
         status: undefined,
       };
       this.resetForm("queryForm");
@@ -300,8 +296,14 @@ export default {
               planName: i.planName,
               children: [i],
             });
+            // if(i.updateTime){
+            //   i.isComplete = true
+            // }
             tempArr.push(i.planName);
           } else {
+            // if(i.updateTime){
+            //   i.isComplete = true
+            // }
             newArr[tempArr.indexOf(i.planName)].children.push(i);
           }
         });
@@ -369,6 +371,16 @@ export default {
     closeDialog() {
       this.destroyHls();
     },
+     //改变起始页
+    handleCurrentChange(val) {
+      this.queryParams.current = val
+      this.getList()
+    },
+    //改变每条数
+    handleSizeChange(val) {
+      this.queryParams.size = val
+      this.getList()
+    },
   },
 };
 </script>

+ 8 - 7
src/views/index/components/monitor.vue

@@ -12,7 +12,7 @@
           />
         </div>
         <ul class="monitor-list" >
-         
+
           <li v-for="(hls, index) in hls_video" :key="index" style="height:14vh">
             <video
               v-if="hls.boolhls"
@@ -117,7 +117,7 @@ export default {
   },
   data() {
     return {
-      hls2:"",     
+      hls2:"",
        videoS:false,
       configKey: undefined,
       configName: undefined,
@@ -205,7 +205,7 @@ export default {
       iframe_Url: "",
       tableData:[],
       videoMsg:{
-        
+
       }
     };
   },
@@ -663,6 +663,10 @@ export default {
 ::-webkit-scrollbar {
 	    display: none
 }
+.el-popper{
+  width:14.8%;
+  overflow: hidden;
+}
 </style>
 <style lang="scss">
 .monitor-setting .el-form-item__label {
@@ -717,10 +721,7 @@ export default {
   width:100%;
 }
 .el-scrollbar__bar.is-vertical { width: 0 !important }
-.el-popper{
-  width:14.8%;
-  overflow: hidden;
-}
+
 .titleZise{
   position: absolute;
   top:0;

+ 3 - 3
vue.config.js

@@ -109,18 +109,18 @@ module.exports = {
                             chunks: 'all',
                             cacheGroups: {
                                 libs: {
-                                    name: 'chunk-libs',
+                                    name: 'chunk-libs1',
                                     test: /[\\/]node_modules[\\/]/,
                                     priority: 10,
                                     chunks: 'initial' // only package third parties that are initially dependent
                                 },
                                 elementUI: {
-                                    name: 'chunk-elementUI', // split elementUI into a single package
+                                    name: 'chunk-elementUI1', // split elementUI into a single package
                                     priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
                                     test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
                                 },
                                 commons: {
-                                    name: 'chunk-commons',
+                                    name: 'chunk-commons1',
                                     test: resolve('src/components'), // can customize your rules
                                     minChunks: 3, //  minimum common number
                                     priority: 5,