Merge branch 'nhkd-web' of http://192.168.1.43:3000/git/sass-lab-web into nhkd-web

src/views/comprehensive/laboratoryManagement/subject/indexKDNH.vue

@@ -392,7 +392,7 @@ export default {
     this.getDeptList();
     // this.subscriptionMQTT();
     this.getList();
-   // this.queryHardByTypeList();
+    // this.queryHardByTypeList();
   },
   methods:{
     goAlarmRecord(){
@@ -573,12 +573,12 @@ export default {
           if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){
             startUrl(obj).then(res => {
               if(res.code == 200){
-                if(!res.data.data[0]){
+                if(!res.data[0]){
                   this.msgError("视频配置异常请联系管理员")
                   this.newData.videoData = [];
                   this.pageType = 6;
                 }else{
-                  let newData = res.data.data;
+                  let newData = res.data;
                   let videoList = [];
                   for(let i=0;i<newData.length;i++){
                     let obj = {
@@ -597,12 +597,12 @@ export default {
           }else{
             startUrl(obj).then(res => {
               if(res.code == 200){
-                if(!res.data.data[0]){
+                if(!res.data[0]){
                   this.msgError("视频配置异常请联系管理员")
                   this.newData.videoData = [];
                   this.pageType = 6;
                 }else{
-                  let newData = res.data.data;
+                  let newData = res.data;
                   let videoList = [];
                   for(let i=0;i<newData.length;i++){
                     let text = localStorage.getItem('cameraUrl');
@@ -687,11 +687,11 @@ export default {
                 startUrl(obj).then(res => {
                   console.log('res',res)
                   if(res.code == 200){
-                    if(!res.data.data[0]){
+                    if(!res.data[0]){
                       this.msgError("视频配置异常请联系管理员")
                       return
                     }
-                    let newData = res.data.data;
+                    let newData = res.data;
                     let videoList = [];
                     for(let i=0;i<newData.length;i++){
                       let obj = {
@@ -714,11 +714,11 @@ export default {
                 startUrl(obj).then(res => {
                   console.log('res',res)
                   if(res.code == 200){
-                    if(!res.data.data[0]){
+                    if(!res.data[0]){
                       this.msgError("视频配置异常请联系管理员")
                       return
                     }
-                    let newData = res.data.data;
+                    let newData = res.data;
                     let videoList = [];
                     for(let i=0;i<newData.length;i++){
                       let text = localStorage.getItem('cameraUrl');
@@ -748,6 +748,8 @@ export default {
           }else{
             this.$set(this.checkedSubject,'videoData',[]);
           }
+        }else if(type==5){
+          this.queryHardByTypeList();
         }
       }
     },