Merge branch 'web-v2' into web-v2-pro

src/api/laboratory/subject.js

@@ -17,6 +17,14 @@ export function authListSubject(query) {
     params: query
   })
 }
+// 查询实验室列表-带权限-新
+export function authListSubjectTow(query) {
+  return request({
+    url: '/laboratory/subject/manger/pclist',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询实验室详细
 export function getSubject(id) {

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

@@ -265,7 +265,14 @@
 import mqtt from 'mqtt'
 import flvjs from 'flv.js'
 import { hardWareControl,alarmControl } from "@/api/laboratory/hardware";
-import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl, } from "@/api/laboratory/subject";
+import {
+  authListSubject,
+  subjectInfo,
+  updateSubject,
+  mangerVoice,
+  startUrl,
+  authListSubjectTow
+} from '@/api/laboratory/subject'
 import { filterDept } from "@/api/medicUniversity-3_1/index";
 import addSubject from "./addSubject.vue";
 import deviceList from "./deviceList.vue";
@@ -552,7 +559,7 @@ export default {
           if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){
             startUrl(obj).then(res => {
               if(res.code == 200){
-                if(!res.data[0]){
+                if(!res.data.data[0]){
                   this.msgError("视频配置异常请联系管理员")
                   this.newData.videoData = [];
                   this.pageType = 6;
@@ -576,7 +583,7 @@ export default {
           }else{
             startUrl(obj).then(res => {
               if(res.code == 200){
-                if(!res.data[0]){
+                if(!res.data.data[0]){
                   this.msgError("视频配置异常请联系管理员")
                   this.newData.videoData = [];
                   this.pageType = 6;
@@ -584,7 +591,6 @@ export default {
                   let newData = res.data.data;
                   let videoList = [];
                   for(let i=0;i<newData.length;i++){
-                    debugger
                     let text = localStorage.getItem('cameraUrl');
                     let url = newData[i].ws_flv;
                     url = url.split("rtp/");
@@ -835,7 +841,7 @@ export default {
     getList() {
       this.loading = true;
       // this.offMQTT();
-      authListSubject(this.queryParams).then(response => {
+      authListSubjectTow(this.queryParams).then(response => {
         this.subjectList = response.rows;
         this.total = response.total;
         this.loading = false;