coys

package-lock.json

@@ -1216,6 +1216,123 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@better-scroll/core": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/core/-/core-2.5.1.tgz",
+      "integrity": "sha512-koKOuYA55dQ04FJRIVUpMGDr1hbCfWmfX0MGp1hKagkQSWSRpwblqACiwtggVauoj9aaJRJZ9hDsTM4weaavlg==",
+      "requires": {
+        "@better-scroll/shared-utils": "^2.5.1"
+      }
+    },
+    "@better-scroll/indicators": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/indicators/-/indicators-2.5.1.tgz",
+      "integrity": "sha512-Hk+Y00pR6fTsu6C9HGg1yYZtsu1gAcTgcs4C9aM5h6fQANX/T2YIYrOSjZmdL+js2PTcXJWZS8VM4Xjoi1PbfQ==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/infinity": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/infinity/-/infinity-2.5.1.tgz",
+      "integrity": "sha512-GKHrrasIh0KlGzhASHDo5hEEBJcDFpP4XaZGPH9Ey8+QBH6/O1ykAXS2ixkVAOTkBrv+KgFXoCUr4oN1xWeM+g==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/mouse-wheel": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/mouse-wheel/-/mouse-wheel-2.5.1.tgz",
+      "integrity": "sha512-DGnrirRMY6zMM7xwgx09D/cA9A//3J1/uDkq8iBVEyE5p0sEr/keQpjEfFHGkBRa505BnbBwdbN6f5lugEDSPw==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/movable": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/movable/-/movable-2.5.1.tgz",
+      "integrity": "sha512-8bLPRY15bbK4K5+tjrtdaKsFFKmJx72wRdg+xz3xQGFcTD940HFkJiORSOcz8Ufue7eOJfcmreQJBw6XY+TqTw==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/nested-scroll": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/nested-scroll/-/nested-scroll-2.5.1.tgz",
+      "integrity": "sha512-3cRsARxf9tq1VWBq7YAaET0xGAmgY1ERMmnXDo2gHFrmsJoNOionlpAeHdZvKQp2jG7JrzJ1O27nGCXf40gnkw==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/observe-dom": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/observe-dom/-/observe-dom-2.5.1.tgz",
+      "integrity": "sha512-TCMGFLRfpXBPIwtUV/efliUmfmrhSNI7NXdSyjdWjsLOS7dh3eFkmcom5ERVWMaXVELSmujGXLqobT+dT0C/jg==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/observe-image": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/observe-image/-/observe-image-2.5.1.tgz",
+      "integrity": "sha512-0Lhfj83o8EESwOxr8bfStCzNOokTm3KB7JeyMS8u/xl+3tyTuls9889cyAukYk4Yly1cS49pCGfj2P8YOiwtUg==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/pull-down": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/pull-down/-/pull-down-2.5.1.tgz",
+      "integrity": "sha512-Y6XcGu2NlevPg3k9VBRRFvpmfoTA+rO96JGdog2qKHclIPNXnsVwsIHtZfAm9weE/f9UuC4BnB+VUFRlucfupg==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/pull-up": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/pull-up/-/pull-up-2.5.1.tgz",
+      "integrity": "sha512-1hu3xSMxdB8T391KffpNZ7g93lMwZEHjfb1F1Y4KvIkciDt8nXqkGpqrZF+YwR+EJTgYcWqUO8kgmI6XXu7Pkg==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/scroll-bar": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/scroll-bar/-/scroll-bar-2.5.1.tgz",
+      "integrity": "sha512-i6r60pWG/ztkFK2j5Gj54I0LJb2jGh5TWJNQBoW0gUkp28B+0JvBFTwZn9tF7beZCBorKR7Hvvu4O9A1TJy94Q==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/shared-utils": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/shared-utils/-/shared-utils-2.5.1.tgz",
+      "integrity": "sha512-AplkfSjXVYP9LZiD6JsKgmgQJ/mG4uuLmBuwLz8W5OsYc7AYTfN8kw6GqZ5OwCGoXkVhBGyd8NeC4xwYItp0aw=="
+    },
+    "@better-scroll/slide": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/slide/-/slide-2.5.1.tgz",
+      "integrity": "sha512-aDOrfsmjAcz6DXN7mDX3tPieAn195R43Yn9e3waI19TIEok/mQlI1a/kb5quqWOoxkiaZQ8xe3vx5ZTj9C+F6Q==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/wheel": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/wheel/-/wheel-2.5.1.tgz",
+      "integrity": "sha512-fYLcEvkh88Z/2L+P5/+SGMunuc+HzAjGOiORIa/x21qb/knO2RFH4A/V1Rt3OIW4QluWzuFnU6jJRPlsQVZ4fg==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
+    "@better-scroll/zoom": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@better-scroll/zoom/-/zoom-2.5.1.tgz",
+      "integrity": "sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1"
+      }
+    },
     "@discoveryjs/json-ext": {
       "version": "0.5.7",
       "resolved": "https://registry.npmmirror.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
@@ -2610,6 +2727,27 @@
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
+    "better-scroll": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/better-scroll/-/better-scroll-2.5.1.tgz",
+      "integrity": "sha512-OiF3cQroRfTzf+CRQH2z1G52ZAlNHINI6lCAvDmyFu0o0nRuTaV9F+fmBGIU2BL5p5IplUQ4E7sYa1TLfZarzQ==",
+      "requires": {
+        "@better-scroll/core": "^2.5.1",
+        "@better-scroll/indicators": "^2.5.1",
+        "@better-scroll/infinity": "^2.5.1",
+        "@better-scroll/mouse-wheel": "^2.5.1",
+        "@better-scroll/movable": "^2.5.1",
+        "@better-scroll/nested-scroll": "^2.5.1",
+        "@better-scroll/observe-dom": "^2.5.1",
+        "@better-scroll/observe-image": "^2.5.1",
+        "@better-scroll/pull-down": "^2.5.1",
+        "@better-scroll/pull-up": "^2.5.1",
+        "@better-scroll/scroll-bar": "^2.5.1",
+        "@better-scroll/slide": "^2.5.1",
+        "@better-scroll/wheel": "^2.5.1",
+        "@better-scroll/zoom": "^2.5.1"
+      }
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",

src/views/menu/monitoringCall/components/consultInfo.vue

@@ -1,35 +1,39 @@
 <template>
   <div>
-    <NavBar :go="{type:'push',path:'/monitoringCall'}" />
+    <NavBar :go="{ type: 'push', path: '/monitoringCall' }" />
     <div class="bigBox">
       <van-collapse v-model="activeNames" @open="addActiveNames">
         <div class="titleBox">
-
           <div class="textTitle">{{ taskData.taskName }}</div>
           <div class="text">调阅开始时间:{{ taskData.taskStartTime }}</div>
           <div class="text" v-if="taskData.taskStatus == 2">调阅结束时间:{{ taskData.taskEndTime }}</div>
         </div>
-          
-          <!-- 进行调阅 -->
 
-          <!-- <div @click="editTaskInfo">进行调阅</div> -->
-          <div v-if="taskData.taskStatus == 2">
-            <!-- 调阅列表 -->
-            <div class="topBox" v-for="item in taskData.coreMonitoringTaskRegistrationMonitorVOList" :key="item.id">
-              <!-- //主机列表组件 -->
-              <MonitoingList :list="item" :taskStatus="taskData.taskStatus"></MonitoingList>
-            </div>
-          </div>
-          <!-- ------------ -->
-          <div v-else>
-            <van-collapse-item  :name="item.hostId" v-for="item in hostList" :key="item.hostId">
-              <template #title>
-                <div class="textTitle">{{ item.hostName }}</div>
-              </template>
-              <passage ref="passage" :list="item.deviceVOS"  :taskId="$route.params.id.split('_')[0]" :hostId="item.hostId" @resetList="getHostHandler"></passage>
-            </van-collapse-item>
+        <!-- 进行调阅 -->
+
+        <!-- <div @click="editTaskInfo">进行调阅</div> -->
+        <div v-if="taskData.taskStatus == 2">
+          <!-- 调阅列表 -->
+          <div class="topBox" v-for="item in taskData.coreMonitoringTaskRegistrationMonitorVOList" :key="item.id">
+            <!-- //主机列表组件 -->
+            <MonitoingList :list="item" :taskStatus="taskData.taskStatus"></MonitoingList>
           </div>
-      
+        </div>
+        <!-- ------------ -->
+        <div v-else>
+          <van-collapse-item :name="item.hostId" v-for="item in hostList" :key="item.hostId">
+            <template #title>
+              <div class="textTitle">{{ item.hostName }}</div>
+            </template>
+            <passage
+              ref="passage"
+              :list="item.deviceVOS"
+              :taskId="$route.params.id.split('_')[0]"
+              :hostId="item.hostId"
+              @resetList="getHostHandler"
+            ></passage>
+          </van-collapse-item>
+        </div>
       </van-collapse>
 
       <!-- 底部按钮 -->
@@ -39,7 +43,7 @@
             <van-button type="info" @click="addInfoHandler">添加调阅记录</van-button>
           </van-col>
         </van-row> -->
-        <van-row v-if="hostList&&hostList.length>0">
+        <van-row v-if="hostList && hostList.length > 0">
           <van-col span="24">
             <van-button type="info" @click="endMontor">结束调阅</van-button>
           </van-col>
@@ -65,13 +69,13 @@ export default {
   data() {
     return {
       taskData: {},
-      hostList:[],//主机列表
+      hostList: [], //主机列表
       activeNames: []
     }
   },
   components: {
     scandialog,
-    
+
     passage,
     NavBar,
     Dialog,
@@ -94,8 +98,7 @@ export default {
           this.taskData = data
 
           //如果当前是调阅中则获取视频主机和通道
-          if (data&&data.taskStatus < 2) {
-          
+          if (data && data.taskStatus < 2) {
             this.getHostHandler()
           }
         }
@@ -105,9 +108,19 @@ export default {
       getSysDeviceByTaskId({ taskId: this.$route.params.id.split('_')[0] }).then(res => {
         let { code, data, msg } = res
         if (code == 200) {
+          if (data && data.length == 0) {
+            Dialog.alert({
+              message: '机构下没有主机摄像头，不能开启调阅任务!'
+            }).then(() => {
+              // on close
+              this.$router.push('/monitoringCall')
+            })
+          }else{
+
+            this.hostList = data
+            this.activeNames = [this.hostList[0].hostId]
+          }
           
-          this.hostList=data
-          this.activeNames=[this.hostList[0].hostId]
         }
       })
     },
@@ -118,23 +131,26 @@ export default {
     //结束调阅
     endMontor() {
       //没有记录的时候不能结束调阅
-      if (!this.taskData.coreMonitoringTaskRegistrationMonitorVOList||this.taskData.coreMonitoringTaskRegistrationMonitorVOList.length == 0) {
+      if (
+        !this.taskData.coreMonitoringTaskRegistrationMonitorVOList ||
+        this.taskData.coreMonitoringTaskRegistrationMonitorVOList.length == 0
+      ) {
         Dialog({ message: '该调阅没有记录不能进行结束操作!' })
         return
       }
 
-      let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
+      // let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
 
-      startDate = Date.parse(new Date(startDate))
-      let endDate = Date.parse(new Date())
-      if (endDate - startDate <= 3600000) {
-        Dialog({ message: '该调阅未满一个小时请确认' })
-        // 未满一小时不能结束调阅
-      } else {
-        this.$refs.scandialog.visible = true
+      // startDate = Date.parse(new Date(startDate))
+      // let endDate = Date.parse(new Date())
+      // if (endDate - startDate <= 3600000) {
+      //   Dialog({ message: '该调阅未满一个小时请确认' })
+      //   // 未满一小时不能结束调阅
+      // } else {
+      this.$refs.scandialog.visible = true
 
-        startDate = new Date(startDate)
-      }
+      //   startDate = new Date(startDate)
+      // }
     },
     //文件上传
     resultImg(img) {
@@ -175,10 +191,9 @@ export default {
         if (code == 200) {
           Toast.success('扫描成功')
           setTimeout(() => {
-            
             //结束调阅
             this.endHandler()
-          }, 2000);
+          }, 2000)
         }
       })
     },
@@ -190,10 +205,7 @@ export default {
         this.$router.push('/monitoringCall')
       })
     },
-    addActiveNames(){
-      
-    }
-    
+    addActiveNames() {}
   }
 }
 </script>
@@ -203,7 +215,7 @@ export default {
   margin-top: 0px;
   margin-bottom: 0px;
 }
-.titleBox{
+.titleBox {
   margin: 20px;
   margin-bottom: 0px;
   background-color: #fff;
@@ -223,7 +235,7 @@ export default {
   }
   .text {
     padding: 20px;
-    
+
     font-size: 26px;
     color: #b0b0b0;
   }